报警详情地图初始化问题修改

gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue

@@ -74,54 +74,6 @@
       <el-divider></el-divider>
 
 
-      <el-row v-if="this.deviceType=='调压阀'||this.deviceType=='阀门井'" style="width: 100%;height: 45px;margin-top: -15px;">
-        <el-col :span="14" style="margin-bottom: -10px;">
-          <div style="color: #31EAEA;">
-            <ul><li>下级设备信息</li></ul>
-          </div>
-        </el-col>
-      </el-row>
-
-      <el-row v-if="this.deviceType=='调压阀'||this.deviceType=='阀门井'">
-        <el-col :span="36" style="padding: 20px;width: 100%;">
-          <div style="width: 100%;float: left;height: 100%;">
-            <el-table :data="deviceInfoList" style="width: 100%">
-              <el-table-column label="设备名称" align="center" prop="deviceName" />
-              <el-table-column label="设备编号" align="center" prop="deviceCode" />
-              <el-table-column label="浓度" align="center" prop="potency" />
-              <el-table-column label="设备状态" align="center" prop="deviceType" >
-                <template slot-scope="scope">
-                  <span v-if="scope.row.status == 0">预热</span>
-                  <span v-if="scope.row.status == 1">正常</span>
-                  <span v-if="scope.row.status == 2">错误</span>
-                  <span v-if="scope.row.status == 3">传感器故障</span>
-                  <span v-if="scope.row.status == 4">报警</span>
-                  <span v-if="scope.row.status == 5">低报</span>
-                  <span v-if="scope.row.status == 6">高报</span>
-                  <span v-if="scope.row.status == 7">通信故障</span>
-                  <span v-if="scope.row.status == 8">通信故障</span>
-                  <span v-if="scope.row.status == 9">离线</span>
-                  <span v-if="scope.row.status == 10">电量低</span>
-                  <span v-if="scope.row.status == 11">主电故障</span>
-                  <span v-if="scope.row.status == 12">备电故障</span>
-                  <span v-if="scope.row.status == 13">无此节点</span>
-                  <span v-if="scope.row.status == 14">低电压</span>
-                  <span v-if="scope.row.status == 15">故障</span>
-                  <span v-if="scope.row.status == 16">报警联动</span>
-                  <span v-if="scope.row.status == 17">低低报</span>
-                  <span v-if="scope.row.status == 18">高高报</span>
-                  <span v-if="scope.row.status == 19">水位淹没报警</span>
-                </template>
-              </el-table-column>
-
-            </el-table>
-          </div>
-        </el-col>
-
-      </el-row>
-
-
-
       <el-row style="width: 100%;height: 45px;margin-top: -15px;">
         <el-col :span="24" style="margin-bottom: -10px;">
           <div style="color: #31EAEA;">
@@ -208,6 +160,52 @@
         </el-col>
       </el-row>
 
+      <el-row v-if="this.deviceType=='调压阀'||this.deviceType=='阀门井'" style="width: 100%;height: 45px;margin-top: -15px;">
+        <el-col :span="14" style="margin-bottom: -10px;">
+          <div style="color: #31EAEA;">
+            <ul><li>下级设备信息</li></ul>
+          </div>
+        </el-col>
+      </el-row>
+
+      <el-row v-if="this.deviceType=='调压阀'||this.deviceType=='阀门井'">
+        <el-col :span="36" style="padding: 20px;width: 100%;">
+          <div style="width: 100%;float: left;height: 100%;">
+            <el-table :data="deviceInfoList" style="width: 100%">
+              <el-table-column label="设备名称" align="center" prop="deviceName" />
+              <el-table-column label="设备编号" align="center" prop="deviceCode" />
+              <el-table-column label="浓度" align="center" prop="potency" />
+              <el-table-column label="设备状态" align="center" prop="deviceType" >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.status == 0">预热</span>
+                  <span v-if="scope.row.status == 1">正常</span>
+                  <span v-if="scope.row.status == 2">错误</span>
+                  <span v-if="scope.row.status == 3">传感器故障</span>
+                  <span v-if="scope.row.status == 4">报警</span>
+                  <span v-if="scope.row.status == 5">低报</span>
+                  <span v-if="scope.row.status == 6">高报</span>
+                  <span v-if="scope.row.status == 7">通信故障</span>
+                  <span v-if="scope.row.status == 8">通信故障</span>
+                  <span v-if="scope.row.status == 9">离线</span>
+                  <span v-if="scope.row.status == 10">电量低</span>
+                  <span v-if="scope.row.status == 11">主电故障</span>
+                  <span v-if="scope.row.status == 12">备电故障</span>
+                  <span v-if="scope.row.status == 13">无此节点</span>
+                  <span v-if="scope.row.status == 14">低电压</span>
+                  <span v-if="scope.row.status == 15">故障</span>
+                  <span v-if="scope.row.status == 16">报警联动</span>
+                  <span v-if="scope.row.status == 17">低低报</span>
+                  <span v-if="scope.row.status == 18">高高报</span>
+                  <span v-if="scope.row.status == 19">水位淹没报警</span>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          </div>
+        </el-col>
+
+      </el-row>
+
 
       <template v-if="this.deviceType!=='调压阀'&&this.deviceType!=='阀门井'">
         <el-row >