diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index a0f00cef5..5b0996148 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -287,9 +287,11 @@ if (response.code === 200) { for (let i = 0; i < response.data.list.length; i++) { try { - let tempObj = JSON.parse(response.data.list[i].param); + let param=response.data.list[i].param|| '{}'; + let tempObj = JSON.parse(param); response.data.list[i].paramObj = []; - let tempObj1 = JSON.parse(response.data.list[i].labels); + let labels=response.data.list[i].labels|| '{}'; + let tempObj1=JSON.parse(labels); response.data.list[i].labelModule = []; for (let k in tempObj) { response.data.list[i].paramObj.push({key: k, value: tempObj[k]}) diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 373d53506..24c1a406a 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -92,7 +92,7 @@ export const asset = { stateData: [ {value: 1, label: i18n.t('asset.inStock')}, {value: 2, label: i18n.t('asset.notInStock')}, - {value: 3, label: i18n.t('asset.Suspended')}, + {value: 3, label: i18n.t('asset.suspended')}, ], }; @@ -137,3 +137,9 @@ export const intervalList = [ {value: 900, label: '15m'}, {value: 1800, label: '30m'} ]; + +export const setting = { + DcState:[ + {value:1,label: i18n.t('setting.usable')} + ] +}; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 9b278cc70..368b53b78 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -535,7 +535,7 @@ const cn = { uSize: "U位", inStock: "在库", notInStock: "出库", - Suspended:'停用', + suspended:'停用', principal: "负责人", tel: "电话", featureTitle: "属性", @@ -623,7 +623,9 @@ const cn = { }, createDc: "新建数据中心", editDc: "编辑数据中心", - editCabinet: "编辑机柜" + editCabinet: "编辑机柜", + usable:'可用', + suspended:'停用', }, model: { model: "资产型号", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 8ea68b760..83c491349 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -441,7 +441,7 @@ const en = { uSize: 'U size', inStock: 'In stock',//'在库' notInStock: 'Not in stock',//'出库' - Suspended:'Suspended', + suspended:'Suspended', assetType:'Asset type',//'资产类型' principal:'Administrator',//'负责人' tel:'Telephone', //'电话' @@ -599,7 +599,9 @@ const en = { direction:'Direction', tags:'Tags', snmpSetting:'SNMP setting', - } + }, + usable:'Usable', + suspended:'Suspended', }, model: { model: 'Asset model', diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue index 053668448..513d0cd3f 100644 --- a/nezha-fronted/src/components/common/leftMenu.vue +++ b/nezha-fronted/src/components/common/leftMenu.vue @@ -303,8 +303,10 @@ this.moduleList = response.data.list; for (let i = 0; i < this.moduleList.length; i++) { try { - let tempObj = JSON.parse(this.moduleList[i].param); - let tempObj1 = JSON.parse(this.moduleList[i].labels); + let param=this.moduleList[i].param|| '{}'; + let tempObj = JSON.parse(param); + let labels=this.moduleList[i].labels|| '{}'; + let tempObj1=JSON.parse(labels); this.$set(this.moduleList[i], 'paramObj', []); this.$set(this.moduleList[i], 'labelModule', []); for (let k in tempObj) { diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index bdf32973b..ce4a2fafa 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -272,8 +272,9 @@
-
- +
+ + {{$t('validate.key')}} = @@ -312,6 +313,7 @@ currentProjectCopy: {id: ''}, tempParamObj: [], tempLabelModule: [], + inputKeyErr:[], tempEndpoint: {}, tempEndpoint2: {}, rightBox: {show: false, title: this.$t('project.endpoint.createEndpoint'),isEdit: false}, @@ -409,8 +411,8 @@ //子弹框控制 obj: module或endpoint对象 type:1module2endpoint showEditLabelsBox(show, obj, type, e) { //editLabelsBox tempLabelModule labelModule - console.log(123123123123,show, obj, type, e,this.tempLabelModule); if (show) { + this.inputKeyErr=[]; let position = e.target.getBoundingClientRect(); this.editLabelsBox.type = type; if (this.editLabelsBox.type == 2) { @@ -424,12 +426,15 @@ } else { this.tempLabelModule = JSON.parse(JSON.stringify(obj.labelModule)); } + this.tempLabelModule.forEach((item,index)=>{ + this.inputKeyErr.push(false); + }) } else { if (!this.editLabelsBox.show) { return; } for (let i = 0; i < this.tempLabelModule.length; i++) { - if (!this.tempLabelModule[i].key || !this.tempLabelModule[i].value) { + if (!this.tempLabelModule[i].key || !this.tempLabelModule[i].value || this.inputKeyErr[i]) { this.tempLabelModule.splice(i, 1); i--; } @@ -471,11 +476,20 @@ // 新增labels addLabels() { this.tempLabelModule.push({key: '', value: ''}); + this.inputKeyErr.push(false); }, // 移除单个param removeLabels(index) { this.tempLabelModule.splice(index, 1); + this.inputKeyErr.splice(index, 1); + }, + validateInput:function(value,index){ + if(!/[a-zA-Z_:][a-zA-Z0-9_:]*/.test(value)){ + this.inputKeyErr.splice(index,1,true) + }else{ + this.inputKeyErr.splice(index,1,false) + } }, //编辑endpoint toEditEndpoint(endpoint) { @@ -687,8 +701,10 @@ if (response.code === 200) { for (let i = 0; i < response.data.list.length; i++) { try { - let tempObj = JSON.parse(response.data.list[i].param); - let tempObj1 = JSON.parse(response.data.list[i].labels); + let param=response.data.list[i].param|| '{}'; + let tempObj = JSON.parse(param); + let labels=response.data.list[i].labels|| '{}'; + let tempObj1=JSON.parse(labels); response.data.list[i].paramObj = []; response.data.list[i].labelsModule = []; for (let k in tempObj) { @@ -1150,4 +1166,8 @@ .endpoints-box-endpoints .el-form-item.is-error { margin-bottom: 22px; } + .input-error .el-input__inner,.input-error .el-input__inner:hover,.input-error .el-input__inner:focus, + .input-error .input__inner,.input-error .input__inner:hover,.input-error .input__inner:focus { + border-color: #F56C6C !important; + } diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue index 9ed548a47..05a002c46 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue @@ -100,7 +100,7 @@
- + = diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 3cec6f3db..f8be462b0 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -283,7 +283,7 @@
- + = diff --git a/nezha-fronted/src/components/common/searchSelectInfo.vue b/nezha-fronted/src/components/common/searchSelectInfo.vue index f03597287..e605be981 100644 --- a/nezha-fronted/src/components/common/searchSelectInfo.vue +++ b/nezha-fronted/src/components/common/searchSelectInfo.vue @@ -48,7 +48,7 @@ label: i18n.t('asset.notInStock') }, { value: 3, - label: i18n.t('asset.Suspended') + label: i18n.t('asset.suspended') } ], pingStatus:[ diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index a5d7892f2..13a57d3c6 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -87,7 +87,7 @@
{{ $t('asset.inStock')}} {{ $t('asset.notInStock')}} - {{ $t('asset.Suspended')}} + {{ $t('asset.suspended')}}