zc

src/assets/styles/kuangdaMap.scss

@@ -62,25 +62,20 @@
     }
     .map-min-for-box:nth-child(9){
       margin:140px 0 0 0;
-      width:140px;
+      width:288px;
       height:177px;
     }
     .map-min-for-box:nth-child(10){
       margin:140px 0 0 0;
-      width:148px;
-      height:177px;
-    }
-    .map-min-for-box:nth-child(11){
-      margin:140px 0 0 0;
       width:161px;
       height:177px;
     }
-    .map-min-for-box:nth-child(12){
+    .map-min-for-box:nth-child(11){
       margin:140px 0 0 0;
       width:70px;
       height:177px;
     }
-    .map-min-for-box:nth-child(13){
+    .map-min-for-box:nth-child(12){
       margin:140px 0 0 0;
       width:110px;
       height:177px;
@@ -90,27 +85,27 @@
       width:40px;
       height:28px;
     }
-    .map-min-img:nth-child(14){
+    .map-min-img:nth-child(13){
       top:240px;
       left:126px;
     }
-    .map-min-img:nth-child(15){
+    .map-min-img:nth-child(14){
       top:240px;
       left:190px;
     }
-    .map-min-img:nth-child(16){
+    .map-min-img:nth-child(15){
       top:240px;
       left:474px;
     }
-    .map-min-img:nth-child(17){
+    .map-min-img:nth-child(16){
       top:240px;
       left:540px;
     }
-    .map-min-img:nth-child(18){
+    .map-min-img:nth-child(17){
       top:240px;
       left:848px;
     }
-    .map-min-img:nth-child(19){
+    .map-min-img:nth-child(18){
       top:240px;
       left:916px;
     }
@@ -423,24 +418,19 @@
     .map-min-box:nth-child(9){
       margin: 99px 0 0 0;
       height:125px;
-      width:100px;
+      width:205px;
     }
     .map-min-box:nth-child(10){
       margin: 99px 0 0 0;
       height:125px;
-      width:105px;
-    }
-    .map-min-box:nth-child(11){
-      margin: 99px 0 0 0;
-      height:125px;
       width:115px;
     }
-    .map-min-box:nth-child(12){
+    .map-min-box:nth-child(11){
       margin: 99px 0 0 0;
       height:125px;
       width:50px;
     }
-    .map-min-box:nth-child(13){
+    .map-min-box:nth-child(12){
       margin: 99px 0 0 0;
       height:125px;
       width:78px;

src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -2,7 +2,6 @@
 <template>
   <div class="app-container sensor">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" class="form-box">
-
       <el-form-item label="学院" prop="deptId">
         <el-select v-model="queryParams.deptId" placeholder="请选择学院" @change="handleNodeClick">
           <el-option
@@ -50,7 +49,9 @@
       <el-table-column label="学院" align="left" prop="deptName" />
       <el-table-column label="实验室" align="left" prop="subjectName" />
       <el-table-column label="路由" align="left" prop="routeNum" />
-      <el-table-column label="状态" align="left" prop="senseState" />
+      <el-table-column label="状态" align="left" prop="senseState">
+        <template slot-scope="scope">{{scope.row.senseState.name}}</template>
+      </el-table-column>
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
         <template slot-scope="scope">
           <div class="button-box">

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue

@@ -62,7 +62,7 @@
       <el-table-column label="学院" align="center" prop="deptName" width="250"/>
       <el-table-column label="位置" align="center" prop="posi" width="250" show-overflow-tooltip/>
       <el-table-column label="设备状态" align="center" prop="status" width="100">
-        <template slot-scope="scope">{{scope.row.status == 3||scope.row.status == 4?'在线':'离线'}}</template>
+        <template slot-scope="scope">{{scope.row.operate.name}}</template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="250"/>
       <el-table-column label="创建人" align="center" prop="createBy" width="150"/>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartAlarm/index.vue

@@ -69,7 +69,7 @@
       <el-table-column label="学院" align="center" prop="deptName" width="180"/>
       <el-table-column label="位置" align="center" prop="posi" width="250" show-overflow-tooltip/>
       <el-table-column label="设备状态" align="center" prop="status" width="80">
-        <template slot-scope="scope">{{scope.row.status == 3||scope.row.status == 4?'在线':'离线'}}</template>
+        <template slot-scope="scope">{{scope.row.operate.name}}</template>
       </el-table-column>
       <el-table-column label="报警时长" align="center" prop="ringTime" width="80">
         <template slot-scope="scope">{{scope.row.ringTime?scope.row.ringTime+'秒':'未设置'}}</template>