xushining 1 gadu atpakaļ
vecāks
revīzija
363572e233

+ 5 - 5
.env.development

@@ -1,5 +1,5 @@
-VUE_APP_API=http://18.6.30.63:8099
-VUE_APP_SHARDINGURL=http://18.6.30.63:8075
-VUE_APP_ADAPTERURL=http://18.6.30.63:8011
-VUE_APP_APIS=18.6.30.63:8099
-VUE_APP_ADAPTERURLS=18.6.30.63:8011
+VUE_APP_API=http://192.168.10.18:8099
+VUE_APP_SHARDINGURL=http://192.168.10.18:8075
+VUE_APP_ADAPTERURL=http://192.168.10.18:8011
+VUE_APP_APIS=192.168.10.18:8099
+VUE_APP_ADAPTERURLS=192.168.10.18:8011

+ 9 - 3
src/App.vue

@@ -165,7 +165,7 @@ export default {
         this.activeTabStation = arr[1]
         this.handleClosed()
         setTimeout(() => {
-          this.handleChange(4)
+          this.handleChange(4,true)
         }, 3000);
       }
     },
@@ -193,7 +193,7 @@ export default {
         this.$store.commit("activeTab", syzArray[0].name);
       });
     },
-    handleChange(val) {
+    handleChange(val,flag) {
       if (val !== 10) {
         this.matricesDisplay = false;
         this.syzDialogShow = false;
@@ -218,7 +218,13 @@ export default {
           this.temperatureDisplay = true;
           break;
         case 4:
-          this.syzDialogShow = true;
+          if (flag) {
+            this.syzDialogShow = true;
+          } else {
+            this.activeTabStation = ''
+            this.syzDialogShow = true;
+          }
+          
           break;
         case 5:
           this.agcDisplay = true;

+ 12 - 0
src/components/focus/syzDetails.vue

@@ -580,6 +580,18 @@ export default {
             let starTimerWarn = setInterval(() =>{
                 this.getSyzWarnData()
             }, 2000)
+            if (this.activeTabStation) {
+                setTimeout(() => {
+                    clearInterval(this.starTimer);
+                this.starTimer = null;
+                this.$store.commit("activeTab", this.activeTabStation);
+                this.renderAlarm(this.activeTabStation, false);
+                    if (this.activeTabStation !== 'all') {
+                        this.activeTab = this.activeTabStation
+                    this.debounce(this.getSvgDataFn(this.activeTabStation), 200)
+                }  
+                }, 100);
+            }
         },
 
         closed() {

+ 4 - 1
src/components/modeControl/modeControl.vue

@@ -231,7 +231,10 @@ export default {
       ];
       mb.register(vss);
     },
-    windturbineMessage(msg){
+    windturbineMessage(msg) {
+      if (msg === "CLOSE") {
+        this.dialogVisible = false;
+        }
       if(msg === 'OPEN_PAGE_MANUAL'){
         this.ChangeBar(2)
       }