From b1c72d6ae99ea3a254f9a0e3a22f71f88550ecc2 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 1 Jul 2025 15:43:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ems):=20=E6=B3=A8=E9=87=8A=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E5=92=8C=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E7=94=A8=E6=88=B7=E5=88=97=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E7=9A=84=E7=B4=A2=E5=BC=95=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ems/record/recordAlarmData/index.vue      | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/ems/record/recordAlarmData/index.vue b/src/views/ems/record/recordAlarmData/index.vue
index 0d88d4a..6741695 100644
--- a/src/views/ems/record/recordAlarmData/index.vue
+++ b/src/views/ems/record/recordAlarmData/index.vue
@@ -115,31 +115,31 @@
       <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="计量设备名称" align="center" prop="monitorName" v-if="columns[1].visible"/>
-      <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible"/>
-      <el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[3].visible">
+      <!-- <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible"/> -->
+      <el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="异常类型" align="center" prop="alarmType" v-if="columns[4].visible">
+      <el-table-column label="异常类型" align="center" prop="alarmType" v-if="columns[3].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/>
         </template>
       </el-table-column>
-      <el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[5].visible">
+      <el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[4].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.alarm_status" :value="scope.row.alarmStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[6].visible"/>
-      <el-table-column label="操作人员" align="center" prop="operationName" v-if="columns[7].visible"/>
-      <el-table-column label="操作时间" align="center" prop="operationTime" width="180" v-if="columns[8].visible">
+      <el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[5].visible"/>
+      <el-table-column label="操作人员" align="center" prop="operationName" v-if="columns[6].visible"/>
+      <el-table-column label="操作时间" align="center" prop="operationTime" width="180" v-if="columns[7].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="cause" v-if="columns[9].visible"/>
-      <el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[14].visible"/>
+      <el-table-column label="备注" align="center" prop="cause" v-if="columns[8].visible"/>
+      <!-- <el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[14].visible"/> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
           <el-button
@@ -296,19 +296,19 @@ export default {
       columns: [
         { key: 0, label: `自增标识`, visible: false },
         { key: 1, label: `计量设备编号`, visible: true },
-        { key: 2, label: `采集设备编号`, visible: false },
-        { key: 3, label: `记录时间`, visible: true },
-        { key: 4, label: `异常类型`, visible: true },
-        { key: 5, label: `异常状态`, visible: true },
-        { key: 6, label: `异常数据`, visible: true },
-        { key: 7, label: `操作人员`, visible: true },
-        { key: 8, label: `操作时间`, visible: true },
-        { key: 9, label: `备注`, visible: false },
-        { key: 10, label: `创建人`, visible: false },
-        { key: 11, label: `创建时间`, visible: true },
-        { key: 12, label: `更新人`, visible: false },
-        { key: 13, label: `更新时间`, visible: false },
-        { key: 14, label: `通知用户`, visible: false }
+        // { key: 2, label: `采集设备编号`, visible: false },
+        { 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: `操作时间`, visible: true },
+        { key: 8, label: `备注`, visible: false },
+        { key: 9, label: `创建人`, visible: false },
+        { key: 10, label: `创建时间`, visible: true },
+        { key: 11, label: `更新人`, visible: false },
+        { key: 12, label: `更新时间`, visible: false },
+        // { key: 14, label: `通知用户`, visible: false }
       ]
     }
   },