diff --git a/nezha-fronted/src/components/common/alert/alertLabel2.vue b/nezha-fronted/src/components/common/alert/alertLabel2.vue index 698e36f56..90606d1de 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel2.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel2.vue @@ -3,42 +3,42 @@
ID
-
{{alertLabelData?alertLabelData.id:''}}
+
{{alertLabelData?alertLabelData.id:'--'}}
SN
-
{{alertLabelData?alertLabelData.sn:''}}
+
{{alertLabelData?alertLabelData.sn:'--'}}
Host
-
{{alertLabelData?alertLabelData.host:''}}
+
{{alertLabelData?alertLabelData.host:'--'}}
State
-
{{alertLabelData?(alertStateStr(alertLabelData.state)):''}}
+
{{alertLabelData?(alertStateStr(alertLabelData.state)):'--'}}
Ping
- {{alertLabelData.pingRtt?alertLabelData.pingRtt+'ms':''}} + {{alertLabelData.pingRtt?alertLabelData.pingRtt+'ms':'--'}}
Asset Type
-
{{alertLabelData?alertLabelData.assetType:''}}
+
{{alertLabelData?alertLabelData.assetType:'--'}}
Vendor
-
{{alertLabelData?alertLabelData.vendor:''}}
+
{{alertLabelData?alertLabelData.vendor:'--'}}
Model
-
{{alertLabelData?alertLabelData.model:''}}
+
{{alertLabelData?alertLabelData.model:'--'}}
PingLastReply
-
{{alertLabelData?alertLabelData.pingLastReply:''}}
+
{{(alertLabelData&&alertLabelData.pingLastReply)?alertLabelData.pingLastReply:'--'}}
Alert
@@ -48,80 +48,80 @@
DC
-
{{alertLabelData?alertLabelData.dataCenter:''}}
+
{{alertLabelData?alertLabelData.dataCenter:'--'}}
Endpoint
-
{{alertLabelData?alertLabelData.endpoint:''}}
+
{{alertLabelData?alertLabelData.endpoint:'--'}}
Administrator
-
{{alertLabelData?alertLabelData.principal:''}}
+
{{alertLabelData?alertLabelData.principal:'--'}}
ID
-
{{alertLabelData?alertLabelData.id:''}}
+
{{alertLabelData?alertLabelData.id:'--'}}
Name
-
{{alertLabelData?alertLabelData.name:''}}
+
{{alertLabelData?alertLabelData.name:'--'}}
Project
-
{{alertLabelData?alertLabelData.project.name:''}}
+
{{alertLabelData?alertLabelData.project.name:'--'}}
Description
-
{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}
+
{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):'--'}}
ID
-
{{alertLabelData?alertLabelData.id:''}}
+
{{alertLabelData?alertLabelData.id:'--'}}
Name
-
{{alertLabelData?alertLabelData.name:''}}
+
{{alertLabelData?alertLabelData.name:'--'}}
Description
-
{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}
+
{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):'--'}}
ID
-
{{alertLabelData?alertLabelData.id:''}}
+
{{alertLabelData?alertLabelData.id:'--'}}
Project
-
{{alertLabelData?alertLabelData.project.name:''}}
+
{{alertLabelData?alertLabelData.project.name:'--'}}
Module
-
{{alertLabelData?alertLabelData.module.name:''}}
+
{{alertLabelData?alertLabelData.module.name:'--'}}
Labels
-
{{alertLabelData?alertLabelData.labels:''}}
+
{{alertLabelData?alertLabelData.labels:'--'}}
Host
-
{{alertLabelData?alertLabelData.host:''}}
+
{{alertLabelData?alertLabelData.host:'--'}}
Port
-
{{alertLabelData?alertLabelData.port:''}}
+
{{alertLabelData?alertLabelData.port:'--'}}
Path
-
{{alertLabelData?alertLabelData.path:''}}
+
{{alertLabelData?alertLabelData.path:'--'}}
@@ -173,6 +173,13 @@ // } // } // } + id:{ + immediate: true, + deep:true, + handler(n){ + this.init() + } + }, that:{ immediate: true, deep:true, @@ -231,6 +238,49 @@ } }, methods:{ + init(){ + this.loading=true; + if(this.type==='asset'){ + this.$get('/asset/info?id='+this.id).then((res)=>{ + if(res.msg==='success'){ + this.loading=false; + this.alertLabelData=res.data.Basic; + } else{ + this.$message.error(res.msg); + } + }) + } + if(this.type==='project'){ + this.$get('/project?id='+this.id).then((res)=>{ + if(res.msg==='success'){ + this.loading=false; + this.alertLabelData=res.data.list[0]; + } else{ + this.$message.error(res.msg); + } + }) + } + if(this.type==='module'){ + this.$get('/module?id='+this.id).then((res)=>{ + if(res.msg==='success'){ + this.loading=false; + this.alertLabelData=res.data.list[0]; + } else{ + this.$message.error(res.msg); + } + }) + } + if(this.type==='endpoint'){ + this.$get('/endpoint?id='+this.id).then((res)=>{ + if(res.msg==='success'){ + this.loading=false; + this.alertLabelData=res.data.list[0]; + } else{ + this.$message.error(res.msg); + } + }) + } + }, alertActiveStr(){ return this.$t('overall.active'); }, @@ -243,46 +293,7 @@ }, }, mounted(){ - if(this.type==='asset'){ - this.$get('/asset/info?id='+this.id).then((res)=>{ - if(res.msg==='success'){ - this.loading=false; - this.alertLabelData=res.data.Basic; - } else{ - this.$message.error(res.msg); - } - }) - } - if(this.type==='project'){ - this.$get('/project?id='+this.id).then((res)=>{ - if(res.msg==='success'){ - this.loading=false; - this.alertLabelData=res.data.list[0]; - } else{ - this.$message.error(res.msg); - } - }) - } - if(this.type==='module'){ - this.$get('/module?id='+this.id).then((res)=>{ - if(res.msg==='success'){ - this.loading=false; - this.alertLabelData=res.data.list[0]; - } else{ - this.$message.error(res.msg); - } - }) - } - if(this.type==='endpoint'){ - this.$get('/endpoint?id='+this.id).then((res)=>{ - if(res.msg==='success'){ - this.loading=false; - this.alertLabelData=res.data.list[0]; - } else{ - this.$message.error(res.msg); - } - }) - } + }, beforeDestroy(){ diff --git a/nezha-fronted/src/components/common/overView/messageAsset.vue b/nezha-fronted/src/components/common/overView/messageAsset.vue index df2934f1a..9ffbfc4c8 100644 --- a/nezha-fronted/src/components/common/overView/messageAsset.vue +++ b/nezha-fronted/src/components/common/overView/messageAsset.vue @@ -104,6 +104,7 @@ }, boxWidth:'', LRTriangle:true,//true 左三角 false 右 + timer:null, } }, methods:{ @@ -249,9 +250,11 @@ }); }, changeAsset(data,e){ + if(this.timer){ + clearTimeout(this.timer); + } this.assetData.id=data; let boxWidth=document.getElementsByClassName('content-right')[0].offsetWidth; - console.log(boxWidth); this.boxWidth=boxWidth; // this.assetData.rate=window.screen.height/1297; this.$nextTick(()=>{ @@ -285,7 +288,18 @@ } }, closeAsset(){ - this.assetData.show=false + if(!this.timer){ + this.timer=setTimeout(()=>{ + this.assetData.show=false; + this.timer=null; + },100) + }else{ + clearTimeout(this.timer); + this.timer=setTimeout(()=>{ + this.assetData.show=false; + this.timer=null; + },100) + } }, endLoading(){ this.loading=false;