gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改中文以及调用接口

Browse Source
This commit is contained in:
zhangyu
2020-07-28 14:26:51 +08:00
parent f1e7478557
commit e1e609dc5b
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -20,37 +20,41 @@
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Ping</div> <div class="alertLabelTitle">Ping</div>
<div class="alertLabelValue"> <div class="alertLabelValue">
<div v-if="alertLabelData" :class="{'active-icon green':alertLabelData.pingState == 1,'active-icon red':alertLabelData.pingState == 0}"></div> <div v-if="alertLabelData" :class="{'active-icon green':alertLabelData.pingStatus == 1,'active-icon red':alertLabelData.pingStatus == 0}"></div>
<span v-if="alertLabelData">{{alertLabelData.pingRtt?alertLabelData.pingRtt+'ms':''}}</span> <span v-if="alertLabelData">{{alertLabelData.pingRtt?alertLabelData.pingRtt+'ms':''}}</span>
</div> </div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Type</div> <div class="alertLabelTitle">Asset Type</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.model.type.value:''}}</div> <div class="alertLabelValue">{{alertLabelData?alertLabelData.assetType:''}}</div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Vendor</div> <div class="alertLabelTitle">Vendor</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.model.vendor.name:''}}</div> <div class="alertLabelValue">{{alertLabelData?alertLabelData.vendor:''}}</div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Model</div> <div class="alertLabelTitle">Model</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.model.name:''}}</div> <div class="alertLabelValue">{{alertLabelData?alertLabelData.model:''}}</div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">PurchaseDate</div> <div class="alertLabelTitle">PingLastReply</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.createAt:''}}</div> <div class="alertLabelValue">{{alertLabelData?alertLabelData.pingLastReply:''}}</div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Alert</div> <div class="alertLabelTitle">Alert</div>
<div class="alertLabelValue"><sapn v-if="alertLabelData" :class="{danger:alertLabelData.alertNum>0,success:alertLabelData.alertNum<=0}">{{alertLabelData.alertNum + alertActiveStr()}}</sapn></div> <div class="alertLabelValue"><sapn v-if="alertLabelData" :class="{danger:alertLabelData.alert>0,success:alertLabelData.alert<=0}">{{alertLabelData.alert + alertActiveStr()}}</sapn></div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Dc</div> <div class="alertLabelTitle">DC</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.idc.name:''}}</div> <div class="alertLabelValue">{{alertLabelData?alertLabelData.dataCenter:''}}</div>
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Endpoint</div> <div class="alertLabelTitle">Endpoint</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.endpointNum:''}}</div> <div class="alertLabelValue">{{alertLabelData?alertLabelData.endpoint:''}}</div>
</div>
<div class="alertLabelBox">
<div class="alertLabelTitle">Administrator</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.principal:''}}</div>
</div> </div>
</div> </div>
@@ -105,20 +109,20 @@
watch:{ watch:{
labelLoading(){ labelLoading(){
if(this.type==='asset'){ 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'){ if(res.msg==='success'){
this.loading=false; this.loading=false;
this.alertLabelData=res.data.list[0]; this.alertLabelData=res.data.Basic;
} else{ } else{
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}) })
} }
if(this.type==='project'){ 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'){ if(res.msg==='success'){
this.loading=false; this.loading=false;
this.alertLabelData=res.data.list[0]; this.alertLabelData=res.data.basic;
} else{ } else{
this.$message.error(res.msg); this.$message.error(res.msg);
} }
@@ -156,7 +160,7 @@
} else { } else {
return vm.$t('asset.notInStock') return vm.$t('asset.notInStock')
} }
} },
}, },
mounted(){ mounted(){
// console.log(vm.$t('overall.exportAll')); // console.log(vm.$t('overall.exportAll'));

1
nezha-fronted/src/components/common/language/cn.js
View File

@@ -371,6 +371,7 @@ const cn = {
asset: { asset: {
asset: "资产", asset: "资产",
EditAsset: "编辑资产", EditAsset: "编辑资产",
assetType:'资产类型',//'资产类型'
createAssetTab: { createAssetTab: {
title: "新增资产", title: "新增资产",
sn: "SN", sn: "SN",

2
nezha-fronted/src/components/page/alert/list.vue
View File

@@ -2,7 +2,7 @@
.list { .list {
height: 100%; height: 100%;
} }
.too-long-split{ /deep/ .too-long-split{
cursor: pointer; cursor: pointer;
vertical-align: bottom; vertical-align: bottom;
} }

1
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -891,6 +891,7 @@
/*Promise.all([this.getVendorData(), this.getAssetTypeData(), this.getUserData(), this.getDcData()]).then(response => { /*Promise.all([this.getVendorData(), this.getAssetTypeData(), this.getUserData(), this.getDcData()]).then(response => {
this.getTableData(); this.getTableData();
});*/ });*/
this.getUserData();
this.getLeftMenuList().then(() => { this.getLeftMenuList().then(() => {
this.getTableData(); this.getTableData();
}); });