修改合并 江

src/views/overview/components/power_curve/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-09 18:10:08
- * @LastEditTime: 2025-01-21 15:59:51
+ * @LastEditTime: 2025-01-22 17:34:11
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/power_curve/index.vue
@@ -69,10 +69,14 @@
                   </el-table-column>
                   <el-table-column prop="engineTypeName" label="风机机型">
                   </el-table-column>
-                  <el-table-column prop="xData" label="风速"> </el-table-column>
-                  <el-table-column prop="yData" label="实际功率">
+                  <el-table-column prop="xData" label="风速(m/s)">
                   </el-table-column>
-                  <el-table-column prop="contractPowerCurve" label="合同功率">
+                  <el-table-column prop="yData" label="实际功率(kWh)">
+                  </el-table-column>
+                  <el-table-column
+                    prop="contractPowerCurve"
+                    label="合同功率(kWh)"
+                  >
                   </el-table-column>
                 </el-table>
               </div>

src/views/overview/components/production_indicator_all/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-13 13:45:50
- * @LastEditTime: 2025-01-22 15:35:23
+ * @LastEditTime: 2025-01-22 17:32:55
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/production_indicator_all/index.vue
@@ -34,58 +34,19 @@
       <div v-if="productionIndicatorCsvData.length > 0">
         <template v-for="(itemCsv, itemind) in productionIndicatorCsvData">
           <el-table
-            v-if="Object.keys(itemCsv.data[0]).length > 4"
+            v-if="Object.keys(itemCsv.data[0]).length <= 4"
             :data="itemCsv.data"
-            :key="itemind + 'itemCsv'"
             border
             style="width: 100%"
-            max-height="500"
             align="center"
           >
-            <el-table-column prop="EPActualTotal" label="实发电量（瓦）">
+            <el-table-column prop="Qp" label="风场总发电量（kWh）">
             </el-table-column>
-            <el-table-column
-              prop="TurbinePowerRate"
-              label="风机能量利用率（百分比）"
-            >
+            <el-table-column prop="Thc" label="风场等效利用小时(h)">
             </el-table-column>
-            <el-table-column prop="EPLostStopPercent" label="停机损失百分比">
+            <el-table-column prop="Rdr" label="风场弃风率（%）">
             </el-table-column>
-            <el-table-column prop="EPLostBadPercent" label="欠发损失百分比">
-            </el-table-column>
-            <el-table-column
-              prop="EPLostPerformPercent"
-              label="功率曲线未达标损失百分比"
-            >
-            </el-table-column>
-            <el-table-column prop="EPLostLimitPercent" label="限电损失百分比">
-            </el-table-column>
-            <el-table-column prop="TurbineRunRate" label="风机可利用率">
-            </el-table-column>
-            <el-table-column prop="mean_width" label="功率水平平均宽度">
-            </el-table-column>
-            <el-table-column prop="variance_width" label="功率水平方差">
-            </el-table-column>
-            <el-table-column prop="WindSpeedAvr" label="平均风速（m/s）">
-            </el-table-column>
-            <el-table-column prop="Thi" label="利用小时"> </el-table-column>
-            <el-table-column prop="Ws" label="功率曲线一致性系数">
-            </el-table-column>
-          </el-table>
-          <el-table
-            v-else
-            :data="itemCsv.data"
-            border
-            style="width: 100%"
-            align="center"
-          >
-            <el-table-column prop="Qp" label="风场总发电量（瓦）">
-            </el-table-column>
-            <el-table-column prop="Thc" label="风场等效利用小时">
-            </el-table-column>
-            <el-table-column prop="Rdr" label="风场弃风率（百分比）">
-            </el-table-column>
-            <el-table-column prop="Qdr" label="风场弃风电量（瓦）">
+            <el-table-column prop="Qdr" label="风场弃风电量（kWh）">
             </el-table-column>
           </el-table>
         </template>

src/views/overview/components/production_indicator_unit/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-13 13:44:56
- * @LastEditTime: 2025-01-22 15:31:16
+ * @LastEditTime: 2025-01-22 18:02:06
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/production_indicator_unit/index.vue
@@ -32,16 +32,8 @@
       </el-alert>
       <div v-if="productionIndicatorCsvData.length > 0">
         <template v-for="(itemCsv, itemind) in productionIndicatorCsvData">
