代码提交

src/views/HomePop/ringMainUnit.vue

@@ -366,10 +366,19 @@ export default {
       this.equipmentName = "箱变";
     }
     this.getDeviceData();
-    window.setTimeout(() => {
+
+    if (this.ringMainUnit!='金盾FH9环网柜') {
+       window.setTimeout(() => {
       let tab = { index: 0, name: "interval1" };
       this.intervalClick(tab);
     }, 1000);
+    }else{
+      window.setTimeout(() => {
+      let tab = { index: 1, name: "interval2" };
+      this.intervalClick(tab);
+    }, 1000);
+    }
+   
   },
   //  beforeDestroy() {
   //   this.webRtcServer.disconnect();
@@ -412,14 +421,14 @@ export default {
           });
           this.tableColumns = Object.keys(units).map((x, y) => {
             let heardName = [];
-            heardName.push((heardName = "间隔" + (y + 1)));
+            heardName.push((heardName = "间隔" + units[x].name.substring(0,1)));
-            return { name: heardName, key: "interval" + (y + 1) };
+            return { name: heardName, key: "interval" + units[x].name.substring(0,1) };
           });
           this.totalInterval = this.tableColumns.length;
           this.echartsTab = Object.keys(units).map((x, y) => {
             let heardName = [];
-            heardName.push((heardName = "间隔" + (y + 1) + "局放数据"));
+            heardName.push((heardName = "间隔" + units[x].name.substring(0,1) + "局放数据"));
-            return { name: heardName, key: "interval" + (y + 1) };
+            return { name: heardName, key: "interval" + units[x].name.substring(0,1) };
           });
           let temperatureChildDataA = [];
           let temperatureChildDataB = [];
@@ -697,13 +706,15 @@ export default {
       // this.$emit("closeStatus", this.closeStatus)
       this.rtsp = "";
       this.rtsp1 = "";
-      this.closeJSMpeg();
+      if (this.JSMpeg != null) {
+        this.closeJSMpeg();
+      }
     },
     //图
     intervalShow(InintervalData) {
       let num = [];
       let time = [];
-      if (InintervalData != null) {
+      if (InintervalData != null && InintervalData!= []) {
         for (const i in InintervalData[0].hour_data) {
           num.push(InintervalData[0].hour_data[i]);
           time.push(i);
@@ -923,7 +934,6 @@ export default {
   display: flex;
   flex-wrap: wrap;
   align-content: space-between;
-  overflow: auto;
   .top {
     height: 4%;
     width: 100%;