diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index ac0ab7a2c..51c95585a 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -20,37 +20,41 @@
Ping
-
+
{{alertLabelData.pingRtt?alertLabelData.pingRtt+'ms':''}}
-
Type
-
{{alertLabelData?alertLabelData.model.type.value:''}}
+
Asset Type
+
{{alertLabelData?alertLabelData.assetType:''}}
Vendor
-
{{alertLabelData?alertLabelData.model.vendor.name:''}}
+
{{alertLabelData?alertLabelData.vendor:''}}
Model
-
{{alertLabelData?alertLabelData.model.name:''}}
+
{{alertLabelData?alertLabelData.model:''}}
-
PurchaseDate
-
{{alertLabelData?alertLabelData.createAt:''}}
+
PingLastReply
+
{{alertLabelData?alertLabelData.pingLastReply:''}}
Alert
-
{{alertLabelData.alertNum + alertActiveStr()}}
+
{{alertLabelData.alert + alertActiveStr()}}
-
Dc
-
{{alertLabelData?alertLabelData.idc.name:''}}
+
DC
+
{{alertLabelData?alertLabelData.dataCenter:''}}
Endpoint
-
{{alertLabelData?alertLabelData.endpointNum:''}}
+
{{alertLabelData?alertLabelData.endpoint:''}}
+
+
+
Administrator
+
{{alertLabelData?alertLabelData.principal:''}}
@@ -105,20 +109,20 @@ watch:{ labelLoading(){ if(this.type==='asset'){ - this.$get('/asset?id='+this.id).then((res)=>{ + this.$get('/asset/info?id='+this.id).then((res)=>{ if(res.msg==='success'){ this.loading=false; - this.alertLabelData=res.data.list[0]; + this.alertLabelData=res.data.Basic; } else{ this.$message.error(res.msg); } }) } if(this.type==='project'){ - this.$get('/project?id='+this.id).then((res)=>{ + this.$get('/project/info?id='+this.id).then((res)=>{ if(res.msg==='success'){ this.loading=false; - this.alertLabelData=res.data.list[0]; + this.alertLabelData=res.data.basic; } else{ this.$message.error(res.msg); } @@ -156,7 +160,7 @@ } else { return vm.$t('asset.notInStock') } - } + }, }, mounted(){ // console.log(vm.$t('overall.exportAll')); diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 92937b286..ff8f31e1b 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -371,6 +371,7 @@ const cn = { asset: { asset: "资产", EditAsset: "编辑资产", + assetType:'资产类型',//'资产类型' createAssetTab: { title: "新增资产", sn: "SN", diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 49e863207..041ca4750 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -2,7 +2,7 @@ .list { height: 100%; } - .too-long-split{ + /deep/ .too-long-split{ cursor: pointer; vertical-align: bottom; } diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index c58433ed7..9015f624f 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -891,6 +891,7 @@ /*Promise.all([this.getVendorData(), this.getAssetTypeData(), this.getUserData(), this.getDcData()]).then(response => { this.getTableData(); });*/ + this.getUserData(); this.getLeftMenuList().then(() => { this.getTableData(); });