-          <div v-if="Object.keys(itemCsv.data[0]).length > 4">
-            <Rader
-              :chartData="chantItem"
-              v-for="(chantItem, chartInd) in itemCsv.data"
-              :key="chartInd + 'chantItem' + itemind"
-            ></Rader>
-          </div>
-
           <el-table
-            :key="chartInd + 'table' + itemind"
+            :key="'table' + itemind"
             max-height="500"
             v-if="Object.keys(itemCsv.data[0]).length > 4"
             :data="itemCsv.data"
@@ -49,33 +41,61 @@
             style="width: 100%"
             align="center"
           >
-            <el-table-column prop="EPActualTotal" label="实发电量">
+            <el-table-column prop="wind_turbine_name" label="机组">
             </el-table-column>
-            <el-table-column prop="TurbinePowerRate" label="风机能量利用率">
+            <el-table-column prop="EPActualTotal" label="实发电量（kWh）">
             </el-table-column>
-            <el-table-column prop="EPLostStopPercent" label="停机损失百分比">
+            <el-table-column
+              prop="TurbinePowerRate"
+              label="风机能量利用率（%）"
+            >
             </el-table-column>
-            <el-table-column prop="EPLostBadPercent" label="欠发损失百分比">
+            <el-table-column
+              prop="EPLostStopPercent"
+              label="停机损失百分比（%）"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="EPLostBadPercent"
+              label="欠发损失百分比（%）"
+            >
             </el-table-column>
             <el-table-column
               prop="EPLostPerformPercent"
-              label="功率曲线未达标损失百分比"
+              label="功率曲线未达标损失百分比（%）"
             >
             </el-table-column>
-            <el-table-column prop="EPLostLimitPercent" label="限电损失百分比">
+            <el-table-column
+              prop="EPLostLimitPercent"
+              label="限电损失百分比（%）"
+            >
             </el-table-column>
-            <el-table-column prop="TurbineRunRate" label="风机可利用率">
+            <el-table-column prop="TurbineRunRate" label="风机可利用率（%）">
             </el-table-column>
-            <el-table-column prop="mean_width" label="功率水平平均宽度">
+            <el-table-column prop="mean_width" label="功率水平平均宽度(m/s)">
             </el-table-column>
             <el-table-column prop="variance_width" label="功率水平方差">
             </el-table-column>
-            <el-table-column prop="WindSpeedAvr" label="平均风速">
+            <el-table-column prop="WindSpeedAvr" label="平均风速(m/s)">
+            </el-table-column>
+            <el-table-column prop="Thi" label="利用小时（h）">
             </el-table-column>
-            <el-table-column prop="Thi" label="利用小时"> </el-table-column>
             <el-table-column prop="Ws" label="功率曲线一致性系数">
             </el-table-column>
           </el-table>
+          <el-row v-if="Object.keys(itemCsv.data[0]).length > 4">
+            <el-col
+              :xs="24"
+              :sm="24"
+              :md="24"
+              :lg="12"
+              :xl="12"
+              v-for="(chantItem, chartInd) in itemCsv.data"
+              :key="chartInd + 'chantItem' + itemind"
+            >
+              <Rader :chartData="chantItem"></Rader>
+            </el-col>
+          </el-row>
         </template>
       </div>
       <el-empty description="暂无分析记录" v-else></el-empty>

src/views/overview/components/yaw_error/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-10 09:24:14
- * @LastEditTime: 2025-01-22 14:54:29
+ * @LastEditTime: 2025-01-22 17:37:31
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/yaw_error/index.vue
@@ -51,9 +51,9 @@
           >
             <el-table-column prop="engine_name" label="风机名称">
             </el-table-column>
-            <el-table-column prop="yaw_error1" label="误差值">
+            <el-table-column prop="yaw_error1" label="静态偏航误差值（度）">
             </el-table-column>
-            <el-table-column prop="powerloss" label="电量损失">
+            <el-table-column prop="powerloss" label="电量损失（%）">
             </el-table-column>
             <el-table-column align="right">
               <template slot="header" slot-scope="scope">

