Prechádzať zdrojové kódy

热力图bug 修复图形组件

liujiejie 7 mesiacov pred
rodič
commit
965741da04

+ 2 - 1
src/views/performance/components/chartsCom/BarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-09-11 14:30:17
- * @LastEditTime: 2025-08-19 14:38:12
+ * @LastEditTime: 2025-08-21 09:34:39
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/BarChart.vue
@@ -225,6 +225,7 @@ export default {
               : undefined,
           tickcolor: "rgb(255,255,255)",
           dtick: this.chartData.xaixs === "风速(m/s)" ? 1 : undefined,
+          margin: 50,
         },
         yaxis: {
           title: this.chartData.yaixs || "Y轴",

+ 22 - 3
src/views/performance/components/chartsCom/BarChart1.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-08-15 16:31:43
- * @LastEditTime: 2025-08-15 18:17:33
+ * @LastEditTime: 2025-08-20 14:14:19
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/BarChart1.vue
@@ -67,11 +67,12 @@ export default {
       }));
 
       const option = {
+        backgroundColor: "#e5ecf6", // 整个图表背景色
         grid: {
           left: "10%", // 左边距
           right: "10%", // 右边距
-          //   top: "5%", // 上边距
-          bottom: "5%", // 下边距
+          top: "15%", // 上边距
+          //   bottom: "15%", // 下边距
           containLabel: true, // 保证坐标轴标签显示完整
         },
         tooltip: {
@@ -94,11 +95,29 @@ export default {
           type: "category",
           data: xData,
           name: dataObj.xaixs || "",
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: "#fff",
+            },
+          },
           axisTick: { alignWithLabel: true },
+          //   nameLocation: "middle", // 设置名称位置
+          //   nameGap: 30, // 与轴线的距离
+          //   nameRotate: 0, // 旋转角度(可选)
         },
         yAxis: {
           type: "value",
           name: dataObj.yaixs || "",
+          nameLocation: "middle", // 设置名称位置
+          nameGap: 30, // 与轴线的距离
+          nameRotate: 90, // 旋转角度(可选)
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: "#fff",
+            },
+          },
         },
         series: series,
       };

+ 17 - 9
src/views/performance/components/chartsCom/LineAndScatter.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-07-24 17:30:10
- * @LastEditTime: 2025-08-18 09:42:29
+ * @LastEditTime: 2025-08-20 16:40:49
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/LineAndScatter.vue
@@ -180,15 +180,21 @@ export default {
           name: turbine.engineName, // 使用机组名称
           type: "scattergl", // 使用散点图
           mode: index === 0 ? "lines" : "markers",
-          //   line: {
-          //     color:
-          //       this.color1.length > 0
-          //         ? this.color1[index % this.color1.length]
-          //         : this.colors[index % this.colors.length], // 为每个机组分配不同的颜色
-          //   },
+          // line: {
+          //   color:
+          //     this.color1.length > 0
+          //       ? this.color1[index % this.color1.length]
+          //       : this.colors[index % this.colors.length], // 为每个机组分配不同的颜色
+          // },
           marker: {
-            color: index === 0 ? "#3856A0" : index === 1 ? "#77BDC2" : "red", // 为每个机组分配不同的颜色
+            color:
+              index === 0
+                ? this.color1[(index % this.color1.length) + 7]
+                : index === 1
+                ? "#77BDC2"
+                : "red", // 为每个机组分配不同的颜色
             // size: 12,
+            size: index === 1 ? 6 : 4,
             symbol: index === 0 ? "circle" : index === 1 ? "x" : "etc.", // 也可以是 "circle", "diamond", "x", etc.
           },
 
@@ -198,6 +204,7 @@ export default {
             `${this.chartData.yaixs}:` +
             "%{y} <br>",
         };
+
         // ✅ 设置 y2 绑定逻辑
         if (index === 1 || index === 2) {
           chartConfig.yaxis = "y2";
@@ -259,7 +266,7 @@ export default {
               : undefined,
         },
         yaxis2: {
-          title: "yaw state",
+          title: "偏航激活状态",
           titlefont: { color: "#1A295D" },
           tickfont: { color: "#1A295D" },
           overlaying: "y", // 在第一个 Y 轴上方绘制
@@ -268,6 +275,7 @@ export default {
           showline: true,
           linecolor: "#1A295D", // 设置右侧轴线颜色
           automargin: true,
+          size: 2,
         },
         // margin: {
         //   r: 150,

+ 14 - 46
src/views/performance/components/chartsCom/WindRoseChart1.vue

@@ -58,13 +58,8 @@ export default {
         });
       });
 
