http请求改为https；问题修改

.env.production

@@ -15,34 +15,34 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
-VUE_APP_ALARM=http://10.220.1.5:6015
-# VUE_APP_ALARM=http://10.112.33.5:6015
+# VUE_APP_ALARM=https://10.220.1.5:6015
+VUE_APP_ALARM=https://10.112.33.5:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
-VUE_APP_API=http://10.220.1.5:6060
-# VUE_APP_API=http://10.112.33.5:6060
+# VUE_APP_API=https://10.220.1.5:6060
+VUE_APP_API=https://10.112.33.5:6060
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
-VUE_APP_URL=https://10.220.1.5:5300
-# VUE_APP_URL=https://10.112.33.5:5300
+# VUE_APP_URL=https://10.220.1.5:5300
+VUE_APP_URL=https://10.112.33.5:5300
 
-VUE_APP_URL2=http://10.220.1.5:8080
-# VUE_APP_URL2=http://10.112.33.5:8081
+# VUE_APP_URL2=https://10.220.1.5:8080
+VUE_APP_URL2=https://10.112.33.5:8081
 
-VUE_APP_REPORT=http://10.220.1.5:8001
-# VUE_APP_REPORT=http://10.112.33.5:8001
+# VUE_APP_REPORT=https://10.220.1.5:8443
+VUE_APP_REPORT=https://10.112.33.5:8443
 
-VUE_APP_WS_URL=ws://10.220.1.5:6014
-# VUE_APP_WS_URL=ws://10.112.33.5:6014
+# VUE_APP_WS_URL=ws://10.220.1.5:6014
+VUE_APP_WS_URL=ws://10.112.33.5:6014
 
-VUE_APP_GENERAT_URL=http://10.220.1.5:6060
-# VUE_APP_GENERAT_URL=http://10.112.33.5:6060
+# VUE_APP_GENERAT_URL=https://10.220.1.5:6060
+VUE_APP_GENERAT_URL=https://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
 VUE_APP_HEADER2_URL=http://10.112.32.31:10201

src/views/economicsOperation/stationAnalyse/angleAnalysis/components/current-scatter-chart.vue

@@ -172,10 +172,11 @@ export default {
         });
         let myChart = echarts.init(document.getElementById(this.id));
         that.chart = myChart;
+
         //指定图表的配置项和数据
         const option = {
           //标题
-          color: this.color,
+          color: that.color,
           title: {
             text: that.chartTitle,
             right: 440,
@@ -214,9 +215,11 @@ export default {
               const dataIndex = data[0].dataIndex;
               let label = `<p><span style="display:inline-block;width:100%">${that.xAxisData[dataIndex]}</span>`;
               data.forEach((ele, index) => {
+                console.log(ele, index, that.color);
                 label += `<p>
                             <span style="background:${
-                              that.color[index]
+                              //   that.color[ele.componentIndex]
+                              ele.color
                             };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
                                 <span>${
                                   ele.seriesName
@@ -440,7 +443,7 @@ export default {
         this.color = [
           "#205081",
           "#e96767", //
-          "#41a273", // 
+          "#41a273", //
           "rgb(77, 119, 255)",
           "rgb(1, 191, 236)",
           "#f2c94c",
@@ -520,7 +523,9 @@ export default {
   mounted() {
     this.$el.style.width = this.width;
     this.$el.style.height = this.height;
-    this.initChart();
+    this.$nextTick(() => {
+      this.initChart();
+    });
   },
   updated() {
     let myChart = echarts.init(document.getElementById(this.id));

src/views/economicsOperation/stationAnalyse/angleAnalysis/index.vue

@@ -432,9 +432,10 @@ const funSubmit = (params) => {
           data: ygsdxz,
           xAxisIndex: 0,
           lineStyle: {
-            color: "#67c23a",
+            // color: "#67c23a",
           },
           large: true,
+          color: "#205081",
         },
         {
           name: "实发有功",
@@ -445,7 +446,7 @@ const funSubmit = (params) => {
           data: sfyg,
           xAxisIndex: 0,
           lineStyle: {
-            color: "rgb(242.5, 208.5, 157.5)",
+            // color: "rgb(242.5, 208.5, 157.5)",
           },
           large: true,
           markPoint: {
@@ -465,6 +466,7 @@ const funSubmit = (params) => {
             },
             data: [],
           },
+          color: "#e96767",
         },
         {
           name: "理论功率",
@@ -475,9 +477,10 @@ const funSubmit = (params) => {
           data: llgl,
           xAxisIndex: 0,
           lineStyle: {
-            color: "#f56c6c",
+            // color: "#f56c6c",
           },
           large: true,
+          color: "#41a273",
         },
         {
           name: "偏差上限",
@@ -488,11 +491,12 @@ const funSubmit = (params) => {
           data: pcsx,
           xAxisIndex: 0,
           lineStyle: {
-            color: "#64b5f6",
+            // color: "#64b5f6",
             opacity: 0,
           },
           symbol: "none",
           large: true,
+          color: "rgb(77, 119, 255)",
         },
         {
           name: "偏差下限",
@@ -503,11 +507,12 @@ const funSubmit = (params) => {
           data: pcxx,
           xAxisIndex: 0,
           lineStyle: {
-            color: "#ffb74d",
+            // color: "#ffb74d",
             opacity: 0,
           },
           symbol: "none",
           large: true,
+          color: "rgb(1, 191, 236)",
         },
         {
           name: "保证功率",
@@ -522,6 +527,7 @@ const funSubmit = (params) => {
           //     color: "#f56c6c"
           // },
           large: true,
+          color: "#f2c94c",
         },
         {
           name: "平均风速",
@@ -536,6 +542,7 @@ const funSubmit = (params) => {
           //     color: "#f56c6c"
           // },
           large: true,
+          color: "#7bbfdd",
         },
       ];
       tableData.value = tableArr;

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/components/current-scatter-chart.vue

@@ -216,7 +216,8 @@ export default {
               data.forEach((ele, index) => {
                 label += `<p>
                             <span style="background:${
-                              that.color[index]
+                              //   that.color[index]
+                              ele.color
                             };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
                                 <span>${
                                   ele.seriesName

src/views/economicsOperation/stationAnalyse/fjglfsAnalysis/index.vue

@@ -301,6 +301,7 @@ const funSubmit = (params) => {
             xAxisIndex: 0,
             yAxisIndex: 1,
             large: true,
+            color: "#7bbfdd",
           },
           {
             name: "实发有功",
@@ -312,6 +313,7 @@ const funSubmit = (params) => {
             xAxisIndex: 0,
             yAxisIndex: 0,
             large: true,
+            color: "#e96767",
           },
           {
             name: "理论功率",
@@ -323,6 +325,7 @@ const funSubmit = (params) => {
             xAxisIndex: 0,
             yAxisIndex: 0,
             large: true,
+            color: "#41a273",
           }
         );
       }