src/views/performance/components/PlotlyCharts.vue

@@ -132,7 +132,7 @@ export default {
   },
   methods: {
     updateCharts() {
-      console.log(this.lineMarkerData, "this.lineMarkerData");
+      // console.log(this.lineMarkerData, "this.lineMarkerData");
       this.powerCurveData.turbines =
         this.lineMarkerData.data?.filter(
           (item) => item.enginName !== "合同功率曲线"
@@ -173,8 +173,9 @@ export default {
         line: this.config.powerConfig.line,
         marker: this.config.powerConfig.marker,
       });
+      // console.log(this.powerCurveData, "this.powerCurveData");
       const layout = {
-        title: this.config.lableConfig.title.text || "有功功率曲线分析",
+        title: "有功功率曲线分析" + this.lineMarkerData.engineTypeName,
         plot_bgcolor: this.config.lableConfig.plot_bgcolor,
         xaxis: this.config.lableConfig.xaxis,
         yaxis: this.config.lableConfig.yaxis,
@@ -188,8 +189,8 @@ export default {
         (item) =>
           item.enginCode === this.lineMarkerData?.formInfoFieldEngineCode
       );
-      console.log(this.powerCurveData.turbines, "this.powerCurveData.turbines");
-      console.log(fentuCharts, "fentuCharts");
+      // console.log(this.powerCurveData.turbines, "this.powerCurveData.turbines");
+      // console.log(fentuCharts, "fentuCharts");
       if (fentuCharts[0]?.enginName || fentuCharts[0]?.enginCode) {
         const highlightedData = [];
         const nonHighlightedData = [];

src/views/performance/components/chartsCom/3DDrawingChart.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-17 19:04:52
- * @LastEditTime: 2025-01-22 14:09:40
- * @LastEditors: bogon
+ * @LastEditTime: 2025-01-22 17:42:58
+ * @LastEditors: milo-MacBook-Pro.local
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/3DDrawingChart.vue
 -->
@@ -128,33 +128,7 @@ export default {
     },
     renderChart() {
       // 构造3D散点图数据
-      // const trace = {
-      //   x: this.chartData.data[0].xData, // 发电机转速
-      //   y: this.chartData.data[0].yData, // 时间
-      //   z: this.chartData.data[0].zData, // 有功功率
-      //   mode: this.chartData.data[0].mode,
-      //   type: "scatter3d", // 3D 散点图
-      //   marker: {
-      //     size: 2, // 点的大小
-      //     color: this.chartData.data[0].zData, // 根据 Z 数据设置颜色
-      //     //   colorscale: "Viridis", // 色带
-      //     colorscale: this.color1
-      //       ? [
-      //           [0, "#F9FDD2"], // 颜色从 this.color1 开始
-      //           [1, this.color1], // 结束颜色为其他颜色
-      //         ]
-      //       : [
-      //           [0, "#F9FDD2"],
-      //           [0.15, "#E9F6BD"],
-      //           [0.3, "#C2E3B9"],
-      //           [0.45, "#8AC8BE"],
-      //           [0.6, "#5CA8BF"],
-      //           [0.75, "#407DB3"],
-      //           [0.9, "#2E4C9A"],
-      //           [1, "#1B2973"],
-      //         ],
-      //   },
-      // };
+
       const trace = {
         x: this.chartData.data[0].xData, // 发电机转速
         y: this.chartData.data[0].yData, // 时间

src/views/performance/components/chartsCom/BoxLineCharts.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-09-11 14:32:51
- * @LastEditTime: 2025-01-21 19:04:09
+ * @LastEditTime: 2025-01-22 17:38:59
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/BoxLineCharts.vue
@@ -225,7 +225,6 @@ export default {
           color: "#00000000",
           size: 0,
         },
-
         line: {
           color: "#C7C7C7", // 设置箱线图边框颜色
         },

src/views/performance/components/chartsCom/Radar.vue

@@ -34,6 +34,7 @@ export default {
   },
   methods: {
     drawRadarChart() {
+      console.log("this.chartData 雷达图设置", this.chartData);
       // 获取动态数据的 keys 和 values
       const keys = Object.keys(this.chartData);
       const values = Object.values(this.chartData).map((val) =>
@@ -43,10 +44,24 @@ export default {
       // 构造 Plotly 雷达图数据
       const trace = {
         type: "scatterpolar",
-        r: [...values, values[0]], // 闭合多边形，起点与终点一致
-        theta: [...keys, keys[0]], // 闭合多边形，起点与终点一致
+        r: [
+          this.chartData.TurbinePowerRate,
+          this.chartData.TurbineRunRate,
+          this.chartData.WindSpeedAvr,
+          this.chartData.Thi,
+          this.chartData.Ws,
+        ],
+        theta: [
+          "风机能量利用率",
+          "风机可利用率",
+          "平均风速",
+          "利用小时",
+          "功率曲线一致性系数",
+        ],
+        // r: [...values, values[0]], // 闭合多边形，起点与终点一致
+        // theta: [...keys, keys[0]], // 闭合多边形，起点与终点一致
         fill: "toself", // 填充多边形区域
-        name: "多边形雷达图",
+        name: this.chartData.wind_turbine_name + "机组指标",
         marker: {
           color: "#636efc",
         },
@@ -59,18 +74,21 @@ export default {
       // 雷达图布局
       const layout = {
         polar: {
+          bgcolor: "#e5ecf6", // 设置背景色为黄色
           radialaxis: {
             visible: true,
             range: [Math.min(...values) * 1.1, Math.max(...values) * 1.1], // 设置范围
+            gridcolor: "white", // 设置径向网格线为白色
           },
           angularaxis: {
             showline: false, // 隐藏 `angularaxis` 线
             showticklabels: true, // 隐藏角度标签
-            ticks: "", // 隐藏刻度
+            ticks: false, // 隐藏刻度
+            gridcolor: "white", // 设置角度网格线为白色
           },
         },
         showlegend: false, // 隐藏图例
-        title: "多边形雷达图",
+        title: this.chartData.wind_turbine_name + "机组指标",
       };
 
       // 渲染图表

src/views/performance/components/chartsCom/lineAndChildLine.vue

@@ -56,20 +56,64 @@ export default {
       color1: "#406DAB", // 默认颜色
       loading: false,
       isError: false,
+      // colors: [
+      //   "#DFEDC1",
+      //   "#DBEEBC",
+      //   "#A8D7BE",
+      //   "#8ECAC1",
+      //   "#77BDC2",
+      //   "#64ADC2",
+      //   "#559ABE",
+      //   "#4884B7",
+      //   "#406DAB",
+      //   "#3856A0",
+      //   "#314291",
+      //   "#28357A",
+      //   "#1A285E",
+      // ],
       colors: [
-        "#DFEDC1",
-        "#DBEEBC",
-        "#A8D7BE",
-        "#8ECAC1",
-        "#77BDC2",
-        "#64ADC2",
-        "#559ABE",
-        "#4884B7",
-        "#406DAB",
-        "#3856A0",
-        "#314291",
-        "#28357A",
-        "#1A285E",
+        "#636EFA",
+        "#EF553B",
+        "#00CC96",
+        "#AB63FA",
+        "#FFA15A",
+        "#19D3F3",
+        "#FF6692",
+        "#B6E880",
+        "#FF97FF",
+        "#FECB52",
+        "#636EFB",
+        "#EF553C",
+        "#00CC97",
+        "#AB63FB",
+        "#FFA15B",
+        "#19D3F4",
+        "#FF6693",
+        "#B6E881",
+        "#FF97FE",
+        "#FECB51",
+        "#1F77B4",
+        "#FF7F0E",
+        "#2CA02C",
+        "#D62728",
+        "#9467BD",
+        "#8C564B",
+        "#E377C2",
+        "#7F7F7F",
+        "#BCBD22",
+        "#17BECF",
+        "#1A55F2",
+        "#FF5733",
+        "#33FF57",
+        "#3375FF",
+        "#FF33A6",
+        "#57FF33",
+        "#3380FF",
+        "#FF8033",
+        "#57FF80",
+        "#8033FF",
+        "#FF3380",
+        "#FFD733",
       ],
     };
   },