Merge branch 'develop_jzl'

gassafetyprogress-web/src/components/bigWindow/rightBar.vue

@@ -48,37 +48,93 @@
         ></div>
       </div>
     </div>
-    <div class="" style="padding: 0px 10px;">
-      <div class="yujingleft yujing" style="width: 33%;height: 90px;float: left;">
-          <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-            <img src="@/assets/mapinages/group786.png" alt="" style="width: 50px;height: 50px;" />
-          </div>
-          <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
-            <p>设备预警</p>
-            <span>2</span>
-          </div>
+    <div class="" style="padding: 0px 10px">
+      <div
+        class="yujingleft yujing"
+        style="width: 33%; height: 90px; float: left"
+      >
+        <div
+          class="yujingtop"
+          style="
+            width: 70px;
+            height: 90px;
+            float: left;
+            margin-top: 15px;
+            text-align: right;
+          "
+        >
+          <img
+            src="@/assets/mapinages/group786.png"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
+        </div>
+        <div
+          class="yujingbottom"
+          style="float: left; color: #cddbe4; margin-left: 10px"
+        >
+          <p>设备预警</p>
+          <span>2</span>
+        </div>
       </div>
-      <div class="yujingcenter yujing" style="width: 33%;height: 90px;float: left;">
-        <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-          <img src="@/assets/mapinages/group787.png" alt="" style="width: 50px;height: 50px;" />
+      <div
+        class="yujingcenter yujing"
+        style="width: 33%; height: 90px; float: left"
+      >
+        <div
+          class="yujingtop"
+          style="
+            width: 70px;
+            height: 90px;
+            float: left;
+            margin-top: 15px;
+            text-align: right;
+          "
+        >
+          <img
+            src="@/assets/mapinages/group787.png"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
         </div>
-        <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
+        <div
+          class="yujingbottom"
+          style="float: left; color: #cddbe4; margin-left: 10px"
+        >
           <p>事件情况</p>
           <span>2</span>
         </div>
       </div>
-      <div class="yujingright yujing" style="width: 33%;height: 90px;float: left;">
-        <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-          <img src="@/assets/mapinages/group788.png" alt="" style="width: 50px;height: 50px;" />
+      <div
+        class="yujingright yujing"
+        style="width: 33%; height: 90px; float: left"
+      >
+        <div
+          class="yujingtop"
+          style="
+            width: 70px;
+            height: 90px;
+            float: left;
+            margin-top: 15px;
+            text-align: right;
+          "
+        >
+          <img
+            src="@/assets/mapinages/group788.png"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
         </div>
-        <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
+        <div
+          class="yujingbottom"
+          style="float: left; color: #cddbe4; margin-left: 10px"
+        >
           <p>隐患数量</p>
           <span>2</span>
         </div>
       </div>
     </div>
 
-
     <div class="left">
       <div
         class="bottom right-bottom-data-left"
@@ -372,6 +428,10 @@ export default {
       this.drawLine3();
     });
   },
+  beforeDestroy() {
+    console.log("清空定时器");
+    clearInterval(this.alarmTimer);
+  },
   methods: {
     getAlarm() {
       return alarmData().then((response) => {
@@ -581,16 +641,13 @@ export default {
       });
     },
 
-
-
-    
     drawLine3() {
       // 基于准备好的dom，初始化echarts实例
       let myChart31 = echarts.init(document.getElementById("huanleft"));
-      let myChart32 = echarts.init(document.getElementById('huanright'))
+      let myChart32 = echarts.init(document.getElementById("huanright"));
       // 绘制图表
       myChart31.setOption({
-        color: ["#91cc75", "#5470c6", "#fa8167" ],
+        color: ["#91cc75", "#5470c6", "#fa8167"],
         grid: {
           left: 0,
           // right: 0,