shilin 3 роки тому
батько
коміт
20c39e04f9

+ 1 - 1
public/static/config/modeConfig.js

@@ -11,7 +11,7 @@ if (localTest) {
     baseURL = "http://192.168.10.12:8082/" // 联机调试 - 石林
         // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
 } else {
-    baseURL = "http://10.155.32.4:8082/" // 正式环境
+    baseURL = "http://192.168.10.12:8082/" // 正式环境
 }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";

+ 4 - 3
src/views/Agc/Agc.vue

@@ -93,6 +93,7 @@ export default {
     requestData(showLoading) {
       let that = this;
       that.API.requestData({
+        timeout:30000,
         showLoading,
         method: "POST",
         subUrl: "genreset/getAgcValues",
@@ -150,9 +151,9 @@ export default {
     let that = this;
     that.$nextTick(() => {
       that.requestData(false);
-      that.timmer = setInterval(() => {
-        that.requestData(false);
-      }, that.$store.state.websocketTimeSec);
+      // that.timmer = setInterval(() => {
+      //   that.requestData(false);
+      // }, 60000);
     });
   },
 

+ 7 - 6
src/views/LightMatrix3/LightMatrix3.vue

@@ -79,6 +79,12 @@
                   </div>
                 </div>
                 <div class="card-right">
+                   <div class="num">
+                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
+                      <SvgIcon svgid="svg-P"></SvgIcon>
+                    </i>
+                    <span>{{ cItem.fs }}</span>
+                  </div>
                   <div class="num">
                     <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
                       <SvgIcon svgid="svg-W"></SvgIcon>
@@ -91,12 +97,7 @@
                     </i>
                     <span>{{ cItem.fdjzs.toFixed(2) }}</span>
                   </div>
-                  <div class="num">
-                    <i class="svg-icon svg-icon-sm" :class="cItem.color != 'red' ? 'svg-icon-' + cItem.color : 'svg-icon-white'">
-                      <SvgIcon svgid="svg-P"></SvgIcon>
-                    </i>
-                    <span>{{ cItem.fs }}</span>
-                  </div>
+          
                 </div>
               </div>
             </div>

+ 7 - 6
src/views/WindSite/pages/Home/Home.vue

@@ -428,9 +428,7 @@ export default {
     // 请求服务
     requestData (showLoading) {
       this.requestWpInfo(showLoading);
-      this.requestLoss(showLoading);
-      this.requestPower(showLoading);
-      this.requestMonthPower(showLoading);
+
     },
 
     // 获取场站监视数据
@@ -697,9 +695,12 @@ export default {
     that.$nextTick(() => {
       that.getWp();
       that.requestData(false);
-      // that.timmer = setInterval(() => {
-      //   that.requestData(false);
-      // }, that.$store.state.websocketTimeSec);
+       that.requestLoss(false);
+      that.requestPower(false);
+      that.requestMonthPower(false);
+      that.timmer = setInterval(() => {
+        that.requestData(false);
+      }, that.$store.state.websocketTimeSec);
       that.timmer2 = setInterval(() => {
         that.nowTime = new Date().formatDate("hh:mm:ss");
       }, 1000);