From adefe40ca430ac3da8409017726e84a1cdf261fe Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Thu, 7 Nov 2024 09:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=9F=E7=8E=87=E6=A8=AA?=
 =?UTF-8?q?=E5=9D=90=E6=A0=87=E4=BF=AE=E6=94=B9=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=8F=91=E7=94=B5=E9=87=8F=E5=8D=95=E4=BD=8D=E4=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/dasadmin/src/views/backend/dashboard.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index 25b6fdf4..875b1aa6 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -239,7 +239,7 @@
                                     </div>
                                     <div class="summarize-panel-base">
                                         <div><span class="content-number">{{realData.attributeMap.windfarmmonthprodenergy}}</span></div>
-                                        <div><span>万kWh</span></div>
+                                        <div><span>kWh</span></div>
                                         <div><span>月发电量</span></div>
                                     </div>
                                 </div>
@@ -251,7 +251,7 @@
                                     </div>
                                     <div class="summarize-panel-base">
                                         <div><span class="content-number">{{realData.attributeMap.windfarmyearprodenergy}}</span></div>
-                                        <div><span>万kWh</span></div>
+                                        <div><span>kWh</span></div>
                                         <div><span>年发电量</span></div>
                                     </div>
                                 </div>
@@ -263,7 +263,7 @@
                                     </div>
                                     <div class="summarize-panel-base">
                                         <div><span class="content-number">{{realData.attributeMap.windfarmtotalprodenergy}}</span></div>
-                                        <div><span>万kWh</span></div>
+                                        <div><span>kWh</span></div>
                                         <div><span>总发电量</span></div>
                                     </div>
                                 </div>
@@ -565,7 +565,8 @@ const initpowerChart = () => {
                     color: '#999999',
                 },
             },
-            data: powerChartData.time.WindFarmAvgWindSpeed,
+            data: powerChartData.time.WindFarmAvgWindSpee??powerChartData.time.WindFarmActivePower
+            ,
         },
         yAxis: [
             {
@@ -639,7 +640,7 @@ const initpowerChart = () => {
             {
                 name: '全场总有功功率',
                 type: 'bar',
-                barWidth: 20,
+                //barWidth: 10,
                 itemStyle: {
                     color: '#00A7EB',
                     barBorderRadius: 2
@@ -861,7 +862,6 @@ const getTableData = (deviceCode) => {
     }
     console.log(JSON.stringify(data))
     getAlarmListReq(data).then((res) => {
-        debugger
         if (res.code == 200) {
             //tableData.value = res.rows
             tableData.value = res.rows.map((item: any) => {