From 7d205a352dc3e46d22999200746d8ab9e6b8938e Mon Sep 17 00:00:00 2001
From: zhangxiaolong <zhangxiaolong@geedgenetworks.com>
Date: Mon, 7 Mar 2022 15:54:28 +0800
Subject: [PATCH] =?UTF-8?q?CN-=20333=20fix=20:=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20CN-332=20feat=20:=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts/chartAlarmInfo.scss          | 31 ++++++++++++++-----
 .../charts/ChartTwoSituationStatistics.vue    | 22 ++++++-------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/assets/css/components/views/charts/chartAlarmInfo.scss b/src/assets/css/components/views/charts/chartAlarmInfo.scss
index 451efccd..d9ea1f31 100644
--- a/src/assets/css/components/views/charts/chartAlarmInfo.scss
+++ b/src/assets/css/components/views/charts/chartAlarmInfo.scss
@@ -1,7 +1,6 @@
 .cn-chart-alarm-info {
     width: 100%;
     height: 100%;
-    margin-left: 30px;
     position: relative;
 
     .cn-chart-alarm-info-mainContent {
@@ -10,9 +9,10 @@
 
         .cn-chart-alarm-content {
             display: flex;
+            margin-left: 30px;
+            margin-right: 30px;
             justify-content: flex-start;
             align-items: center;
-            width: 100%;
             height: calc(100% / 9);
             border-bottom: 1px solid #E7EAED;
 
@@ -37,8 +37,8 @@
                     .cn-icon-alert {
                         width: 12px;
                         position: absolute;
-                        top: calc(50% - 6px);
-                        left: calc(50% - 6px);
+                        top: calc(50% - 8px);
+                        left: calc(50% - 8px);
                     }
                 }
 
@@ -56,13 +56,20 @@
                         text-align: center;
                         margin-top: 10px;
                         display: flex;
+                        justify-content: center;
+                        align-items: center;
                         flex-wrap: wrap;
 
                         .cn-alarm-info-bottom-middle {
                             display: flex;
                             margin-left: 20px;
                             height: 14px;
-
+                            .cn-icon-time2{
+                                color: #8FA1BE;
+                                width: 10px;
+                                height: 10px;
+                                font-size: 12px;
+                            }
                             .cn-alarm-info-bottom-time {
                                 color: #999999;
                                 line-height: 14px;
@@ -71,10 +78,16 @@
                         }
 
                         .cn-alarm-info-bottom-right {
+                            height: 14px;
                             display: flex;
                             justify-content: center;
                             align-items: center;
-
+                            .cn-icon-time2{
+                                color: #8FA1BE;
+                                width: 10px;
+                                height: 10px;
+                                font-size: 12px;
+                            }
                             .cn-alarm-info-bottom-time {
                                 color: #999999;
                                 line-height: 14px;
@@ -84,12 +97,16 @@
 
                         .cn-alarm-info-bottom-type {
                             width: auto;
-                            height: 16px;
+                            border-radius: 2px;
+                            font-family: Roboto-Regular;
+                            line-height: 16px;
                             font-size: 12px;
                             border: 1px solid;
                             font-weight: 400;
                             max-width: 72px;
                             overflow: hidden;
+                            padding-left: 2px;
+                            padding-right: 2px;
                         }
 
 
diff --git a/src/views/charts/charts/ChartTwoSituationStatistics.vue b/src/views/charts/charts/ChartTwoSituationStatistics.vue
index 8c2bd6d3..8d8d9ba0 100644
--- a/src/views/charts/charts/ChartTwoSituationStatistics.vue
+++ b/src/views/charts/charts/ChartTwoSituationStatistics.vue
@@ -2,7 +2,7 @@
   <div class="chart-two-situation-statistics">
     <div
       class="situation-statistics-main"
-      v-for="(value, key,index) in result ? result : []"
+      v-for="(value, key,index) in chartData ? chartData : []"
       :key="index"
     >
       <div class="situation-statistics-top">
@@ -32,16 +32,16 @@ export default {
   },
   data() {
     return {
-      result: {
-        doh: {
-          count: 111,
-          percent: 0.85,
-        },
-        dot: {
-          count: 111,
-          percent: 80.85,
-        },
-      },
+      // result: {
+      //   doh: {
+      //     count: 111,
+      //     percent: 0.85,
+      //   },
+      //   dot: {
+      //     count: 111,
+      //     percent: 80.85,
+      //   },
+      // },
     }
   },
 }