优化项目启动时警告问题

This commit is contained in:
BianLzhaoMin 2024-07-23 10:40:28 +08:00
parent e9fa9c20cb
commit 5b27e5202f
2 changed files with 505 additions and 315 deletions

View File

@ -1,85 +1,230 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 表单 --> <!-- 表单 -->
<el-form :inline="true" :model="queryForm" ref="queryForm" label-width="68px" size="small" v-show="showSearch"> <el-form
:inline="true"
:model="queryForm"
ref="queryForm"
label-width="68px"
size="small"
v-show="showSearch"
>
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input v-model="queryForm.keyWord" clearable placeholder="请输入关键字" /> <el-input
v-model="queryForm.keyWord"
clearable
placeholder="请输入关键字"
/>
</el-form-item> </el-form-item>
<!-- 物品种类下拉 --> <!-- 物品种类下拉 -->
<el-form-item label="物品种类" prop="goodsType"> <el-form-item label="物品种类" prop="goodsType">
<el-select v-model="queryForm.goodsType" placeholder="请选择物品种类" filterable clearable> <el-select
v-model="queryForm.goodsType"
placeholder="请选择物品种类"
filterable
clearable
>
<el-option label="物品种类1" value="1"></el-option> <el-option label="物品种类1" value="1"></el-option>
<el-option label="物品种类2" value="2"></el-option> <el-option label="物品种类2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 设备类型下拉 --> <!-- 设备类型下拉 -->
<el-form-item label="设备类型" prop="deviceType"> <el-form-item label="设备类型" prop="deviceType">
<el-select v-model="queryForm.deviceType" placeholder="请选择设备类型" filterable clearable> <el-select
v-model="queryForm.deviceType"
placeholder="请选择设备类型"
filterable
clearable
>
<el-option label="设备类型1" value="1"></el-option> <el-option label="设备类型1" value="1"></el-option>
<el-option label="设备类型2" value="2"></el-option> <el-option label="设备类型2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 规格型号下拉 --> <!-- 规格型号下拉 -->
<el-form-item label="规格型号" prop="specificationModel"> <el-form-item label="规格型号" prop="specificationModel">
<el-select v-model="queryForm.specificationModel" placeholder="请选择规格型号" filterable clearable> <el-select
v-model="queryForm.specificationModel"
placeholder="请选择规格型号"
filterable
clearable
>
<el-option label="规格型号1" value="1"></el-option> <el-option label="规格型号1" value="1"></el-option>
<el-option label="规格型号2" value="2"></el-option> <el-option label="规格型号2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" plain @click="resetQueryForm">重置</el-button> icon="el-icon-search"
type="primary"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" plain @click="resetQueryForm"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-button class="el-icon-back" type="success" @click="goBackPushAndAccept" size="mini">&nbsp;推送接收</el-button> <el-button
<el-button type="primary" @click="accept" size="mini" :loading="loading" v-if="!isDetail">接收</el-button> class="el-icon-back"
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" /> type="success"
@click="goBackPushAndAccept"
size="mini"
>&nbsp;推送接收</el-button
>
<el-button
type="primary"
@click="accept"
size="mini"
:loading="loading"
v-if="!isDetail"
>接收</el-button
>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
/>
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table :data="tableData" style="width: 100%" @selection-change="selection"> <el-table
:data="tableData"
style="width: 100%"
@selection-change="selection"
>
<el-table-column <el-table-column
v-if="!isDetail" v-if="!isDetail"
type="selection" type="selection"
width="55" width="55"
align="center" align="center"
:selectable="row => row.status == '1'" :selectable="(row) => row.status == '1'"
/> />
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
align="center" align="center"
width="50" width="50"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" :index="
indexContinuation(queryParams.pageNum, queryParams.pageSize)
"
/> />
<el-table-column prop="machineryNum" label="机具编号" align="center" show-overflow-tooltip /> <el-table-column
<el-table-column prop="machineryName" label="机具名称" align="center" show-overflow-tooltip /> prop="machineryNum"
<el-table-column prop="machineryType" label="机具类型" align="center" show-overflow-tooltip /> label="机具编号"
<el-table-column prop="specificationModel" label="规格型号" align="center" show-overflow-tooltip /> align="center"
<el-table-column prop="rentalDate" label="租赁日期" align="center" show-overflow-tooltip /> show-overflow-tooltip
<el-table-column prop="rentalPrice" label="租赁价格" align="center" show-overflow-tooltip /> />
<el-table-column prop="unit" label="所属单位" align="center" show-overflow-tooltip /> <el-table-column
<el-table-column prop="manufacturer" label="生产厂家" align="center" show-overflow-tooltip /> prop="machineryName"
<el-table-column prop="productionDate" label="出厂日期" align="center" show-overflow-tooltip /> label="机具名称"
<el-table-column prop="isNewEquipment" label="是否是新装备" align="center" show-overflow-tooltip /> align="center"
<el-table-column prop="verificationNum" label="检验证编号" align="center" show-overflow-tooltip /> show-overflow-tooltip
<el-table-column prop="inspectionUnit" label="检验单位" align="center" show-overflow-tooltip /> />
<el-table-column prop="inspectionDate" label="检验日期" align="center" show-overflow-tooltip /> <el-table-column
<el-table-column prop="nextInspectionDate" label="下次检验日期" align="center" show-overflow-tooltip /> prop="machineryType"
<el-table-column prop="machinistName" label="机手姓名" align="center" show-overflow-tooltip v-if="!isDetail"> label="机具类型"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="specificationModel"
label="规格型号"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="rentalDate"
label="租赁日期"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="rentalPrice"
label="租赁价格"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="unit"
label="所属单位"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="manufacturer"
label="生产厂家"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="productionDate"
label="出厂日期"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="isNewEquipment"
label="是否是新装备"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="verificationNum"
label="检验证编号"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="inspectionUnit"
label="检验单位"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="inspectionDate"
label="检验日期"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="nextInspectionDate"
label="下次检验日期"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="machinistName"
label="机手姓名"
align="center"
show-overflow-tooltip
v-if="!isDetail"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.machinistName" type="text" size="mini" @click="getMachinistDetail(scope.row)"> <el-button
v-if="scope.row.machinistName"
type="text"
size="mini"
@click="getMachinistDetail(scope.row)"
>
{{ scope.row.machinistName }} {{ scope.row.machinistName }}
</el-button> </el-button>
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="状态" align="center" show-overflow-tooltip> <el-table-column
prop="status"
label="状态"
align="center"
show-overflow-tooltip
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status == 0" type="danger">未接收</el-tag> <el-tag v-if="scope.row.status == 0" type="danger"
<el-tag v-else-if="scope.row.status == 1" type="success">已接收</el-tag> >未接收</el-tag
>
<el-tag v-else-if="scope.row.status == 1" type="success"
>已接收</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -97,20 +242,38 @@
<el-card> <el-card>
<div class="wrapper"> <div class="wrapper">
<div class="idCardContainer"> <div class="idCardContainer">
<el-image class="idCard" :src="src.IDCardFront" :preview-src-list="src.IDCardFrontList"></el-image> <el-image
<el-image class="idCard" :src="src.IDCardBack" :preview-src-list="src.IDCardBackList"></el-image> class="idCard"
:src="src.IDCardFront"
:preview-src-list="src.IDCardFrontList"
></el-image>
<el-image
class="idCard"
:src="src.IDCardBack"
:preview-src-list="src.IDCardBackList"
></el-image>
</div> </div>
<div class="information"> <div class="information">
<el-row> <el-row>
<el-col :span="10" class="item">姓名: {{ information.name }}</el-col> <el-col :span="10" class="item"
<el-col :span="14" class="item">身份证号: {{ information.IDCard }}</el-col> >姓名: {{ information.name }}</el-col
>
<el-col :span="14" class="item"
>身份证号: {{ information.IDCard }}</el-col
>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" class="item">性别: {{ information.gender }}</el-col> <el-col :span="12" class="item"
>性别: {{ information.gender }}</el-col
>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10" class="item">年龄: {{ information.age }}</el-col> <el-col :span="10" class="item"
<el-col :span="14" class="item">电话: {{ information.phone }}</el-col> >年龄: {{ information.age }}</el-col
>
<el-col :span="14" class="item"
>电话: {{ information.phone }}</el-col
>
</el-row> </el-row>
</div> </div>
</div> </div>
@ -118,21 +281,34 @@
<!-- 持证信息 --> <!-- 持证信息 -->
<el-card header="持证信息"> <el-card header="持证信息">
<div class="certificate"> <div class="certificate">
<div class="certificateItem" v-for="item in certificateList"> <div
<el-image class="itemImg" :src="item.src" :preview-src-list="item.previewList"></el-image> class="certificateItem"
v-for="(item, index) in certificateList"
:key="index"
>
<el-image
class="itemImg"
:src="item.src"
:preview-src-list="item.previewList"
></el-image>
<span class="itemName">{{ item.name }}</span> <span class="itemName">{{ item.name }}</span>
</div> </div>
</div> </div>
</el-card> </el-card>
<!-- 关闭按钮 --> <!-- 关闭按钮 -->
<el-button type="primary" slot="footer" @click="dialogVisible = false">关闭</el-button> <el-button
type="primary"
slot="footer"
@click="dialogVisible = false"
>关闭</el-button
>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'PushAndAcceptDetail', name: 'pushAndAcceptDetail',
data() { data() {
return { return {
loading: false, loading: false,
@ -190,10 +366,16 @@ export default {
dialogVisible: false, dialogVisible: false,
// //
src: { src: {
IDCardFront: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', IDCardFront:
IDCardBack: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
IDCardFrontList: ['https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg'], IDCardBack:
IDCardBackList: ['https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg'], 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
IDCardFrontList: [
'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
],
IDCardBackList: [
'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
],
}, },
// //
information: { information: {
@ -208,22 +390,30 @@ export default {
{ {
name: 'xx范德萨范德萨范德萨范德萨发大水范德萨发大水x证', name: 'xx范德萨范德萨范德萨范德萨发大水范德萨发大水x证',
src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
previewList: ['https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg'], previewList: [
'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
],
}, },
{ {
name: 'xx范德萨范范德萨范德萨发大水范德萨德萨发大水x证', name: 'xx范德萨范范德萨范德萨发大水范德萨德萨发大水x证',
src: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', src: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
previewList: ['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'] previewList: [
'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
],
}, },
{ {
name: 'xx范德萨范德萨发大水x证', name: 'xx范德萨范德萨发大水x证',
src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
previewList: ['https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg'] previewList: [
'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
],
}, },
{ {
name: 'xx范德萨范德萨发大水x证', name: 'xx范德萨范德萨发大水x证',
src: 'https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png', src: 'https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png',
previewList: ['https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png'] previewList: [
'https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png',
],
}, },
], ],
} }
@ -238,7 +428,7 @@ export default {
methods: { methods: {
// //
handleQuery() { handleQuery() {
console.log('🚀 ~ handleQuery ~ 搜索:', params) console.log('🚀 ~ handleQuery ~ 搜索:')
this.getList() this.getList()
}, },
// //
@ -324,7 +514,7 @@ export default {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: start; justify-content: flex-start;
.certificateItem { .certificateItem {
width: 25%; width: 25%;
display: flex; display: flex;

View File

@ -44,7 +44,7 @@ module.exports = {
// target: `http://192.168.2.76:28080`, //超 // target: `http://192.168.2.76:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
target: `http://192.168.2.76:28080`,//旭/ target: `http://192.168.2.81:28080`,//旭/
// target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.248:28080`, //帅
// target: `http://10.40.92.253:28080`, //福 // target: `http://10.40.92.253:28080`, //福