wangb 6 napja
szülő
commit
a2cf919499

+ 2 - 2
.env.development

@@ -11,8 +11,8 @@ VUE_APP_TITLE = '页面标题'
 # 马力军
 # VUE_APP_LOGIN_URL = 'http://192.168.2.45:48080'
 # 王波
-VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
-# VUE_APP_LOGIN_URL = 'http://172.16.12.102:8190'
+# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = 'http://172.16.12.102:8190'
 
 # 发电能力分析
 # VUE_APP_GENERAT_URL = 'http://192.168.0.102:9002'

+ 10 - 10
.env.production

@@ -19,37 +19,37 @@ VUE_APP_TITLE = '页面标题'
 # VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
 # VUE_APP_LOGIN_URL = 'http://127.0.0.1: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://10.127.7.241:48080'
+# 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.241: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://192.168.0.105: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://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://192.168.0.105: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://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'
 
 # 综合报警
-# VUE_APP_ALARM = 'http://10.127.7.241:6015'
-VUE_APP_ALARM = 'http://172.16.12.101:6015'
+VUE_APP_ALARM = 'http://10.127.7.241:6015'
+# VUE_APP_ALARM = 'http://172.16.12.101:6015'
 
 # VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'
 VUE_APP_ADP_BASE_URL = 'http://172.16.12.101'

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

@@ -21,11 +21,11 @@ const skipLogin = false;
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
 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";
 
-// const baseReportUrl = "http://10.127.7.196";
-const baseReportUrl = "http://172.16.12.101";
+const baseReportUrl = "http://10.127.7.196";
+// const baseReportUrl = "http://172.16.12.101";
 
 // 是否隐藏控制台打印的 log info warn 信息
 const hideLog = false;

+ 25 - 0
src/views/generatingCapacity/dataFilter/prepare/search.vue

@@ -8,6 +8,7 @@
           class="w-[150px]"
           @change="funStationChange"
         >
+          <el-option label="全区域" @click="getAllWt"> </el-option>
           <el-option
             v-for="item in stationList"
             :key="item.id"
@@ -169,6 +170,30 @@ export default {
         }
       });
     },
+
+    getAllWt() {
+      let windList = [];
+      let promiseList = [];
+      this.stationList.forEach((ele) => {
+        let promiseItem = new Promise((resolve, reject) => {
+          apiGetbaseWindturbine({
+            stationId: ele.id,
+          }).then((res) => {
+            resolve(res?.data || []);
+          });
+        });
+        promiseList.push(promiseItem);
+      });
+      Promise.all(promiseList).then((res) => {
+        res.forEach((ele) => {
+          windList = [].concat(windList, ele);
+        });
+        this.windList = windList;
+        this.queryForm.wtIds = windList.map((o) => o.id);
+        this.checkAll = true;
+      });
+    },
+
     funStationChange(stationId) {
       if (stationId) {
         this.funGetWind(stationId);