Browse Source

基于风机发电量全寿命周期管控的研究与应用项目中,配合后端同事修改双网卡展示系统页面(10.127.7.241西安,172.16.12.101定边),智能报表中关口计量表修改支持以上两个ip访问并打包生产环境;

SunZehao 10 months ago
parent
commit
49ff7afc89
3 changed files with 68 additions and 62 deletions
  1. 8 8
      .env.production
  2. 2 2
      public/static/config/modeConfig.js
  3. 58 52
      src/views/intelligentReporting/gkjlb/index.vue

+ 8 - 8
.env.production

@@ -13,8 +13,8 @@ VUE_APP_TITLE = '页面标题'
 
 # 登录
 # VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
-# VUE_APP_LOGIN_URL = 'http://10.127.7.196:48080'
-VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
+# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 # VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
 # VUE_APP_LOGIN_URL = 'http://127.0.0.1:48080'
 
@@ -22,22 +22,22 @@ VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 
 # 发电能力分析
 # VUE_APP_GENERAT_URL = 'http://123.60.219.66:9002'
-# VUE_APP_GENERAT_URL = 'http://10.127.7.196:9002'
-VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
+VUE_APP_GENERAT_URL = 'http://10.127.7.241:9002'
+# VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
 # VUE_APP_GENERAT_URL = 'http://192.168.2.231:9002'
 # VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
 
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://123.60.219.66:9001'
-# VUE_APP_REPORT_URL = 'http://10.127.7.196:9001'
-VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
+VUE_APP_REPORT_URL = 'http://10.127.7.241:9001'
+# VUE_APP_REPORT_URL = 'http://172.16.12.101:9001'
 # VUE_APP_REPORT_URL = 'http://192.168.2.231:9001'
 # VUE_APP_REPORT_URL = 'http://127.0.0.1:9001'
 
 # 功率预测
 # VUE_APP_BASE_URL = 'http://123.60.219.66:8086'
-# VUE_APP_BASE_URL = 'http://10.127.7.196:8086'
-VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
+VUE_APP_BASE_URL = 'http://10.127.7.241:8086'
+# VUE_APP_BASE_URL = 'http://172.16.12.101:8086'
 # VUE_APP_BASE_URL = 'http://192.168.2.231:8086'
 # VUE_APP_BASE_URL = 'http://127.0.0.1:8086'
 

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

@@ -18,8 +18,8 @@ const tilesMaxLevel = 18;
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
 const showModuleName = 0;
 
-// const reportBaseUrl = "http://10.127.7.241:8083";
-const reportBaseUrl = "http://172.16.12.101:8083";
+const reportBaseUrl = "http://10.127.7.241:8083";
+// const reportBaseUrl = "http://172.16.12.101:8083";
 
 // if (localTest) {
 //     baseURL = "http://192.168.10.8:9002/" // 联机调试 

+ 58 - 52
src/views/intelligentReporting/gkjlb/index.vue

@@ -1,57 +1,63 @@
 <template>
-  <div :style="pageHeight">
-    <iframe
-      :src="url"
-      width="100%"
-      height="100%"
-      frameborder="0"
-      scrolling="auto"
-    ></iframe>
-  </div>
+    <div :style="pageHeight">
+        <iframe :src="url" width="100%" height="100%" frameborder="0" scrolling="auto"></iframe>
+    </div>
 </template>
 <script>
-export default {
-  data() {
-    return {
-      url: null,
+    export default {
+        data() {
+            return {
+                url: null,
+            };
+        },
+        computed: {
+            pageHeight() {
+                return {
+                    height: document.documentElement.clientHeight - 80 + "px",
+                };
+            },
+        },
+        watch: {
+            $route: {
+                handler: function (route) {
+                    this.url = null;
+                    if (route.query.name) {
+                        // window.location.origin.indexOf('172.16.12.101') != -1
+                        if (route.query.name === "xinzhuang") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$4a71c6bc1fd34da7843c6eb2a7b3aee3&id=admin&pw=admin`;
+                        } else if (route.query.name === "jiliangshan") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$621b7c14e4aa4a0483a8e577d8dc4cff&id=admin&pw=admin`;
+                        } else if (route.query.name === "zuozhuang") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$36292212f28b4702af2c4aa01a62bdc1&id=admin&pw=admin`;
+                        } else if (route.query.name === "fanshigou") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$2320f3ed77e740d6bb1b66b1f7062ad1&id=admin&pw=admin`;
+                        } else if (route.query.name === "caoshanliang") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$3dc29db548d54d289e58bf4a30dfb026&id=admin&pw=admin`;
+                        } else if (route.query.name === "leijiashan") {
+                            this.url =
+                                `${
+              this.reportBaseUrl || "http://172.16.12.101:8083"
+            }/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin`;
+                        }
+                    }
+                },
+                immediate: true,
+            },
+        },
     };
-  },
-  computed: {
-    pageHeight() {
-      return {
-        height: document.documentElement.clientHeight - 80 + "px",
-      };
-    },
-  },
-  watch: {
-    $route: {
-      handler: function (route) {
-        this.url = null;
-        if (route.query.name) {
-          // window.location.origin.indexOf('172.16.12.101') != -1
-          if (route.query.name === "xinzhuang") {
-            this.url =
-              "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$4a71c6bc1fd34da7843c6eb2a7b3aee3&id=admin&pw=admin";
-          } else if (route.query.name === "jiliangshan") {
-            this.url =
-              "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$621b7c14e4aa4a0483a8e577d8dc4cff&id=admin&pw=admin";
-          } else if (route.query.name === "zuozhuang") {
-            this.url =
-              "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$36292212f28b4702af2c4aa01a62bdc1&id=admin&pw=admin";
-          } else if (route.query.name === "fanshigou") {
-            this.url =
-              "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$2320f3ed77e740d6bb1b66b1f7062ad1&id=admin&pw=admin";
-          } else if (route.query.name === "caoshanliang") {
-            this.url =
-              "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$3dc29db548d54d289e58bf4a30dfb026&id=admin&pw=admin";
-          } else if (route.query.name === "leijiashan") {
-            this.url =
-              "http://172.16.12.101:8083/rbi/ebibase/showreport.do?resid=EANA$2$2$1$bd71f31ba69443b5b3f3997965927c41$5ebbf0905b22448cbd9834ec6560fd26&id=admin&pw=admin";
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-};
 </script>