From 0641fd164c3f4b2eddf4db418950f2251b2005a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= Date: Thu, 2 Apr 2020 14:33:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20module=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0snmp=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/header.vue | 1 + .../src/components/common/js/validate.js | 16 +- .../components/common/rightBox/moduleBox.vue | 201 +++++++++++------- .../src/components/page/project/project.vue | 24 ++- 4 files changed, 157 insertions(+), 85 deletions(-) diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 1f66941da..67ede98c7 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -294,6 +294,7 @@ param: '', type: '', paramObj: [], + snmpParam: '', //snmp setting 下划线命名是因为业务需求 walk: [], walkStr: '', //转为string的walk,用于回显 diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index 96dfe7ce1..528da85a4 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -32,7 +32,7 @@ export function port(rule, value, callback) { setTimeout(() => { if (!value) { callback(); - } else if(Number(value) == 'NaN'){ + } else if(isNaN(Number(value))){ callback(new Error(vm.$t('validate.number'))) }else{ if(value < 1 ||value > 65535){ @@ -44,6 +44,18 @@ export function port(rule, value, callback) { }, 100) } +export function nzNumber(rule, value, callback) { + setTimeout(() => { + if (!value) { + callback(); + } else if(isNaN(Number(value))){ + callback(new Error(vm.$t('validate.number'))) + }else{ + callback(); + } + }, 100) +} + export function noSpecialChar(rule, value, callback){ const charReg = /\w+/; setTimeout(() => { @@ -57,7 +69,7 @@ export function noSpecialChar(rule, value, callback){ export function positiveInteger(rule, value, callback){ setTimeout(() => { - if(Number(value) == 'NaN'){ + if(isNaN(Number(value))){ callback(new Error(vm.$t('validate.number'))) }else{ if(Number(value) >=0 ){ diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 570a1ad34..ed8fd9563 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -3,11 +3,11 @@
- - @@ -20,28 +20,37 @@ - + - + -
{{module.project.name}}
+
{{currentModule.project.name}}
- -
{{module.name}}
+ +
{{currentModule.name}}
- - + + +
+
+
HTTP
+
+
+
SNMP
+
+
-