Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

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

@@ -351,7 +351,8 @@ export default {
       this.$router.push({
         path: '/dataMonitoring/alarmdetail',
         query: {
-          alarmId: row.alarmId
+          alarmId: row.alarmId,
+          deviceType:row.deviceType
         }
       }) //带参跳转
     },

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

@@ -177,7 +177,8 @@ export default {
       this.$router.push({
         path: '/dataMonitoring/realtimedetail',
         query:{
-          deviceId : row.deviceId
+          deviceId : row.deviceId,
+          deviceType: row.deviceType
         }
       }) //带参跳转
     },

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

 <template>
   <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
     <div style="padding-top: 10px;background: #fff;height: 100%;">
-      <div>
-        <div style="width: 5%;height: 45px;margin-left: 20px;" @click="$router.go(-1)">
+        
+      <el-row>
+        <el-col :span="24" style="padding-left: 15px;">
+          <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
-          <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png"
-              style="width: 25px;" alt=""></div>
-        </div>
+            <div style="float: left;margin-top: 8px;margin-left: 5px;"><img src="../../../assets/logo/fanhui.png" style="width: 25px;" alt=""></div>
           </div>
+        </el-col>
+      </el-row>
 
-      <div style="width: 100%;height: 350px;padding: 10px;height: 300px;">
-        <div style="width: 66.6%;float: left;height: 100%;">
+      <el-row>
+        <el-col :span="16" style="padding: 10px;">
+          <div style="height: 100%;">
             <el-table :data="dataListdetail1" style="width: 100%">
               <el-table-column label="设备名称" align="center" prop="deviceName" />
               <el-table-column label="设备编号" align="center" prop="deviceCode" />
@@ -39,41 +42,62 @@
               <el-table-column label="设备状态" align="center" prop="deviceStatus">
               </el-table-column>
             </el-table>
-
-
-
           </div>
-        <div id="marbox" style="width: 33%;height: 350px; border: 1px solid rgb(218, 213, 213);float: right;margin-top: -45px;">
+        </el-col>
+        <el-col :span="8" style="padding: 10px;padding-left: 0px;">
+          <div id="marbox" style="height: 350px; border: 1px solid rgb(218, 213, 213);margin-top: -45px;">
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
-      </div>
+        </el-col>
+      </el-row>
+
+
       
-      <div v-if="form.deviceType != '4'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;">
-          <div id="main1" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+      <template v-if="$route.query.deviceType !='0'">
+        <el-row  v-if="form.deviceType != '4'">
+          <el-col :span="12" style="padding: 10px;">
+            <div id="main1" style="height:300px;background-color: rgb(247 247 247);padding: 5px;">
               <div v-if = "form.deviceReportDataList == null" class="div-null">
                 <p>暂无数据</p>
               </div>
             </div>
-        <div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+          </el-col>
+          <el-col :span="12" style="padding: 10px;">
+            <div id="main2" style="height:300px;background-color: rgb(247 247 247);padding: 5px;">
               <div v-if = "form.deviceReportDataList == null" class="div-null">
                 <p>暂无数据</p>
               </div>
             </div>
-      </div>
-
-
-      <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;">
-        <div v-if="form.deviceType != '4'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12" style="padding: 10px;" v-if="form.deviceType != '4'">
+            <div id="main3" style="height:300px;background-color: rgb(247 247 247);padding: 5px;">
               <div v-if = "form.deviceReportDataList == null" class="div-null">
                 <p>暂无数据</p>
               </div>
             </div>
-        <div id="main4" style="float: left;width: 49.8%;margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+          </el-col>
+          <el-col :span="12" style="padding: 10px;">
+            <div id="main4" style="margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;">
               <div v-if = "form.deviceReportDataList == null" class="div-null">
                 <p>暂无数据</p>
               </div>
             </div>
-      </div>
+          </el-col>
+        </el-row>
+        <!-- <div v-if="form.deviceType != '4'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;"> -->
+          
+        
+      <!-- </div> -->
+
+
+        <!-- <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;"> -->
+          
+         
+        <!-- </div> -->
+      </template>
+      
 
       
     </div>

gassafety-web/src/views/device/deviceInfo/index.vue

@@ -457,8 +457,4 @@ export default {
 };
 </script>
 <style>
-  .el-col {
-    margin-left: 0;
-    margin-right: 10px;
-  }
 </style>