root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:设备状态监控wql改成mybatis plus

Browse Source
This commit is contained in:
zds
2024-10-12 18:02:03 +08:00
parent 54af1e05e7
commit f196238217
13 changed files with 318 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lms/nladmin-ui/src/views/wms/agvrush/devicestatus/index.vue
View File

@@ -137,8 +137,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="upload_user">
<el-select v-model="form.upload_user" placeholder="请选择" filterable multiple clearable
style="width: 200px">
<el-select v-model="form.upload_user" placeholder="请选择" filterable multiple clearable style="width: 200px">
<el-option
v-for="item in userList"
:key="item.username"
@@ -146,7 +145,7 @@
:value="item.username"
>
<span style="float: left">{{ item.username }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.personName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.person_name }}</span>
</el-option>
</el-select>
</el-form-item>
@@ -167,16 +166,15 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip width="150px"/>
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip width="150px"/>
<el-table-column prop="product_area" label="区域" show-overflow-tooltip/>
<el-table-column prop="device_type" label="设备类型" :formatter="typeFormatter" show-overflow-tooltip/>
<el-table-column prop="mode" label="工作状态" :formatter="modeFormatter" show-overflow-tooltip/>
<el-table-column prop="mode_update_time" label="工作状态变更时间" show-overflow-tooltip width="150px"/>
<el-table-column prop="error" label="故障状态" :formatter="erroFormatter" show-overflow-tooltip/>
<el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip/>
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip/>
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip/>
<el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'故障编码')" />
<el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
<el-table-column prop="product_area" label="区域" :min-width="flexWidth('product_area',crud.data,'区域')" />
<el-table-column prop="device_type" label="设备类型" :formatter="typeFormatter" :min-width="flexWidth('device_type',crud.data,'设备类型')" />
<el-table-column prop="mode" label="工作状态" :formatter="modeFormatter" :min-width="flexWidth('mode',crud.data,'工作状态')" />
<el-table-column prop="mode_update_time" label="工作状态变更时间" :min-width="flexWidth('mode_update_time',crud.data,'工作状态变更时间')" />
<el-table-column prop="error" label="故障状态" :formatter="erroFormatter" :min-width="flexWidth('error',crud.data,'故障状态')" />
<el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip />
<el-table-column prop="error_update_time" label="故障状态更新时间" :min-width="flexWidth('error_update_time',crud.data,'故障编码')" />
<el-table-column label="是否上报" align="center" prop="upload_flag">
<template slot-scope="scope">
<el-switch
@@ -189,11 +187,11 @@
/>
</template>
</el-table-column>
<el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip/>
<el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip />
<el-table-column
v-permission="['admin','customerbase:edit','customerbase:del']"
v-permission="['admin','devicestatus:edit','devicestatus:del']"
label="操作"
width="150px"
width="120px"
align="center"
>
<template slot-scope="scope">
@@ -222,7 +220,11 @@ import crudUser from '@/views/system/user/user'
const defaultForm = {
device_code: null,
upload_user: null
device_name: null,
product_area: null,
device_type: null,
upload_flag: null,
upload_user: []
}
export default {
name: 'DeviceStatus',
@@ -244,7 +246,25 @@ export default {
},
data() {
return {
permission: {},
permission: {
add: ['admin', 'devicestatus:add'],
edit: ['admin', 'devicestatus:edit'],
del: ['admin', 'devicestatus:del']
},
rules: {
device_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
device_name: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
product_area: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
device_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
]
},
classes: [],
userList: [],
agvRegionList: [
@@ -264,8 +284,7 @@ export default {
{ 'label': '四向车', 'value': '3' },
{ 'label': 'AGV', 'value': '4' },
{ 'label': '其他', 'value': '5' }
],
rules: {}
]
}
},
methods: {
@@ -273,15 +292,19 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.afterToCU](crud, form) {
[CRUD.HOOK.afterToEdit](crud, form) {
this.getUserList()
debugger
if (form.upload_user && form.upload_user !== '') {
form.upload_user = form.upload_user.split(',')
} else {
form.upload_user = null
}
},
[CRUD.HOOK.beforeSubmit](crud) {
const arr = crud.form.upload_user
const regionCodes = arr.map(user => user).join(',')
this.crud.form.upload_user = regionCodes
},
// 改变状态
getUserList() {
crudUser.getUserList().then(res => {

16
lms/nladmin-ui/src/views/wms/basedata/master/faultdevice/index.vue
View File

@@ -106,14 +106,14 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="fault_code" label="故障编码" show-overflow-tooltip />
<el-table-column prop="fault_info" label="故障信息 " show-overflow-tooltip width="150px" />
<el-table-column prop="fault_type" label="异常类型 " show-overflow-tooltip width="100px" :formatter="formatType" />
<el-table-column prop="solve_mode" label="解决方式" show-overflow-tooltip width="300px" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_name" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column prop="fault_code" label="故障编码" :min-width="flexWidth('fault_code',crud.data,'故障编码')" />
<el-table-column prop="fault_info" label="故障信息" :min-width="flexWidth('fault_info',crud.data,'故障信息')" />
<el-table-column prop="fault_type" label="异常类型" :min-width="flexWidth('fault_type',crud.data,'异常类型')" :formatter="formatType" />
<el-table-column prop="solve_mode" label="解决方式" :min-width="flexWidth('solve_mode',crud.data,'解决方式')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改者" :min-width="flexWidth('update_name',crud.data,'修改者')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
v-permission="['admin','faultdevice:edit','faultdevice:del']"
label="操作"