From ca22cdd5550cfa0defb0f430c538698182cdaec1 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 30 十二月 2024 16:42:49 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat-ui-vue3

---
 src/views/data/channel/modbus/tag/index.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/data/channel/modbus/tag/index.vue b/src/views/data/channel/modbus/tag/index.vue
index 7739240..528d368 100644
--- a/src/views/data/channel/modbus/tag/index.vue
+++ b/src/views/data/channel/modbus/tag/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-drawer
     v-model="drawer"
-    size="50%"
+    size="60%"
     title="ModBus Tag"
     :direction="direction"
     :before-close="handleClose"
@@ -133,19 +133,22 @@
           label="数据值"
           header-align="center"
           align="center"
+          min-width="100"
           :formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
         />
         <el-table-column
-          prop="quality"
+          prop="dataTime"
+          label="数据时间"
+          header-align="center"
+          align="center"
+          min-width="150"
+        />
+        <el-table-column
+          prop="dataQuality"
           label="数据质量"
           header-align="center"
           align="center"
-        >
-          <template #default="scope">
-            <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad</el-tag>
-            <el-tag v-else size="small">good</el-tag>
-          </template>
-        </el-table-column>
+        />
         <el-table-column label="操作" align="center" min-width="110" fixed="right">
           <template #default="scope">
             <el-button

--
Gitblit v1.9.3