From 8fee7b7e4cb7bdc4fd849e5153270bca94d48b85 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 27 Mar 2023 21:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=80=E5=A4=96=E4=BE=A7?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1,=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E5=8E=BB=E9=99=A4=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E4=B8=AD=E9=A6=96=E9=A1=B5=E7=9A=84=E5=85=B3=E9=97=AD=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/common.scss                       |  3 ++-
 src/assets/scss/modules/management/list-main.scss |  2 +-
 src/views/main-content.vue                        |  3 ++-
 src/views/modules/base/resi.vue                   | 15 +++++----------
 src/views/modules/communityService/gxxq/index.vue |  2 +-
 .../communityService/labelConfig/index.vue        |  2 +-
 .../communityService/policy/policyList.vue        |  4 ++--
 src/views/modules/shequzhili/event/eventList.vue  |  8 +++++---
 .../modules/shequzhili/issue/issueAuditList.vue   |  4 ++--
 src/views/modules/shequzhili/issue/issueList.vue  |  7 ++++---
 src/views/modules/shequzhili/xiangmu/index.vue    | 11 ++++++-----
 11 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 435cda15c..31a876ca6 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -716,7 +716,8 @@ img {
             }
         }
         > .el-tabs__content {
-            padding: $content--padding;
+            // 去除全部滚动条注释M
+            // padding: $content--padding;
             .el-loading-mask {
                 z-index: 830;
             }
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 490652011..fb26d15c5 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -8,7 +8,7 @@
     // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
     background: #FFFFFF;
     box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
-    margin:7px 7px;
+    margin:20px 7px 7px;
 
     overflow:hidden;
 
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index eb6dfc340..ae837feac 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -22,12 +22,13 @@
         @tab-click="tabSelectedHandle"
         @tab-remove="tabRemoveHandle"
       >
+      <!-- item.name !== 'indexWork', -->
         <el-tab-pane
           v-for="item in $store.state.contentTabs"
           :key="item.name"
           :name="item.name"
           :label="item.title"
-          :closable="item.name !== 'indexWork'"
+          :closable=" item.name !== 'home'"
           :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }"
         >
           <template v-if="tabIsIframe(item.iframeURL)">
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index ebd90775b..f7d92d72b 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -639,7 +639,7 @@ export default {
 			currentPage: 1,
 			pageSize: 20,
 			total: null,
-			searchH: 0,
+			searchH: 241,
 			resideathAddObj1: {}, // 死亡登记子组件
 			conditions: [],
 			activeName: "",
@@ -715,8 +715,8 @@ export default {
 		...mapGetters(["clientHeight", "iframeHeight"]),
 		tableHeight() {
 			const h =
-				this.clientHeight - this.searchH - 275 + this.iframeHeight;
-			const _h = this.clientHeight - 275 - this.searchH;
+				this.clientHeight - this.searchH - 241 + this.iframeHeight;
+			const _h = this.clientHeight - 241 - this.searchH;
 			return this.$store.state.inIframe ? h : _h;
 		},
 	},
@@ -736,13 +736,8 @@ export default {
 	},
 
 	async mounted() {
-		// this.$nextTick(() => {
-		//   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
-		// })
-		console.log(
-			"document.documentElement.clientWidth",
-			document.documentElement.clientHeight
-		);
+		this.searchH = this.$refs.myResiSearch.offsetHeight;
+	
 		this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
 			elseParams: {
 				categoryKeys: ["resi_info"],
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 681ab04c3..40cd26388 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -304,7 +304,7 @@ export default {
       pageSize: 20,
       tableLoading: true,
       total: 0,
-      searchH: 172,
+      searchH: 115,
       formShow: false,
       formTitle: "",
       rowObj: {},
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
index 11cc0930a..b7c7c5ec0 100644
--- a/src/views/modules/communityService/labelConfig/index.vue
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -135,7 +135,7 @@ export default {
             pageSize:20,
             tableLoading:true,
             total:0,
-            searchH:100,
+            searchH:115,
             formShow:false,
             formTitle:"",
             rowObj:{}
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 5e6b2c417..195ae7647 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -330,8 +330,8 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 350 + this.iframeHeigh
-        : this.clientHeight - 350;
+        ? this.clientHeight - 400 + this.iframeHeigh
+        : this.clientHeight - 400;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 9071a252c..2582c73e1 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -565,6 +565,8 @@ export default {
         disabledDate: startDisabledDate,
       },
       eventId: "",
+      
+      searchH:180,
 
       eventDetailData: {},
 
@@ -576,9 +578,9 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.$store.state.inIframe
-        ? this.clientHeight - 410 + this.iframeHeigh
-        : this.clientHeight - 410;
+      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      const _h = this.clientHeight - 275 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue
index 539645102..e09b4398d 100644
--- a/src/views/modules/shequzhili/issue/issueAuditList.vue
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -273,8 +273,8 @@ export default {
   computed: {
     maxTableHeight () {
       return this.$store.state.inIframe
-        ? this.clientHeight - 360 + this.iframeHeigh
-        : this.clientHeight - 360;
+        ? this.clientHeight - 400 + this.iframeHeigh
+        : this.clientHeight - 400;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
index 1a56accc7..ddea3db9d 100644
--- a/src/views/modules/shequzhili/issue/issueList.vue
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -295,13 +295,14 @@ export default {
       issueId: '',
       issueDetailData: {},
 
+      searchH:120,
     };
   },
   computed: {
     maxTableHeight () {
-      return this.$store.state.inIframe
-        ? this.clientHeight - 360 + this.iframeHeigh
-        : this.clientHeight - 360;
+      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      const _h = this.clientHeight - 275 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 49ffb192e..91b88f602 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -246,9 +246,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </div>
-
-      <div>
+        <div>
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -260,6 +258,9 @@
         >
         </el-pagination>
       </div>
+      </div>
+
+     
     </div>
 
     <div class="g-page" v-if="pageType == 'edit' || pageType == 'info'">
@@ -351,8 +352,8 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 360 + this.iframeHeigh
-        : this.clientHeight - 360;
+        ? this.clientHeight - 400 + this.iframeHeigh
+        : this.clientHeight - 400;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },