From 921f766f70f66584d5aebbef912d7eb1a6640d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com>
Date: Wed, 28 Aug 2024 09:55:19 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=E4=BF=AE=E6=94=B9=E7=89=A9=E8=81=94?=
 =?UTF-8?q?=E7=BD=91=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=90=8D=E7=A7=B0=EF=BC=8Ckey0-10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ems/record/recordIOTInstant/index.vue     | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index 9c02afa..1bcbc40 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -171,30 +171,30 @@
                     <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="monitorId" v-if="columns[1].visible"/>
-                        <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[1].visible"/>
-                        <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
+                        <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[2].visible"/>
+                        <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[3].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="tempreture" v-if="columns[3].visible"/>
-                        <el-table-column label="湿度" align="center" prop="humidity" v-if="columns[4].visible"/>
-                        <el-table-column label="照度" align="center" prop="illuminance" v-if="columns[5].visible"/>
-                        <el-table-column label="噪声" align="center" prop="noise" v-if="columns[6].visible"/>
-                        <el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[7].visible"/>
-                        <el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[8].visible">
+                        <el-table-column label="温度" align="center" prop="tempreture" v-if="columns[4].visible"/>
+                        <el-table-column label="湿度" align="center" prop="humidity" v-if="columns[5].visible"/>
+                        <el-table-column label="照度" align="center" prop="illuminance" v-if="columns[6].visible"/>
+                        <el-table-column label="噪声" align="center" prop="noise" v-if="columns[7].visible"/>
+                        <el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[8].visible"/>
+                        <el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[9].visible">
                             <template slot-scope="scope">
                                 <span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[9].visible"/>
-                        <el-table-column label=" " align="center" prop="confirmPersonID" v-if="columns[10].visible"/>
+                        <el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[10].visible"/>
+                        <!-- <el-table-column label=" " align="center" prop="confirmPersonID" v-if="columns[10].visible"/>
                         <el-table-column label=" " align="center" prop="confirmTime" width="180" v-if="columns[11].visible">
                             <template slot-scope="scope">
                                 <span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label=" " align="center" prop="confirmFlag" v-if="columns[12].visible"/>
+                        <el-table-column label=" " align="center" prop="confirmFlag" v-if="columns[12].visible"/> -->
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
                         <template slot-scope="scope">
                             <el-button
@@ -369,14 +369,15 @@
                 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: `硫化氢浓度`, visible: true },
-                        { key: 8, label: `记录时间`, visible: true },
-                        { key: 9, 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: `噪声`, visible: true },
+                        { key: 8, label: `硫化氢浓度`, visible: true },
+                        { key: 9, label: `记录时间`, visible: true },
+                        { key: 10, label: `报警类型`, visible: true },
                 ]
             };
         },