From 2be80a71ffceac3d39f4039a8b86eea566ab23be Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Thu, 10 Aug 2023 18:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9B=BE=E6=A0=87=E7=9A=84x?=
 =?UTF-8?q?=E8=BD=B4=E6=9C=80=E5=90=8Elabel=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98=20=E8=B0=83=E6=95=B4detail?=
 =?UTF-8?q?s=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=8B=89=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serverMonitor/instances/details.vue       |  7 +++++
 .../serverMonitor/instances/lineChart.vue     | 16 ++++++++--
 .../serverMonitor/instances/monitor.vue       | 10 +++----
 .../instances/serviceProcess.vue              | 29 +++++++++++++++----
 4 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/views/abnormalAlarm/serverMonitor/instances/details.vue b/src/views/abnormalAlarm/serverMonitor/instances/details.vue
index c9dd8fc..4847008 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/details.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/details.vue
@@ -1264,6 +1264,7 @@ export default {
       height: 52px;
       letter-spacing: 1px;
       color: #ade6ee;
+      justify-content: flex-start;
     }
     .ant-list-item:nth-child(odd){
       background-color: rgba(13, 109, 118, 0.2);
@@ -1275,12 +1276,18 @@ export default {
       margin-left: 12px;
     }
     &-info{
+      width: 188px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      margin-left: 15px;
       display: inline-block;
       color: #ffffff;
     }
     &-date{
       display: inline-block;
       color: #90b4c5;
+      margin-left: 35px;
     }
     &-actions{
       
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/lineChart.vue b/src/views/abnormalAlarm/serverMonitor/instances/lineChart.vue
index afed8bd..d4606ec 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/lineChart.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/lineChart.vue
@@ -19,7 +19,8 @@ export default {
   },
   data() {
     return {
-      option: {}
+      option: {},
+      xData: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
     }
   },
   mounted () {
@@ -82,10 +83,19 @@ export default {
             }
           },
           axisLabel: {
-            color: "rgba(173, 230, 238, 1)"
+            color: "rgba(173, 230, 238, 1)",
+            formatter: (value,index)=>{
+              if(index === 0) {
+                return '        ' + value;
+              }
+              if(index === this.xData.length -1) {
+                return value + '        ';
+              }
+              return value
+            }
           },
           boundaryGap: false,
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+          data: this.xData
         },
         yAxis: {
           type: 'value',
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue b/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue
index c6861c7..ed2c4cb 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/monitor.vue
@@ -36,7 +36,7 @@
         </a-col>
       </a-row>
       <div class="monitor-search-btns">
-        <a-button class="monitor-search-btns-ant">Create Alert RULES</a-button>
+        <a-button class="monitor-search-btns-ant">Create Alert Rules</a-button>
       </div>
     </div>
     <div class="monitor-content">
@@ -121,7 +121,7 @@
         <a-col :span="8" style="height: 34%;">
           <div class="monitor-content-item">
             <LineChart
-              title="Lnternal Network Bandwidth (bit/s)"
+              title="Internal Network Bandwidth (bit/s)"
               layout="line8"
               :dataSource="data8"
               @zoom="handelZoom"
@@ -247,17 +247,17 @@ export default {
       ],
       data8: [
         {
-          name: "Lntranet in Rete",
+          name: "Intranet in Rete",
           data: [15, 23, 22, 28, 35, 47, 26]
         },
         {
-          name: "Lntranet Out Rete",
+          name: "Intranet Out Rete",
           data: [25, 13, 32, 18, 45, 27, 36]
         }
       ],
       data9: [
         {
-          name: "Lntranet Out Rete",
+          name: "Intranet Out Rete",
           data: [15, 23, 22, 28, 35, 47, 26]
         }
       ],
diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
index d32086f..769b568 100644
--- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
+++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue
@@ -63,7 +63,7 @@
             <div class="service-content-center-item" id="cpu"></div>
           </a-col>
           <a-col :span="12">
-            <BoxTitle title="Proces menbry usage(%)">
+            <BoxTitle title="Proces memory usage(%)">
               <template slot="right">
                 <ul class="legend-list">
                   <li v-for="(item,index) in procesMenbry.legend" :key="index">
@@ -204,6 +204,7 @@ export default {
         showSizeChanger: true,
         total: 0
       },
+      xData: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
     }
   },
   mounted () {
@@ -374,10 +375,19 @@ export default {
             }
           },
           axisLabel: {
-            color: "rgba(173, 230, 238, 1)"
+            color: "rgba(173, 230, 238, 1)",
+            formatter: (value,index)=>{
+              if(index === 0) {
+                return '        ' + value;
+              }
+              if(index === this.xData.length -1) {
+                return value + '        ';
+              }
+              return value
+            }
           },
           boundaryGap: false,
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+          data: this.xData
         },
         yAxis: {
           type: 'value',
@@ -450,10 +460,19 @@ export default {
             }
           },
           axisLabel: {
-            color: "rgba(173, 230, 238, 1)"
+            color: "rgba(173, 230, 238, 1)",
+            formatter: (value,index)=>{
+              if(index === 0) {
+                return '        ' + value;
+              }
+              if(index === this.xData.length -1) {
+                return value + '        ';
+              }
+              return value
+            }
           },
           boundaryGap: false,
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+          data: this.xData
         },
         yAxis: {
           type: 'value',