bug调整

This commit is contained in:
2024-06-05 19:44:23 +08:00
parent 03f7a5af97
commit 913378ae0c
3 changed files with 86 additions and 81 deletions

View File

@@ -10,7 +10,7 @@
{{ detailData.subName }} {{ detailData.subName }}
</el-descriptions-item> </el-descriptions-item>
<template v-if='detailData.deviceType == 1'> <template v-if='detailData.deviceType == 1'>
<el-descriptions-item label='设备名称' :span='2'> <el-descriptions-item label='终端装置' :span='2'>
{{ detailData.deviceName }} {{ detailData.deviceName }}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
@@ -22,12 +22,17 @@
{{ detailData.deviceName }} {{ detailData.deviceName }}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<el-descriptions-item label='当前状态'> <!-- <el-descriptions-item label='当前状态'>-->
<el-tag :type='getDeviceStatusType(detailData.deviceStatus)'> <!-- <el-tag :type='getDeviceStatusType(detailData.deviceStatus)'>-->
{{ getDeviceStatus(detailData.deviceStatus) }} <!-- {{ getDeviceStatus(detailData.deviceStatus) }}-->
<!-- </el-tag>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label='变更前前状态'>
<el-tag :type='getDeviceStatusType(detailData.devOriginalStatus)'>
{{ getDeviceStatus(detailData.devOriginalStatus) }}
</el-tag> </el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label='变更状态' > <el-descriptions-item label='目标状态'>
<el-tag :type='getDeviceStatusType(detailData.devStatus)'> <el-tag :type='getDeviceStatusType(detailData.devStatus)'>
{{ getDeviceStatus(detailData.devStatus) }} {{ getDeviceStatus(detailData.devStatus) }}
</el-tag> </el-tag>

View File

@@ -66,7 +66,7 @@ const tableStore = new TableStore({
{ title: '监测点', field: 'deviceName', minWidth: 200 }, { title: '监测点', field: 'deviceName', minWidth: 200 },
{ title: '退运原因', field: 'propertyNo', minWidth: 160 }, { title: '退运原因', field: 'propertyNo', minWidth: 160 },
{ {
title: '前状态', field: 'devOriginalStatus', minWidth: 130, title: '变更前状态', field: 'devOriginalStatus', minWidth: 130,
render: 'tag', render: 'tag',
custom: { custom: {
0: 'success', 0: 'success',

View File

@@ -65,7 +65,7 @@ const tableStore = new TableStore({
{ title: '终端名称', field: 'deviceName', minWidth: 130 }, { title: '终端名称', field: 'deviceName', minWidth: 130 },
{ title: '变更原因', field: 'propertyNo', minWidth: 160 }, { title: '变更原因', field: 'propertyNo', minWidth: 160 },
{ {
title: '前状态', title: '变更前状态',
field: 'devOriginalStatus', field: 'devOriginalStatus',
minWidth: 130, minWidth: 130,
render: 'tag', render: 'tag',
@@ -85,7 +85,7 @@ const tableStore = new TableStore({
} }
}, },
{ {
title: '变更状态', title: '目标状态',
field: 'devStatus', field: 'devStatus',
minWidth: 130, minWidth: 130,
render: 'tag', render: 'tag',