问题修改（sunzehao提交）

.env.development

@@ -18,8 +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://192.168.2.232: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'

src/components/homeComponent/forecastBarComponent.vue

@@ -31,6 +31,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    wpId: {
+      type: String,
+      default: "",
+    },
     total: {
       type: Number,
       default: 150,
@@ -194,7 +198,8 @@ export default {
             symbolSize: [1, 8],
             symbolPosition: "start",
             symbolOffset: [8, -1],
-            symbolBoundingData: value.total,
+            // symbolBoundingData: value.total,
+            symbolBoundingData: this.handleElectricDetail(value),
             symbolRotate: -15,
             data: [value],
             z: 2,
@@ -205,7 +210,8 @@ export default {
             type: "pictorialBar",
             animation: this.firstAnimation,
             symbol: "rect",
-            symbolBoundingData: value.total,
+            // symbolBoundingData: value.total,
+            symbolBoundingData: this.handleElectricDetail(value),
             itemStyle: {
               normal: {
                 color: "none",
@@ -248,7 +254,8 @@ export default {
             barGap: "-120%", // 设置外框粗细
             data: [
               {
-                value: value.total,
+                // value: value.total,
+                value: this.handleElectricDetail(value),
                 itemStyle: {
                   normal: {
                     color: "transparent",
@@ -280,7 +287,23 @@ export default {
       window.removeEventListener("resize", this.resize);
       window.addEventListener("resize", this.resize);
     },
-    handleElectricDetail() {},
+    handleElectricDetail(value) {
+      let number = 0
+      if (this.wpId === "GJNY_SXGS_DBXNY_ZGS0") {
+        if (value.id === 'day') {
+          number = 400
+        } else {
+          number = 8000
+        }
+      } else {
+        if (value.id === 'day') {
+          number = 150
+        } else {
+          number = 1500
+        }
+      }
+      return number
+    },
   },
   created() {
     this.id = "pie-chart-" + util.newGUID();

src/components/powerPredictionComponent/panoramicPowerDialog/panoramaPowerDialogPage.vue

@@ -40,6 +40,8 @@
                         border: '0.5px solid rgba(0,0,0,.5) !important',
                         }">
                         <el-table-column prop="dataTime" label="时间" align="center" width="160"></el-table-column>
+                        <el-table-column prop="actualWindSpeedDq" label="实际风速" align="center"></el-table-column>
+                        <el-table-column prop="forecastWindSpeedDq" label="预测风速" align="center"></el-table-column>
                         <el-table-column prop="theoreticalPower" label="理论功率" align="center"></el-table-column>
                         <el-table-column prop="availablePower" label="可用功率" align="center"></el-table-column>
                         <el-table-column label="当期数据" align="center">

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

@@ -712,12 +712,12 @@ const funTimeArea = () => {
             barxAxis.data.push(wtObj.wtId);
             for (const timeKey in wtObj.time1) {
               barSeries.value[timeKey].data.push(
-                (wtObj.time1[timeKey] / 60).toFixed(0)
+                Math.floor((wtObj.time1[timeKey] / 60))
               );
             }
             for (const time2Key in wtObj.time2) {
               barUnWorkSeries.value[time2Key].data.push(
-                (wtObj.time2[time2Key] / 60).toFixed(0)
+                Math.floor((wtObj.time2[time2Key] / 60))
               );
             }
           }

src/views/generatingCapacity/yhjyReport/index.vue

@@ -665,7 +665,7 @@
                     this.OperationName = "";
                     this.OperationGs = "";
                     this.OperationMonth = "";
-                    this.basrMsgArr = [];
+                    // this.basrMsgArr = [];
                     this.fjsxList1 = [];
                     this.fjsxList2 = [];
                     this.orderAnalysisArr = []

src/views/home/index.vue

@@ -450,7 +450,8 @@
                     <forecast-bar-component
                       :list="item"
                       height="40px"
-                      width="420px"
+                      width="370px"
+                      :wpId="wpId"
                       :theme="swichTheme"
                     />
                   </div>
@@ -475,7 +476,8 @@
                     <forecast-bar-component
                       :list="item"
                       height="40px"
-                      width="390px"
+                      width="370px"
+                      :wpId="wpId"
                       :theme="swichTheme"
                     />
                   </div>
@@ -1535,7 +1537,7 @@ export default {
             [
               {
                 name: "日预测电量",
-                id: "day2",
+                id: "day",
                 value: it.rycdl,
                 color: "#FF9B23",
                 total: res.data.rl * 24,
@@ -1546,7 +1548,7 @@ export default {
             [
               {
                 name: "月发电量",
-                id: "day",
+                id: "month",
                 value: it.yfdl,
                 color: "#1C99FF",
                 total: res.data.rl * 24 * 30,
@@ -1555,7 +1557,7 @@ export default {
             [
               {
                 name: "月预测电量",
-                id: "day2",
+                id: "month",
                 value: it.yycdl,
                 color: "#1C99FF",
                 total: res.data.rl * 24 * 30,

src/views/powerPrediction/batteryDivinerPage.vue

@@ -619,12 +619,14 @@ export default {
               series.push(seriesObj);
             });
           }
+          let color = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
           this.getPowerLine(
             "powerChart",
             "日发电量预测曲线",
             xAxis,
             legend,
-            series
+            series,
+            color
           );
         }
       });
@@ -679,12 +681,14 @@ export default {
               series1.push(seriesObj1);
             });
           }
+          let color = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
           this.getPowerLine(
             "monthChart",
             "本月单日发电量预测",
             xAxis,
             legend,
-            series
+            series,
+            color
           );
           this.getPowerBar("monthChartBar", "", xAxis, legend, series1);
         }
@@ -734,18 +738,20 @@ export default {
               series1.push(seriesObj1);
             });
           }
+          let color = ['#5470c6', '#91cc75', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
           this.getPowerLine(
             "windChart1",
             "今年月度发电量预测",
             xAxis,
             legend,
-            series
+            series,
+            color
           );
           this.getPowerBar("installChart1", "", xAxis, legend, series1);
         }
       });
     },
-    getPowerLine(name, title, xAxis, legend, series) {
+    getPowerLine(name, title, xAxis, legend, series, color) {
       const seriesFindFs = series.some((ele) => {
         return ele.name.indexOf("风速") !== -1;
       });
@@ -796,6 +802,7 @@ export default {
             fontWeight: "bold",
           },
         },
+        color: color,
         tooltip: {
           trigger: "axis",
         },

src/views/powerPrediction/homePageNoMap.vue

@@ -23,7 +23,7 @@
               justify-content: end;
               margin-right: 53px;
             ">
-                        <div v-for="item in showpowerLegend" :key="item.name">
+                        <!-- <div v-for="item in showpowerLegend" :key="item.name">
                             <span class="lineColor" :style="{ background: item.color }"></span>
                             <span class="powerLegendColor" :style="{ background: item.color }"></span>
                             <span :style="!theme ? 'color: #fff' : ''" style="
@@ -32,7 +32,7 @@
                   position: relative;
                   top: 1px;
                 ">{{ item.name }}</span>
-                        </div>
+                        </div> -->
                     </div>
                     <div class="chart-name">
                         <div class="point point-left bottom"></div>
@@ -771,7 +771,7 @@
                             xAxis.push(item.substring(item.indexOf(" ") + 1));
                         });
                         jsonData.todayPowerForecastData.dataFormatList.forEach((iten) => {
-                            if (iten.name !== "短期") {
+                            // if (iten.name !== "短期") {
                                 legend.push(iten.name);
                                 let seriesObj = {
                                     name: iten.name,
@@ -782,7 +782,7 @@
                                     symbol: "none",
                                 };
                                 series.push(seriesObj);
-                            }
+                            // }
                         });
                         that.getPowerLine("lineChart", "今日功率预测", xAxis, legend, series);
                     }
@@ -1579,7 +1579,7 @@
                         }
                         if (datas.data.dataFormatList.length > 0) {
                             datas.data.dataFormatList.forEach((iten) => {
-                                if (iten.name !== "短期") {
+                                // if (iten.name !== "短期") {
                                     legend.push(iten.name);
                                     let seriesObj = {
                                         name: iten.name,
@@ -1590,7 +1590,7 @@
                                         symbol: "none",
                                     };
                                     series.push(seriesObj);
-                                }
+                                // }
                             });
                         }
                         that.getPowerLine("lineChart", "今日功率预测", xAxis, legend, series);
@@ -1655,65 +1655,65 @@
                     },
                     tooltip: {
                         trigger: "axis",
-                        formatter: name === "lineChart" ?
-                            (item) => {
-                                let str =
-                                    `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
-                                let strMsg = "";
-                                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;
-                                        }
-                                        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:${
-                                        item[0].color
-                                    };\"></span>&nbsp;
-                                    <span style="display:inline-block;">${
-                                        item[0].color === "#e96366" ? "超短期" : "短期"
-                                    }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
-                                        </div>`;
-                                    // 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;
-                            } : "",
+                        // formatter: name === "lineChart" ?
+                        //     (item) => {
+                        //         let str =
+                        //             `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
+                        //         let strMsg = "";
+                        //         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;
+                        //                 }
+                        //                 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:${
+                        //                 item[0].color
+                        //             };\"></span>&nbsp;
+                        //             <span style="display:inline-block;">${
+                        //                 item[0].color === "#e96366" ? "超短期" : "短期"
+                        //             }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
+                        //                 </div>`;
+                        //             // 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;
+                        //     } : "",
                     },
                     // axisPointer: {
                     //     link: {
@@ -1741,7 +1741,7 @@
                         right: name !== "lineChart1" ? "20" : "20%",
                         data: legend,
                         // show: name === 'lineChart' ? false : true
-                        show: false,
+                        show: true,
                         // formatter: name === 'lineChart' ? (name, type) => {
                         //     // debugger
                         //     if (!type) {

src/views/powerPrediction/panoramicPower.vue

@@ -33,7 +33,7 @@
                 justify-content: end;
                 margin-right: 5px;
               ">
-                            <div v-for="it in item.showpowerLegend" :key="it.name">
+                            <!-- <div v-for="it in item.showpowerLegend" :key="it.name">
                                 <span class="lineColor" :style="{ background: it.color }"></span>
                                 <span class="powerLegendColor" :style="{ background: it.color }"></span>
                                 <span :style="!theme ? 'color: #fff' : ''" style="
@@ -42,7 +42,7 @@
                     position: relative;
                     top: 1px;
                   ">{{ it.name }}</span>
-                            </div>
+                            </div> -->
                         </div>
                         <div class="chart-name">
                             <div class="point point-left bottom"></div>
@@ -557,7 +557,7 @@
                                 let series = [];
                                 let namess = "";
                                 for (let i = 0; i < item.dataFormatList.length; i++) {
-                                    if (item.dataFormatList[i].name !== "短期") {
+                                    // if (item.dataFormatList[i].name !== "短期") {
                                         legend.push(item.dataFormatList[i].name);
                                         namess = item.name;
                                         let seriesObj = {
@@ -569,7 +569,7 @@
                                             symbol: "none",
                                         };
                                         series.push(seriesObj);
-                                    }
+                                    // }
                                 }
                                 this.$nextTick(() => {
                                     this.getPowerLine(namess, index, xAxis, legend, series);
@@ -592,72 +592,72 @@
                     },
                     tooltip: {
                         trigger: "axis",
-                        formatter: (item) => {
-                            // debugger
+                        // formatter: (item) => {
+                        //     // debugger
 
-                            let str =
-                                `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
-                            let strMsg = "";
-                            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.chartsData[numxc].showpowerLegend[index].name =
-                                        //     it.seriesName;
-                                        // this.chartsData[numxc].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.chartsData[numxc].showpowerLegend[index].name = "超短期";
-                                        // } else {
-                                        //     this.chartsData[numxc].showpowerLegend[index].name = "短期";
-                                        // }
-                                        // this.chartsData[numxc].showpowerLegend[index].color = it.color;
-                                    }
-                                    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:${
-                                    item[0].color
-                                };\"></span>&nbsp;
-                                <span style="display:inline-block;">${
-                                    item[0].color === "#e96366" ? "超短期" : "短期"
-                                }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
-                                    </div>`;
-                                // if (item[0].color === "#e96366") {
-                                //     this.chartsData[numxc].showpowerLegend[3].name = "超短期";
-                                // } else {
-                                //     this.chartsData[numxc].showpowerLegend[3].name = "短期";
-                                // }
-                                // this.chartsData[numxc].showpowerLegend[3].color = item[0].color;
-                                str = str + strMsg;
-                            }
-                            return str;
-                        },
+                        //     let str =
+                        //         `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
+                        //     let strMsg = "";
+                        //     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.chartsData[numxc].showpowerLegend[index].name =
+                        //                 //     it.seriesName;
+                        //                 // this.chartsData[numxc].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.chartsData[numxc].showpowerLegend[index].name = "超短期";
+                        //                 // } else {
+                        //                 //     this.chartsData[numxc].showpowerLegend[index].name = "短期";
+                        //                 // }
+                        //                 // this.chartsData[numxc].showpowerLegend[index].color = it.color;
+                        //             }
+                        //             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:${
+                        //             item[0].color
+                        //         };\"></span>&nbsp;
+                        //         <span style="display:inline-block;">${
+                        //             item[0].color === "#e96366" ? "超短期" : "短期"
+                        //         }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
+                        //             </div>`;
+                        //         // if (item[0].color === "#e96366") {
+                        //         //     this.chartsData[numxc].showpowerLegend[3].name = "超短期";
+                        //         // } else {
+                        //         //     this.chartsData[numxc].showpowerLegend[3].name = "短期";
+                        //         // }
+                        //         // this.chartsData[numxc].showpowerLegend[3].color = item[0].color;
+                        //         str = str + strMsg;
+                        //     }
+                        //     return str;
+                        // },
                     },
                     legend: {
                         top: 0,
                         right: 0,
                         data: legend,
-                        show: false,
+                        show: true,
                     },
                     grid: {
                         left: "5%",

src/views/powerPrediction/powerPredictionPage.vue

@@ -50,7 +50,7 @@
                 justify-content: end;
                 margin-right: 23px;
               ">
-                            <div v-for="item in showpowerLegend" :key="item.name">
+                            <!-- <div v-for="item in showpowerLegend" :key="item.name">
                                 <span class="lineColor" :style="{ background: item.color }"></span>
                                 <span class="powerLegendColor" :style="{ background: item.color }"></span>
                                 <span :style="!theme ? 'color: #fff' : ''" style="
@@ -59,7 +59,7 @@
                     position: relative;
                     top: 1px;
                   ">{{ item.name }}</span>
-                            </div>
+                            </div> -->
                         </div>
                         <div class="chart-name">
                             <div class="point point-left bottom"></div>
@@ -505,7 +505,7 @@
 
                     jsonData.globalPowerPredictionChartData2.dataFormatList.forEach(
                         (iten) => {
-                            if (iten.name !== "短期") {
+                            // if (iten.name !== "短期") {
                                 legend.push(iten.name);
                                 let seriesObj = {
                                     name: iten.name,
@@ -516,7 +516,7 @@
                                     symbol: "none",
                                 };
                                 series.push(seriesObj);
-                            }
+                            // }
                         }
                     );
                     that.getPowerLine("powerChart", "功率预测", xAxis, legend, series);
@@ -922,7 +922,7 @@
                         }
                         if (datas.data.dataFormatList.length > 0) {
                             datas.data.dataFormatList.forEach((iten) => {
-                                if (iten.name !== "短期") {
+                                // if (iten.name !== "短期") {
                                     legend.push(iten.name);
                                     let seriesObj = {
                                         name: iten.name,
@@ -933,7 +933,7 @@
                                         symbol: "none",
                                     };
                                     series.push(seriesObj);
-                                }
+                                // }
                             });
                         }
                         this.getPowerLine("powerChart", "功率预测", xAxis, legend, series);
@@ -999,71 +999,71 @@
                     },
                     tooltip: {
                         trigger: "axis",
-                        formatter: name === "powerChart" ?
-                            (item) => {
-                                let str =
-                                    `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
-                                let strMsg = "";
-                                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;
-                                        }
-                                        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:${
-                                        item[0].color
-                                    };\"></span>&nbsp;
-                                    <span style="display:inline-block;">${
-                                        item[0].color === "#e96366" ? "超短期" : "短期"
-                                    }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
-                                        </div>`;
-                                    // 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;
-                            } : "",
+                        // formatter: name === "powerChart" ?
+                        //     (item) => {
+                        //         let str =
+                        //             `<span style="display:inline-block;margin-bottom: 5px">${item[0].axisValue}</span></br>`;
+                        //         let strMsg = "";
+                        //         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;
+                        //                 }
+                        //                 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:${
+                        //                 item[0].color
+                        //             };\"></span>&nbsp;
+                        //             <span style="display:inline-block;">${
+                        //                 item[0].color === "#e96366" ? "超短期" : "短期"
+                        //             }:</span>&nbsp;&nbsp;<span>${item[0].value}</span>
+                        //                 </div>`;
+                        //             // 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;
+                        //     } : "",
                     },
                     legend: {
                         // width: '380',
                         right: "20",
                         data: legend,
                         // show: name === 'powerChart' ? false : true
-                        show: false,
+                        show: true,
                     },
                     grid: {
                         left: "5%",