From ddfdcc76097848062d7421520fb7f9d33dabfa4b Mon Sep 17 00:00:00 2001
From: YOU <15501379989@163.com>
Date: Tue, 15 Apr 2025 18:22:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8D=95=E4=BD=8D=E5=8F=8A?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/common/model.ts | 23 +++++++++++++++++++----
 src/views/dashboard/main.vue        |  5 ++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/views/dashboard/common/model.ts b/src/views/dashboard/common/model.ts
index fb6c86e..a148508 100644
--- a/src/views/dashboard/common/model.ts
+++ b/src/views/dashboard/common/model.ts
@@ -1,10 +1,9 @@
 import dateService from '@/service/dateService';
 import utilService from '@/service/utilService';
 import { IObject } from '@/types/interface';
-import { Legend } from 'highcharts';
 import moment from 'moment';
 
-export const monthEnergyUsageTrend = (data = []): IObject => {
+export const monthEnergyUsageTrend = (data = [], unit?: string): IObject => {
   const length = new dateService().getDateCountByMonth()[12];
   const xAxisData = Array.from({ length }, (x, i) => i + 1);
   const seriesData = [];
@@ -21,12 +20,28 @@ export const monthEnergyUsageTrend = (data = []): IObject => {
   }
 
   return {
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params: Array<IObject>) => {
+        if (utilService.isValidArray(params)) {
+          const [first] = params;
+          const { axisValue } = first;
+
+          let str = `<div>${axisValue}日</div><div>`;
+          for (const item of params) {
+            const { data } = item;
+            str += `<div style="display: flex;justify-content: space-between;"><span>${item.marker}</span> <span><b>${data}</b> ${unit}</span></div>`;
+          }
+          return str + '</div>';
+        }
+        return '';
+      },
+    },
     grid: {
       bottom: 45,
       top: 30,
       left: 60,
     },
-    tooltip: { trigger: 'axis' },
     xAxis: {
       name: '（日）',
       type: 'category',
@@ -424,7 +439,7 @@ export const energyUsageDistribution = (data = []): IObject => {
     }
   }
   const energyMap: Array<IObject> = [
-    { key: 'A29hh', name: '电用量', unit: '万kWh', color: '#0084FF' },
+    { key: 'A29hh', name: '电用量', unit: 'kWh', color: '#0084FF' },
     { key: 'E3hh', name: '蒸汽用量', unit: 't', color: '#FFE777' },
     { key: 'B2hh', name: '水用量', unit: 't', color: '#37FFC9' },
     { key: 'C2hh', name: '压缩空气用量', unit: 'Nm³', color: '#19D6FF' },
diff --git a/src/views/dashboard/main.vue b/src/views/dashboard/main.vue
index e2b471c..e038cb4 100644
--- a/src/views/dashboard/main.vue
+++ b/src/views/dashboard/main.vue
@@ -240,7 +240,9 @@ export default defineComponent({
         cb: (res: any) => {
           if (utilService.isValidObject(res) && utilService.isValidArray(res.currentMonthData)) {
             const d = res.currentMonthData;
-            state.left[2].option = monthEnergyUsageTrend(d);
+            const c = state.dataForm.code;
+            const u = state.dataForm.codeMap[c];
+            state.left[2].option = monthEnergyUsageTrend(d, u);
           }
         },
       });
@@ -514,6 +516,7 @@ export default defineComponent({
         flex-direction: column;
         justify-content: space-between;
         background: rgba(#000b31, 0.7);
+        z-index: 2;
       }
 
       .bottom {