From ded06566e93c97e3f0a9d848975c0e467c9bf0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 24 Oct 2024 19:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8F=E6=B5=8B=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=80=BC=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/equipmentManagement/measurement.vue  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
index a6a7534e..f3122d26 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -63,34 +63,34 @@ const tableColumn = [
         prop: 'porder',
         width: 76,
         align: 'center',
-        sortable:'custom'
+        sortable: 'custom',
     },
     {
         label: '属性名称',
         prop: 'attributeName',
         align: 'left',
-        sortable:'custom'
+        sortable: 'custom',
     },
     {
         label: '属性编码',
         prop: 'attributeCode',
         align: 'left',
         width: 200,
-        sortable:'custom'
+        sortable: 'custom',
     },
     {
         label: '子系统',
         prop: 'subSystem',
         align: 'left',
         width: 110,
-        sortable:false
+        sortable: false,
     },
     {
         label: '实时值',
         prop: 'realTimeValue',
         width: 140,
         align: 'center',
-        sortable:false
+        sortable: false,
     },
 ]
 const tableData = ref<any[]>([])
@@ -156,10 +156,10 @@ const getCompleteData = () => {
         })
         .then((realData: any) => {
             const data = realData.list.map((item: any) => {
-                const realValItem = realData.realVal[props.deviceId]?.[item.attributeCode] ?? '-'
+                const realValItem = realData.realVal[props.deviceId]?.[item.attributeCode]                
                 return {
                     ...item,
-                    realTimeValue: realValItem % 1 === 0 ? realValItem : realValItem.toFixed(3),
+                    realTimeValue: realValItem ? (realValItem % 1 === 0 ? realValItem : realValItem.toFixed(3)) : '-',
                 }
             })