From 77d8af1487f3d9d1c6190838a89cc2d412aa7898 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 28 Mar 2023 15:51:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/collect.vue | 16 ++++++------ .../modules/base/community/communityTable.vue | 8 +++--- .../modules/base/huji/immigration/index.vue | 26 ++++++++----------- .../modules/plugins/change/changedeath.vue | 22 ++++++++++++---- .../plugins/change/changerelocation.vue | 15 ++++------- 5 files changed, 45 insertions(+), 42 deletions(-) diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue index c253e8e2b..d5f80200e 100644 --- a/src/views/modules/base/collect.vue +++ b/src/views/modules/base/collect.vue @@ -59,18 +59,18 @@ -
- + + + 重置 查询 - -
- - + +
@@ -421,8 +421,8 @@ export default { computed: { ...mapGetters(["clientHeight", "iframeHeight"]), tableHeight () { - const h = this.clientHeight - 360 + this.iframeHeigh; - const _h = this.clientHeight - 360; + const h = this.clientHeight - 400 + this.iframeHeigh; + const _h = this.clientHeight - 400; return this.$store.state.inIframe ? h : _h; }, dialogTableHeight () { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 515910991..f6fe14242 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -176,7 +176,7 @@ >下载房屋模板
-
补全小程序小区码 -
+
-->
智能填报
-
@@ -227,7 +227,7 @@ @click="handleDownQr(agencyObj, 'community')" >社区二维码 -
+ --> --> - -
+ + + 查询 -
- + +
@@ -547,13 +548,16 @@ export default { importLoading: false, searchH: 0, - tableHeight: 0, changeRecordShow: false, }; }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), - + tableHeight(){ + const h = this.clientHeight - 450 + this.iframeHeigh; + const _h = this.clientHeight - 450; + return this.$store.state.inIframe ? h : _h; + }, changeVDisabled() { return !this.fmData.villageId; }, @@ -563,6 +567,7 @@ export default { changeDDisabled() { return !this.fmData.unitId; }, + }, watch: { rangeTime: function (val) { @@ -575,15 +580,6 @@ export default { this.fmData.endTime = ""; } }, - searchH() { - const h = this.clientHeight - this.searchH + this.iframeHeight; - const _h = this.clientHeight - this.searchH; - console.log("computed-searchH---_h", _h); - - this.$nextTick(() => { - this.tableHeight = this.$store.state.inIframe ? h : _h; - }); - }, }, mounted() { this.getGridList(); diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 86a05754c..4a2159a12 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -69,8 +69,11 @@ --> -
- + + + 重置 查询 -
- + +
@@ -96,6 +99,7 @@ class="m-table-item" v-loading="dataListLoading" :data="dataList" + :height="tableHeight" border > @@ -277,7 +281,7 @@ import nextTick from "dai-js/tools/nextTick"; import resiChangeRecord from "@/views/components/resiChangeRecord.vue"; import { requestPost } from "@/js/dai/request"; import resiInfo from "@/views/components/resiInfo.vue"; - +import { mapGetters } from "vuex"; export default { mixins: [mixinViewModule], data() { @@ -328,6 +332,14 @@ export default { resiInfo, resiChangeRecord, }, + computed:{ + ...mapGetters(["clientHeight", "iframeHeight"]), + tableHeight(){ + const h = this.clientHeight - 410 + this.iframeHeigh; + const _h = this.clientHeight - 410; + return this.$store.state.inIframe ? h : _h; + }, + }, methods: { async handleRecovery(rowData) { console.log("11111"); diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index 8fd6d43e7..88c1e9ca7 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -441,7 +441,6 @@ export default { changeRecordShow: false, searchH: 0, - tableHeight: 0, }; }, components: { @@ -451,6 +450,11 @@ export default { }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), + tableHeight(){ + const h = this.clientHeight - 420 + this.iframeHeigh; + const _h = this.clientHeight - 420; + return this.$store.state.inIframe ? h : _h; + }, changeVDisabled() { return !this.dataForm.villageId; }, @@ -479,15 +483,6 @@ export default { this.dataForm.endTime = ""; } }, - searchH() { - const h = this.clientHeight - this.searchH + this.iframeHeight; - const _h = this.clientHeight - this.searchH; - console.log("computed-searchH---_h", _h); - - this.$nextTick(() => { - this.tableHeight = this.$store.state.inIframe ? h : _h; - }); - }, }, methods: { async handleRecovery(rowData) {