修复图例交互事件影响刷选功能报错问题，绩效榜增加限电列

src/views/HealthControl/energyEfficAnalyse/powerHotAnalyse/components/current-scatter-chart.vue

@@ -313,16 +313,7 @@ export default {
       };
 
       window.addEventListener("resize", that.resize);
-
       myChart.setOption(option);
-      myChart.on("legendselectchanged", (params) => {
-        let arr = Object.values(params.selected);
-        if (arr.indexOf(false) == -1) {
-          that.$emit("closeBrush", true);
-        } else {
-          that.$emit("closeBrush", false);
-        }
-      });
       if (that.brushSelected) {
         myChart.dispatchAction({
           type: "takeGlobalCursor",
@@ -347,11 +338,11 @@ export default {
       }
       myChart.off("brushSelected");
       myChart.on("brushSelected", (params) => {
+        console.log(params);
         that.$emit("getSelected", params.batch || []);
       });
       myChart.off("click");
       myChart.on("click", (params) => {
-        // console.log(params)
         if (params.componentType === "markArea") {
           myChart.dispatchAction({
             type: "brush",

src/views/HealthControl/energyEfficAnalyse/powerHotAnalyse/index.vue

@@ -218,11 +218,6 @@
             :brushSelected="isChartArea"
             :dataSet="dataSet"
             @getSelected="funChartSelect"
-            @closeBrush="
-              (val) => {
-                isChartArea = val;
-              }
-            "
           />
         </div>
       </el-tabs>
@@ -713,19 +708,27 @@ export default {
                 scale: 1,
               },
               itemStyle: {
-                color: [
-                  {
-                    type: "linear",
-                    colorStops: [
-                      { offset: 0, color: "#000" },
-                      { offset: 0.2, color: "rgb(75,11,106)" },
-                      { offset: 0.4, color: "rgb(210,70,69)" },
-                      { offset: 0.6, color: "rgb(247,126,21)", },
-                      { offset: 1, color: "rgb(249,252,156)" },
-                    ],
-                    globalCoord: false,
-                  },
-                ],
+                // color: [
+                //   {
+                //     type: "linear",
+                //     x: 0,
+                //     y: 0,
+                //     x2: 0,
+                //     y2: 1,
+                //     colorStops: [
+                //       {
+                //         offset: 0,
+                //         color: "red", // 0% 处的颜色
+                //       },
+                //       {
+                //         offset: 1,
+                //         color: "blue", // 100% 处的颜色
+                //       },
+                //     ],
+                //     global: false, // 缺省为 false
+                //   },
+                // ],
+                color: "red",
               },
               name: "有用点",
               symbolSize: (data) => {
@@ -767,51 +770,46 @@ export default {
       let dataSetObj = [];
       this.wtData = [];
       if (batch?.length && this.dataSet) {
-        scatterls = batch[0].selected[1].dataIndex;
-        scatterhs = batch[0].selected[2].dataIndex;
-        if (scatterls?.length || scatterhs?.length) {
-          dataSetObj = JSON.parse(this.dataSet);
-          if (scatterls?.length) {
-            for (const scatterIndex of scatterls) {
-              wDataArr.push(dataSetObj[0].source[scatterIndex].k);
-            }
+        let wy = batch[0].selected.findIndex((i) => i.seriesName == "无用点");
+        let yy = batch[0].selected.findIndex((i) => i.seriesName == "有用点");
+        console.log(wy, yy);
+        scatterls = wy != -1 ? batch[0].selected[wy].dataIndex : []; //无用点
+        scatterhs = yy != -1 ? batch[0].selected[yy].dataIndex : []; //有用点
+
+        dataSetObj = JSON.parse(this.dataSet);
+        if (scatterls?.length) {
+          for (const scatterIndex of scatterls) {
+            wDataArr.push(dataSetObj[0].source[scatterIndex].k);
           }
-          if (scatterhs?.length) {
-            for (const scatterIndex1 of scatterhs) {
-              yDataArr.push(dataSetObj[1].source[scatterIndex1].k);
-            }
+        }
+        if (scatterhs?.length) {
+          for (const scatterIndex1 of scatterhs) {
+            yDataArr.push(dataSetObj[1].source[scatterIndex1].k);
           }
-          const wtRes = await getPowerFittingSelectedChartGF({
-            yk: yDataArr.join(","),
-            wk: wDataArr.join(","),
-          });
-          if (wtRes.code === 200) {
-            let id = 1;
-            const tempArr = []; //用于以风机id 聚合dataArr
-            if (wtRes.data?.length) {
-              for (const data of wtRes.data) {
-                if (tempArr.length) {
-                  const findIndex = tempArr.findIndex(
-                    (o) => o.wtId === data.wtId
-                  );
-                  if (findIndex !== -1) {
-                    if (!tempArr[findIndex].children) {
-                      tempArr[findIndex].children = [];
-                    }
-                    tempArr[findIndex].children.push({
-                      ...data,
-                      id: id,
-                      filter: data.filter === 0 ? "是" : "否",
-                    });
-                    id++;
-                  } else {
-                    tempArr.push({
-                      ...data,
-                      id: id,
-                      filter: data.filter === 0 ? "是" : "否",
-                    });
-                    id++;
+        }
+        const wtRes = await getPowerFittingSelectedChartGF({
+          yk: yDataArr.join(","),
+          wk: wDataArr.join(","),
+        });
+        if (wtRes.code === 200) {
+          let id = 1;
+          const tempArr = []; //用于以风机id 聚合dataArr
+          if (wtRes.data?.length) {
+            for (const data of wtRes.data) {
+              if (tempArr.length) {
+                const findIndex = tempArr.findIndex(
+                  (o) => o.wtId === data.wtId
+                );
+                if (findIndex !== -1) {
+                  if (!tempArr[findIndex].children) {
+                    tempArr[findIndex].children = [];
                   }
+                  tempArr[findIndex].children.push({
+                    ...data,
+                    id: id,
+                    filter: data.filter === 0 ? "是" : "否",
+                  });
+                  id++;
                 } else {
                   tempArr.push({
                     ...data,
@@ -820,13 +818,20 @@ export default {
                   });
                   id++;
                 }
+              } else {
+                tempArr.push({
+                  ...data,
+                  id: id,
+                  filter: data.filter === 0 ? "是" : "否",
+                });
+                id++;
               }
-              this.wtDialog = true;
-              this.$nextTick(() => {
-                this.wtTab = "table";
-                this.wtData = tempArr;
-              });
             }
+            this.wtDialog = true;
+            this.$nextTick(() => {
+              this.wtTab = "table";
+              this.wtData = tempArr;
+            });
           }
         }
       }

src/views/economicsOperation/benchmarkingManagement/performanceRankingList/index.vue

@@ -265,6 +265,7 @@ export default {
         },
         { code: "fjhjx", name: "故障", unit: "万kWh" },
         { code: "jhjx", name: "检修", unit: "万kWh" },
+        { code: "xd", name: "限电", unit: "万kWh" },
         { code: "sl", name: "受累", unit: "万kWh" },
         { code: "xn", name: "性能", unit: "万kWh" },
         { code: "fnlly", name: "风能利用率", name1: "光能利用率", unit: "%" },