Explorar o código

热力图bug 修复图形组件

liujiejie hai 4 meses
pai
achega
96ad90329f

+ 3 - 3
src/views/overview/components/fault_all/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-13 13:56:55
- * @LastEditTime: 2025-08-01 09:54:06
+ * @LastEditTime: 2025-08-18 14:49:59
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/fault_all/index.vue
@@ -52,14 +52,14 @@
           "
           :zongFaultCsvData="zongFaultCsvData"
         ></FaultAll>
-        <Time3DBarChart
+        <!-- <Time3DBarChart
           :setUpImgData="setUpImgData"
           :key="'Time3DChart'"
           :index="`${new Date().getTime()}` + 'fen'"
           :ref="'Time3DChart'"
           :chartData="zongFaultCsvData[0]"
         >
-        </Time3DBarChart>
+        </Time3DBarChart> -->
         <template v-for="(itemCsv, indCsv) in zongFaultCsvData">
           <el-table
             max-height="500"

+ 2 - 1
src/views/overview/components/fault_unit/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-13 13:56:12
- * @LastEditTime: 2025-07-24 09:59:21
+ * @LastEditTime: 2025-08-19 09:59:05
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/fault_unit/index.vue
@@ -370,6 +370,7 @@ export default {
               this.fenFaultCsvHeader = [];
               this.fenFaultCsvData = [];
               this.fetchCsvData("fault", item.fileAddr);
+              console.log(this.fenFaultCsvData, "this.fenFaultCsvData");
             }
           });
         } else {

+ 16 - 14
src/views/overview/components/production_indicator2/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-07-23 10:53:25
- * @LastEditTime: 2025-08-15 16:48:40
+ * @LastEditTime: 2025-08-19 10:08:35
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/production_indicator2/index.vue
@@ -36,7 +36,7 @@
           </div>
         </div>
       </el-alert>
-      <div class="chartsBox" v-if="fenFaultCsvData.length > 0">
+      <div class="chartsBox">
         <FaultUnit
           :faultTitledata="[
             '机组发电量VS故障停机时长',
@@ -45,21 +45,21 @@
             '故障时长(小时)',
           ]"
           :faultTypes="
-            fenFaultCsvData &&
-            fenFaultCsvData[0] &&
-            fenFaultCsvData[0].data.map((item) => item.wind_turbine_name)
+            productionIndicator2 &&
+            productionIndicator2[0] &&
+            productionIndicator2[0].data.map((item) => item.wind_turbine_name)
           "
           :faultCounts="
-            fenFaultCsvData &&
-            fenFaultCsvData[0] &&
-            fenFaultCsvData[0].data.map((item) => Number(item.count))
+            productionIndicator2 &&
+            productionIndicator2[0] &&
+            productionIndicator2[0].data.map((item) => Number(item.count))
           "
           :faultDurations="
-            fenFaultCsvData &&
-            fenFaultCsvData[0] &&
-            fenFaultCsvData[0].data.map((item) => Number(item.fault_time))
+            productionIndicator2 &&
+            productionIndicator2[0] &&
+            productionIndicator2[0].data.map((item) => Number(item.fault_time))
           "
-          :fenFaultCsvData="fenFaultCsvData"
+          :fenFaultCsvData="productionIndicator2"
         ></FaultUnit>
         <!-- <template v-for="itemCsv in fenFaultCsvData">
           <el-table
@@ -95,7 +95,7 @@
           </el-table>
         </template> -->
       </div>
-      <el-empty description="暂无分析记录" v-else></el-empty>
+      <!-- <el-empty description="暂无分析记录" v-else></el-empty> -->
       <el-dialog
         v-if="isShowDescription"
         title="添加评论"
@@ -147,6 +147,7 @@ import DicCard from "@/views/overview/components/dicCard/index.vue";
 import FilterChart from "@/views/overview/components/filterChart/index.vue";
 import FaultUnit from "@/views/performance/components/chartsCom/FaultUnit.vue";
 import TinymceEditor from "@/components/Tinymce.vue";
