Преглед на файлове

华电部署解决上一条下一条图片不展示的问题

liujiejie преди 1 седмица
родител
ревизия
865667e918

+ 2 - 2
src/components/map/index.vue

@@ -259,9 +259,9 @@ export default {
           source: new XYZ({
             // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
             // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
             // url: "http://10.96.137.5:9080/tiles/{z}/{x}/{y}.png", //大~#@唐
-            // url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
+            url: "http://192.168.0.1/tiles/{z}/{x}/{y}.png", //华电
             // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //中广核
           }),
         }),

+ 2 - 2
src/router/index.js

@@ -28,8 +28,8 @@ const createRouter = () =>
             iconName: "gps",
             component: () =>
               import(
-                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
-                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
+                // /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/Index.vue"
+                /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/HD.vue" //华电选择这个
               ),
           },
           {

+ 3 - 3
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-06-20 11:47:19
+ * @LastEditTime: 2025-07-14 10:22:44
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/production_indicator_unit/index.vue
@@ -100,14 +100,14 @@
             </el-table-column>
             <el-table-column
               prop="mean_width"
-              label="功率水平平均宽度(m/s)"
+              label="功率水平平均宽度(m/s)(<=3.5)"
               width="200"
               header-align="center"
             >
             </el-table-column>
             <el-table-column
               prop="variance_width"
-              label="功率水平方差"
+              label="功率水平方差(<=1.5)"
               width="170"
               header-align="center"
             >

+ 24 - 19
src/views/performance/components/chartsCom/TwoDMarkersChart1.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-09-11 14:32:12
- * @LastEditTime: 2025-07-10 14:07:08
+ * @LastEditTime: 2025-07-14 10:03:35
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/powerMarkers2DCharts.vue
@@ -516,30 +516,35 @@ export default {
       this.downloadCSV();
     },
 
-    downloadCSV() {
+    async downloadCSV() {
+      const paramValueTypes = await axios.get("/ETLapi/sysConf/getByType", {
+        params: { type: "en_cn_mapping" },
+      });
+      console.log(paramValueTypes, "paramValueTypes");
       const headers = [this.chartData.xaixs, this.chartData.yaixs];
       const csvRows = [headers]; // 保存标头
+
       // 使用 Set 或 Map 去重
       const uniquePoints = [];
-      this.selectedPoints.forEach((point) => {
-        if (!uniquePoints.some((p) => p.x === point.x && p.y === point.y)) {
-          uniquePoints.push(point);
-        }
-      });
+      // this.selectedPoints.forEach((point) => {
+      //   if (!uniquePoints.some((p) => p.x === point.x && p.y === point.y)) {
+      //     uniquePoints.push(point);
+      //   }
+      // });
 
-      // 将去重后的点加入 CSV 数据
-      uniquePoints.forEach((point) => {
-        csvRows.push(`${point.x},${point.y}`);
-      });
+      // // 将去重后的点加入 CSV 数据
+      // uniquePoints.forEach((point) => {
+      //   csvRows.push(`${point.x},${point.y}`);
+      // });
 
-      const csvString = csvRows.join("\n");
-      const blob = new Blob([csvString], { type: "text/csv; charset=utf-8" });
-      const url = URL.createObjectURL(blob);
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = "selected_data.csv";
-      a.click();
-      URL.revokeObjectURL(url);
+      // const csvString = csvRows.join("\n");
+      // const blob = new Blob([csvString], { type: "text/csv; charset=utf-8" });
+      // const url = URL.createObjectURL(blob);
+      // const a = document.createElement("a");
+      // a.href = url;
+      // a.download = "selected_data.csv";
+      // a.click();
+      // URL.revokeObjectURL(url);
     },
     updateChartColor(color) {
       // 更新图表颜色

+ 23 - 16
src/views/performance/components/chartsCom/powerMarkers2DCharts.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-09-11 14:32:12
- * @LastEditTime: 2025-07-10 11:09:31
+ * @LastEditTime: 2025-07-14 10:21:14
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/chartsCom/powerMarkers2DCharts.vue
@@ -430,13 +430,13 @@ export default {
         const pointIndex = data.points[0].pointIndex;
         const xClick = data.points[0].x;
         const yClick = data.points[0].y;
-
+        // console.log(data.points[0], "data.points[0]");
         // 将点击的点添加到选中的点数组
         this.selectedPoints.push({
           x: xClick, // 点击点的 x 坐标
           y: yClick, // 点击点的 y 坐标
           index: pointIndex, // 点击点的索引
-          time: data.points[0].text, // 点击点的时间信息
+          time: data.points[0].timeData, // 点击点的时间信息
         });
 
         // 初始化颜色和大小数组
@@ -469,6 +469,7 @@ export default {
             if (inPolygon(xVal, yVal, xv, yv)) {
               const pointKey = `${xVal}-${yVal}`;
               if (!addedPoints[pointKey]) {
+                // console.log(gd.data[0], "gd.data[0]");
                 this.selectedPoints.push({
                   x: gd.data[0].x[i],
                   y: gd.data[0].y[i],
@@ -548,28 +549,34 @@ export default {
       }
       this.downloadCSV();
     },
-    downloadCSV() {
+    async downloadCSV() {
+      const paramValueTypes = await axios.get("/ETLapi/sysConf/getByType", {
+        params: { type: "en_cn_mapping" },
+      });
+      // console.log(paramValueTypes, "paramValueTypes");
       const headers = [this.chartData.xaixs, this.chartData.yaixs];
       const csvRows = [headers]; // 保存标头
       // 使用 Set 或 Map 去重
       const uniquePoints = [];
+
       this.selectedPoints.forEach((point) => {
         if (!uniquePoints.some((p) => p.x === point.x && p.y === point.y)) {
           uniquePoints.push(point);
         }
       });
-      // 将去重后的点加入 CSV 数据
-      uniquePoints.forEach((point) => {
-        csvRows.push(`${point.x},${point.y}`);
-      });
-      const csvString = csvRows.join("\n");
-      const blob = new Blob([csvString], { type: "text/csv; charset=utf-8" });
-      const url = URL.createObjectURL(blob);
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = "selected_data.csv";
-      a.click();
-      URL.revokeObjectURL(url);
+      console.log(uniquePoints, "uniquePoints");
+      // // 将去重后的点加入 CSV 数据
+      // uniquePoints.forEach((point) => {
+      //   csvRows.push(`${point.x},${point.y}`);
+      // });
+      // const csvString = csvRows.join("\n");
+      // const blob = new Blob([csvString], { type: "text/csv; charset=utf-8" });
+      // const url = URL.createObjectURL(blob);
+      // const a = document.createElement("a");
+      // a.href = url;
+      // a.download = "selected_data.csv";
+      // a.click();
+      // URL.revokeObjectURL(url);
     },
     updateChartColor(color) {
       // 更新图表颜色

+ 2 - 2
vue.config.js

@@ -89,8 +89,8 @@ module.exports = {
         // target: "http://192.168.5.11:8001", // WZLapi 目标地址
         // target: "http://106.120.102.238:18080/ImportDataDev", //导数工具
         // target: "http://106.120.102.238:18080/WindTransDev", //WTL外网目标地址
-        target: "http://106.120.102.238:28999/transDataWeb", //WTL演示环境
-        // target: "http://192.168.50.235:8999/transDataWeb", //WTL演示环境
+        // target: "http://106.120.102.238:28999/transDataWeb", //WTL演示环境
+        target: "http://192.168.50.235:8999/transDataWeb", //WTL演示环境
         changeOrigin: true,
         pathRewrite: {
           "^/ETLapi": "", // 去掉 /WZLapi 前缀