常规上传

.env.development

@@ -19,7 +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://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'

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CalculationModelConfiguration: typeof import('./src/components/powerPredictionComponent/configPage/calculationModelConfiguration.vue')['default']
     Card1: typeof import('./src/components/coms/cards/card-1.vue')['default']
     CheckTable: typeof import('./src/components/coms/table/check-table.vue')['default']
-    Col: typeof import('./src/components/homeComponent/grid/col.vue')['default']
+    Col: typeof import('./src/components/coms/grid/col.vue')['default']
     CollapseList: typeof import('./src/components/coms/collapse/collapse-list.vue')['default']
     CollectionLineManagement: typeof import('./src/components/powerPredictionComponent/configPage/stationFlode/collectionLineManagement.vue')['default']
     CommonHeaders: typeof import('./src/components/commonHeaders.vue')['default']
@@ -154,7 +154,7 @@ declare module 'vue' {
     RoleManagement: typeof import('./src/components/powerPredictionComponent/configPage/roleManagement.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Row: typeof import('./src/components/homeComponent/grid/row.vue')['default']
+    Row: typeof import('./src/components/coms/grid/row.vue')['default']
     SBQ: typeof import('./src/components/powerPredictionComponent/configPage/configDesignVue/SBQ.vue')['default']
     ScatterLineChart: typeof import('./src/components/chart/combination/scatter-line-chart.vue')['default']
     SimpleLineChart: typeof import('./src/components/chart/line/simple-line-chart.vue')['default']

src/components/generatingCapacityComponent/kMap/index.vue

@@ -44,7 +44,7 @@ export default {
   data() {
     return {
       mapViewer: null,
-      tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
+      tilsUrl: "./static/newKMapTiles/{z}/{x}/{y}.jpg",
       labelEntities: [],
       // 本地化语言配置
       localSet: {

src/views/generatingCapacity/dataAnalysis/agcAnalysis/components/current-scatter-chart.vue

@@ -175,6 +175,7 @@ export default {
         //指定图表的配置项和数据
         const option = {
           //标题
+          color: this.color,
           title: {
             text: that.chartTitle,
             right: 440,
@@ -209,22 +210,22 @@ export default {
             axisPointer: {
               type: "cross",
             },
-            // formatter(data) {
-            //   let label = ``;
-            //   data.forEach((ele, index) => {
-            //     label += `<p>
-            //                   <span style="background:${
-            //                     that.color[index]
-            //                   };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
-            //                   <span>${
-            //                     ele.seriesName
-            //                   }:<span style="font-weight: 700;margin-left:10px">${
-            //       ele.value || 0
-            //     }</span></span>
-            //                 </p>`;
-            //   });
-            //   return label;
-            // },
+            formatter(data) {
+              let label = ``;
+              data.forEach((ele, index) => {
+                label += `<p>
+                              <span style="background:${
+                                that.color[index]
+                              };margin-right:5px;display:inline-block;width:10px;height:10px;border-radius:50%;over-flow:hidden;"></span>
+                              <span>${
+                                ele.seriesName
+                              }:<span style="font-weight: 700;margin-left:10px">${
+                  ele.value || 0
+                }</span></span>
+                            </p>`;
+              });
+              return label;
+            },
           },
           brush: {
             seriesIndex: [2, 3],

src/views/generatingCapacity/dataAnalysis/posAnalysis/components/leafletMap.vue

@@ -30,7 +30,7 @@ export default {
       layers: [],
       rightObj: {},
       areaLayer: null,
-      tilsUrl: "./static/kMapTiles/{z}/{x}/{y}.jpg",
+      tilsUrl: "./static/newKMapTiles/{z}/{x}/{y}.jpg",
       ciLayer: null,
       viewCenterMap: {
         GJNY_SXGS_ZZ_FDC_STA: { lng: 107.86058, lat: 37.37861 },

src/views/generatingCapacity/jjyxReport/index.vue

@@ -157,7 +157,7 @@
               label="风机平均风速(m/s)"
             />
             <el-table-column
-              prop="cftPjfs"
+              prop="cftfs"
               align="center"
               label="测风塔平均风速(m/s)"
             />
@@ -205,7 +205,7 @@
               label="风机平均风速(m/s)"
             />
             <el-table-column
-              prop="cftPjfs"
+              prop="cftfs"
               align="center"
               label="测风塔平均风速(m/s)"
             />

src/views/powerPrediction/stationPowerContro.vue

@@ -192,7 +192,7 @@ export default {
                 time: iv.time,
               };
               iv.power.forEach((ic, idx) => {
-                obj[obj.nameEn + (idx + 1)] = ic > 0 ? ic.toFixed(2) : "/";
+                obj[obj.nameEn + (idx + 1)] = ic > -1 ? ic === 0 ? 0 : ic.toFixed(2) : "/";
               });
               that.tableData.push(obj);
             });