详情

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

@@ -100,20 +100,32 @@
           </div>
         </div>
 
-         <div v-if="form.deviceType != '压力表'" style="height: 320px;width: 100%;margin-top: 15px;padding: 10px;">
+        <div v-if="form.deviceType != '压力表'" 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;">
+            <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;">
+        <div id="main2" style="float: right;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+          <div v-if = "form.deviceReportDataList == null" class="div-null">
+            <p>暂无数据</p>
           </div>
         </div>
-  
-  
-        <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;">
-          <div v-if="form.deviceType != '压力表'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+      </div>
+
+
+      <div style="height: 320px;width: 100%;padding: 10px;margin-top: 10px;">
+        <div v-if="form.deviceType != '压力表'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+          <div v-if = "form.deviceReportDataList == null" class="div-null">
+            <p>暂无数据</p>
           </div>
-          <div id="main4" style="float: left;width: 49.8%;margin-left: 5px;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+        </div>
+        <div id="main4" style="float: left;width: 49.8%;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>
 
 
 
@@ -155,6 +167,7 @@ export default {
     },
     data() {
       return {
+        order_list:[],
         tableData: [{
             date: '2016-05-02',
             name: '王小虎',
@@ -813,6 +826,12 @@ export default {
   }
   </script>
   <style>
+    .div-null{
+      width: 100%;
+      height: 300px;
+      text-align: center;
+      line-height: 250px;
+    }
     .el-tree-node__content{
       width: 150px;
     }

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

@@ -43,26 +43,39 @@
 
 
         </div>
-        <div id="marbox"
-          style="width: 33%;height: 350px; border: 1px solid rgb(218, 213, 213);float: right;margin-top: -45px;">
+        <div id="marbox" style="width: 33%;height: 350px; border: 1px solid rgb(218, 213, 213);float: right;margin-top: -45px;">
           <div style="width: 100%;height: 100%" id="container"></div>
         </div>
       </div>
 
-      <div v-if="form.deviceType != '压力表'" 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;">
-        </div>
+      <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;">
+            <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;">
+          <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 != '压力表'" id="main3" style="float: left;width: 49.8%;height:300px;background-color: rgb(247 247 247);padding: 5px;">
+        <div v-if="form.deviceType != '4'" id="main3" style="float: left;width: 49.8%;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;">
+          <div v-if = "form.deviceReportDataList == null" class="div-null">
+            <p>暂无数据</p>
+          </div>
         </div>
       </div>
+
+      
     </div>
 
   </div>
@@ -84,6 +97,7 @@
     },
     data() {
       return {
+        order_list:[],
         inspector: [],
         isDisplay: false,
         dialogImageUrl: '',
@@ -605,6 +619,12 @@
   }
 </script>
 <style>
+  .div-null{
+    width: 100%;
+    height: 300px;
+    text-align: center;
+    line-height: 250px;
+  }
   .el-tree-node__content {
     width: 150px;
   }