完成光伏功率曲线查询和功率光照曲线页面功能及样式

src/api/powerGenerating/index.js

@@ -94,7 +94,7 @@ export function getPrepareExcelShow(data, timeout = 5000) {
 export function getProcessExcelShow(data, timeout = 5000) {
   return request({
     baseURL: process.env.VUE_APP_TEST,
-    url: "/power/prepare/show",
+    url: "/power/process/show",
     method: "get",
     params: data,
     headers,
@@ -116,7 +116,7 @@ export function getPrepareData(data, timeout = 5000) {
 export function getProcessData(data, timeout = 5000) {
   return request({
     baseURL: process.env.VUE_APP_TEST,
-    url: "/power/process/show",
+    url: "/power/process/data",
     method: "get",
     params: data,
     headers,
@@ -124,7 +124,7 @@ export function getProcessData(data, timeout = 5000) {
   });
 }
 //
-export function fittingCurveSave(data, timeout = 5000) {
+export function fittingCurveSave(data, timeout = 15000) {
   return request({
     baseURL: process.env.VUE_APP_TEST,
     url: "/power/fitting/curve/save",
@@ -179,7 +179,7 @@ export function getLightPrepareTree(data, timeout = 5000) {
   });
 }
 // 光伏准备表格数据
-export function getLightPrepareData(data, timeout = 5000) {
+export function getLightPrepareData(data, timeout = 20000) {
   return request({
     baseURL: process.env.VUE_APP_TEST,
     url: "/new/photovol/filelist",
@@ -398,3 +398,14 @@ export function getWindAgcConfig(data, timeout = 15000) {
     timeout,
   });
 }
+
+export function getLightPowerBeam(data, timeout = 15000) {
+  return request({
+    baseURL: process.env.VUE_APP_TEST,
+    url: "/new/photovol/analysis/powerbeam",
+    method: "post",
+    data: data,
+    headers,
+    timeout,
+  });
+}

src/router/index.js

@@ -1814,17 +1814,17 @@ export const asyncRoutes = [
               permissions: ["jn_dlbb_dmb"],
             },
           },
-          //   {
-          //     path: "rateAnalysis",
-          //     name: "rateAnalysis",
-          //     component: () =>
-          //       import("@/views/powerGenerating/lightAnalyse/rateAnalysis"),
-          //     meta: {
-          //       title: "对风偏差分析",
-          //       icon: "",
-          //       permissions: ["jn_dlbb_dmb"],
-          //     },
-          //   },
+          {
+            path: "glHotAnalysis",
+            name: "glHotAnalysis",
+            component: () =>
+              import("@/views/powerGenerating/lightAnalyse/glHotAnalysis"),
+            meta: {
+              title: "功率光照曲线分析",
+              icon: "",
+              permissions: ["jn_dlbb_dmb"],
+            },
+          },
         ],
       },
     ],

src/views/powerGenerating/dataFilter/lightPrepare/index.vue

@@ -138,6 +138,8 @@ const funSubmit = async (params) => {
   if (res.code === 200) {
     ElMessage.success(res.msg);
     funGetTree();
+  } else {
+    ElMessage.error(res.msg);
   }
 };
 /**created */

src/views/powerGenerating/dataFilter/process/index.vue

@@ -240,6 +240,8 @@ const funSubmit = async (query) => {
   if (res.code === 200) {
     ElMessage.success(res.msg);
     funGetProcessTree();
+  } else {
+    ElMessage.error(res.msg);
   }
 };
 /**created */

src/views/powerGenerating/lightAnalyse/glHotAnalysis/components/current-scatter-chart.json

@@ -0,0 +1,398 @@
+
+{
+	"color": [
+			"#1C99FF",
+			"#FF8700",
+			"#e6b600d9",
+			"#0098d9",
+			"#3D54BE",
+			"#005eaa",
+			"#cda819",
+			"#32a487"
+	],
+	"textStyle": {},
+	"title": {
+			"textStyle": {
+					"color": "#333333"
+			},
+			"subtextStyle": {
+					"color": "#aaaaaa"
+			}
+	},
+	"line": {
+			"itemStyle": {
+					"borderWidth": 1
+			},
+			"lineStyle": {
+					"width": 2
+			},
+			"symbolSize": 4,
+			"symbol": "emptyCircle",
+			"smooth": false
+	},
+	"radar": {
+			"itemStyle": {
+					"borderWidth": 1
+			},
+			"lineStyle": {
+					"width": 2
+			},
+			"symbolSize": 4,
+			"symbol": "emptyCircle",
+			"smooth": false
+	},
+	"bar": {
+			"itemStyle": {
+					"barBorderWidth": 0,
+					"barBorderColor": "#ccc"
+			}
+	},
+	"pie": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"scatter": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"boxplot": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"parallel": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"sankey": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"funnel": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"gauge": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			}
+	},
+	"candlestick": {
+			"itemStyle": {
+					"color": "#c12e34",
+					"color0": "#2b821d",
+					"borderColor": "#c12e34",
+					"borderColor0": "#2b821d",
+					"borderWidth": 1
+			}
+	},
+	"graph": {
+			"itemStyle": {
+					"borderWidth": 0,
+					"borderColor": "#ccc"
+			},
+			"lineStyle": {
+					"width": 1,
+					"color": "#aaaaaa"
+			},
+			"symbolSize": 4,
+			"symbol": "emptyCircle",
+			"smooth": false,
+			"color": [
+					"#c12e34",
+					"#e6b600",
+					"#0098d9",
+					"#50ec39",
+					"#005eaa",
+					"#339ca8",
+					"#cda819",
+					"#32a487"
+			],
+			"label": {
+					"color": "#eeeeee"
+			}
+	},
+	"map": {
+			"itemStyle": {
+					"areaColor": "#ddd",
+					"borderColor": "#eee",
+					"borderWidth": 0.5
+			},
+			"label": {
+					"color": "#c12e34"
+			},
+			"emphasis": {
+					"itemStyle": {
+							"areaColor": "#e6b600",
+							"borderColor": "#ddd",
+							"borderWidth": 1
+					},
+					"label": {
+							"color": "#c12e34"
+					}
+			}
+	},
+	"geo": {
+			"itemStyle": {
+					"areaColor": "#ddd",
+					"borderColor": "#eee",
+					"borderWidth": 0.5
+			},
+			"label": {
+					"color": "#c12e34"
+			},
+			"emphasis": {
+					"itemStyle": {
+							"areaColor": "#e6b600",
+							"borderColor": "#ddd",
+							"borderWidth": 1
+					},
+					"label": {
+							"color": "#c12e34"
+					}
+			}
+	},
+	"categoryAxis": {
+			"axisLine": {
+					"show": true,
+					"lineStyle": {
+							"color": "#333"
+					}
+			},
+			"axisTick": {
+					"show": true,
+					"lineStyle": {
+							"color": "#333"
+					}
+			},
+			"axisLabel": {
+					"show": true,
+					"color": "#333"
+			},
+			"splitLine": {
+					"show": false,
+					"lineStyle": {
+							"color": [
+									"#ccc"
+							]
+					}
+			},
+			"splitArea": {
+					"show": false,
+					"areaStyle": {
+							"color": [
+									"rgba(250,250,250,0.3)",
+									"rgba(200,200,200,0.3)"
+							]
+					}
+			}
+	},
+	"valueAxis": {
+			"axisLine": {
+					"show": true,
+					"lineStyle": {
+							"color": "#838383"
+					}
+			},
+			"axisTick": {
+					"show": true,
+					"lineStyle": {
+							"color": "#838383"
+					}
+			},
+			"axisLabel": {
+					"show": true,
+					"color": "#838383"
+			},
+			"splitLine": {
+					"show": true,
+					"lineStyle": {
+							"color": [
+									"#ccc"
+							]
+					}
+			},
+			"splitArea": {
+					"show": false,
+					"areaStyle": {
+							"color": [
+									"rgba(250,250,250,0.3)",
+									"rgba(200,200,200,0.3)"
+							]
+					}
+			}
+	},
+	"logAxis": {
+			"axisLine": {
+					"show": true,
+					"lineStyle": {
+							"color": "#333"
+					}
+			},
+			"axisTick": {
+					"show": true,
+					"lineStyle": {
+							"color": "#333"
+					}
+			},
+			"axisLabel": {
+					"show": true,
+					"color": "#333"
+			},
+			"splitLine": {
+					"show": true,
+					"lineStyle": {
+							"color": [
+									"#ccc"
+							]
+					}
+			},
+			"splitArea": {
+					"show": false,
+					"areaStyle": {
+							"color": [
+									"rgba(250,250,250,0.3)",
+									"rgba(200,200,200,0.3)"
+							]
+					}
+			}
+	},
+	"timeAxis": {
+			"axisLine": {
+					"show": true,
+					"lineStyle": {
+							"color": "#333"
+					}
+			},
+			"axisTick": {
+					"show": true,
+					"lineStyle": {
+							"color": "#333"
+					}
+			},
+			"axisLabel": {
+					"show": true,
+					"color": "#333"
+			},
+			"splitLine": {
+					"show": true,
+					"lineStyle": {
+							"color": [
+									"#ccc"
+							]
+					}
+			},
+			"splitArea": {
+					"show": false,
+					"areaStyle": {
+							"color": [
+									"rgba(250,250,250,0.3)",
+									"rgba(200,200,200,0.3)"
+							]
+					}
+			}
+	},
+	"toolbox": {
+			"iconStyle": {
+					"borderColor": "#06467c"
+			},
+			"emphasis": {
+					"iconStyle": {
+							"borderColor": "#4187c2"
+					}
+			},
+			"textStyle": {
+				"color": "#838383"
+			}
+	},
+	"legend": {
+			"textStyle": {
+					"color": "#838383"
+			}
+	},
+	"tooltip": {
+			"axisPointer": {
+					"lineStyle": {
+							"color": "#cccccc",
+							"width": 1
+					},
+					"crossStyle": {
+							"color": "#cccccc",
+							"width": 1
+					}
+			}
+	},
+	"timeline": {
+			"lineStyle": {
+					"color": "#005eaa",
+					"width": 1
+			},
+			"itemStyle": {
+					"color": "#005eaa",
+					"borderWidth": 1
+			},
+			"controlStyle": {
+					"color": "#005eaa",
+					"borderColor": "#005eaa",
+					"borderWidth": 0.5
+			},
+			"checkpointStyle": {
+					"color": "#005eaa",
+					"borderColor": "#316bc2"
+			},
+			"label": {
+					"color": "#005eaa"
+			},
+			"emphasis": {
+					"itemStyle": {
+							"color": "#005eaa"
+					},
+					"controlStyle": {
+							"color": "#005eaa",
+							"borderColor": "#005eaa",
+							"borderWidth": 0.5
+					},
+					"label": {
+							"color": "#005eaa"
+					}
+			}
+	},
+	"visualMap": {
+			"color": [
+					"#1790cf",
+					"#a2d4e6"
+			]
+	},
+	"dataZoom": {
+			"backgroundColor": "rgba(47,69,84,0)",
+			"dataBackgroundColor": "rgba(47,69,84,0.3)",
+			"fillerColor": "rgba(167,183,204,0.4)",
+			"handleColor": "#a7b7cc",
+			"handleSize": "100%",
+			"textStyle": {
+					"color": "#333333"
+			}
+	},
+	"markPoint": {
+			"label": {
+					"color": "#eeeeee"
+			},
+			"emphasis": {
+					"label": {
+							"color": "#eeeeee"
+					}
+			}
+	}
+}

src/views/powerGenerating/lightAnalyse/glHotAnalysis/components/current-scatter-chart.vue

@@ -0,0 +1,388 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@tools/util";
+import partten from "@/helper/partten";
+import * as echarts from "echarts";
+import chartTheme from "./current-scatter-chart.json";
+
+export default {
+  name: "currentScatterChart",
+  props: {
+    // 图表宽度
+    width: {
+      type: String,
+      default: "100%",
+    },
+    // 图表高度
+    height: {
+      type: String,
+      default: "350px",
+    },
+    // 图表主标题
+    chartTitle: {
+      type: String,
+      default: "自定义图表组件",
+    },
+    // X 轴配置项
+    xAxisData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    // Y 轴配置项
+    yAxisData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    dataSet: {
+      type: String,
+      default: "",
+    },
+    // 图表核心数据
+    seriesData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    // 是否显示图表图例
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
+    // 是否默认采用笔刷模式
+    brushSelected: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      id: "",
+      chart: null,
+      color: [
+        "#05bb4c",
+        "#4b55ae",
+        "#fa8c16",
+        "#f8de5b",
+        "#1a93cf",
+        "#c531c7",
+        "#bd3338",
+      ],
+      theme: "dark",
+    };
+  },
+  computed: {
+    collapse() {
+      return this.$store.state.collapse;
+    },
+  },
+  watch: {
+    height() {
+      if (this.chart) {
+        this.chart.resize();
+      }
+    },
+    collapse(val) {
+      if (this.chart) {
+        setTimeout(() => {
+          this.chart.resize();
+        }, 300);
+      }
+    },
+  },
+  methods: {
+    resize() {},
+    initChart() {
+      const that = this;
+      echarts.registerTheme("chartTheme", chartTheme);
+      let myChart = echarts.init(
+        document.getElementById(this.id),
+        "chartTheme"
+      );
+      that.chart = myChart;
+      //指定图表的配置项和数据
+      const option = {
+        //标题
+        title: {
+          text: that.chartTitle,
+          left: 440,
+          top: 4,
+          textStyle: {
+            fontSize: 14,
+            color: that.theme === "dark" ? partten.getColor("grayl") : "#000",
+          },
+        },
+        // backgroundColor:
+        //   that.theme === "dark"
+        //     ? "rgba(0,0,0,0.4)"
+        //     : "rgba(255,255,255,0.5)",
+        //工具箱
+        color: [
+          "#3D54BE",
+          "rgb(255,0,0)",
+          "#a1a1a1",
+          "#0098d9",
+          "#FF8700",
+          "#005eaa",
+          "#cda819",
+          "#32a487",
+        ],
+        toolbox: {
+          show: true,
+          x: "right",
+          position: [10, 10],
+          // backgroundColor:'rgba(0,0,0,0.4)',
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            fontSize: util.vh(16),
+            color: partten.getColor("gray"),
+          },
+          iconStyle: {
+            borderColor: partten.getColor("gray"),
+          },
+          emphasis: {
+            iconStyle: {
+              borderColor: partten.getColor("gray"),
+            },
+          },
+        },
+        tooltip: {
+          trigger: "item",
+          axisPointer: {
+            type: "cross",
+          },
+          backgroundColor: "rgba(0,0,0,0.4)",
+          borderColor: partten.getColor("gray"),
+          textStyle: {
+            fontSize: util.vh(16),
+            color: "#fff",
+          },
+          formatter(params) {
+            return params.value.length
+              ? `${params.seriesName}<br />光照：${params.value[0]}<br />功率：${params.value[1]} kW<br />温度：${params.value[2]} ℃`
+              : `${params.name}`;
+          },
+        },
+        // brush: {
+        //   seriesIndex: [2,3],
+        //   yAxisIndex: 0,
+        //   transformable: true,
+        //   throttleType: "debounce",
+        //   throttleDelay: 1000,
+        //   removeOnClick: true,
+        //   brushType: "polygon",
+        //   brushMode: "multiple",
+        //   brushStyle: {
+        //     borderWidth: 1,
+        //     borderColor: "#ff2424",
+        //   },
+        // },
+        dataZoom: [
+          {
+            type: "inside", //图表下方的伸缩条
+            show: false, //是否显示
+            realtime: true, //拖动时，是否实时更新系列的视图
+            start: 0, //伸缩条开始位置（1-100），可以随时更改
+            end: 100, //伸缩条结束位置（1-100），可以随时更改
+          },
+          {
+            type: "slider", //图表下方的伸缩条
+            show: false, //是否显示
+            realtime: true, //拖动时，是否实时更新系列的视图
+            start: 0, //伸缩条开始位置（1-100），可以随时更改
+            end: 100, //伸缩条结束位置（1-100），可以随时更改
+          },
+        ],
+        textStyle: {
+          fontSize: util.vh(16),
+          color: that.theme === "dark" ? "#fff" : "#000",
+        },
+        //图例-每一条数据的名字
+        legend: {
+          show: that.showLegend,
+          data: ["拟合功率", "保证功率", "无用点", "有用点", "Cp值"],
+          right: "120",
+          top: "5",
+          // icon: "circle",
+          itemWidth: 6,
+          inactiveColor:
+            that.theme === "dark" ? partten.getColor("gray") : "#838383",
+          textStyle: {
+            color:
+              that.theme === "dark" ? partten.getColor("grayl") : "#838383",
+            fontSize: 12,
+          },
+        },
+        visualMap: [
+          {
+            type: "continuous",
+            min: -40,
+            max: 50,
+            dimension: 2,
+            orient: "vertical",
+            right: 4,
+            top: 50,
+            itemHeight: 600,
+            text: ["50", "-40"],
+            calculable: false,
+            range: [-40, 50],
+            inRange: {
+              color: [
+                "#000",
+                "rgb(75,11,106)",
+                "rgb(133,33,106)",
+                "rgb(176,49,92)",
+                "rgb(210,70,69)",
+                "rgb(235,100,42)",
+                "rgb(247,126,21)",
+                "rgb(252,183,28)",
+                "rgb(249,252,156)",
+              ],
+            },
+            outOfRange: {
+              color: ["#eee", "#eee"],
+            },
+          },
+        ],
+        grid: {
+          top: 48,
+          left: 40,
+          right: 50,
+          bottom: 24,
+        },
+        //x轴
+        xAxis: [
+          {
+            name: "光照",
+            nameTextStyle: {
+              color: "#838383",
+            },
+            type: "value",
+            boundaryGap: false,
+            data: that.xAxisData || [],
+            min: 0,
+            max: "dataMax",
+            // interval: 1,
+            axisLabel: {
+              formatter: "{value}",
+            },
+            splitLine: {
+              show: false,
+            },
+            textStyle: {
+              color: that.theme === "dark" ? partten.getColor("gray") : "#000",
+            },
+          },
+        ],
+        //y轴没有显式设置，根据值自动生成y轴
+        yAxis: [
+          {
+            splitLine: { show: false },
+            position: "left",
+            min: 0,
+            name: "kW",
+            nameTextStyle: {
+              color: "#838383",
+            },
+          },
+          {
+            splitLine: { show: false },
+            position: "right",
+            min: 0,
+          },
+        ],
+        animation: true,
+        dataset: that.dataSet.length ? JSON.parse(that.dataSet) : [],
+        //数据-data是最终要显示的数据
+        series: that.seriesData,
+      };
+
+      that.resize = function () {
+        myChart.resize();
+      };
+
+      window.addEventListener("resize", that.resize);
+
+      myChart.setOption(option);
+      if (that.brushSelected) {
+        myChart.dispatchAction({
+          type: "takeGlobalCursor",
+          // 如果想变为“可刷选状态”，必须设置。不设置则会关闭“可刷选状态”。
+          key: "brush",
+          brushOption: {
+            seriesIndex: [2, 3],
+            yAxisIndex: 0,
+            transformable: true,
+            throttleType: "debounce",
+            throttleDelay: 1000,
+            removeOnClick: true,
+            brushType: "polygon",
+            brushMode: "multiple",
+            brushStyle: {
+              borderWidth: 1,
+              color: "rgba(255,36,36,0.2)",
+              borderColor: "#ff2424",
+            },
+          },
+        });
+      }
+      myChart.off("brushSelected");
+      myChart.on("brushSelected", (params) => {
+        that.$emit("getSelected", params.batch || []);
+      });
+      // myChart.off('click')
+      // myChart.on('click', params => {
+      //     // console.log(params)
+      //     if(params.componentType === 'markArea'){
+      //       myChart.dispatchAction({
+      //         type: 'brush',
+      //         areas: [
+      //           {
+      //             xAxisIndex: 0,
+      //             brushType: 'lineX',
+      //             coordRange: [params.data.coord[0][0], params.data.coord[1][0]]
+      //           },
+      //         ]
+      //       });
+      //     }
+      //   })
+    },
+  },
+  created() {
+    this.id = "chart-" + util.newGUID();
+  },
+  mounted() {
+    // this.$nextTick(() => {
+    this.$el.style.width = this.width;
+    this.$el.style.height = this.height;
+    this.initChart();
+    // });
+  },
+  updated() {
+    // console.log('update')
+    let myChart = echarts.init(document.getElementById(this.id));
+    myChart.dispose();
+    this.$nextTick(() => {
+      this.initChart();
+    });
+  },
+  unmounted() {
+    window.removeEventListener("resize", this.resize);
+  },
+};
+</script>
+
+<style>
+.chart {
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+</style>

src/views/powerGenerating/lightAnalyse/glHotAnalysis/index.vue

@@ -0,0 +1,250 @@
+<script setup name="prepare">
+import excelCop from "@/components/excel.vue";
+import treeCop from "@/components/tree.vue";
+import { ref, nextTick, onActivated, onMounted, reactive } from "vue";
+import {
+  getLightPowerBeam,
+  getLightPrepareTree,
+} from "@/api/powerGenerating/index.js";
+import { ElMessage } from "element-plus";
+import CurrentScatterChart from "./components/current-scatter-chart.vue";
+
+/**submit */
+const funSubmit = async () => {
+  if (!excelCheckIds.value.length) {
+    ElMessage.error("请勾选要执行的项");
+    return false;
+  }
+  // tableShowId.value = '1'
+  // tableName.value = obj.name
+
+  // let res = null
+  let chartRes = {
+    scatterhs: [[]],
+    scatterls: [[]],
+    sjgl: [[]],
+    llgl: [[]],
+    cpz: [[]],
+  };
+  let chartResponse = null;
+
+  chartResponse = await getLightPowerBeam({
+    filename: excelCheckIds.value.join(),
+  });
+  // if(res.code === 200){
+  // 	tableColumn.value = res.data.title.map(o => {
+  // 		return {
+  // 			prop: o.key,
+  // 			width: o.des==='时间'? 100: 80,
+  // 			label: o.des,
+  // 		}
+  // 	})
+  // 	tableData.value = res.data.data
+  // 	tableLoading.value = false
+  // }else{
+  // 	tableLoading.value = false
+  // }
+
+  if (chartResponse && chartResponse.code === 200) {
+    // activeTab.value = '2'
+    nextTick(() => {
+      chartRes = chartResponse.data;
+      seriesData.value = [
+        {
+          name: "拟合功率",
+          type: "line",
+          symbol: "line", //设定为实心点
+          symbolSize: 0, //设定实心点的大小
+          smooth: true, //这个是把线变成曲线
+          data: chartRes.curve,
+          xAxisIndex: 0,
+        },
+        {
+          type: "effectScatter",
+          showEffectOn: "emphasis",
+          rippleEffect: {
+            scale: 1,
+          },
+          name: "数据散点",
+          data: chartRes.scatter,
+          xAxisIndex: 0,
+          yAxisIndex: 0,
+        },
+      ];
+    });
+  } else if (chartResponse && chartResponse.code === 1001) {
+    ElMessage.error(chartResponse.msg + "，请重新选择！");
+  }
+};
+/**excel 开始 */
+const excelCheckIds = ref([]);
+const funExcelChange = async (obj) => {
+  //点击excel项时
+  return false;
+};
+const funExcelCheckChange = ({ checkArr, data }) => {
+  //bug
+  excelCheckIds.value = checkArr;
+  funSubmit();
+};
+/**excel fitData */
+const excelFitList = ref([]);
+/**prepare tree 开始 */
+const actTreeNode = ref(null); //当前激活的treeNode
+const funRepeatMap = (arr, type = "prepare") => {
+  return arr.map((o) => {
+    if (o.children) {
+      const findIndex = o.children.findIndex((p) => !!p.path);
+      if (findIndex !== -1) {
+        o.childs = o.children;
+        o.children = [];
+        if (!actTreeNode.value && type === "process") {
+          //判断当且仅有process获取tree时 赋值
+          actTreeNode.value = o;
+        }
+      }
+    }
+    return {
+      ...o,
+      children: o.children ? funRepeatMap(o.children, type) : [],
+    };
+  });
+};
+/**process tree 开始 */
+const processTreeData = ref([]);
+const funGetProcessTree = async (flag = true) => {
+  //flag控制是否获取tree的第一项 true为可获取
+  actTreeNode.value = null;
+  const res = await getLightPrepareTree();
+  excelFitList.value = [];
+  processTreeData.value = funRepeatMap(res.data, "process"); //flag控制对actTreeNode赋值
+  if (actTreeNode.value) {
+    funProcessCurrentChange({ current: actTreeNode.value, currentNode: null });
+    // const child = actTreeNode.value.childs[0]
+    // const obj = {
+    // 	id: child.path,
+    // 	interval: child.interval,
+    // 	path: child.path,
+    // 	station: child.station,
+    // 	time: child.time,
+    // 	type: child.type,
+    // 	windturbine: child.windturbine,
+    // 	name: child.path
+    // }
+    // funExcelChange(obj)
+  }
+};
+const funProcessCurrentChange = ({ current, currentNode }) => {
+  if (current.childs) {
+    excelFitList.value = current.childs.map((o) => {
+      return {
+        id: o.path,
+        interval: o.interval,
+        path: o.path,
+        station: o.station,
+        time: o.time,
+        type: o.type,
+        windturbineId: o.windturbineId,
+        name: o.path,
+      };
+    });
+  } else {
+    excelFitList.value = [];
+  }
+};
+const funTreeCheckChange = ({
+  current,
+  checkedNodes,
+  checkedKeys,
+  halfCheckedNodes,
+  halfCheckedKeys,
+}) => {
+  //tree change  -> excel change
+  funProcessCurrentChange({ current, currentNode: "" });
+  const checkIds = [];
+  if (checkedNodes.length) {
+    for (const node of checkedNodes) {
+      if (node.childs && node.childs.length) {
+        for (const child of node.childs) {
+          checkIds.push(child.path);
+        }
+      }
+    }
+  }
+  excelCheckIds.value = checkIds;
+  funSubmit();
+};
+
+/**table 开始 */
+const tableShowId = ref("");
+const tableColumn = ref([]);
+const tableLoading = ref(false);
+const tableName = ref("");
+const tableData = ref([]);
+/**table 结束 */
+/**chart Data */
+const xAxisData = ref([]);
+const chartRef = ref(); //chart 的ref
+const seriesData = ref([]);
+const dataSet = ref("");
+/**tab  */
+const activeTab = ref("1");
+/**created */
+// funGetTree()
+funGetProcessTree();
+/**mounted */
+
+/**activated */
+onActivated(() => {
+  funGetProcessTree();
+});
+</script>
+<template>
+  <div class="container-wrapper">
+    <div class="power-data-wrapper card-shadow wrapper">
+      <div class="card-title">数据展示</div>
+      <div class="data-wrapper">
+        <tree-cop
+          :data="processTreeData"
+          type="light"
+          @checkChange="funTreeCheckChange"
+          :show-checkbox="true"
+          @currentChange="funProcessCurrentChange"
+          @refresh="funGetProcessTree"
+        />
+        <excel-cop
+          :data="excelFitList"
+          :checkIds="excelCheckIds"
+          :showCheckbox="true"
+          @excelChange="funExcelChange"
+          @checkChange="funExcelCheckChange"
+        />
+        <div class="data-table-wrapper card-shadow">
+          <div class="data-table-chart">
+            <CurrentScatterChart
+              ref="chartRef"
+              width="100%"
+              height="100%"
+              :chartTitle="''"
+              :xAxisData="xAxisData"
+              :yAxisData="{ splitLine: { show: false } }"
+              :seriesData="seriesData"
+              :showLegend="true"
+              :brushSelected="false"
+              :dataSet="dataSet"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<style lang="less" scoped>
+.power-data-wrapper {
+  height: 100%;
+  margin-top: 0;
+}
+.data-table-wrapper {
+  width: calc(62% - 40px) !important;
+}
+</style>

src/views/powerGenerating/windAnalyse/angleAnalysis/index.vue

@@ -202,7 +202,7 @@ onActivated(() => {
             <CurrentScatterChart
               ref="chartRef"
               width="100%"
-              :height="`calc( ${tableHeight})`"
+              height="100%"
               :chartTitle="''"
               :xAxisData="xAxisData"
               :yAxisData="{ splitLine: { show: false } }"

src/views/powerGenerating/windAnalyse/lineAnalysis/index.vue

@@ -32,7 +32,7 @@ const funExcelCheckChange = ({ checkArr, data }) => {
 const treeData = ref([]);
 const treeCopRef = ref(); //treeCop ref
 const actTreeNode = ref(null); //当前激活的treeNode
-const funRepeatMap = (arr, type = "fitting") => {
+const funRepeatMap = (arr, type = "fitting",flag) => {
   return arr.map((o) => {
     if (o.children) {
       const findIndex = o.children.findIndex((p) => !!p.type);
@@ -51,10 +51,10 @@ const funRepeatMap = (arr, type = "fitting") => {
     };
   });
 };
-const funGetTree = async () => {
+const funGetTree = async (val = "fitting") => {
   actTreeNode.value = null;
   const res = await getWindFittingTree();
-  treeData.value = funRepeatMap(res.data);
+  treeData.value = funRepeatMap(res.data, val);
   excelList.value = [];
   if (actTreeNode.value) {
     funCurrentChange({ current: actTreeNode.value, currentNode: null });
@@ -573,7 +573,7 @@ const wtDialog = ref(false);
 const wtData = ref([]);
 const activeTab = ref("1");
 /**created */
-funGetTree();
+funGetTree("created");
 // funGetProcessTree()
 /**mounted */
 
@@ -690,7 +690,6 @@ onActivated(() => {
           :data="treeData"
           @checkChange="funTreeCheckChange"
           :show-checkbox="true"
-          :height="treeHeight"
           @currentChange="funCurrentChange"
           @refresh="funGetTree"
         ></tree-cop>
@@ -698,7 +697,6 @@ onActivated(() => {
           :checkIds="excelCheckIds"
           :showCheckbox="excelCheckboxShow"
           :data="excelList"
-          :height="excelHeight"
           @excelChange="funExcelChange"
           @checkChange="funExcelCheckChange"
         ></excel-cop>

src/views/powerGenerating/windAnalyse/loseAnalysis/index.vue

@@ -148,11 +148,11 @@ const barData = ref({
 });
 const lineData = ref([]);
 const barColor = [
-  "#4b55ae",
+  "#1c99ff",
   "#e17e23",
   "#ba3237",
   "#c531c7",
-  "rgb(63,177,227)",
+  "#fff",
   "#05bb4c",
 ];
 
@@ -337,7 +337,7 @@ onActivated(() => {
   .el-tabs__active-bar {
     background-color: #05bb4c;
   }
- .el-tabs__item.is-top:last-child {
+  .el-tabs__item.is-top:last-child {
     padding: 0;
     padding-left: 5px;
   }