From 8872c08aa5e535dc36e82063904092e66d86f328 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Sun, 2 Nov 2025 16:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alops-ui/src/layout/components/Navbar.vue |  2 +-
 .../inMonitoring/devicesState/cardItem.vue    | 30 +++++++++++++++----
 .../inMonitoring/devicesState/detail.vue      |  2 +-
 .../inMonitoring/inMonitor/message/index.vue  | 13 ++++----
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue b/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue
index cbe7284d..b317eabf 100644
--- a/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue
+++ b/ALOps_sys_fe/alops-ui/src/layout/components/Navbar.vue
@@ -89,7 +89,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
+        this.$store.dispatch('user/LogOut').then(() => {
           location.href = '/index'
         })
       }).catch(() => {})
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue
index 8cb87934..256351a6 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue
@@ -43,7 +43,7 @@
                           <div class="info-item">
                               <span class="info-label">
                                   <i class="fas fa-heartbeat"></i> 带外IP
-                                  <i class="fas fa-heartbeat"></i> 带内IP
+                                  <!-- <i class="fas fa-heartbeat"></i> 带内IP -->
                               </span>
                               <span class="info-value">{{cardData.ip || '暂无'}}</span>
                           </div>
@@ -61,18 +61,22 @@
                         </div>
 
                         <div class="metric-card">
-                            <div class="metric-value cpu-usage">{{getPercentage(cardData.health)||0}}%</div>
+                            <div class="metric-value cpu-usage">
+                                 <span :class="['health-icon', `health-${Number(cardData.health||0)}`]">
+                                    {{ cardData.health == 1?'健康':cardData.health == 2?'良好':cardData.health == 3?'一般':cardData.health == 4?'需维护':'未知' }}
+                                </span>
+                            </div>
                             <div class="metric-label">健康度</div>
-                            <div class="progress-bar">
+                            <!-- <div class="progress-bar">
                                 <div class="progress-fill" :style="{width: getPercentage(cardData.health)||0+'%'}"></div>
-                            </div>
+                            </div> -->
                         </div>
                         <div class="metric-card">
                             <div class="metric-value alert-pending">{{cardData.unhandledAlertCount||0}}</div>
                             <div class="metric-label">待处理预警数</div>
                         </div>
                         <div class="metric-card">
-                            <div class="metric-value alert-total">{{cardData.handledAlertCount||0}}</div>
+                            <div class="metric-value alert-total">{{cardData.alertCount||0}}</div>
                             <div class="metric-label">预警总数</div>
                         </div>
                     </div>
@@ -498,4 +502,20 @@ export default {
                 grid-template-columns: 1fr;
             }
         }
+        
+        .health-1{
+            color: #4CAF50;
+        }
+        .health-2{
+            color: #FF9800;
+        }
+        .health-4{
+            color: #F44336;
+        }
+        .health-3{
+            color: #FFEB3B;
+        }
+        .health-0{
+            color: #9E9E9E;
+        }
 </style>
\ No newline at end of file
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue
index 569759eb..3a374f1d 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue
@@ -50,7 +50,7 @@
                               <span class="info-label">
                                   <i class="fas fa-tag"></i> 品牌型号
                               </span>
-                              <span class="info-value">{{details.manufacture || '暂无'}}</span>
+                              <span class="info-value">{{details.brand || '暂无'}}</span>
                           </div>
                       </div>
 
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue
index 7629b350..09459e74 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue
@@ -25,17 +25,17 @@
               </el-form-item>
             </el-form>
 
-            <!-- <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+            <el-row :gutter="10" class="mb8">
+              <!-- <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:files:add']">新增</el-button>
-              </el-col>
+              </el-col> -->
               <el-col :span="1.5">
                 <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['device:files:remove']">删除</el-button>
               </el-col>
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['device:files:import']">导入</el-button>
-              </el-col>
-            </el-row> -->
+              </el-col> -->
+            </el-row>
 
             <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
@@ -71,6 +71,7 @@
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button size="mini" v-if="scope.row.status == 'UNHANDLED'" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['device:files:edit']">去处理</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['device:files:remove']">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>