diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue index 67752838..32a4d59e 100644 --- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue +++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue @@ -374,13 +374,19 @@ export default { gotoDetail(row) { if (row.postStatus == '0') { - this.detail = row; - this.showList = false; - this.showAdd = true; + this.$nextTick(() => { + this.showSet = false; + this.showList = false; + this.showDetail = true; + }) } else { this.detail = row; - this.showList = false; - this.showDetail = true; + + this.$nextTick(() => { + this.showSet = false; + this.showList = false; + this.showDetail = true; + }) } // this.detail = row; // this.showList = false; diff --git a/packages/monitor/components/deviceSlider.vue b/packages/monitor/components/deviceSlider.vue index 82ee2fe8..d7a5754b 100644 --- a/packages/monitor/components/deviceSlider.vue +++ b/packages/monitor/components/deviceSlider.vue @@ -10,7 +10,7 @@
- + @@ -76,7 +76,10 @@ export default { list: [], noArea: [], staData: [], - search: {} + name: '', + search: { + bind: '' + } } }, methods: { @@ -99,12 +102,18 @@ export default { this.$emit('select', data) }, handleFilter(v, data) { - if (!v) return true + if (!v) { + return !this.search.bind ? true : data.deviceStatus === this.search.bind + } - return data?.name?.indexOf(v) > -1 + return data?.name?.indexOf(v) > -1 && (!this.search.bind ? true : data.deviceStatus === this.search.bind) }, handleTreeFilter(v) { this.$refs.deviceTree?.filter(v) + }, + + onChange () { + this.$refs.deviceTree?.filter(this.search.name) } }, created() {