问题修改

.env.production

@@ -15,34 +15,34 @@ VUE_APP_DIALOG_NUM = 8
 #趋势对比鼠标点击
 VUE_APP_DIALOG_POINT = contextmenu
 # 综合报警
-# VUE_APP_ALARM=http://10.220.1.5:6015
-VUE_APP_ALARM=http://10.112.33.5:6015
+VUE_APP_ALARM=http://10.220.1.5:6015
+# VUE_APP_ALARM=http://10.112.33.5:6015
 # VUE_APP_ALARM=http://123.60.219.66:48080
 # 登录
 # VUE_APP_VUE_LOGIN_URL=http://10.220.1.8:48080
 # VUE_APP_VUE_LOGIN_URL=http://123.60.219.66:48080
 
 
-# VUE_APP_API=http://10.220.1.5:6060
-VUE_APP_API=http://10.112.33.5:6060
+VUE_APP_API=http://10.220.1.5:6060
+# VUE_APP_API=http://10.112.33.5:6060
 # VUE_APP_TEST=http://10.81.3.155:9002
 # VUE_APP_WS='ws://10.81.3.155:9002'
 # VUE_APP_ADAPTERURL=http://10.81.3.155:8011
 
-# VUE_APP_URL=https://10.220.1.5:5300
-VUE_APP_URL=https://10.112.33.5:5300
+VUE_APP_URL=https://10.220.1.5:5300
+# VUE_APP_URL=https://10.112.33.5:5300
 
-# VUE_APP_URL2=http://10.220.1.5:8080
-VUE_APP_URL2=http://10.112.33.5:8081
+VUE_APP_URL2=http://10.220.1.5:8080
+# VUE_APP_URL2=http://10.112.33.5:8081
 
-# VUE_APP_REPORT=http://10.220.1.5:8001
-VUE_APP_REPORT=http://10.112.33.5:8001
+VUE_APP_REPORT=http://10.220.1.5:8001
+# VUE_APP_REPORT=http://10.112.33.5:8001
 
-# VUE_APP_WS_URL=ws://10.220.1.5:6014
-VUE_APP_WS_URL=ws://10.112.33.5:6014
+VUE_APP_WS_URL=ws://10.220.1.5:6014
+# VUE_APP_WS_URL=ws://10.112.33.5:6014
 
-# VUE_APP_GENERAT_URL=http://10.220.1.5:6060
-VUE_APP_GENERAT_URL=http://10.112.33.5:6060
+VUE_APP_GENERAT_URL=http://10.220.1.5:6060
+# VUE_APP_GENERAT_URL=http://10.112.33.5:6060
 
 VUE_APP_HEADER_URL=http://10.112.32.31:10200
 VUE_APP_HEADER2_URL=http://10.112.32.31:10201

src/App.vue

