2025-11-20紧急优化内容

2025-11-26 17:50:06 +08:00
parent 1378947a9e
commit 7fb6d1aa47
17 changed files with 459 additions and 117 deletions
--- a/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue
@ -14,7 +14,6 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { formatDate } from "@/filters/ems";
 import { storagePower } from "@/api/ems/dzjk";

 export default {
@ -37,9 +36,6 @@ export default {
  methods: {
    init(siteId, timeRange) {
      this.chart.showLoading();
-      const x = [];
-      const data1 = [],
-        data2 = [];
      const [startTime='', endTime=''] = timeRange;
      storagePower(siteId,startTime,endTime)
        .then((response) => {
@ -50,7 +46,6 @@ export default {
        });
    },
    setOption(data) {
-      // data=[{deviceId:'pcs1',energyStoragePowList:[{createDate,deviceId,pcsTotalActPower,pcsTotalReactivePower}]}]
      let xdata = [],
        series = [];
      data.forEach((element, index) => {
@ -65,8 +60,13 @@ export default {
              // color:'#FFBD00'
            },
            data: (element.energyStoragePowList || []).map(
-              (i) => i.pcsTotalActPower
-            ),
+              (i) => {
+                return {
+                  value:i.pcsTotalActPower,
+                  year:i.dateDay || ''
+                }
+              }
+            )
          },
          {
            type: "line",
@ -75,7 +75,12 @@ export default {
              // color:'#FFBD00'
            },
            data: (element.energyStoragePowList || []).map(
-              (i) => i.pcsTotalReactivePower
+              (i) => {
+                return {
+                  value: i.pcsTotalReactivePower,
+                  year:i.dateDay || ''
+                }
+              }
            ),
          }
        );
@ -94,11 +99,24 @@ export default {
          containLabel: true,
        },
        tooltip: {
+          show:true,
          trigger: "axis",
          axisPointer: {
            // 坐标轴指示器，坐标轴触发有效
            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
          },
+          formatter :(params)=>{
+            if(params.length <= 0) return
+            let result = (params[0].data.year || '')+ params[0].name + '<div>'
+            params.forEach(item=>{
+              const {color,seriesName,value} = item
+              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
+                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
+                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
+            })
+            result+='</div>'
+            return result
+          }
        },
        textStyle: {
          color: "#333333",
--- a/src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue
@ -14,7 +14,6 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { formatDate } from "@/filters/ems";
 import { batteryAveSoc } from "@/api/ems/dzjk";
 export default {
  mixins: [resize],
@ -50,7 +49,10 @@ export default {
        ydata = [];
      data.forEach((element) => {
        xdata.push(element.createDate);
-        ydata.push(element.batterySOC);
+        ydata.push({
+          value:element.batterySOC,
+          year:element.dateDay,
+        });
      });
      xdata = this.chart.setOption({
        legend: {
@ -66,11 +68,24 @@ export default {
          containLabel: true,
        },
        tooltip: {
+          show:true,
          trigger: "axis",
          axisPointer: {
            // 坐标轴指示器，坐标轴触发有效
            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
          },
+          formatter :(params)=>{
+            if(params.length <= 0) return
+            let result = (params[0].data.year || '')+ params[0].name + '<div>'
+            params.forEach(item=>{
+              const {color,seriesName,value} = item
+              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
+                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
+                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
+            })
+            result+='</div>'
+            return result
+          }
        },
        textStyle: {
          color: "#333333",
--- a/src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue
@ -14,7 +14,6 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { formatDate } from "@/filters/ems";
 import { batteryAveTemp } from "@/api/ems/dzjk";

 export default {
@ -37,9 +36,6 @@ export default {
  methods: {
    init(siteId,timeRange) {
      this.chart.showLoading();
-      const x = [];
-      const data1 = [],
-        data2 = [];
      const [startTime='', endTime=''] = timeRange;
      batteryAveTemp(siteId,startTime,endTime)
        .then((response) => {
@ -54,7 +50,12 @@ export default {
        ydata = [];
      data.forEach((element) => {
        xdata.push(element.createDate);
-        ydata.push(element.batteryTemp);
+        ydata.push(
+          {
+            value: element.batteryTemp,
+            year: element.dateDay
+          }
+        );
      });
      xdata = this.chart.setOption({
        legend: {
@ -70,11 +71,24 @@ export default {
          containLabel: true,
        },
        tooltip: {
+          show:true,
          trigger: "axis",
          axisPointer: {
            // 坐标轴指示器，坐标轴触发有效
            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
          },
+          formatter :(params)=>{
+            if(params.length <= 0) return
+            let result = (params[0].data.year || '')+ params[0].name + '<div>'
+            params.forEach(item=>{
+              const {color,seriesName,value} = item
+              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
+                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
+                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
+            })
+            result+='</div>'
+            return result
+          }
        },
        textStyle: {
          color: "#333333",
--- a/src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue
@ -14,7 +14,6 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { formatDate } from "@/filters/ems";
 import { pcsMaxTemp } from "@/api/ems/dzjk";

 export default {
@ -37,8 +36,6 @@ export default {
  methods: {
    init(siteId,timeRange) {
      this.chart.showLoading();
-      const x = [];
-      const data = [];
      const [startTime='', endTime=''] = timeRange;
      pcsMaxTemp(siteId,startTime,endTime)
        .then((response) => {
@ -61,7 +58,12 @@ export default {
          areaStyle: {
            // color:'#FFBD00'
          },
-          data: (element.maxTempVoList || []).map((i) => i.temp),
+          data: (element.maxTempVoList || []).map((i) => {
+            return {
+              value: i.temp,
+              year: i.dateDay
+            }
+          }),
        });
      });
      this.chart.setOption({
@ -78,11 +80,24 @@ export default {
          containLabel: true,
        },
        tooltip: {
+          show:true,
          trigger: "axis",
          axisPointer: {
            // 坐标轴指示器，坐标轴触发有效
            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
          },
+          formatter :(params)=>{
+            if(params.length <= 0) return
+            let result = (params[0].data.year || '')+ params[0].name + '<div>'
+            params.forEach(item=>{
+              const {color,seriesName,value} = item
+              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
+                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
+                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
+            })
+            result+='</div>'
+            return result
+          }
        },
        textStyle: {
          color: "#333333",