From 7d9b2e83f8e81791541d4c0ef262f25a278ef078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Wed, 13 Nov 2024 16:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cs/index3.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/cs/index3.vue b/src/views/cs/index3.vue
index 4e0e56b..7c905ff 100644
--- a/src/views/cs/index3.vue
+++ b/src/views/cs/index3.vue
@@ -141,6 +141,13 @@ export default {
       })
       EnergyExpend().then(e => {
         this.expend = e.map(v => v.expend).reduce((a, b) => a + b, 0).toFixed(2)
+        let data = e.map(v=>{
+          return {
+            ...v,
+            monitorName:parseFloat(v.monitorName.split(' - ')?.[1]?.split('(')?.[0])
+          }
+        })
+        data.sort((a,b)=>a.monitorName-b.monitorName)
 
         let option2 = {
           grid: {
@@ -165,7 +172,7 @@ export default {
             }
           },
           xAxis: {
-            data: e.map(v => parseFloat(v.monitorName.split(' - ')?.[1]?.split('(')?.[0]) + "#"),
+            data: data.map(v => v.monitorName + "#"),
             axisLine: {
               show: true, //隐藏X轴轴线
               lineStyle: {
@@ -234,7 +241,7 @@ export default {
               // areaStyle: {
               //   color: "rgba(5,140,255, 0.2)",
               // },
-              data: e.map(v => parseFloat(v.expend)),
+              data: data.map(v => parseFloat(v.expend)),
             },
           ]
         };