diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue index 254f20ff9..c5ed5d98c 100644 --- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue +++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue @@ -196,7 +196,7 @@ export default { if (item.inputWidth !== oldInputWidth) { this.$refs[`${type}_${item.id}_cascader`][0].$el.querySelector('.el-input__inner').style.width = `${item.inputWidth}px` this.$nextTick(() => { - this.needMore(type, item) + this.needMore(type, item, true) }) } @@ -268,7 +268,7 @@ export default { casFocus (item, isFocus, e) { this.$set(item, 'isFocus', isFocus) }, - needMore (type, item) { + needMore (type, item, expand) { const contentWidth = this.$refs.searchContentBox[0].offsetWidth - 210 // 窗口尺寸没改变,则只重排当前type if (type && contentWidth === this.contentWidth) { @@ -280,11 +280,12 @@ export default { if (this.titleSearchListCopy[type].width > this.contentWidth) { showMore = true this.titleSearchListCopy[type].index = i + expand && (this.titleSearchListCopy[type].showMore = true) } } }) if (!showMore) { - this.titleSearchListCopy[type].index = this.titleSearchListCopy[type].children.length - 1 + this.titleSearchListCopy[type].index = this.titleSearchListCopy[type].children.length } } else { // 全体重排 this.contentWidth = contentWidth @@ -315,9 +316,10 @@ export default { width = html.offsetWidth return width }, - changShowMore (key) { - this.titleSearchListCopy[key].showMore = !this.titleSearchListCopy[key].showMore - } + changShowMore (type) { + this.titleSearchListCopy[type].showMore = !this.titleSearchListCopy[type].showMore + }, + }, destroyed () { window.removeEventListener('resize', this.needMore) diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 9d2d627ff..f48394d00 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -84,10 +84,10 @@ export default { rules: { name: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], - state: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] + // state: [ + // { required: true, message: this.$t('validate.required'), trigger: 'blur' } + // ] }, areaData: [], coordinateFlag: false @@ -118,6 +118,7 @@ export default { if (this.editDc.id) { const param = { ...this.editDc } const attr = this.$refs.latlngPicker.getAttribute() + console.log(attr) param.latitude = attr.latitude param.longitude = attr.longitude this.$put('/dc', param).then(response => { @@ -134,6 +135,9 @@ export default { if (param.area) { param.areaId = param.area.id } + const attr = this.$refs.latlngPicker.getAttribute() + param.latitude = attr.latitude + param.longitude = attr.longitude if (!regNum.test(param.longitude)) { param.longitude = null }