bug调整

src/views/pqs/supervise/retire/detail.vue

@@ -1,42 +1,47 @@
 <template>
-  <!--工作流view的路径：/pqs/supervise/retire/detail-->
+    <!--工作流view的路径：/pqs/supervise/retire/detail-->
-  <div class='default-main'>
+    <div class='default-main'>
-    <!--        <h1>详细信息回显</h1>-->
+        <!--        <h1>详细信息回显</h1>-->
-    <el-descriptions :column='2' border>
+        <el-descriptions :column='2' border>
-      <el-descriptions-item label='供电公司'>
+            <el-descriptions-item label='供电公司'>
-        {{ detailData.gdName }}
+                {{ detailData.gdName }}
-      </el-descriptions-item>
+            </el-descriptions-item>
-      <el-descriptions-item label='变电站'>
+            <el-descriptions-item label='变电站'>
-        {{ 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>
-      <template v-else>
+            <template v-else>
-        <el-descriptions-item label='母线'>
+                <el-descriptions-item label='母线'>
-          {{ detailData.volName }}
+                    {{ detailData.volName }}
-        </el-descriptions-item>
+                </el-descriptions-item>
-        <el-descriptions-item label='监测点'>
+                <el-descriptions-item label='监测点'>
-          {{ 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-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.devOriginalStatus)'>
-          {{ getDeviceStatus(detailData.devStatus) }}
+                    {{ getDeviceStatus(detailData.devOriginalStatus) }}
-        </el-tag>
+                </el-tag>
-      </el-descriptions-item>
+            </el-descriptions-item>
-      <el-descriptions-item :span='2' label='变更原因'>
+            <el-descriptions-item label='目标状态'>
-        {{ detailData.propertyNo }}
+                <el-tag :type='getDeviceStatusType(detailData.devStatus)'>
-      </el-descriptions-item>
+                    {{ getDeviceStatus(detailData.devStatus) }}
-    </el-descriptions>
+                </el-tag>
-  </div>
+            </el-descriptions-item>
+            <el-descriptions-item :span='2' label='变更原因'>
+                {{ detailData.propertyNo }}
+            </el-descriptions-item>
+        </el-descriptions>
+    </div>
 </template>
 <script setup lang='ts'>
 import { onMounted, ref } from 'vue'
@@ -48,65 +53,65 @@ defineOptions({ name: 'QuitRunningDeviceDetail' })
 const { query } = useRoute() // 查询参数
 
 const props = defineProps({
-  id: propTypes.string.def(undefined)
+    id: propTypes.string.def(undefined)
 })
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref({}) // 详情数据
 const queryId = query.id// 从 URL 传递过来的 id 编号
 const getDeviceStatus = (status: number) => {
-  if (status === 0) {
+    if (status === 0) {
+        return '运行'
+    }
+    if (status === 1) {
+        return '检修'
+    }
+    if (status === 2) {
+        return '停运'
+    }
+    if (status === 3) {
+        return '调试'
+    }
+    if (status === 4) {
+        return '退运'
+    }
     return '运行'
-  }
-  if (status === 1) {
-    return '检修'
-  }
-  if (status === 2) {
-    return '停运'
-  }
-  if (status === 3) {
-    return '调试'
-  }
-  if (status === 4) {
-    return '退运'
-  }
-  return '运行'
 }
 
 const getDeviceStatusType = (status: number) => {
-  if (status === 0) {
+    if (status === 0) {
+        return 'success'
+    }
+    if (status === 1) {
+        return 'warning'
+    }
+    if (status === 2) {
+        return 'danger'
+    }
+    if (status === 3) {
+        return 'warning'
+    }
+    if (status === 4) {
+        return 'info'
+    }
     return 'success'
-  }
-  if (status === 1) {
-    return 'warning'
-  }
-  if (status === 2) {
-    return 'danger'
-  }
-  if (status === 3) {
-    return 'warning'
-  }
-  if (status === 4) {
-    return 'info'
-  }
-  return 'success'
 }
 
 /** 获得数据 */
 const getInfo = async () => {
-  detailLoading.value = true
+    detailLoading.value = true
-  try {
+    try {
-    await getRunningDeviceById(props.id || queryId).then(res => {
+        await getRunningDeviceById(props.id || queryId).then(res => {
-      detailData.value = res.data
+            detailData.value = res.data
-    })
+        })
-  } finally {
+    } finally {
-    detailLoading.value = false
+        detailLoading.value = false
-  }
+    }
 }
 defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
 
 /** 初始化 **/
 onMounted(() => {
-  getInfo()
+    getInfo()
 })
 
 </script>

src/views/pqs/supervise/retire/monitor.vue

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

src/views/pqs/supervise/retire/terminal.vue

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