@@ -648,9 +648,7 @@ export default {
     $(window).resize(() => {
       that.setScale();
     });
-    this.$nextTick(() =>{
-        document.title = '预警系统'
-    })
+    
   },
 
   unmounted() {
@@ -689,12 +687,24 @@ export default {
       let str = window.location.href;
       if (str.indexOf("integratedAlarm") > -1) {
         this.showMenuData = this.warnDatas;
+        this.$nextTick(() =>{
+            document.title = '预警系统'
+        })
       } else if (str.indexOf("economicsOperation") > -1) {
         this.showMenuData = this.economyDatas;
+        this.$nextTick(() =>{
+            document.title = '经济运行'
+        })
       } else if (str.indexOf("nxreport") > -1) {
         this.showMenuData = this.reportDatas;
+        this.$nextTick(() =>{
+            document.title = '智能报表'
+        })
       } else {
         this.showMenuData = this.warnDatas;
+        this.$nextTick(() =>{
+            document.title = '预警系统'
+        })
       }
     },
     pagestyFn(path) {

src/components/chart/combination/multiple-bar-line-chart.vue

@@ -31,7 +31,7 @@ export default {
     // 单位
     units: {
       type: Array,
-      default: () => ["(万KWh)", "(风速)"],
+      default: () => ["(KWh)", "(风速)"],
     },
     // 显示 legend
     showLegend: {
@@ -207,7 +207,7 @@ export default {
               var value = param.value; //y轴值
               var mark = param.marker; //点
               var unit = `<span style='font-size:12px'>${
-                seriesName === "风速" ? "m/s" : "万kWh"
+                seriesName === "风速" ? "m/s" : "kWh"
               }</span>`;
 
               htmlStr += mark; //一个点

src/nxfStyle.less

@@ -705,6 +705,13 @@
     }
 
     // el-table
+
+    .el-table {
+        .el-table__fixed-right-patch {
+            background: transparent !important;
+        }
+    }
+
     .main-body,
     .warn-table,
     .df-table {

src/views/SandTable/SandTable.vue

@@ -259,6 +259,7 @@
         apiGetqueryShutdownEvent2ByMap
     } from "@/api/sandtable/index.js";
     import jsonData from "./component/data.json";
+    import jsonDataHT from "./component/dataHTjson.json";
     export default {
         // 名称
         name: "SandTable",
@@ -580,14 +581,14 @@
             init(res) {
                 let that = this
                 // 72小时功率曲线
-                if (res.data["72time"] && res.data["72time"].length > 0) {
+                if (res.dataL) {
                     let xAxis = [];
                     let seriesSpeed = [];
                     let seriesGl = [];
-                    res.data["72time"].forEach((it) => {
-                        xAxis.push(dayjs(it.time).format("MM-DD HH:mm"));
-                        seriesSpeed.push(it.speed);
-                        seriesGl.push(it.expectedpower);
+                    res.dataL.forEach((it) => {
+                        xAxis.push(dayjs(it.stoptime).format("MM-DD HH:mm"));
+                        seriesSpeed.push(it.times);
+                        seriesGl.push(it.hours);
                     });
                     let series = [
                         {
@@ -609,6 +610,31 @@
                         series,
                         "problem1"
                     );
+                }
+                if (res.dataR) {
+                    let xAxis = [];
+                    let seriesSpeed = [];
+                    let seriesGl = [];
+                    res.dataR.forEach((it) => {
+                        xAxis.push(dayjs(it.stoptime).format("MM-DD HH:mm"));
+                        seriesSpeed.push(it.times);
+                        seriesGl.push(it.hours);
+                    });
+                    let series = [
+                        {
+                            name: "故障次数",
+                            data: seriesSpeed,
+                            type: "line",
+                            symbol: "none",
+                        },
+                        {
+                            name: "故障时长",
+                            data: seriesGl,
+                            yAxisIndex: 1,
+                            type: "line",
+                            symbol: "none",
+                        },
+                    ];
                     that.getPowerLine2(
                         xAxis,
                         series,
@@ -736,11 +762,11 @@
                 if (dateType === "z") {
                     date = dayjs().subtract(1, 'week').format("YYYY-MM-DD HH:mm:ss")
                 } else if (dateType === "y") {
-                    date = dayjs().subtract(1, 'month').format("YYYY-MM-DD HH:mm:ss")
+                    date = dayjs().startOf('month').format("YYYY-MM-DD HH:mm:ss")
                 } else if (dateType === "n") {
                     date = dayjs().subtract(1, 'year').format("YYYY-MM-DD HH:mm:ss")
                 } else {
-                    date = dayjs().subtract(1, 'month').format("YYYY-MM-DD HH:mm:ss")
+                    date = dayjs().startOf('month').format("YYYY-MM-DD HH:mm:ss")
                 }
                 let params = {
                     wpId: "NX_FGS_HA_FDC_STA",
@@ -1534,7 +1560,7 @@
             };
             // 渲染后
             this.$nextTick(() =>{
-                // this.init(jsonData)
+                this.init(jsonDataHT)
                 this.getDataInfo();
                 this.timmer = setInterval(() => {
                     this.getDataInfo();

src/views/SandTable/component/dataHTjson.json

@@ -0,0 +1,378 @@
+{
+    "dataL": [
+        {
+            "name": null,
+            "stoptime": "2025-08-01",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-02",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-03",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-04",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-05",
+            "times": 1,
+            "hours": 0.0214
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-06",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-07",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-08",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-09",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-10",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-11",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-12",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-13",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-14",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-15",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-16",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-17",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-18",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-19",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-20",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-21",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-22",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-23",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-24",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-25",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-26",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-27",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-28",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-29",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-30",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-31",
+            "times": 0,
+            "hours": 0.0
+        }
+    ],
+    "dataR": [
+        {
+            "name": null,
+            "stoptime": "2025-08-01",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-02",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-03",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-04",
+            "times": 1,
+            "hours": 0.013
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-05",
+            "times": 1,
+            "hours": 0.0211
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-06",
+            "times": 1,
+            "hours": 0.224
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-07",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-08",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-09",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-10",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-11",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-12",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-13",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-14",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-15",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-16",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-17",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-18",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-19",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-20",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-21",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-22",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-23",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-24",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-25",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-26",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-27",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-28",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-29",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-30",
+            "times": 0,
+            "hours": 0.0
+        },
+        {
+            "name": null,
+            "stoptime": "2025-08-31",
+            "times": 0,
+            "hours": 0.0
+        }
+    ]
+}