From f9e111f49b5dbcf92a0c04232d660270e708b3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= Date: Sun, 22 Nov 2020 19:24:24 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20endpoint=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0suspended?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/bottomBox/tabs/endpointTab.vue | 10 +++++++--- .../src/components/common/searchSelectInfo.vue | 7 +++++-- nezha-fronted/src/components/page/project/project.vue | 10 +++++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index 63ea1dbd9..f08617f61 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -273,8 +273,8 @@ id:33, name:this.$t('asset.state'), // name: this.$t('asset.asset'), - type:'state', - label:'state', + type:'select', + label:'endpointState', disabled:false, readonly:true, }], @@ -385,7 +385,11 @@ // this.pageObj.pageNo = 1; for (let item in searchObj) { 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){ diff --git a/nezha-fronted/src/components/common/searchSelectInfo.vue b/nezha-fronted/src/components/common/searchSelectInfo.vue index c017bb4d1..ac8bafa31 100644 --- a/nezha-fronted/src/components/common/searchSelectInfo.vue +++ b/nezha-fronted/src/components/common/searchSelectInfo.vue @@ -53,11 +53,14 @@ ], endpointState: [ //资产入库/出库状态 { - value: 'UP', + value: 1, label: 'UP' }, { - value: 'DOWN', + value: 0, label: 'DOWN' + }, { + value: 2, + label: 'SUSPENDED' } ], pingStatus:[ diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 7e80bb6e1..6264c03aa 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -373,8 +373,8 @@ id:33, name:this.$t('asset.state'), // name: this.$t('asset.asset'), - type:'state', - label:'state', + type:'select', + label:'endpointState', disabled:false, readonly:true, }], @@ -580,7 +580,11 @@ this.endpointPageObj.pageNo=1; for(let item in searchObj){ 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){