From 3c69d362efc9a2b187067cb80670a164a0971e29 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 1 Jul 2025 17:01:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E4=BC=98=E5=8C=96=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=9B=91=E6=B5=8B=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了不必要的列定义和相关代码
- 根据设备类型动态显示传感器数据列
- 调整了表格列的宽度和显示逻辑
- 删除了未使用的采集时间字段
- 简化了表单输入项
---
 .../ems/record/recordIOTInstant/index.vue     | 126 ++++--------------
 1 file changed, 28 insertions(+), 98 deletions(-)

diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index 1401017..76178ba 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -184,48 +184,38 @@
               v-hasPermi="['ems/record:recordIotenvInstant:export']"
             >导出</el-button>
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="recordIotenvInstantList" @selection-change="handleSelectionChange">
           <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="monitorName" v-if="columns[1].visible">
-
+          <el-table-column label="序号" type="index" width="55" align="center" />
+          <el-table-column label="计量设备" align="center" prop="monitorName" min-width="150">
           </el-table-column>
-          <el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
-
+          
+          <!-- 根据设备类型显示对应的传感器数据列 -->
+          <!-- type=5: 只显示温度 -->
+          <el-table-column v-if="!selectedNodeType || selectedNodeType === 5 || selectedNodeType === 6" 
+                           label="温度(℃)" align="center" prop="temperature" width="100">
           </el-table-column>
-          <el-table-column label="湿度" align="center" prop="humidity" v-if="columns[3].visible">
-
+          
+          <!-- type=6: 显示温度和湿度 -->
+          <el-table-column v-if="!selectedNodeType || selectedNodeType === 6" 
+                           label="湿度(%)" align="center" prop="humidity" width="100">
           </el-table-column>
-          <el-table-column label="照度" align="center" prop="illuminance" v-if="columns[4].visible">
-
-          </el-table-column>
-          <el-table-column label="噪声" align="center" prop="noise" v-if="columns[5].visible">
-
-          </el-table-column>
-          <!-- <el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[6].visible">
-
-          </el-table-column>
-          <el-table-column label="振动-速度(mm/s)" align="center" prop="vibrationSpeed" v-if="columns[7].visible">
-
-          </el-table-column>
-          <el-table-column label="振动-位移(um)" align="center" prop="vibrationDisplacement" v-if="columns[8].visible">
-
-          </el-table-column>
-          <el-table-column label="振动-加速度(g)" align="center" prop="vibrationAcceleration" v-if="columns[9].visible">
-
-          </el-table-column>
-          <el-table-column label="振动-温度(℃)" align="center" prop="vibrationTemp" v-if="columns[10].visible">
-
+          
+          <!-- 照度列（暂时隐藏，如需要可根据type显示） -->
+          <!-- <el-table-column v-if="!selectedNodeType" 
+                           label="照度(lx)" align="center" prop="illuminance" width="100">
           </el-table-column> -->
-          <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[6].visible">
-
+          
+          <!-- type=7: 显示噪声 -->
+          <el-table-column v-if="!selectedNodeType || selectedNodeType === 7" 
+                           label="噪声(dB)" align="center" prop="noise" width="100">
           </el-table-column>
-          <el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[7].visible">
 
+          <!-- 记录时间列，给足够的宽度 -->
+          <el-table-column label="记录时间" align="center" prop="recodeTime" width="200">
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
             <template slot-scope="scope">
@@ -270,9 +260,9 @@
         <el-form-item label="湿度" prop="humidity">
           <el-input v-model="form.humidity" placeholder="请输入湿度" />
         </el-form-item>
-        <el-form-item label="照度" prop="illuminance">
+        <!-- <el-form-item label="照度" prop="illuminance">
           <el-input v-model="form.illuminance" placeholder="请输入照度" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="噪声" prop="noise">
           <el-input v-model="form.noise" placeholder="请输入噪声" />
         </el-form-item>
@@ -291,14 +281,14 @@
         <el-form-item label="振动-温度(℃)" prop="vibrationTemp">
           <el-input v-model="form.vibrationTemp" placeholder="请输入振动-温度(℃)" />
         </el-form-item> -->
-        <el-form-item label="采集时间" prop="collectTime">
+        <!-- <el-form-item label="采集时间" prop="collectTime">
           <el-date-picker clearable
                           v-model="form.collectTime"
                           type="date"
                           value-format="yyyy-MM-dd"
                           placeholder="请选择采集时间">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="记录时间" prop="recodeTime">
           <el-date-picker clearable
                           v-model="form.recodeTime"
@@ -386,22 +376,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      },
-      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: 7, label: `振动-速度(mm/s)`, visible: false },
-        // { key: 8, label: `振动-位移(um)`, visible: false },
-        // { key: 9, label: `振动-加速度(g)`, visible: false },
-        // { key: 10, label: `振动-温度(℃)`, visible: false },
-        { key: 6, label: `采集时间`, visible: false },
-        { key: 7, label: `记录时间`, visible: true },
-      ]
+      }
     };
   },
   created() {
@@ -414,9 +389,6 @@ export default {
     this.daterangeRecordTime[0] =  yesterday+ ' 08:00:00'
     this.daterangeRecordTime[1] = today + ' 08:00:00'
 
-    // 初始化列显示
-    this.updateColumnsVisibility();
-
     this.getTreeMonitorInfo()
     this.getTreeselect()
     this.getList();
@@ -494,7 +466,7 @@ export default {
       
       // 存储当前选中节点的type，用于控制列显示
       this.selectedNodeType = data.type;
-      this.updateColumnsVisibility();
+      console.log('选中节点类型:', this.selectedNodeType);
       this.handleQuery();
     },
 
@@ -563,7 +535,6 @@ export default {
       this.selectedNodeType = null;
       this.queryParams.monitorId = null;
       this.queryParams.monitorIds = [];
-      this.updateColumnsVisibility();
       
       this.handleQuery();
     },
@@ -632,47 +603,6 @@ export default {
       })
     },
 
-    // 根据选中节点类型更新列显示
-    updateColumnsVisibility() {
-      // 重置所有列为不可见
-      this.columns.forEach(col => {
-        if (col.key >= 2 && col.key <= 5) { // 传感器数据列
-          col.visible = false;
-        }
-      });
-      
-      if (!this.selectedNodeType) {
-        // 如果没有选中类型，显示所有传感器列
-        this.columns[2].visible = true; // 温度
-        this.columns[3].visible = true; // 湿度
-        this.columns[4].visible = true; // 照度
-        this.columns[5].visible = true; // 噪声
-        return;
-      }
-      
-      // 根据type显示对应的传感器数据列
-      switch (this.selectedNodeType) {
-        case 5: // 温度传感器：只显示温度
-          this.columns[2].visible = true; // 温度
-          break;
-        case 6: // 温湿度传感器：显示温度和湿度
-          this.columns[2].visible = true; // 温度
-          this.columns[3].visible = true; // 湿度
-          break;
-        case 7: // 噪声传感器：只显示噪声
-          this.columns[5].visible = true; // 噪声
-          break;
-        default:
-          // 其他类型显示所有
-          this.columns[2].visible = true; // 温度
-          this.columns[3].visible = true; // 湿度
-          this.columns[4].visible = true; // 照度
-          this.columns[5].visible = true; // 噪声
-      }
-      
-      console.log('更新列显示:', this.selectedNodeType, this.columns.map(c => ({key: c.key, label: c.label, visible: c.visible})));
-    },
-
   }
 };
 </script>