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 @@
带外IP
- 带内IP
+
{{cardData.ip || '暂无'}}
@@ -61,18 +61,22 @@
-
{{getPercentage(cardData.health)||0}}%
+
+
+ {{ cardData.health == 1?'健康':cardData.health == 2?'良好':cardData.health == 3?'一般':cardData.health == 4?'需维护':'未知' }}
+
+
健康度
-
+
{{cardData.unhandledAlertCount||0}}
待处理预警数
-
{{cardData.handledAlertCount||0}}
+
{{cardData.alertCount||0}}
预警总数
@@ -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;
+ }
\ 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 @@
品牌型号
- {{details.manufacture || '暂无'}}
+ {{details.brand || '暂无'}}
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 @@
-
删除
-
+
+ -->
+
@@ -71,6 +71,7 @@
去处理
+ 删除