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

perf: endpoint搜索条件的状态增加suspended

Browse Source
This commit is contained in:
陈劲松
2020-11-22 19:24:24 +08:00
committed by chenjinsong
parent d9b19b364f
commit f9e111f49b
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
View File

@@ -273,8 +273,8 @@
id:33, id:33,
name:this.$t('asset.state'), name:this.$t('asset.state'),
// name: this.$t('asset.asset'), // name: this.$t('asset.asset'),
type:'state', type:'select',
label:'state', label:'endpointState',
disabled:false, disabled:false,
readonly:true, readonly:true,
}], }],
@@ -385,7 +385,11 @@
// this.pageObj.pageNo = 1; // this.pageObj.pageNo = 1;
for (let item in searchObj) { for (let item in searchObj) {
if (searchObj[item]) { if (searchObj[item]) {
this.$set(this.endpointSearchLabel, item, searchObj[item]); if (item === "endpointState") {
this.$set(this.endpointSearchLabel, 'state', searchObj[item]);
} else {
this.$set(this.endpointSearchLabel,item,searchObj[item]);
}
} }
} }
if(orderBy){ if(orderBy){

7
nezha-fronted/src/components/common/searchSelectInfo.vue
View File

@@ -53,11 +53,14 @@
], ],
endpointState: [ //资产入库/出库状态 endpointState: [ //资产入库/出库状态
{ {
value: 'UP', value: 1,
label: 'UP' label: 'UP'
}, { }, {
value: 'DOWN', value: 0,
label: 'DOWN' label: 'DOWN'
}, {
value: 2,
label: 'SUSPENDED'
} }
], ],
pingStatus:[ pingStatus:[

8
nezha-fronted/src/components/page/project/project.vue
View File

@@ -373,8 +373,8 @@
id:33, id:33,
name:this.$t('asset.state'), name:this.$t('asset.state'),
// name: this.$t('asset.asset'), // name: this.$t('asset.asset'),
type:'state', type:'select',
label:'state', label:'endpointState',
disabled:false, disabled:false,
readonly:true, readonly:true,
}], }],
@@ -580,9 +580,13 @@
this.endpointPageObj.pageNo=1; this.endpointPageObj.pageNo=1;
for(let item in searchObj){ for(let item in searchObj){
if(searchObj[item]){ if(searchObj[item]){
if (item === "endpointState") {
this.$set(this.endpointSearchLabel, 'state', searchObj[item]);
} else {
this.$set(this.endpointSearchLabel,item,searchObj[item]); this.$set(this.endpointSearchLabel,item,searchObj[item]);
} }
} }
}
if(orderBy){ if(orderBy){
this.$set(this.endpointSearchLabel,'orderBy',orderBy); this.$set(this.endpointSearchLabel,'orderBy',orderBy);
} }