问题修改

.env.development

@@ -18,7 +18,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://192.168.2.232:9002'
 
 # 智能报表
 # VUE_APP_REPORT_URL = 'http://192.168.0.102:9001'

components.d.ts

@@ -166,7 +166,7 @@ declare module 'vue' {
     StrightLineChart: typeof import('./src/components/chart/line/stright-line-chart.vue')['default']
     SubmitBtn: typeof import('./src/components/generatingCapacityComponent/SubmitBtn.vue')['default']
     SvgDraw: typeof import('./src/components/coms/icon/svg-draw.vue')['default']
-    SvgIcon: typeof import('./src/components/powerPredictionComponent/svgIcon/index.vue')['default']
+    SvgIcon: typeof import('./src/components/coms/icon/svg-icon.vue')['default']
     SvgPageShow: typeof import('./src/components/powerPredictionComponent/powerControlSvg/svgPageShow.vue')['default']
     Tab: typeof import('./src/components/coms/tabs/tab.vue')['default']
     Table: typeof import('./src/components/generatingCapacityComponent/table.vue')['default']

src/components/powerPredictionComponent/homePageAssembly/weatherDetail.vue

@@ -19,7 +19,7 @@
                                 <!-- <div class="detailsMsg">{{item.data[0].msg}}</div> -->
                                 <div class="detailsTimesv">
                                     <div class="detailN">
-                                        <span>极端天气预警:</span>
+                                        <span>天气预警:</span>
                                         <span
                                             :style="haveColor(item.alertObj.alertTitle)">{{item.alertObj.alertTitle}};</span>
                                     </div>

src/views/IntegratedAlarm/reliability/historyAnalyse/index.vue

@@ -565,7 +565,7 @@ watch(
         state.modelId = [arr[0][0]?.nemCode];
         let componenDefaultSelect =
           arr[1]?.find((ele) => {
-            return ele.nemCode === "ZZ";
+            return ele.nemCode === "FDJ";
           })?.nemCode || "";
         componenDefaultSelect
           ? (state.components = [componenDefaultSelect])

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

@@ -253,13 +253,14 @@ const funExcelChange = async (obj) => {
   activeTab.value = "1";
   isChartArea.value = false;
   tableShowId.value = obj.id;
-  let tableX = ["未满发样板机", "满发样板机", "未满发", "满发"];
-  tableX.forEach((it) => {
+  let tableX = ["未满发样板机_", "满发样板机_", "样板机_", "未满发_", "满发_", "_"];
+for(let i =0; i<tableX.length; i++) {
+    let it = tableX[i]
     if (obj.name.indexOf(it) !== -1) {
-      tableName.value = obj.name.substring(0, obj.name.indexOf(it) - 1);
-      return;
+    tableName.value = obj.name.substring(0, obj.name.indexOf(it));
+    break;
     }
-  });
+}
   tableFilePath.value = obj.path;
   excelType.value = obj.type; // 接收excel的type 用于控制右侧tab展示
 
@@ -954,13 +955,14 @@ const initPageData = () => {
     activeTab.value = "1";
     isChartArea.value = false;
     tableShowId.value = obj.id;
-    let tableX = ["未满发样板机", "满发样板机", "未满发", "满发"];
-    tableX.forEach((it) => {
-      if (obj.name.indexOf(it) !== -1) {
-        tableName.value = obj.name.substring(0, obj.name.indexOf(it) - 1);
-        return;
-      }
-    });
+    let tableX = ["未满发样板机_", "满发样板机_", "样板机_", "未满发_", "满发_", "_"];
+for(let i =0; i<tableX.length; i++) {
+    let it = tableX[i]
+    if (obj.name.indexOf(it) !== -1) {
+    tableName.value = obj.name.substring(0, obj.name.indexOf(it));
+    break;
+    }
+}
     tableFilePath.value = obj.path;
     excelType.value = obj.type; // 接收excel的type 用于控制右侧tab展示
 

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

@@ -325,13 +325,14 @@ const funExcelChange = async (obj) => {
   /**次代码供温度功率曲线分析使用 */
   excelCheckIds.value = [obj.id]; //当为单选展示风机图表时
   tableShowId.value = obj.id
-  let tableX = ["未满发样板机", "满发样板机", "未满发", "满发" ]
-  tableX.forEach(it =>{
+  let tableX = ["未满发样板机_", "满发样板机_", "样板机_", "未满发_", "满发_", "_"];
+for(let i =0; i<tableX.length; i++) {
+    let it = tableX[i]
     if (obj.name.indexOf(it) !== -1) {
-        tableName.value = obj.name.substring(0, obj.name.indexOf(it)-1)
-        return
+    tableName.value = obj.name.substring(0, obj.name.indexOf(it));
+    break;
     }
-  })
+}
   tableFilePath.value = obj.path;
 
   chartExcelList.value = excelList.value.map((o) => {
@@ -1186,13 +1187,14 @@ const initPageData = () => {
 
     excelCheckIds.value = [obj.id]; //当为单选展示风机图表时
     tableShowId.value = obj.id
-    let tableX = ["未满发样板机", "满发样板机", "未满发", "满发" ]
-    tableX.forEach(it =>{
+    let tableX = ["未满发样板机_", "满发样板机_", "样板机_", "未满发_", "满发_", "_"];
+    for(let i =0; i<tableX.length; i++) {
+        let it = tableX[i]
         if (obj.name.indexOf(it) !== -1) {
-            tableName.value = obj.name.substring(0, obj.name.indexOf(it)-1)
-            return
+        tableName.value = obj.name.substring(0, obj.name.indexOf(it));
+        break;
         }
-    })
+    }
     tableFilePath.value = obj.path;
     chartExcelList.value = excelList.value.map((o) => {
       return {

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

@@ -314,7 +314,7 @@ const funRepeatMap = (arr) => {
 };
 const funGetTree = async () => {
   actTreeNode.value = null;
-  const res = await httpRequest.get("/power/prepare/tree");
+  const res = await httpRequest.get("/power/process/tree");
   treeData.value = funRepeatMap(res.data);
   excelList.value = [];
   if (actTreeNode.value) {

src/views/powerPrediction/component/power.json

@@ -1309,8 +1309,8 @@
                 "name": "风向",
                 "xAxisData": null,
                 "data": [
-                    [null, 15, null, null, null, null, null, null],
-                    [null, null, null, 20, null, null, null, null]
+                    [null, 15.6, null, null, null, null, null, null],
+                    [null, null, null, 20.555343453453453, null, null, null, null]
                 ]
             },
             {

src/views/powerPrediction/homePageNoMap.vue

@@ -525,7 +525,7 @@
                 {
                     img: twoimg,
                     name: "待机",
-                    nameEn: "tjsum",
+                    nameEn: "djsum",
                     borderSty: "#05BB4C",
                     backSty: "#258952",
                     numBack: "#212223",
@@ -534,7 +534,7 @@
                 {
                     img: sevenimg,
                     name: "故障",
-                    nameEn: "whsum",
+                    nameEn: "jxsum",
                     borderSty: "#BA3237",
                     backSty: "#73262B",
                     numBack: "#212223",
@@ -543,7 +543,7 @@
                 {
                     img: threeimg,
                     name: "维护",
-                    nameEn: "jxsum",
+                    nameEn: "whsum",
                     borderSty: "#E17D24",
                     backSty: "#694119",
                     numBack: "#212223",
@@ -561,7 +561,7 @@
                 {
                     img: siximg,
                     name: "受累",
-                    nameEn: "djsum",
+                    nameEn: "tjsum",
                     borderSty: "#fff",
                     backSty: "#38393B",
                     numBack: "#212223",
@@ -589,7 +589,7 @@
                 {
                     img: twoimg1,
                     name: "待机",
-                    nameEn: "tjsum",
+                    nameEn: "djsum",
                     borderSty: "#6BDB97",
                     backSty: "#0EAC4C",
                     numBack: "#077C35",
@@ -598,17 +598,16 @@
                 {
                     img: sevenimg1,
                     name: "故障",
-                    nameEn: "whsum",
+                    nameEn: "jxsum",
                     borderSty: "#73262B",
                     backSty: "#BA3237",
                     numBack: "#881B1F",
-
                     number: 0,
                 },
                 {
                     img: threeimg1,
                     name: "维护",
-                    nameEn: "jxsum",
+                    nameEn: "whsum",
                     borderSty: "#F1AF74",
                     backSty: "#E17D24",
                     numBack: "#A6530A",
@@ -626,7 +625,7 @@
                 {
                     img: fourimg1,
                     name: "受累",
-                    nameEn: "djsum",
+                    nameEn: "tjsum",
                     borderSty: "#CDCDCD",
                     backSty: "#A8A8A8",
                     numBack: "#878787",
@@ -1657,38 +1656,58 @@
                                 let str =
                                     `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
                                 let strMsg = "";
-                                item.forEach((it, index) => {
-                                    if (index !== 3) {
-                                        strMsg = `<div style="margin-bottom: 5px">
-                                    <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${it.color};\"></span>&nbsp;
-                                    <span style="display:inline-block;">${it.seriesName}:</span>&nbsp;&nbsp;<span>${it.value}</span>
-                                        </div>`;
-
-                                        this.showpowerLegend[index].name = it.seriesName;
-                                        this.showpowerLegend[index].color = it.color;
-                                    } else {
-                                        if (it.axisValue === "00:15:00") {
-                                            it.color = "#e96366";
+                                if (item.length > 1) {
+                                    item.forEach((it, index) => {
+                                        // if (index !== 3) {
+                                        if (it.seriesName !== "超短期") {
+                                            strMsg = `<div style="margin-bottom: 5px">
+                                        <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${it.color};\"></span>&nbsp;
+                                        <span style="display:inline-block;">${it.seriesName}:</span>&nbsp;&nbsp;<span>${it.value}</span>
+                                            </div>`;
+
+                                            this.showpowerLegend[index].name = it.seriesName;
+                                            this.showpowerLegend[index].color = it.color;
+                                        } else {
+                                            if (it.axisValue === "00:15:00") {
+                                                it.color = "#e96366";
+                                            }
+                                            strMsg = `<div style="margin-bottom: 5px">
+                                        <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${
+                                          it.color
+                                        };\"></span>&nbsp;
+                                        <span style="display:inline-block;">${
+                                          it.color === "#e96366" ? "超短期" : "短期"
+                                        }:</span>&nbsp;&nbsp;<span>${it.value}</span>
+                                            </div>`;
+                                            if (it.color === "#e96366") {
+                                                this.showpowerLegend[index].name = "超短期";
+                                            } else {
+                                                this.showpowerLegend[index].name = "短期";
+                                            }
+                                            this.showpowerLegend[index].color = it.color;
                                         }
-                                        strMsg = `<div style="margin-bottom: 5px">
+                                        str = str + strMsg;
+                                    });
+                                } else {
+                                    if (item[0].axisValue === "00:15:00") {
+                                        item[0].color = "#e96366";
+                                    }
+                                    strMsg = `<div style="margin-bottom: 5px">
                                     <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${
-                                      it.color
+                                        item[0].color
                                     };\"></span>&nbsp;
                                     <span style="display:inline-block;">${
-                                      it.color === "#e96366" ? "超短期" : "短期"
-                                    }:</span>&nbsp;&nbsp;<span>${
-                        it.value
-                      }</span>
+                                        item[0].color === "#e96366" ? "超短期" : "短期"
+                                    }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
                                         </div>`;
-                                        if (it.color === "#e96366") {
-                                            this.showpowerLegend[index].name = "超短期";
-                                        } else {
-                                            this.showpowerLegend[index].name = "短期";
-                                        }
-                                        this.showpowerLegend[index].color = it.color;
+                                    if (item[0].color === "#e96366") {
+                                        this.showpowerLegend[3].name = "超短期";
+                                    } else {
+                                        this.showpowerLegend[3].name = "短期";
                                     }
+                                    this.showpowerLegend[3].color = item[0].color;
                                     str = str + strMsg;
-                                });
+                                }
                                 return str;
                             } : "",
                     },

src/views/powerPrediction/panoramicPower.vue

@@ -129,7 +129,7 @@
                 {
                     img: twoimg,
                     name: "待机",
-                    nameEn: "tjsum",
+                    nameEn: "djsum",
                     borderSty: "#05BB4C",
                     backSty: "#258952",
                     numBack: "#212223",
@@ -138,7 +138,7 @@
                 {
                     img: sevenimg,
                     name: "故障",
-                    nameEn: "whsum",
+                    nameEn: "jxsum",
                     borderSty: "#BA3237",
                     backSty: "#73262B",
                     numBack: "#212223",
@@ -147,7 +147,7 @@
                 {
                     img: threeimg,
                     name: "维护",
-                    nameEn: "jxsum",
+                    nameEn: "whsum",
                     borderSty: "#E17D24",
                     backSty: "#694119",
                     numBack: "#212223",
@@ -165,7 +165,7 @@
                 {
                     img: siximg,
                     name: "受累",
-                    nameEn: "djsum",
+                    nameEn: "tjsum",
                     borderSty: "#fff",
                     backSty: "#38393B",
                     numBack: "#212223",
@@ -193,7 +193,7 @@
                 {
                     img: twoimg1,
                     name: "待机",
-                    nameEn: "tjsum",
+                    nameEn: "djsum",
                     borderSty: "#6BDB97",
                     backSty: "#0EAC4C",
                     numBack: "#077C35",
@@ -202,17 +202,16 @@
                 {
                     img: sevenimg1,
                     name: "故障",
-                    nameEn: "whsum",
+                    nameEn: "jxsum",
                     borderSty: "#73262B",
                     backSty: "#BA3237",
                     numBack: "#881B1F",
-
                     number: 0,
                 },
                 {
                     img: threeimg1,
                     name: "维护",
-                    nameEn: "jxsum",
+                    nameEn: "whsum",
                     borderSty: "#F1AF74",
                     backSty: "#E17D24",
                     numBack: "#A6530A",
@@ -230,7 +229,7 @@
                 {
                     img: fourimg1,
                     name: "受累",
-                    nameEn: "djsum",
+                    nameEn: "tjsum",
                     borderSty: "#CDCDCD",
                     backSty: "#A8A8A8",
                     numBack: "#878787",
@@ -336,7 +335,7 @@
             // that.getChartData();
             that.getWindStatus();
             that.planFiveMin = setInterval(function () {
-                // that.getChartData();
+                that.getChartData();
             }, 300000);
         },
         computed: {

src/views/powerPrediction/powerPredictionPage.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="powerPredictionPage" :class="!theme ? 'themeDark' : 'themeLight'">
         <el-row class="windStstus">
-            <el-col :span="8" class="scrollbar">
+            <el-col :span="6" class="scrollbar">
                 <!-- <span class="scrollbarName">场站名称：</span> -->
-                <div class="seach">
+                <div class="seachPower">
                     <el-form class="generat-seach" :inline="true">
                         <el-form-item label="场站">
                             <el-select v-model="reportStation" placeholder="选择场站" @change="changeWindNo">
@@ -26,7 +26,7 @@
                     </div>
                 </el-scrollbar> -->
             </el-col>
-            <el-col :span="15">
+            <el-col :span="17">
                 <div class="everyOne" v-for="(item, index) in !theme ? statusData : statusDataW" :key="index"
                     :style="statusSty(item)">
                     <div class="everyOneImg" style="width: 39px">
@@ -210,7 +210,7 @@
                 {
                     img: twoimg,
                     name: "待机",
-                    nameEn: "tjsum",
+                    nameEn: "djsum",
                     borderSty: "#05BB4C",
                     backSty: "#258952",
                     numBack: "#212223",
@@ -219,7 +219,7 @@
                 {
                     img: sevenimg,
                     name: "故障",
-                    nameEn: "whsum",
+                    nameEn: "jxsum",
                     borderSty: "#BA3237",
                     backSty: "#73262B",
                     numBack: "#212223",
@@ -228,7 +228,7 @@
                 {
                     img: threeimg,
                     name: "维护",
-                    nameEn: "jxsum",
+                    nameEn: "whsum",
                     borderSty: "#E17D24",
                     backSty: "#694119",
                     numBack: "#212223",
@@ -246,7 +246,7 @@
                 {
                     img: siximg,
                     name: "受累",
-                    nameEn: "djsum",
+                    nameEn: "tjsum",
                     borderSty: "#fff",
                     backSty: "#38393B",
                     numBack: "#212223",
@@ -274,7 +274,7 @@
                 {
                     img: twoimg1,
                     name: "待机",
-                    nameEn: "tjsum",
+                    nameEn: "djsum",
                     borderSty: "#6BDB97",
                     backSty: "#0EAC4C",
                     numBack: "#077C35",
@@ -283,17 +283,16 @@
                 {
                     img: sevenimg1,
                     name: "故障",
-                    nameEn: "whsum",
+                    nameEn: "jxsum",
                     borderSty: "#73262B",
                     backSty: "#BA3237",
                     numBack: "#881B1F",
-
                     number: 0,
                 },
                 {
                     img: threeimg1,
                     name: "维护",
-                    nameEn: "jxsum",
+                    nameEn: "whsum",
                     borderSty: "#F1AF74",
                     backSty: "#E17D24",
                     numBack: "#A6530A",
@@ -311,7 +310,7 @@
                 {
                     img: fourimg1,
                     name: "受累",
-                    nameEn: "djsum",
+                    nameEn: "tjsum",
                     borderSty: "#CDCDCD",
                     backSty: "#A8A8A8",
                     numBack: "#878787",
@@ -778,7 +777,7 @@
                     this.getCapacity();
                     this.getAssessmentScore();
                     this.getIrradiance();
-                    this.getwindRosetteChart();
+                    // this.getwindRosetteChart();
                     this.getUnitStatus();
                 });
             },
@@ -864,7 +863,7 @@
                 this.getWindSpeed();
                 this.getCapacity();
                 this.getAssessmentScore();
-                this.getwindRosetteChart();
+                // this.getwindRosetteChart();
                 this.getIrradiance();
                 this.getUnitStatus();
             },
@@ -984,37 +983,57 @@
                                 let str =
                                     `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
                                 let strMsg = "";
-                                item.forEach((it, index) => {
-                                    if (index !== 3) {
-                                        strMsg = `<div style="margin-bottom: 5px">
-                                    <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${it.color};\"></span>&nbsp;
-                                    <span style="display:inline-block;">${it.seriesName}:</span>&nbsp;&nbsp;<span>${it.value}</span>
-                                        </div>`;
-                                        this.showpowerLegend[index].name = it.seriesName;
-                                        this.showpowerLegend[index].color = it.color;
-                                    } else {
-                                        if (it.axisValue === "00:15:00") {
-                                            it.color = "#e96366";
+                                if (item.length > 1) {
+                                    item.forEach((it, index) => {
+                                        // if (index !== 3) {
+                                        if (it.seriesName !== "超短期") {
+                                            strMsg = `<div style="margin-bottom: 5px">
+                                        <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${it.color};\"></span>&nbsp;
+                                        <span style="display:inline-block;">${it.seriesName}:</span>&nbsp;&nbsp;<span>${it.value}</span>
+                                            </div>`;
+                                            this.showpowerLegend[index].name = it.seriesName;
+                                            this.showpowerLegend[index].color = it.color;
+                                        } else {
+                                            if (it.axisValue === "00:15:00") {
+                                                it.color = "#e96366";
+                                            }
+                                            strMsg = `<div style="margin-bottom: 5px">
+                                        <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${
+                                          it.color
+                                        };\"></span>&nbsp;
+                                        <span style="display:inline-block;">${
+                                          it.color === "#e96366" ? "超短期" : "短期"
+                                        }:</span>&nbsp;&nbsp;<span>${it.value}</span>
+                                            </div>`;
+                                            if (it.color === "#e96366") {
+                                                this.showpowerLegend[index].name = "超短期";
+                                            } else {
+                                                this.showpowerLegend[index].name = "短期";
+                                            }
+                                            this.showpowerLegend[index].color = it.color;
                                         }
-                                        strMsg = `<div style="margin-bottom: 5px">
+                                        str = str + strMsg;
+                                    });
+                                } else {
+                                    if (item[0].axisValue === "00:15:00") {
+                                        item[0].color = "#e96366";
+                                    }
+                                    strMsg = `<div style="margin-bottom: 5px">
                                     <span style="display:inline-block;margin-right:4px;margin-top:3px;border-radius:10px;width:10px;height:10px;background-color:${
-                                      it.color
+                                        item[0].color
                                     };\"></span>&nbsp;
                                     <span style="display:inline-block;">${
-                                      it.color === "#e96366" ? "超短期" : "短期"
-                                    }:</span>&nbsp;&nbsp;<span>${
-                        it.value
-                      }</span>
+                                        item[0].color === "#e96366" ? "超短期" : "短期"
+                                    }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
                                         </div>`;
-                                        if (it.color === "#e96366") {
-                                            this.showpowerLegend[index].name = "超短期";
-                                        } else {
-                                            this.showpowerLegend[index].name = "短期";
-                                        }
-                                        this.showpowerLegend[index].color = it.color;
+                                    if (item[0].color === "#e96366") {
+                                        this.showpowerLegend[3].name = "超短期";
+                                    } else {
+                                        this.showpowerLegend[3].name = "短期";
                                     }
+                                    this.showpowerLegend[3].color = item[0].color;
                                     str = str + strMsg;
-                                });
+                                }
                                 return str;
                             } : "",
                     },
@@ -1275,6 +1294,8 @@
                                 this.getGaugeX("guageChart", gaugeData);
                             } else if (item.name === "湿度") {
                                 this.getGaugeX("guageChart1", gaugeData);
+                            } else if (item.name === '风向') {
+                                this.getRose(item.data);
                             } else {
                                 this.getGaugeX("guageChart2", gaugeData);
                             }
@@ -1448,6 +1469,7 @@
                             }
 
                         })
+                        console.log("风向", datas.data.dataFormatList)
                         this.getRose(serise);
                     }
                 });
@@ -1502,7 +1524,7 @@
                         radius: [10, '80%']
                     },
                     radiusAxis: {
-                        max: 25,
+                        // max: 25,
                         startAngle: 75
                     },
                     angleAxis: {

src/views/powerPrediction/weatherPage.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="weatherPage" :style="pageHeight">
         <!-- <common-header ref="weather"></common-header> -->
-        <div class="weather_wind">
+        <div class="weather_wind" :class="getBackGround(weatherFrom.weather_day_now)">
             <el-row class="windStstus">
                 <el-col :span="24" class="scrollbar">
                     <!-- <span class="scrollbarName">场站名称：</span> -->

src/viewsCss/powerPredictionPageLess.less

@@ -13,7 +13,7 @@
             display: flex;
         }
 
-        .seach {
+        .seachPower {
 
             .generat-seach {
                 position: relative;