From 6330e0b447ec0c6232895382a88803ebe86d50cf Mon Sep 17 00:00:00 2001
From: fengrong <Hi84805353>
Date: Fri, 8 Nov 2024 11:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ui/dasadmin/src/views/backend/dashboard.vue b/ui/dasadmin/src/views/backend/dashboard.vue
index 88b90fbc..a5ae728b 100644
--- a/ui/dasadmin/src/views/backend/dashboard.vue
+++ b/ui/dasadmin/src/views/backend/dashboard.vue
@@ -45,7 +45,7 @@
                     <!--今日运行状态-->
                     <div class="status panelBg">
                         <el-text class="mx-1 homelabel" style="margin-bottom: 0;">今日运行状态</el-text>
-                        <el-row :gutter="10" class="statusrow">
+                        <el-row :gutter="10" class="statusrow" style="margin-bottom: 0;">
                             <el-col :span="12">
                                 <div class="status-panel">
                                     <img class="status-panel-pic" src="~assets/dashboard/status1.png" alt="">
@@ -186,7 +186,7 @@
                     </div>
 
                     <!--功率趋势-->
-                    <div class="power panelBg" style="margin-bottom: 0;">
+                    <div class="power panelBg" style="margin-bottom: 0;padding-bottom: 10px;">
                         <el-text class="mx-1 homelabel">功率趋势</el-text>
                         <el-row :gutter="10">
                             <el-col class="lg-mb-20" :span="24">
@@ -286,7 +286,7 @@
                     </div>
 
                     <!--实时告警-->
-                    <div class="trend panelBg" style="margin-bottom: 0;">
+                    <div class="realPart panelBg" style="margin-bottom: 0;">
                         <el-text class="mx-1 homelabel">实时告警</el-text>
                         <el-row :gutter="10">
                             <el-col :span="24">
@@ -475,7 +475,7 @@ const StatusListData = () => {
 
                 propertiesToFormat.forEach(property => {
                     if (currentDayStatus.value[property] !== null && currentDayStatus.value[property] !== undefined) {
-                        currentDayStatus.value[property] = Number(currentDayStatus.value[property].toFixed(2));
+                        currentDayStatus.value[property] = Number(currentDayStatus.value[property].toFixed(1));
                     }
                 });
                 return {
@@ -1187,7 +1187,7 @@ onUnmounted(() => {
     margin: 0;
     color: #4E5969;
     background-color: #F2F3F5;
-    overflow-x: hidden;
+    overflow: hidden;
     .content-number{
         color: #333333;
         font-size: 20px;
@@ -1267,11 +1267,11 @@ onUnmounted(() => {
         .power{
             .power-chart{
                 width: 100%;
-                height: 265px;
+                height: 286px;
             }
             @media screen and (max-width: 1920px) {
                 .power-chart{
-                    height: 250px;
+                    height: 230px;
                 }
             }
         }
@@ -1342,9 +1342,18 @@ onUnmounted(() => {
                 height: 260px;
             }
         }
+        .realPart{
+            height: 370px;
+        }
         @media screen and (max-width: 1920px) {
+            .matrix{
+                height:928px
+            }
+            .realPart{
+                height: 343px;
+            }
             .trend{
-                height: 350px;
+                height: 320px;
             }
         }
     }
@@ -1353,7 +1362,7 @@ onUnmounted(() => {
 }
 @media screen and (max-width: 1920px) {
     .default-main{
-        height: auto;
+        height: 928px;
     }
 }