Jelajahi Sumber

禅道样式修改

liujiejie 5 bulan lalu
induk
melakukan
1a4888bca4

+ 2 - 2
downLoadServer/src/server/utils/chartsCom/PlotlyCharts.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2025-05-15 15:22:19
- * @LastEditTime: 2025-05-26 11:00:41
+ * @LastEditTime: 2025-06-23 10:08:03
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /downLoadServer/src/server/utils/chartsCom/PlotlyCharts.js
@@ -72,7 +72,7 @@ export const generatePlotlyCharts = async (
 
     const layout = {
       title: {
-        text: `有功功率曲线分析${chartData.engineTypeName}`,
+        text: `有功功率曲线分析${chartData.engineTypeName}机型`,
         font: { size: 16, weight: "bold" },
       },
       xaxis: { title: { text: "风速(m / s)" || "X轴" }, gridcolor: "#fff" },

+ 2 - 2
downLoadServer/src/server/utils/chartsCom/PlotlyChartsFen.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2025-05-23 17:19:20
- * @LastEditTime: 2025-05-26 11:36:31
+ * @LastEditTime: 2025-06-23 10:36:03
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /downLoadServer/src/server/utils/chartsCom/PlotlyChartsFen.js
@@ -116,7 +116,7 @@ export const generatePlotlyChartsFen = async (
       // 准备布局配置
       const layout = {
         title: {
-          text: `有功功率曲线分析${enginName}`,
+          text: `${enginName}风机有功功率曲线分析`,
           font: {
             size: 16,
             weight: "bold",

+ 17 - 17
downLoadServer/src/server/utils/chartsCom/TwoDMarkersChart.js

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2025-04-25 16:19:33
- * @LastEditTime: 2025-05-06 10:21:04
- * @LastEditors: milo-MacBook-Pro.local
+ * @LastEditTime: 2025-06-24 14:36:35
+ * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /downLoadServer/src/server/utils/chartsCom/TwoDMarkersChart.js
  */
@@ -79,20 +79,20 @@ export const generateTwoDMarkersChart = async (
         mode: "markers",
         type: "scattergl", // 使用 scattergl 提高性能
         text: chartDataset.engineName, // 提示文本
-        marker: {
-          color: colorValues,
-          colorscale: [
-            [0, "#F9FDD2"],
-            [0.15, "#E9F6BD"],
-            [0.3, "#C2E3B9"],
-            [0.45, "#8AC8BE"],
-            [0.6, "#5CA8BF"],
-            [0.75, "#407DB3"],
-            [0.9, "#2E4C9A"],
-            [1, "#1B2973"],
-          ],
-          size: new Array(chartDataset.xData.length).fill(6), // 点的大小
-        },
+        // marker: {
+        //   color: colorValues,
+        //   colorscale: [
+        //     [0, "#F9FDD2"],
+        //     [0.15, "#E9F6BD"],
+        //     [0.3, "#C2E3B9"],
+        //     [0.45, "#8AC8BE"],
+        //     [0.6, "#5CA8BF"],
+        //     [0.75, "#407DB3"],
+        //     [0.9, "#2E4C9A"],
+        //     [1, "#1B2973"],
+        //   ],
+        //   size: new Array(chartDataset.xData.length).fill(6), // 点的大小
+        // },
       };
 
       // 图表布局
@@ -122,7 +122,7 @@ export const generateTwoDMarkersChart = async (
           backgroundcolor: "#e5ecf6",
           showbackground: true,
         },
-        showlegend: false,
+        // showlegend: true,
         plot_bgcolor: "#e5ecf6",
         gridcolor: "#fff",
       };

+ 6 - 1
downLoadServer/src/server/utils/chartsCom/TwoDMarkersChart1.js

@@ -74,7 +74,12 @@ export const generateTwoDMarkersChart1 = async (
       let colorValues = scatterData.colorbar
         ? scatterData.colorbar.map((date) => timeMapping[date])
         : scatterData.color.map((date) => timeMapping[date]);
-
+      console.log(
+        colorValues,
+        uniqueTimeLabels,
+        "colorValues",
+        "uniqueTimeLabels"
+      );
       // 绘制散点图
       const scatterTrace = {
         x: scatterData.xData,

+ 0 - 1
src/App.vue

@@ -10,7 +10,6 @@
 import { mapMutations } from "vuex";
 export default {
   created() {},
-
   computed: {
     defaultLoading() {
       return this.$store.state.settings.loading;

+ 5 - 5
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-04-11 16:51:01
+ * @LastEditTime: 2025-06-23 17:11:03
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/production_indicator_all/index.vue
@@ -44,25 +44,25 @@
           >
             <el-table-column
               prop="Qp"
-              label="风场总发电量(kWh)"
+              label="总发电量(kWh)"
               header-align="center"
             >
             </el-table-column>
             <el-table-column
               prop="Thc"
-              label="风场等效利用小时(h)"
+              label="等效利用小时(h)"
               header-align="center"
             >
             </el-table-column>
             <el-table-column
               prop="Rdr"
-              label="风场弃风率(%)"
+              label="弃风率(%)"
               header-align="center"
             >
             </el-table-column>
             <el-table-column
               prop="Qdr"
-              label="风场弃风电量(kWh)"
+              label="弃风电量(kWh)"
               header-align="center"
             >
             </el-table-column>

+ 6 - 5
src/views/performance/assetssDetail.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:25:45
- * @LastEditTime: 2025-06-20 14:05:08
+ * @LastEditTime: 2025-06-23 17:15:31
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
@@ -165,12 +165,13 @@
               style="width: 100%"
               align="center"
             >
-              <el-table-column prop="Qp" label="风场总发电量">
+              <el-table-column prop="Qp" label="总发电量(万kWh)">
               </el-table-column>
-              <el-table-column prop="Thc" label="风场等效利用小时">
+              <el-table-column prop="Thc" label="等效利用小时(h)">
               </el-table-column>
-              <el-table-column prop="Rdr" label="风场弃风率"> </el-table-column>
-              <el-table-column prop="Qdr" label="风场弃风电量">
+              <el-table-column prop="Rdr" label="弃风率(%)">
+              </el-table-column>
+              <el-table-column prop="Qdr" label="弃风电量(万kWh)">
               </el-table-column>
             </el-table>
           </template>

+ 1 - 1
src/views/performance/assetssMag.vue

@@ -166,7 +166,7 @@
         </el-table-column>
         <el-table-column
           align="center"
-          label="优先执行"
+          label="排队序号"
           prop="orderNum"
           min-width="200"
         >

+ 3 - 3
src/views/performance/components/PlotlyCharts.vue

@@ -98,7 +98,7 @@ export default {
             zeroline: false,
             tickcolor: "rgb(255,255,255)",
             dtick: 1,
-            tickangle: -45,
+            // tickangle: -45,
           },
           yaxis: {
             title: "功率(kW)",
@@ -231,7 +231,7 @@ export default {
       // 配置图表布局
       const layout = {
         title: {
-          text: `有功功率曲线分析${this.lineMarkerData.engineTypeName}`,
+          text: `有功功率曲线分析${this.lineMarkerData.engineTypeName}机型`,
           font: {
             size: 16, // 设置标题字体大小(默认 16)
             weight: "bold",
@@ -275,7 +275,7 @@ export default {
         const layout = {
           title: {
             text:
-              fentuCharts[0]?.enginName ||
+              fentuCharts[0]?.enginName + "风机有功功率曲线分析" ||
               fentuCharts[0]?.enginCode + "风机有功功率曲线分析",
             font: {
               size: 16, // 设置标题字体大小(默认 16)

+ 24 - 21
src/views/performance/components/chartsCom/TwoDMarkersChart.vue

@@ -195,7 +195,7 @@ export default {
           data.colorbar && data.colorbar.length === data.xData.length
             ? [...new Set(data.colorbar)] // 从 colorbar 中提取唯一的标签
             : [...new Set(data.yData)]; // 如果没有 colorbar,使用 data.color
-        const ticktext = uniqueTimeLabels.map((dateStr) => dateStr); // 格式化为标签
+        const ticktext = uniqueTimeLabels.map((dateStr) => dateStr.toFixed(1)); // 格式化为标签
         const tickvals = uniqueTimeLabels.map((label, index) => index + 1); // 设置 tick 值
         const timeMapping = uniqueTimeLabels.reduce((acc, curr, index) => {
           acc[curr] = index + 1;
@@ -227,6 +227,7 @@ export default {
         } else {
           colorValues = data.yData.map((date) => timeMapping[date]);
         }
+
         // 绘制 2D 散点图
         trace = {
           x: data.xData,
@@ -234,25 +235,27 @@ export default {
           mode: "markers",
           type: "scattergl", // 使用 scattergl 提高性能
           text: data.engineName, // 提示文本
-          marker: {
-            color: colorValues, // 根据 colorbar 映射的数字设置颜色
-            colorscale: this.color1
-              ? colors // 如果有 color1 使用自定义颜色比例
-              : [
-                  [0, "#F9FDD2"],
-                  [0.15, "#E9F6BD"],
-                  [0.3, "#C2E3B9"],
-                  [0.45, "#8AC8BE"],
-                  [0.6, "#5CA8BF"],
-                  [0.75, "#407DB3"],
-                  [0.9, "#2E4C9A"],
-                  [1, "#1B2973"],
-                ], // 默认颜色渐变
-            // colorbar: data.colorbar
-            //   ? { title: data.colorbartitle || "Color Legend" }
-            //   : undefined, // 如果有 colorbar 显示,否则不显示
-            size: new Array(data.xData.length).fill(this.pointSize), // 点的大小
-          },
+          // marker: {
+          //   color: colorValues, // 使用时间数据来映射颜色
+          //   colorscale: this.color1
+          //     ? [...colors]
+          //     : [
+          //         [0, "#F9FDD2"],
+          //         [0.15, "#E9F6BD"],
+          //         [0.3, "#C2E3B9"],
+          //         [0.45, "#8AC8BE"],
+          //         [0.6, "#5CA8BF"],
+          //         [0.75, "#407DB3"],
+          //         [0.9, "#2E4C9A"],
+          //         [1, "#1B2973"],
+          //       ], // 默认颜色渐变
+          //   colorbar: {
+          //     // title: data.colorbartitle, // 色标标题
+          //     // tickvals: tickvals, // 设置刻度值
+          //     // ticktext: ticktext, // 设置刻度文本
+          //     tickmode: "array", // 使用数组模式、
+          //   },
+          // },
         };
         if (data.colorbartitle === "密度") {
           trace.marker.cmin = 0;
@@ -335,7 +338,7 @@ export default {
           backgroundcolor: "#e5ecf6",
           showbackground: true, // 显示背景
         },
-        showlegend: false,
+        // showlegend: true,
         plot_bgcolor: "#e5ecf6",
         gridcolor: "#fff", // 设置网格线颜色
       };

+ 8 - 4
src/views/performance/components/chartsCom/TwoDMarkersChart1.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-09-11 14:32:12
- * @LastEditTime: 2025-06-11 10:50:36
+ * @LastEditTime: 2025-06-23 15:42:51
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/powerMarkers2DCharts.vue
@@ -218,7 +218,12 @@ export default {
       } else {
         colorValues = data.color.map((date, index) => timeMapping[date]);
       }
-
+      console.log(
+        colorValues,
+        uniqueTimeLabels,
+        "colorValues",
+        "uniqueTimeLabels2"
+      );
       let scatterTrace = {}; // 用于存放散点图的 trace
       let lineTrace = {}; // 用于存放折线图的 trace
 
@@ -252,8 +257,7 @@ export default {
               title: data.colorbartitle, // 色标标题
               tickvals: tickvals, // 设置刻度值
               ticktext: ticktext, // 设置刻度文本
-              tickmode: "array", // 使用数组模式
-              // tickangle: -45, // 可选:调整刻度文本的角度
+              tickmode: "array", // 使用数组模式、
             },
             size: new Array(data.xData.length).fill(this.pointSize), // 点的大小
           },