对风偏差分析模块BUG修复

.env.development

@@ -19,8 +19,8 @@ VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 # 马力军
 # VUE_APP_GENERAT_URL = 'http://192.168.2.45:9002'
 # 王波
-# VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
-VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
+VUE_APP_GENERAT_URL = 'http://172.16.12.101:9002'
+# VUE_APP_GENERAT_URL = 'http://127.0.0.1:9002'
 
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://192.168.0.102:9001'

.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:7095'
-VUE_APP_ALARM = 'http://172.16.12.101:7095'
+VUE_APP_ALARM = 'http://10.127.7.241:7095'
+# VUE_APP_ALARM = 'http://172.16.12.101:7095'
 
 # VUE_APP_ADP_BASE_URL = 'http://10.127.7.241:6015'
 VUE_APP_ADP_BASE_URL = 'http://172.16.12.101'

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;

src/views/generatingCapacity/dataAnalysis/rateAnalysis/index.vue

@@ -256,7 +256,7 @@
       <div v-loading="exportLoading">
         <el-row
           ref="diaPanelRef"
-          style="height: 650px; overflow-y: auto; over-x: hidden"
+          style="height: 650px; overflow-y: auto; overflow-x: hidden"
         >
           <el-col
             :span="actCopList.length > 1 ? 12 : 24"
@@ -280,6 +280,7 @@
               :yAxis="item.yAxis"
               :dataset="item.dataset"
               :brush="item.isBrush"
+              :count="item.count"
               @getSelected="funChartSelect"
             ></component>
           </el-col>
@@ -558,6 +559,7 @@ const funSubmit = async () => {
   // const rosesRes = flowerRes
   // const lineRes = lineChartRes
   if (rosesRes.code === 200) {
+    console.log(1122, rosesRes.data);
     if (rosesRes.data.length) {
       chartData.value = [];
       for (const chart of rosesRes.data) {
@@ -610,6 +612,7 @@ const funSubmit = async () => {
                 coordinateSystem: "polar",
                 name: "方位风速",
               },
+          count: chart.ys || [],
         });
         chartId++;
         chartData.value.push({
@@ -1104,6 +1107,7 @@ const funDiaSubmit = async () => {
                   coordinateSystem: "polar",
                   name: "方位风速",
                 },
+                count: chart.ys || [],
             });
             chartId++;
           }