diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index 2f5bf3bef..bce07a743 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -292,6 +292,7 @@ export const bottomBoxWindow = { }, showSubListWatch(vm, n) { vm.bottomBox.inTransform = n; + console.info(vm.bottomBox.inTransform) if (!n) { vm.mainTableHeight = vm.$tableHeight.normal; //重置table的高度 vm.tools.toTopBtnTop = vm.$tableHeight.toTopBtnTop; diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index a58f1e384..0a2ef079e 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -170,7 +170,7 @@ name: "index", data() { return { - selectDom: {top: '', tempTop: ''}, // 选择弹框的位置 + selectDom: {top: '', tempTop: '', show: true}, // 选择弹框的位置 clearSearchShow: false, select_conditionsName:'', selectInfoList: searchSelectInfo, @@ -265,12 +265,12 @@ listsV.forEach((item, index) => { item.style.display = "none"; }); - if (n) { + /*if (n) { this.selectDom.tempTop = this.selectDom.top; this.selectDom.top = '36px'; } else { this.selectDom.top = this.selectDom.tempTop; - } + }*/ setTimeout(() => { listsK.forEach((item, index) => { item.style.display = ""; @@ -1179,12 +1179,14 @@ getSelectPosition(e) { let inputListDom = this.getDomFromParents(e.target, 'input-center-box', 0); if (inputListDom) { - if (this.inTransform) { - this.selectDom.top = "36px"; - } else { - let position = inputListDom.getBoundingClientRect(); - this.selectDom.top = position.top+36+'px'; - } + this.$nextTick(() => { + if (this.inTransform) { + //this.selectDom.top = "36px"; + } else { + let position = inputListDom.getBoundingClientRect(); + this.selectDom.top = position.top+36+'px'; + } + }); } }, /*递归向上获取指定class的dom*/ @@ -1221,6 +1223,10 @@ }) }, + close_search(e) { + this.selectDom.show = false; + + } }, mounted() { /*this.defaultItem ? this.select_list.push({name:this.defaultItem,label:this.defaultItem}) : ''; @@ -1525,7 +1531,7 @@ box-shadow: 0 2px 4px rgba(0,0,0,0.1); overflow-y: auto; z-index: 9999; - right: 139px; + /*right: 139px;*/ } .select_info_list ul li{ padding: 5px 10px; diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 0659ef029..d13b32580 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -10,7 +10,7 @@