diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index 36dcb3158..f3444177e 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -2,6 +2,9 @@ import vm from '../../../main' import ca from "element-ui/src/locale/lang/ca"; export function host(rule, value, callback) { + if(!value || value ==''){ + callback(); + } const hostReg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])(\:\d{0,5})?$/ console.log(value) setTimeout(() => { diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index f93bed371..98446dfc0 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -104,6 +104,7 @@ size="small" placeholder="" class="right-box-row-with-btn" + @change="modelChange" >
@@ -140,12 +141,12 @@
{{$t('asset.createAssetTab.location')}}
- - + + - + +<!– –> {{ item.name }} - - - +<!–
–> +<!– –> +<!–
–> {{assetViewData.idcName}}
@@ -174,10 +175,10 @@
- + <!–----------------------------------------cabinet--------------------------------------------–> {{assetViewData.cabinetName}} @@ -213,7 +214,7 @@ {{cabinetSelectedData.remark}} - + -->
{{$t('asset.createAssetTab.cli')}} @@ -261,7 +262,6 @@ }, data() { return { - temp:3, visible: '', vendorModelData: '', assetData: { @@ -291,6 +291,9 @@ }], exporter: 0 }, + modelSize:1, + initLocationData:null, + locationInfo:null, accountSwitch:false,//true 开启,false 关闭 accountData: '', assetViewData: { @@ -525,6 +528,11 @@ }else{ this.changeProtocolSwitch=true; } + }, + locationInfo:{ + deep:true, + handler(n,o){ + } } }, methods: { @@ -567,6 +575,16 @@ } } }, + setLocationData:function(data){ + this.locationInfo=data; + }, + modelChange:function(ids){ + let modelId=ids[1]; + let model=this.allModelUlData.find((item,index)=>{ + return modelId==item.id; + }) + this.modelSize=model.usize; + }, getAssetData(data) { if (data) { this.pageObj.id = data; @@ -576,8 +594,15 @@ this.assetViewData.assetType = response.data.list[0].model.type.value this.assetViewData.vendor = response.data.list[0].model.vendor.value this.assetViewData.model = response.data.list[0].model.name + this.modelSize=response.data.list[0].model.usize; this.assetViewData.idcName = response.data.list[0].idc.name this.assetViewData.cabinetName = response.data.list[0].cabinet == null ? '' : response.data.list[0].cabinet.name + let initLocationData={ + idc:response.data.list[0].idc, + cabinet:response.data.list[0].cabinet, + u:[response.data.list[0].cabinetStart,response.data.list[0].cabinetEnd] + } + this.$refs.locationCascader.initComponet(initLocationData) this.assetViewData.moduleNum = response.data.list[0].moduleNum this.assetViewData.alertNum = response.data.list[0].alertNum this.assetViewData.cabinetName = response.data.list[0].cabinet == null ? '' : response.data.list[0].cabinet.name @@ -766,6 +791,10 @@ if (this.assetData.modelId) { this.assetData.modelId = this.assetData.modelId.join(',').split(',')[1]; } + this.assetData.idcId=this.locationInfo.idc.id; + this.assetData.cabinetId=this.locationInfo.cabinet.id; + this.assetData.cabinetStart=this.locationInfo.u[0]; + this.assetData.cabinetEnd=this.locationInfo.u[1]; // let modelId = this.assetData.modelId.join(',').split(',')[1]; // let form = new FormData(); // form.append("id", this.pageObj.id); diff --git a/nezha-fronted/src/components/common/rightBox/locationCascader.vue b/nezha-fronted/src/components/common/rightBox/locationCascader.vue index 9fa3e82d4..9787d8f14 100644 --- a/nezha-fronted/src/components/common/rightBox/locationCascader.vue +++ b/nezha-fronted/src/components/common/rightBox/locationCascader.vue @@ -1,33 +1,39 @@