From 8f3f820f4446aa31063841022f3dbdd8820b8f87 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 6 May 2025 09:55:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(ems):=20=E4=BF=AE=E6=94=B9=E8=AE=A1?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E5=A4=87=E5=88=97=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将"计量设备编号"列的标题改为"计量设备"
- 将"计量设备编号"列的属性从"monitorId"改为"monitorName"
- 在 recordVibrationInstant 组件中，默认隐藏温度、湿度、照度、噪声和硫化氢浓度列
---
 src/views/ems/record/recordIOTInstant/index.vue   |  5 +++--
 .../ems/record/recordVibrationInstant/index.vue   | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index 7cd03b0..229573a 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -191,7 +191,7 @@
           <el-table-column type="selection" width="55" align="center" />
           <!--                    <el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>-->
           <el-table-column label="序号" type="index" width="55" align="center" v-if="columns[0].visible" />
-          <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible">
+          <el-table-column label="计量设备" align="center" prop="monitorName" v-if="columns[1].visible">
 
           </el-table-column>
           <el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
@@ -377,6 +377,7 @@ export default {
         collectTime: null,
         recodeTime: null,
         monitorIds: [],
+        monitorName:  null,
       },
       // 表单参数
       form: {},
@@ -385,7 +386,7 @@ export default {
       },
       columns: [
         { key: 0, label: `标识`, visible: true },
-        { key: 1, label: `计量设备编号`, visible: true },
+        { key: 1, label: `计量设备`, visible: true },
         { key: 2, label: `温度`, visible: true },
         { key: 3, label: `湿度`, visible: true },
         { key: 4, label: `照度`, visible: true },
diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue
index 7fa66b4..b1a6930 100644
--- a/src/views/ems/record/recordVibrationInstant/index.vue
+++ b/src/views/ems/record/recordVibrationInstant/index.vue
@@ -191,7 +191,7 @@
           <el-table-column type="selection" width="55" align="center" />
           <!--                    <el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>-->
           <el-table-column label="序号" type="index" width="55" align="center" v-if="columns[0].visible" />
-          <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible">
+          <el-table-column label="计量设备" align="center" prop="monitorName" v-if="columns[1].visible">
 
           </el-table-column>
           <el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
@@ -377,6 +377,7 @@ export default {
         collectTime: null,
         recodeTime: null,
         monitorIds: [],
+        monitorName:  null,
       },
       // 表单参数
       form: {},
@@ -385,12 +386,12 @@ export default {
       },
       columns: [
         { key: 0, label: `标识`, visible: true },
-        { key: 1, label: `计量设备编号`, visible: true },
-        { key: 2, label: `温度`, visible: true },
-        { key: 3, label: `湿度`, visible: true },
-        { key: 4, label: `照度`, visible: true },
-        { key: 5, label: `噪声`, visible: true },
-        { key: 6, label: `硫化氢浓度`, visible: true },
+        { key: 1, label: `计量设备`, visible: true },
+        { key: 2, label: `温度`, visible: false },
+        { key: 3, label: `湿度`, visible: false },
+        { key: 4, label: `照度`, visible: false },
+        { key: 5, label: `噪声`, visible: false },
+        { key: 6, label: `硫化氢浓度`, visible: false },
         { key: 7, label: `振动-速度(mm/s)`, visible: true },
         { key: 8, label: `振动-位移(um)`, visible: true },
         { key: 9, label: `振动-加速度(g)`, visible: true },