-      // 计算堆叠最大值
-      const sums = cats.map((_, i) =>
-        seriesData.reduce((acc, arr) => acc + arr[i], 0)
-      );
-      const outerMax = this.innerRadius + Math.max(...sums);
-
       const option = {
+        backgroundColor: "#e5ecf6", // 整个图表背景色
         color: [
           "#8ECAC1",
           "#77BDC2",
@@ -75,64 +70,37 @@ export default {
         ],
         angleAxis: {
           type: "category",
+          boundaryGap: false,
           data: cats,
-
-          boundaryGap: true, //标签和数据点都会在两个刻度之间的带(band)中间
-          axisTick: {
-            show: true, //是否显示坐标轴刻度
-          },
-          splitLine: {
-            show: false,
+          //startAngle:45,//倾斜度
+          axisLine: {
             lineStyle: {
-              color: "#f90",
+              //   color: "#ccc",
             },
           },
-          axisLabel: {
+          splitLine: {
             show: true,
-            // interval: 5, //坐标轴刻度标签的显示间隔,在类目轴中有效
-          },
-          axisTick: {
-            show: true, // 是否显示刻度线
-            // length: 1, // 刻度线长度
             lineStyle: {
-              color: "#999", // 颜色
-              width: 1,
-              type: "dashed", // 'dashed' | 'dotted' | 'solid'
+              color: "#fff",
             },
           },
         },
         radiusAxis: {
           min: 0,
-          max: outerMax,
-          splitNumber: 4,
-          axisLabel: {
-            formatter: (v) =>
-              v <= this.innerRadius ? "" : v - this.innerRadius,
+          //   splitNumber: 4,
+          splitLine: {
+            lineStyle: {
+              color: "#fff",
+            },
           },
-          //   splitLine: { lineStyle: { type: "dashed" } },
-          splitLine: { show: false }, // <- 设置 show: false 就隐藏了
         },
         polar: {},
         legend: {
-          data: seriesNames,
-          right: 0,
-          top: "center",
-          orient: "vertical",
+          show: false, // 直接隐藏图例
         },
+     
         tooltip: { trigger: "item" },
         series: [
-          // 占位透明柱
-          {
-            type: "bar",
-            coordinateSystem: "polar",
-            name: "__offset__",
-            stack: "stack",
-            data: cats.map(() => this.innerRadius),
-            silent: true,
-            tooltip: { show: false },
-            emphasis: { disabled: true },
-            itemStyle: { color: "transparent" },
-          },
           // 数据系列
           ...seriesNames.map((name, idx) => ({
             type: "bar",

+ 94 - 133
src/views/performance/components/chartsCom/json/#34_min_pitch2.json

@@ -1,134 +1,95 @@
 {
-    "analysisTypeCode": "变桨角度差异分析",
-    "engineCode": "WEM00041",
-    "engineTypeName": "",
-    "xaixs": "日期",
-    "yaixs": "变桨角度差异",
-    "data": [
-        {
-            "title": " #34变桨角度差异分布",
-            "engineName": "#34",
-            "engineCode": "WOG01312",
-            "xData": [
-                "1-1",
-                "1-2",
-                "1-3",
-                "1-4",
-                "1-5",
-                "1-6",
-                "1-7",
-                "1-8",
-                "1-9",
-                "1-10",
-                "1-11",
-                "1-12",
-                "1-13",
-                "1-14",
-                "1-15",
-                "1-16",
-                "1-17",
-                "1-18",
-                "1-19",
-                "1-20",
-                "1-21",
-                "1-31",
-                "2-1",
-                "2-3",
-                "2-4",
-                "11-12",
-                "11-13",
-                "11-14",
-                "11-15",
-                "11-16",
-                "11-17",
-                "11-18",
-                "11-19",
-                "12-2",
-                "12-3",
-                "12-4",
-                "12-5",
-                "12-6",
-                "12-7",
-                "12-8",
-                "12-9",
-                "12-10",
-                "12-11",
-                "12-12",
-                "12-13",
-                "12-14",
-                "12-15",
-                "12-16",
-                "12-17",
-                "12-18",
-                "12-19",
-                "12-20",
-                "12-21",
-                "12-22",
-                "12-23",
-                "12-24",
-                "12-25",
-                "12-26"
-            ],
-            "yData": [
-                0.0,
-                0.0,
-                0.0008333333581686036,
-                0.0008999982834059702,
-                0.0007000000059604656,
-                0.0006333384831880195,
-                0.00043333409629065693,
-                0.0008333333581686036,
-                0.0011999977111826965,
-                0.0008333396911741176,
-                0.0005333339055380738,
-                9.999999552965206e-05,
-                0.0005333354949973905,
-                0.0008333357175207112,
-                0.0008333333581686036,
-                0.00103333334922792,
-                0.0005333323160812854,
-                0.00043333409629047934,
-                0.000633333516121346,
-                0.000533335494997124,
-                0.0002999994277956919,
-                0.0008333357175207038,
-                0.000533333309491475,
-                0.0008333317438770897,
-                0.0008333357175210443,
-                0.00013333307902038644,
-                0.00013333332737286674,
-                0.00013333943691878382,
-                0.00013333307902025618,
-                0.00013333943691878382,
-                0.0001333394369191865,
-                9.99999582767729e-05,
-                0.00010000457768908789,
-                0.00010000457768938987,
-                0.0001333338737493343,
-                2.270699402618506,
-                0.002133333237965905,
-                9.999999552965007e-05,
-                0.00013332672127331098,
-                3.3334859230140064e-05,
-                0.00013333943691878385,
-                0.0001333394369191865,
-                0.0027000002145767263,
-                0.004799999785423282,
-                0.0008333333581686036,
-                9.999999552965007e-05,
-                3.333485923012822e-05,
-                0.000433333276708925,
-                0.00010000010728838882,
-                0.0001333333273728694,
-                3.333485922973149e-05,
-                0.0,
-                0.0005333323160812854,
-                0.0007000058174259557,
-                0.0008333317438770897,
-                0.0007000022411365621,
-                0.0005333354949973905,
-                0.000699998664856436
-            ]
-        }
-    ]
-}
+  "analysisTypeCode": "变桨角度差异分析",
+  "engineCode": "WEM00041",
+  "engineTypeName": "",
+  "xaixs": "日期",
+  "yaixs": "变桨角度差异",
+  "data": [
+    {
+      "title": " #34变桨角度差异分布",
+      "engineName": "#34",
+      "engineCode": "WOG01312",
+      "xData": [
+        "1-1",
+        "1-2",
+        "1-3",
+        "1-4",
+        "1-5",
+        "1-6",
+        "1-7",
+        "1-8",
+        "1-9",
+        "1-10",
+        "1-11",
+        "1-12",
+        "1-13",
+        "1-14",
+        "1-15",
+        "1-16",
+        "1-17",
+        "1-18",
+        "1-19",
+        "1-20",
+        "1-21",
+        "1-31",
+        "2-1",
+        "2-3",
+        "2-4",
+        "11-12",
+        "11-13",
+        "11-14",
+        "11-15",
+        "11-16",
+        "11-17",
+        "11-18",
+        "11-19",
+        "12-2",
+        "12-3",
+        "12-4",
+        "12-5",
+        "12-6",
+        "12-7",
+        "12-8",
+        "12-9",
+        "12-10",
+        "12-11",
+        "12-12",
+        "12-13",
+        "12-14",
+        "12-15",
+        "12-16",
+        "12-17",
+        "12-18",
+        "12-19",
+        "12-20",
+        "12-21",
+        "12-22",
+        "12-23",
+        "12-24",
+        "12-25",
+        "12-26"
+      ],
+      "yData": [
+        0.0, 0.0, 0.0008333333581686036, 0.0008999982834059702,
+        0.0007000000059604656, 0.0006333384831880195, 0.00043333409629065693,
+        0.0008333333581686036, 0.0011999977111826965, 0.0008333396911741176,
+        0.0005333339055380738, 9.999999552965206e-5, 0.0005333354949973905,
+        0.0008333357175207112, 0.0008333333581686036, 0.00103333334922792,
+        0.0005333323160812854, 0.00043333409629047934, 0.000633333516121346,
+        0.000533335494997124, 0.0002999994277956919, 0.0008333357175207038,
+        0.000533333309491475, 0.0008333317438770897, 0.0008333357175210443,
+        0.00013333307902038644, 0.00013333332737286674, 0.00013333943691878382,
+        0.00013333307902025618, 0.00013333943691878382, 0.0001333394369191865,
+        9.99999582767729e-5, 0.00010000457768908789, 0.00010000457768938987,
+        0.0001333338737493343, 2.270699402618506, 0.002133333237965905,
+        9.999999552965007e-5, 0.00013332672127331098, 3.3334859230140064e-5,
+        0.00013333943691878385, 0.0001333394369191865, 0.0027000002145767263,
+        0.004799999785423282, 0.0008333333581686036, 9.999999552965007e-5,
+        3.333485923012822e-5, 0.000433333276708925, 0.00010000010728838882,
+        0.0001333333273728694, 3.333485922973149e-5, 0.0, 0.0005333323160812854,
+        0.0007000058174259557, 0.0008333317438770897, 0.0007000022411365621,
+        0.0005333354949973905, 0.000699998664856436
+      ]
+    }
+  ]
+}

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

@@ -3,7 +3,7 @@
   "typecode": "WEM00012",
   "engineCode": "WEM00012",
   "engineTypeName": "WT2000/93",
-  "title": "#31机组 变桨电机温升分析",
+  "title": "#34机组 变桨电机温升分析",
   "xaixs": "风速(m/s)",
   "yaixs": "变桨电机温度(°C)",
   "data": [

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

@@ -14,215 +14,215 @@
       "title": "",
       "windRoseData": [
         {
-          "windDirection": 26,
+          "windDirection": "#34",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 4
         },
         {
-          "windDirection": 26,
+          "windDirection": "#34",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 26,
+          "windDirection": "#34",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 4
         },
         {
-          "windDirection": 26,
+          "windDirection": "#34",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 4
         },
         {
-          "windDirection": 26,
+          "windDirection": "#34",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 4
         },
         {
-          "windDirection": 26,
+          "windDirection": "#34",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 4
         },
         {
-          "windDirection": 27,
+          "windDirection": "#35",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 27,
+          "windDirection": "#35",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 5
         },
         {
-          "windDirection": 27,
+          "windDirection": "#35",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 8
         },
         {
-          "windDirection": 27,
+          "windDirection": "#35",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 27,
+          "windDirection": "#35",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 27,
+          "windDirection": "#35",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 2
         },
 
         {
-          "windDirection": 28,
+          "windDirection": "#36",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 5
         },
         {
-          "windDirection": 28,
+          "windDirection": "#36",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 28,
+          "windDirection": "#36",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 28,
+          "windDirection": "#36",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 28,
+          "windDirection": "#36",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 5
         },
         {
-          "windDirection": 28,
+          "windDirection": "#36",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 5
         },
 
         {
-          "windDirection": 29,
+          "windDirection": "#37",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 29,
+          "windDirection": "#37",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 29,
+          "windDirection": "#37",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 29,
+          "windDirection": "#37",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 29,
+          "windDirection": "#37",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 29,
+          "windDirection": "#37",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 3
         },
 
         {
-          "windDirection": 30,
+          "windDirection": "#38",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 6
         },
         {
-          "windDirection": 30,
+          "windDirection": "#38",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 7
         },
         {
-          "windDirection": 30,
+          "windDirection": "#38",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 6
         },
         {
-          "windDirection": 30,
+          "windDirection": "#38",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 6
         },
         {
-          "windDirection": 30,
+          "windDirection": "#38",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 30,
+          "windDirection": "#38",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 31,
+          "windDirection": "#39",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 7
         },
         {
-          "windDirection": 31,
+          "windDirection": "#39",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 31,
+          "windDirection": "#39",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 7
         },
         {
-          "windDirection": 31,
+          "windDirection": "#39",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 31,
+          "windDirection": "#39",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 4
         },
         {
-          "windDirection": 31,
+          "windDirection": "#39",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 3
         },
         {
-          "windDirection": 32,
+          "windDirection": "#40",
           "windSpeedRange": "调度限电损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 32,
+          "windDirection": "#40",
           "windSpeedRange": "远程停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 32,
+          "windDirection": "#40",
           "windSpeedRange": "故障停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 32,
+          "windDirection": "#40",
           "windSpeedRange": "计划停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 32,
+          "windDirection": "#40",
           "windSpeedRange": "受累停机损失电量",
           "frequency": 2
         },
         {
-          "windDirection": 32,
+          "windDirection": "#40",
           "windSpeedRange": "气象停机损失电量",
           "frequency": 2
         }

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

@@ -12,42 +12,42 @@
       "enginName": "调度限电损失电量",
       "enginCode": "WOG01339",
       "title": "",
-      "xData": [26, 27, 28, 29, 30, 31, 32],
+      "xData": ["#34", "#35", "#36", "#37", "#38", "#39", "#40"],
       "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],
+      "xData": ["#34", "#35", "#36", "#37", "#38", "#39", "#40"],
       "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],
+      "xData": ["#34", "#35", "#36", "#37", "#38", "#39", "#40"],
       "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],
+      "xData": ["#34", "#35", "#36", "#37", "#38", "#39", "#40"],
       "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],
+      "xData": ["#34", "#35", "#36", "#37", "#38", "#39", "#40"],
       "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],
+      "xData": ["#34", "#35", "#36", "#37", "#38", "#39", "#40"],
       "yData": [4, 2, 5, 3, 3, 3, 2, 3, 2, 4, 2, 4, 3, 2, 4]
     }
   ]

+ 21 - 21
src/views/performance/components/chartsCom/json/production_indicator2.json

@@ -2,107 +2,107 @@
   {
     "data": [
       {
-        "wind_turbine_name": "#04",
+        "wind_turbine_name": "#34",
         "count": 2704,
         "fault_time": 16578.36388888889
       },
       {
-        "wind_turbine_name": "#20",
+        "wind_turbine_name": "#35",
         "count": 1745,
         "fault_time": 15797.169444444444
       },
       {
-        "wind_turbine_name": "#19",
+        "wind_turbine_name": "#36",
         "count": 2435,
         "fault_time": 6547.968055555555
       },
       {
-        "wind_turbine_name": "#03",
+        "wind_turbine_name": "#37",
         "count": 1806,
         "fault_time": 3847.393611111111
       },
       {
-        "wind_turbine_name": "#05",
+        "wind_turbine_name": "#38",
         "count": 2176,
         "fault_time": 3830.1525
       },
       {
-        "wind_turbine_name": "#17",
+        "wind_turbine_name": "#39",
         "count": 2299,
         "fault_time": 2724.8186111111113
       },
       {
-        "wind_turbine_name": "#13",
+        "wind_turbine_name": "#30",
         "count": 1217,
         "fault_time": 2414.7336111111113
       },
       {
-        "wind_turbine_name": "#18",
+        "wind_turbine_name": "#41",
         "count": 1925,
         "fault_time": 2394.1705555555554
       },
       {
-        "wind_turbine_name": "#21",
+        "wind_turbine_name": "#42",
         "count": 1081,
         "fault_time": 2054.2947222222224
       },
       {
-        "wind_turbine_name": "#10",
+        "wind_turbine_name": "#43",
         "count": 1834,
         "fault_time": 1842.641388888889
       },
       {
-        "wind_turbine_name": "#11",
+        "wind_turbine_name": "#44",
         "count": 985,
         "fault_time": 1705.2911111111111
       },
       {
-        "wind_turbine_name": "#09",
+        "wind_turbine_name": "#45",
         "count": 595,
         "fault_time": 1550.0308333333332
       },
       {
-        "wind_turbine_name": "#02",
+        "wind_turbine_name": "#46",
         "count": 1910,
         "fault_time": 1375.8447222222221
       },
       {
-        "wind_turbine_name": "#14",
+        "wind_turbine_name": "#47",
         "count": 1339,
         "fault_time": 1214.1933333333334
       },
       {
-        "wind_turbine_name": "#12",
+        "wind_turbine_name": "#48",
         "count": 1068,
         "fault_time": 1141.0852777777777
       },
       {
-        "wind_turbine_name": "#06",
+        "wind_turbine_name": "#49",
         "count": 1645,
         "fault_time": 1010.8191666666667
       },
       {
-        "wind_turbine_name": "#15",
+        "wind_turbine_name": "#50",
         "count": 2643,
         "fault_time": 962.3291666666667
       },
       {
-        "wind_turbine_name": "#01",
+        "wind_turbine_name": "#51",
         "count": 1281,
         "fault_time": 906.0211111111112
       },
       {
-        "wind_turbine_name": "#07",
+        "wind_turbine_name": "#52",
         "count": 1129,
         "fault_time": 868.5258333333334
       },
       {
-        "wind_turbine_name": "#08",
+        "wind_turbine_name": "#53",
         "count": 1400,
         "fault_time": 839.9611111111111
       },
       {
-        "wind_turbine_name": "#16",
+        "wind_turbine_name": "#54",
         "count": 800,
         "fault_time": 710.3188888888889
       }

+ 19 - 11
src/views/performance/components/chartsCom/lineScatter.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-07-28 14:00:00
- * @LastEditTime: 2025-08-15 17:53:58
+ * @LastEditTime: 2025-08-20 14:26:17
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/lineScatter.vue
@@ -128,12 +128,20 @@ export default {
     this.$nextTick(() => {
       this.getData();
       this.color1 = [
-        "#0000F5",
-        "#377E21",
-        "#0000F5",
-        "#377E21",
-        "#000000",
-        "#F2A93B",
+        "#DFEDC1",
+        "#EBF6C1",
+        "#DBEEBC",
+        "#A8D7BE",
+        "#8ECAC1",
+        "#77BDC2",
+        "#64ADC2",
+        "#559ABE",
+        "#4884B7",
+        "#406DAB",
+        "#3856A0",
+        "#314291",
+        "#28357A",
+        "#1A285E",
       ];
     });
     // }
@@ -190,14 +198,14 @@ export default {
           line: {
             color:
               this.color1.length > 0
-                ? this.color1[index % this.color1.length]
-                : this.colors[index % this.colors.length], // 为每个机组分配不同的颜色
+                ? this.color1[(index % this.color1.length) + 7]
+                : this.colors[(index % this.colors.length) + 7], // 为每个机组分配不同的颜色
           },
           marker: {
             color:
               this.color1.length > 0
-                ? this.color1[index % this.color1.length]
-                : this.colors[index % this.colors.length], // 为每个机组分配不同的颜色
+                ? this.color1[(index % this.color1.length) + 7]
+                : this.colors[(index % this.colors.length) + 7], // 为每个机组分配不同的颜色
           },
           hovertemplate:
             `${this.chartData.xaixs}:` +

+ 33 - 56
src/views/performance/components/custonAsCom/dragChart/index.vue

@@ -1,18 +1,12 @@
-<!--
- * @Author: your name
- * @Date: 2024-10-31 16:01:27
- * @LastEditTime: 2025-08-15 09:45:15
- * @LastEditors: bogon
- * @Description: In User Settings Edit
- * @FilePath: /performance-test/src/views/performance/components/custonAsCom/dragChart/index.vue
--->
 <template>
   <div class="chartsBox">
     <ChartsContent
       :addChartType="addChartType"
       :config="config"
     ></ChartsContent>
-    <!-- <div class="drawer drawerText">
+
+    <!-- 抽屉 1:属性 -->
+    <div class="drawer drawerText">
       <svg-icon
         @click="() => (drawer = !drawer)"
         v-show="!drawer"
@@ -20,9 +14,9 @@
         style="width: 30px; height: 30px"
       />
       <el-drawer
-        :withHeader="false"
+        :with-header="false"
         :visible.sync="drawer"
-        :direction="direction"
+        direction="rtl"
         size="270"
         :append-to-body="false"
         :modal="false"
@@ -30,15 +24,15 @@
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         :show-close="false"
+        custom-class="drawer-attr"
       >
         <i class="el-icon-s-unfold" @click="() => (drawer = !drawer)"></i>
-        <ChartsAttributes
-          @addChart="addChart"
-          :addChartType="addChartType"
-        ></ChartsAttributes>
+        <ChartsAttributes @addChart="addChart" :addChartType="addChartType" />
       </el-drawer>
-    </div> -->
-    <!-- <div class="drawer drawerStyle">
+    </div>
+
+    <!-- 抽屉 2:数据 -->
+    <div class="drawer drawerStyle">
       <svg-icon
         @click="() => (drawer1 = !drawer1)"
         v-show="!drawer1"
@@ -46,28 +40,27 @@
         style="width: 30px; height: 30px"
       />
       <el-drawer
-        :withHeader="false"
+        :with-header="false"
         :visible.sync="drawer1"
-        :direction="direction"
+        direction="rtl"
         size="300"
         :modal="false"
         :append-to-body="false"
+        :show-close="false"
+        custom-class="drawer-data"
       >
         <i class="el-icon-s-unfold" @click="() => (drawer1 = !drawer1)"></i>
-        <ChartsData :addChartType="addChartType"></ChartsData>
+        <ChartsData :addChartType="addChartType" />
       </el-drawer>
-    </div> -->
-    <ChartsAttributes
-      @addChart="addChart"
-      :addChartType="addChartType"
-    ></ChartsAttributes>
-    <ChartsData :addChartType="addChartType"></ChartsData>
+    </div>
   </div>
 </template>
+
 <script>
 import ChartsData from "./components/chartsData.vue";
 import ChartsAttributes from "./components/chartsAttributes.vue";
 import ChartsContent from "./components/chartsContent.vue";
+
 export default {
   components: {
     ChartsContent,
@@ -82,22 +75,15 @@ export default {
       configType: "",
       drawer: false,
       drawer1: false,
-      direction: "rtl",
+      direction: "rtl", // 从右往左推
     };
   },
-  mounted() {},
   methods: {
-    /**
-     * @description 响应添加图表
-     * @params {String} 图表类型
-     */
     addChart(type) {
-      // console.log("添加一个图表", type);
-      // 如果连续两次添加相同的类型,强制触发更新
       if (this.addChartType === type) {
-        this.addChartType = ""; // 先清空
+        this.addChartType = "";
         this.$nextTick(() => {
-          this.addChartType = type; // 再赋值
+          this.addChartType = type;
         });
       } else {
         this.addChartType = type;
@@ -106,31 +92,22 @@ export default {
   },
 };
 </script>
+
 <style scoped lang="scss">
 .chartsBox {
   width: 100%;
   display: flex;
   height: 100%;
   position: relative;
-  //   justify-content: space-between;
-  // .drawer {
-  //   background-color: #fff;
-  //   z-index: 99999;
-  //   height: 100%;
-  //   border: 1px solid #ddd;
-  //   // writing-mode: vertical-rl; /* 文字竖排 */
-  //   cursor: pointer;
-  // }
-  // .drawerText {
-  //   position: absolute;
-  //   top: 0;
-  //   // right: 32px;
-  //   right: 0px;
-  // }
-  // .drawerStyle {
-  //   position: absolute;
-  //   top: 0;
-  //   right: 0px;
-  // }
+}
+
+/* 第一个抽屉(属性设置)靠最右 */
+.drawer-attr {
+  right: 0 !important;
+}
+
+/* 第二个抽屉(数据设置)往左推 270px */
+.drawer-data {
+  right: 270px !important;
 }
 </style>