+import productionIndicator from "../../../performance/components/chartsCom/json/production_indicator2.json";
 import {
   analysisDetail,
   queryAnalysisedEngine,
@@ -186,6 +187,7 @@ export default {
   },
   data() {
     return {
+      productionIndicator2: JSON.parse(JSON.stringify(productionIndicator)),
       searchFen: "",
       form: {
         value2: "",
@@ -300,7 +302,7 @@ export default {
                   ) {
                     //分机型故障统计处理
                     this.fenFaultCsvHeader.push(Object.keys(result.data[0]));
-
+                    //
                     this.fenFaultCsvData.push({
                       data: result.data
                         .filter((row) => {

+ 7 - 1
src/views/performance/components/chartsCom/FaultUnit.vue

@@ -48,7 +48,13 @@ export default {
       }));
 
       // 步骤 2:按 name 字符串排序
-      combined.sort((a, b) => a.name.localeCompare(b.name)); // 按字典序排序
+      if (this.faultTitledata[0] === "机组发电量VS故障停机时长") {
+        combined.sort(
+          (a, b) => Number(a.durationHour) - Number(b.durationHour)
+        ); // 按字典序排序
+      } else {
+        combined.sort((a, b) => a.name.localeCompare(b.name)); // 按字典序排序
+      }
 
       // 步骤 3:归一化故障次数用于散点大小
       const rawSizes = combined.map((d) => d.count);

+ 4 - 4
src/views/performance/components/chartsCom/json/min_pitch3.json

@@ -3,12 +3,12 @@
   "typecode": "WEM00012",
   "engineCode": "WEM00012",
   "engineTypeName": "WT2000/93",
-  "title": "变桨电机温升分析",
+  "title": "#31机组 变桨电机温升分析",
   "xaixs": "风速(m/s)",
   "yaixs": "变桨电机温度(°C)",
   "data": [
     {
-      "engineName": "#03",
+      "engineName": "变桨1",
       "engineCode": "WOG00606",
       "xData": [
         3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6,
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "engineName": "#05",
+      "engineName": "变桨2",
       "engineCode": "WOG00608",
       "xData": [
         3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6,
@@ -44,7 +44,7 @@
       ]
     },
     {
-      "engineName": "#06",
+      "engineName": "变桨3",
       "engineCode": "WOG00609",
       "xData": [
         3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8, 5.0, 5.2, 5.4, 5.6,

+ 42 - 43
src/views/performance/components/chartsCom/json/production_indicator1.json

@@ -16,216 +16,215 @@
         {
           "windDirection": 26,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 28.5
+          "frequency": 4
         },
         {
           "windDirection": 26,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 3.2
+          "frequency": 2
         },
         {
           "windDirection": 26,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 6.1
+          "frequency": 4
         },
         {
           "windDirection": 26,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 12.3
+          "frequency": 4
         },
         {
           "windDirection": 26,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 7.6
+          "frequency": 4
         },
         {
           "windDirection": 26,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 42.3
+          "frequency": 4
         },
-
         {
           "windDirection": 27,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 30.1
+          "frequency": 2
         },
         {
           "windDirection": 27,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 2.9
+          "frequency": 5
         },
         {
           "windDirection": 27,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 5.4
+          "frequency": 8
         },
         {
           "windDirection": 27,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 13.7
+          "frequency": 2
         },
         {
           "windDirection": 27,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 6.2
+          "frequency": 2
         },
         {
           "windDirection": 27,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 41.7
+          "frequency": 2
         },
 
         {
           "windDirection": 28,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 26.8
+          "frequency": 5
         },
         {
           "windDirection": 28,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 4.0
+          "frequency": 3
         },
         {
           "windDirection": 28,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 6.5
+          "frequency": 2
         },
         {
           "windDirection": 28,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 10.4
+          "frequency": 3
         },
         {
           "windDirection": 28,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 8.8
+          "frequency": 5
         },
         {
           "windDirection": 28,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 43.5
+          "frequency": 5
         },
 
         {
           "windDirection": 29,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 29.2
+          "frequency": 3
         },
         {
           "windDirection": 29,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 3.1
+          "frequency": 2
         },
         {
           "windDirection": 29,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 7.3
+          "frequency": 2
         },
         {
           "windDirection": 29,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 12.8
+          "frequency": 3
         },
         {
           "windDirection": 29,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 6.5
+          "frequency": 3
         },
         {
           "windDirection": 29,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 41.1
+          "frequency": 3
         },
 
         {
           "windDirection": 30,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 27.4
+          "frequency": 6
         },
         {
           "windDirection": 30,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 3.6
+          "frequency": 7
         },
         {
           "windDirection": 30,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 5.7
+          "frequency": 6
         },
         {
           "windDirection": 30,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 11.9
+          "frequency": 6
         },
         {
           "windDirection": 30,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 7.4
+          "frequency": 2
         },
         {
           "windDirection": 30,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 30.0
+          "frequency": 3
         },
         {
           "windDirection": 31,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 28.5
+          "frequency": 7
         },
         {
           "windDirection": 31,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 3.2
+          "frequency": 2
         },
         {
           "windDirection": 31,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 6.1
+          "frequency": 7
         },
         {
           "windDirection": 31,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 12.3
+          "frequency": 3
         },
         {
           "windDirection": 31,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 7.6
+          "frequency": 4
         },
         {
           "windDirection": 31,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 42.3
+          "frequency": 3
         },
         {
           "windDirection": 32,
           "windSpeedRange": "调度限电损失电量",
-          "frequency": 27.5
+          "frequency": 2
         },
         {
           "windDirection": 32,
           "windSpeedRange": "远程停机损失电量",
-          "frequency": 2.2
+          "frequency": 2
         },
         {
           "windDirection": 32,
           "windSpeedRange": "故障停机损失电量",
-          "frequency": 5.1
+          "frequency": 2
         },
         {
           "windDirection": 32,
           "windSpeedRange": "计划停机损失电量",
-          "frequency": 10.3
+          "frequency": 2
         },
         {
           "windDirection": 32,
           "windSpeedRange": "受累停机损失电量",
-          "frequency": 8.6
+          "frequency": 2
         },
         {
           "windDirection": 32,
           "windSpeedRange": "气象停机损失电量",
-          "frequency": 50.3
+          "frequency": 2
         }
       ]
     }

+ 11 - 11
src/views/performance/components/chartsCom/json/production_indicator11.json

@@ -12,43 +12,43 @@
       "enginName": "调度限电损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41],
+      "xData": [26, 27, 28, 29, 30, 31, 32],
       "yData": [4, 2, 5, 3, 6, 7, 2, 5, 7, 8, 2, 4, 6, 2, 4]
     },
     {
       "enginName": "远程停机损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41],
-      "yData": [2, 5, 6, 2, 7, 2, 2, 8, 7, 2, 2, 6, 6, 1, 3]
+      "xData": [26, 27, 28, 29, 30, 31, 32],
+      "yData": [2, 5, 3, 2, 7, 2, 2, 8, 7, 2, 2, 6, 6, 1, 3]
     },
     {
       "enginName": "故障停机损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41],
-      "yData": [4, 8, 5, 2, 6, 7, 2, 5, 3, 5, 2, 4, 2, 2, 4]
+      "xData": [26, 27, 28, 29, 30, 31, 32],
+      "yData": [4, 8, 3, 2, 6, 7, 2, 5, 3, 5, 2, 4, 2, 2, 4]
     },
     {
       "enginName": "计划停机损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41],
-      "yData": [4, 2, 5, 3, 6, 7, 2, 5, 7, 8, 2, 4, 6, 2, 4]
+      "xData": [26, 27, 28, 29, 30, 31, 32],
+      "yData": [4, 2, 3, 3, 6, 3, 2, 3, 3, 4, 2, 4, 6, 2, 4]
     },
     {
       "enginName": "受累停机损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41],
-      "yData": [4, 2, 5, 3, 6, 7, 2, 5, 7, 8, 2, 4, 6, 2, 4]
+      "xData": [26, 27, 28, 29, 30, 31, 32],
+      "yData": [4, 2, 5, 3, 2, 4, 2, 2, 4, 4, 2, 4, 4, 2, 4]
     },
     {
       "enginName": "气象停机损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41],
-      "yData": [4, 2, 5, 3, 6, 7, 2, 5, 7, 8, 2, 4, 6, 2, 4]
+      "xData": [26, 27, 28, 29, 30, 31, 32],
+      "yData": [4, 2, 5, 3, 3, 3, 2, 3, 2, 4, 2, 4, 3, 2, 4]
     }
   ]
 }

+ 111 - 0
src/views/performance/components/chartsCom/json/production_indicator2.json

@@ -0,0 +1,111 @@
+[
+  {
+    "data": [
+      {
+        "wind_turbine_name": "#04",
+        "count": 2704,
+        "fault_time": 16578.36388888889
+      },
+      {
+        "wind_turbine_name": "#20",
+        "count": 1745,
+        "fault_time": 15797.169444444444
+      },
+      {
+        "wind_turbine_name": "#19",
+        "count": 2435,
+        "fault_time": 6547.968055555555
+      },
+      {
+        "wind_turbine_name": "#03",
+        "count": 1806,
+        "fault_time": 3847.393611111111
+      },
+      {
+        "wind_turbine_name": "#05",
+        "count": 2176,
+        "fault_time": 3830.1525
+      },
+      {
+        "wind_turbine_name": "#17",
+        "count": 2299,
+        "fault_time": 2724.8186111111113
+      },
+      {
+        "wind_turbine_name": "#13",
+        "count": 1217,
+        "fault_time": 2414.7336111111113
+      },
+      {
+        "wind_turbine_name": "#18",
+        "count": 1925,
+        "fault_time": 2394.1705555555554
+      },
+      {
+        "wind_turbine_name": "#21",
+        "count": 1081,
+        "fault_time": 2054.2947222222224
+      },
+      {
+        "wind_turbine_name": "#10",
+        "count": 1834,
+        "fault_time": 1842.641388888889
+      },
+      {
+        "wind_turbine_name": "#11",
+        "count": 985,
+        "fault_time": 1705.2911111111111
+      },
+      {
+        "wind_turbine_name": "#09",
+        "count": 595,
+        "fault_time": 1550.0308333333332
+      },
+      {
+        "wind_turbine_name": "#02",
+        "count": 1910,
+        "fault_time": 1375.8447222222221
+      },
+      {
+        "wind_turbine_name": "#14",
+        "count": 1339,
+        "fault_time": 1214.1933333333334
+      },
+      {
+        "wind_turbine_name": "#12",
+        "count": 1068,
+        "fault_time": 1141.0852777777777
+      },
+      {
+        "wind_turbine_name": "#06",
+        "count": 1645,
+        "fault_time": 1010.8191666666667
+      },
+      {
+        "wind_turbine_name": "#15",
+        "count": 2643,
+        "fault_time": 962.3291666666667
+      },
+      {
+        "wind_turbine_name": "#01",
+        "count": 1281,
+        "fault_time": 906.0211111111112
+      },
+      {
+        "wind_turbine_name": "#07",
+        "count": 1129,
+        "fault_time": 868.5258333333334
+      },
+      {
+        "wind_turbine_name": "#08",
+        "count": 1400,
+        "fault_time": 839.9611111111111
+      },
+      {
+        "wind_turbine_name": "#16",
+        "count": 800,
+        "fault_time": 710.3188888888889
+      }
+    ]
+  }
+]

+ 4 - 4
src/views/performance/components/chartsCom/json/yaw_error1.json

@@ -6,24 +6,24 @@
   "engineCode": "WEM00041",
   "title": "偏航频次及速率",
   "xaixs": "时间",
-  "yaixs": "count",
+  "yaixs": "偏航次数",
   "data": [
     {
-      "enginName": "Yaw Rate < 0.5",
+      "enginName": "偏航速率 < 0.5",
       "engineCode": "",
       "title": "变桨次数分布",
       "xData": ["2024-01", "2024-02", "2024-03", "2024-04"],
       "yData": [1182, 622, 1913, 931]
     },
     {
-      "enginName": "0.5 <=Yaw Rate < =0.6",
+      "enginName": "0.5 <=偏航速率 < =0.6",
       "engineCode": "",
       "title": "",
       "xData": ["2024-01", "2024-02", "2024-03", "2024-04"],
       "yData": [80, 44, 131, 67]
     },
     {
-      "enginName": "Yaw Rate > 0.6",
+      "enginName": "偏航速率 > 0.6",
       "engineCode": "",
       "title": "",
       "xData": ["2024-01", "2024-02", "2024-03", "2024-04"],

+ 5 - 5
src/views/performance/components/chartsCom/json/yaw_error3.json

@@ -4,11 +4,11 @@
   "engineCode": "WEM00041",
   "engineTypeName": "SL1500/90",
   "title": "偏航异常",
-  "xaixs": "时间(年月日 时分)",
-  "yaixs": "cable Angle",
+  "xaixs": "时间",
+  "yaixs": "扭缆角度",
   "data": [
     {
-      "engineName": "cable Angle",
+      "engineName": "扭缆角度",
       "engineCode": "WOG01312",
       "xData": [
         "2025-08-18 12:00",
@@ -39,7 +39,7 @@
       ]
     },
     {
-      "engineName": "Yaw State",
+      "engineName": "偏航激活状态",
       "engineCode": "WOG01313",
       "xData": [
         "2025-08-18 12:00",
@@ -66,7 +66,7 @@
       "yData": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
     },
     {
-      "engineName": "Unwinding State",
+      "engineName": "解缆状态",
       "engineCode": "WOG01314",
       "xData": [
         "2025-08-18 12:00",

+ 0 - 3
src/views/performance/components/custonAsCom/dragChart/components/chartConfig/form/chartLogic/modules/Heatmap.js

@@ -65,7 +65,6 @@ export function handleHeatmapPlotChartLogic(
     item.Ydata = formLabelAlign.Ydata;
   }
   // 生成数据
-  console.log(item, "item heatmap");
   if (
     item.Xdata.length > 1 &&
     item.Xdata[1]?.data?.length > 0 &&
@@ -103,12 +102,10 @@ export function handleHeatmapPlotChartLogic(
 
     for (let i = 0; i < yAxisData.length; i++) {
       for (let j = 0; j < item.Ydata.length; j++) {
-        console.log("i j", xAxisData, yAxisData, item.Ydata[j].label);
         // 对应 Ydata 中每个风机的数据,i 对应时间索引
         const xInd = xAxisData.findIndex(
           (xval) => xval === item.Ydata[j].label
         );
-        console.log(xInd, "xInd");
         if (xInd !== -1) {
           let indexVal = item.Ydata[j]?.data[i]?.[item.Ydata[j].label];
           const value =