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:
wangwenrui
2020-11-03 17:09:31 +08:00
parent f5004289bd
commit 9d35c9caa2
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/charts/chart-detail.vue
View File

@@ -56,6 +56,11 @@
</template>
<template v-else>&nbsp;</template>
</div>
<template v-else-if="key == 'cabinet'">
<span v-if="value&&item.data.cabinetStart&&item.data.cabinetEnd">{{value + '['+item.data.cabinetStart+'-'+item.data.cabinetEnd+']'}}</span>
<span v-else-if="value&&!(item.data.cabinetStart||item.data.cabinetEnd)">{{value}}</span>
<span v-else></span>
</template>
<template v-else-if="key == 'pingRtt'">
<div class="active-icon" :class="{'green': item.data.pingStatus == 1, 'red': item.data.pingStatus == 1 != 1}"></div>
<span>{{value ? value + 'ms' : ''}}</span>

31
nezha-fronted/src/components/common/leftMenu.vue
View File

@@ -52,9 +52,7 @@
</el-popover>
<span v-else>{{item.name}}</span>
</div>
<el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip>
<el-badge class="mark" :value="item.total" />
</el-checkbox>
</el-checkbox-group>
</el-collapse-item>
@@ -67,9 +65,7 @@
</el-popover>
<span v-else>{{item.name}}</span>
</div>
<el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip>
<el-badge class="mark" :value="item.total" />
</el-checkbox>
</el-checkbox-group>
</el-collapse-item>
@@ -82,9 +78,7 @@
</el-popover>
<span v-else>{{item.name}}</span>
</div>
<el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip>
<el-badge class="mark" :value="item.total" />
</el-checkbox>
</el-checkbox-group>
</el-collapse-item>
@@ -94,9 +88,7 @@
<div class="sidebar-info-item-txt">
<span>{{item.label}}</span>
</div>
<el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total < 99">
<el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip>
<el-badge class="mark" :value="item.total" />
</el-checkbox>
</el-checkbox-group>
</el-collapse-item>
@@ -115,9 +107,7 @@
</el-popover>
<span v-else>{{tag.value}}</span>
</div>
<el-tooltip :content="''+tag.total" placement="top" effect="light" :disabled="tag.total<99">
<el-badge class="mark" :value="tag.total" :max="99"/>
</el-tooltip>
</el-checkbox>
</el-checkbox-group>
</el-collapse-item>
@@ -515,11 +505,16 @@
// vendor
this.vendorData = response.data.vendor;
// ping
this.pingData = response.data.ping.map(item => {
item.label = item.name;
item.value = item.status;
this.pingData=[{label:'up',value:1,total:0},{label:'down',value:0,total:0}]
this.pingData.map(item=>{
if(response.data.ping){
let data=response.data.ping.find(t=>t.name == item.label);
item.total = data.total;
item.value = data.status
}
return item;
});
})
this.tagData = response.data.tag

2
nezha-fronted/src/components/common/rightBox/assetBox.vue
View File

@@ -574,6 +574,8 @@
}
if(this.locationInfo.cabinet) {
this.editAsset.cabinetId = this.locationInfo.cabinet.id;
}else{
this.editAsset.cabinetId = null;
}
if(this.locationInfo.u && this.locationInfo.u.length > 0) {
this.editAsset.cabinetStart = this.locationInfo.u[0];

5
nezha-fronted/src/components/common/searchInput.vue
View File

@@ -193,7 +193,6 @@
input_sreach: '',
sreach_num: 0,
searchLabelList: [ //下拉列表里的选项
{id: 0, name: this.$t('search.searchTip'), icon: 'nz-icon nz-icon-search'},
],
bool: false,
no_condition: '',
@@ -916,7 +915,7 @@
this.no_condition = ''
this.input_sreach = ''
this.select_list = []
this.searchLabelList = [{id: 0, name: 'Press Enter or click to search', icon: 'nz-icon nz-icon-search'},]
this.searchLabelList = []
JSON.parse(JSON.stringify(this.searchMsg.searchLabelList)).forEach(val => {
this.searchLabelList.push(val)
})
@@ -969,7 +968,7 @@
}*/
this.searchMsg.searchLabelList.forEach((val, key) => {
if (this.select_list[ind].id == val.id) {
this.searchLabelList.splice(key , 1, val);
this.searchLabelList.splice(key+1 , 0, val);
this.Iskeywords(ind)
}
});

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

@@ -288,6 +288,12 @@
type: 'select',
label: 'pingStatus',
disabled: false
},{
id: 23,
name: this.$t("asset.tableTitle.cabinet"),
type: 'input',
label: 'cabinetName',
disabled: false
}],
},