diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue index 4331c2aab..b341ce6fb 100644 --- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue +++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingBox.vue @@ -270,12 +270,22 @@ auth:configs[0].auth, configs:[], } + if(settingItem.version == 2){ + settingItem.auth={ + username:'', + securityLevel:'', + securityLevel:'', + authProtocol:'', + privProtocol:'', + privPassword:'', + } + } configs.forEach(item=>{ let config={ direction:item.direction&&item.direction!=''?item.direction.split(','):[], ifindex:item.ifindex+'', ifdescr:item.ifdescr, - tags:item.tags, + tags:item.tags&&item.tags!=''?item.tags:{}, edit:false, } settingItem.configs.push(config); diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue index 09a972c1e..ea3343b2e 100644 --- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue +++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue @@ -34,7 +34,7 @@
{{$t('project.module.version')}}
- + @@ -163,12 +163,14 @@ -->
-
-
{{key}}
-
{{value}}
-
+
-
+
{{Object.keys(scope.row[item.prop])[0]}}
{{scope.row[item.prop][Object.keys(scope.row[item.prop])[0]]}}
+{{Object.keys(scope.row[item.prop]).length-1}}
@@ -419,7 +421,8 @@ }, popHide() { - + console.log(this.assetSetting) + this.queryInterfaceInfos(true); }, showInput:function(){ this.showTagInput=true; diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 45314c6ae..b0f25777c 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -497,6 +497,7 @@ }else{ step='30m'; } + this.$refs.messageChart.startLoading(); let axiosArr=[]; let paramStr = JSON.stringify(this.promQueryParamConvert(this.currentMsg)); axiosArr.push(axios.get("/prom/api/v1/query_range?query="+paramStr.substring(1, paramStr.length-1).replace(/\+/g, "%2B").replace(/ /g, "%20").replace(/\\/g, "")+"&start="+this.$stringTimeParseToUnix(start)+"&end="+this.$stringTimeParseToUnix(end)+"&step="+step)); @@ -560,7 +561,6 @@ this.graphShow = true; this.currentMsg = obj; this.$nextTick(() => { - this.$refs.messageChart.startLoading(); this.queryChartDate(); }); }, diff --git a/nezha-fronted/src/components/page/asset/accountConfig.vue b/nezha-fronted/src/components/page/asset/accountConfig.vue index df888dcb3..50ea37f63 100644 --- a/nezha-fronted/src/components/page/asset/accountConfig.vue +++ b/nezha-fronted/src/components/page/asset/accountConfig.vue @@ -50,7 +50,7 @@
-
login option
+
login option
@@ -204,15 +204,15 @@ export default { position: relative; } .telnet-option_title .telnet-option_spilt{ - display: inline-block; - width: 79.9%; + width: calc(100% - 125px); height: 1px; background-color: lightgrey; - vertical-align: middle; + margin:auto 0; + /*margin-bottom: 18px;*/ } .telnet-option .telnet-option_title{ - display: inline-block; + display: flex; vertical-align: middle; margin-bottom: 18px; width: 100%;