From 95870f081e9580f83a99ad2c722fe59c830c4afb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 09:53:11 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/dqfwzx/index.vue | 244 ++++++++++--------
 1 file changed, 131 insertions(+), 113 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index a042d1c4..344df3f9 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -2,25 +2,26 @@
   <div>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >新增</el-button
+        >
       </div>
 
-      <div class="m-center"
-           v-if="tableData.length > 0">
+      <div class="m-center" v-if="tableData.length > 0">
         <div class="center-left">
           <div class="list">
-            <div @click="currentIndex = index"
-                 class="item"
-                 :class="{ 'z-on': currentIndex == index }"
-                 :key="'ct' + index"
-                 v-for="(item, index) in tableData">
-              <div class="item-btn"
-                   v-if="currentIndex == index"
-                   @click="handleEdit">
-                修改
+            <div
+              @click="currentIndex = index"
+              class="item"
+              :class="{ 'z-on': currentIndex == index }"
+              :key="'ct' + index"
+              v-for="(item, index) in tableData"
+            >
+              <div class="item-btns">
+                <a v-if="currentIndex == index" @click="handleEdit">修改</a>
+                <a v-if="currentIndex == index" @click="handleDel">删除</a>
               </div>
+
               <div class="item-name">{{ item.centerName }}</div>
               <div class="item-prop">
                 <div class="prop-field">社区地址：</div>
@@ -48,95 +49,114 @@
             >
           </div> -->
 
-          <div id="centerIndexApp"
-               class="div_map"></div>
-
-          <el-table :data="tableData[currentIndex].matterList"
-                    border
-                    style="width: 100%"
-                    class="resi-table"
-                    :max-height="maxTableHeight">
-            <el-table-column label="序号"
-                             type="index"
-                             align="center"
-                             width="50" />
-            <el-table-column prop="matterName"
-                             label="事项名称">
+          <div id="centerIndexApp" class="div_map"></div>
+
+          <el-table
+            :data="tableData[currentIndex].matterList"
+            border
+            style="width: 100%"
+            class="resi-table"
+            :max-height="maxTableHeight"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            />
+            <el-table-column prop="matterName" label="事项名称">
             </el-table-column>
-            <el-table-column prop="allowTime"
-                             label="可预约时间	">
+            <el-table-column prop="allowTime" label="可预约时间	">
             </el-table-column>
-            <el-table-column fixed="right"
-                             label="操作"
-                             align="center"
-                             width="120">
+            <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="120"
+            >
               <template slot-scope="scope">
-                <el-button @click="handleOrder(scope.$index)"
-                           type="text"
-                           size="small"
-                           style="color: #1c6afd">预约</el-button>
-
-                <el-button @click="handleOrderList(scope.$index)"
-                           type="text"
-                           size="small"
-                           style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
+                <el-button
+                  @click="handleOrder(scope.$index)"
+                  type="text"
+                  size="small"
+                  style="color: #1c6afd"
+                  >预约</el-button
+                >
+
+                <el-button
+                  @click="handleOrderList(scope.$index)"
+                  type="text"
+                  size="small"
+                  style="margin-right: 10px; color: #1c6afd"
+                  >预约记录</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
-      <div class="m-hint"
-           v-else>
-        <el-empty description="暂无内容"
-                  :image-size="200"></el-empty>
+      <div class="m-hint" v-else>
+        <el-empty description="暂无内容" :image-size="200"></el-empty>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
-      <edit-form ref="eleEditForm"
-                 @dialogCancle="handleClose"
-                 @dialogOk="handleEditSuccess"></edit-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="form2Show"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="预约"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleCloseForm2">
-      <order-form ref="eleOrderForm"
-                  @dialogCancle="handleCloseForm2"
-                  @dialogOk="handleOrderSuccess"></order-form>
+    <el-dialog
+      :visible.sync="form2Show"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="预约"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleCloseForm2"
+    >
+      <order-form
+        ref="eleOrderForm"
+        @dialogCancle="handleCloseForm2"
+        @dialogOk="handleOrderSuccess"
+      ></order-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="orderListShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="预约记录"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleCloseOrderList">
-      <order-list ref="eleOrderList"
-                  @dialogCancle="handleCloseOrderList"></order-list>
+    <el-dialog
+      :visible.sync="orderListShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="预约记录"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleCloseOrderList"
+    >
+      <order-list
+        ref="eleOrderList"
+        @dialogCancle="handleCloseOrderList"
+      ></order-list>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost } from "@/js/dai/request2";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import editForm from "./cpts/edit";
@@ -151,7 +171,7 @@ let loading; // 加载动画
 
 export default {
   components: { editForm, orderForm, orderList },
-  data () {
+  data() {
     return {
       openSearch: false,
 
@@ -168,23 +188,23 @@ export default {
     };
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       return this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
-    currentIndex () {
+    currentIndex() {
       this.setMap();
     },
   },
-  async mounted () {
+  async mounted() {
     await this.loadAgency();
     await this.getTableData();
   },
   methods: {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
+    initMap() {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
@@ -204,7 +224,7 @@ export default {
       infoWindowList = Array(10);
     },
 
-    setMarker (lat, lng, centerName) {
+    setMarker(lat, lng, centerName) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -218,11 +238,11 @@ export default {
       ]);
     },
 
-    setCenter (lat, lng) {
+    setCenter(lat, lng) {
       map.setCenter(new window.TMap.LatLng(lat, lng));
     },
 
-    setMap () {
+    setMap() {
       const { tableData, currentIndex } = this;
       let item = tableData[currentIndex];
       if (item) {
@@ -231,24 +251,24 @@ export default {
       }
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleCloseForm2 () {
+    handleCloseForm2() {
       this.form2Show = false;
     },
-    handleCloseOrderList () {
+    handleCloseOrderList() {
       this.orderListShow = false;
     },
 
-    async handleAdd () {
+    async handleAdd() {
       this.formShow = true;
       await nextTick();
       console.log(this.$refs);
       this.$refs.eleEditForm.initForm("add");
     },
 
-    async handleWatch () {
+    async handleWatch() {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm(
@@ -257,7 +277,7 @@ export default {
       );
     },
 
-    async handleEdit () {
+    async handleEdit() {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm(
@@ -266,12 +286,12 @@ export default {
       );
     },
 
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleOrder (index) {
+    async handleOrder(index) {
       this.form2Show = true;
       await nextTick();
       this.$refs.eleOrderForm.initForm(
@@ -281,36 +301,34 @@ export default {
       );
     },
 
-    handleOrderSuccess () {
+    handleOrderSuccess() {
       this.handleCloseForm2();
     },
 
-    async handleOrderList (index) {
+    async handleOrderList(index) {
       this.orderListShow = true;
       await nextTick(0);
       console.log(this.$refs);
       this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
     },
 
-    async handleDel (rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async handleDel() {
+      if (!confirm("删除后不可恢复，确定删除？")) return;
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+      const item = this.tableData[this.currentIndex];
+      const url = "/gov/org/icpartyservicecenter/del";
+
+      const { data, code, msg } = await requestPost(url, [
+        item.partyServiceCenterId,
+      ]);
 
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
-      } else {
-        this.$message.success("操作失败！");
       }
     },
 
-    async getTableData () {
+    async getTableData() {
       const oldLen = this.tableData.length;
       const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
       const { data, code, msg } = await requestPost(url, {
@@ -331,7 +349,7 @@ export default {
     },
 
     //加载组织
-    async loadAgency () {
+    async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
 
@@ -339,8 +357,6 @@ export default {
 
       if (code === 0) {
         this.agencyId = data.agencyId;
-      } else {
-        this.$message.error(msg);
       }
     },
   },
@@ -394,7 +410,8 @@ export default {
           background-color: #ffffff;
           box-shadow: 0 0 10px #6aa;
         }
-        .item-btn {
+
+        .item-btns {
           position: absolute;
           top: 5px;
           right: 5px;
@@ -423,6 +440,7 @@ export default {
             }
           }
         }
+
         .item-name {
           font-size: 16px;
           font-weight: bold;

From fbb6333b4a1a29de5e88e9d276e18af218c5ecb7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 24 Mar 2022 17:02:25 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/community.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 7f91ed38..1708c943 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -307,7 +307,7 @@ export default {
 .div_table {
   margin-left: 15px;
   // flex: 1;
-  width: calc(100vw - 550px);
+  width: calc(100% - 300px);
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;

From f8c5dc1e96594da83deccefc49d813120aa25e4a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:04:31 +0800
Subject: [PATCH 3/8] ss

---
 src/views/modules/communityService/dqfwzx/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 344df3f9..7075c8b1 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -9,7 +9,7 @@
 
       <div class="m-center" v-if="tableData.length > 0">
         <div class="center-left">
-          <div class="list">
+          <div class="list" :class="{ 'z-iframe': $store.state.inIframe }">
             <div
               @click="currentIndex = index"
               class="item"
@@ -378,6 +378,11 @@ export default {
       padding-right: 10px;
       height: calc(100vh - 210px);
       overflow-y: auto;
+
+      &.z-iframe {
+        height: calc(100vh - 100px);
+      }
+
       &::-webkit-scrollbar {
         /*滚动条整体样式*/
         width: 8px; /*高宽分别对应横竖滚动条的尺寸*/

From 2d9173fb19cdc6d758fb1f0e4a6092b46b2a68af Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:08:26 +0800
Subject: [PATCH 4/8] ss2

---
 src/views/modules/communityService/dqfwzx/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 7075c8b1..81865803 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -189,7 +189,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 520;
+      return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },

From 336ce024a9e6ae946420ce0712c5f2b86bbb0b40 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:24:16 +0800
Subject: [PATCH 5/8] ss3

---
 src/views/modules/communityService/dqfwzx/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 81865803..302a0a04 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -189,7 +189,9 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
+      return this.$store.state.inIframe
+        ? this.clientHeight - 520 - 120
+        : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -380,7 +382,7 @@ export default {
       overflow-y: auto;
 
       &.z-iframe {
-        height: calc(100vh - 100px);
+        height: calc(100vh - 210px - 120px);
       }
 
       &::-webkit-scrollbar {
@@ -450,6 +452,7 @@ export default {
           font-size: 16px;
           font-weight: bold;
           margin-bottom: 10px;
+          width: calc(100% - 70px);
         }
         .item-prop {
           display: flex;

From 8ea96bc0d2c8b5e952acac8f8054e71b882a38f7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:31:59 +0800
Subject: [PATCH 6/8] ss4

---
 src/views/modules/communityService/dqfwzx/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 302a0a04..8173f652 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -190,7 +190,7 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 520 - 120
+        ? this.clientHeight - 520 + 120
         : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
@@ -382,7 +382,7 @@ export default {
       overflow-y: auto;
 
       &.z-iframe {
-        height: calc(100vh - 210px - 120px);
+        height: calc(100vh - 210px + 120px);
       }
 
       &::-webkit-scrollbar {

From 65fe89d28080e09fc6235e042f2ec02697fad599 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:42:13 +0800
Subject: [PATCH 7/8] ss5

---
 .../modules/communityService/sqzzz/index.vue  | 217 +++++++++++-------
 1 file changed, 132 insertions(+), 85 deletions(-)

diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index a1241669..9e347e83 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -1,44 +1,60 @@
 <template>
   <div class="resi-container">
     <el-card ref="searchCard" class="search-card">
-         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-          <el-form-item label="组织名称" prop="organizationName">
-            <el-input
-              v-model="fmData.organizationName"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker
-              v-model="fmData.createTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      
-      </el-card>
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
+        <el-form-item label="组织名称" prop="organizationName">
+          <el-input
+            v-model="fmData.organizationName"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker
+            v-model="fmData.createTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd"
           >新增</el-button
         >
         <el-button
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
         <el-upload
           ref="upload"
           class="upload-btn"
@@ -53,9 +69,12 @@
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
         >
-          <el-button size="small" class="diy-button--delete" :loading="importLoading">{{
-            importBtnTitle
-          }}</el-button>
+          <el-button
+            size="small"
+            class="diy-button--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
         </el-upload>
 
         <el-button @click="handleChu" class="diy-button--reset" size="small"
@@ -70,22 +89,41 @@
         :height="maxTableHeight"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
-        <el-table-column prop="organizationName" label="组织名称" align="center">
+        <el-table-column
+          prop="organizationName"
+          label="组织名称"
+          align="center"
+        >
           <template slot-scope="scope">
-            <a  class="name-a" @click="handleWatch(scope.row)">
+            <a class="name-a" @click="handleWatch(scope.row)">
               {{ scope.row.organizationName }}
             </a>
           </template>
         </el-table-column>
-        <el-table-column prop="organizationPersonCount" align="center" label="组织人数">
+        <el-table-column
+          prop="organizationPersonCount"
+          align="center"
+          label="组织人数"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="serviceItem"
+          label="服务事项"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column prop="serviceItem" label="服务事项" align="center" :show-overflow-tooltip="true"> </el-table-column>
         <el-table-column prop="score" width="100" align="center" label="积分">
         </el-table-column>
-        <el-table-column prop="principalName" align="center" label="负责人"> </el-table-column>
+        <el-table-column prop="principalName" align="center" label="负责人">
+        </el-table-column>
         <el-table-column prop="principalPhone" align="center" label="联系电话">
         </el-table-column>
-        <el-table-column prop="organizationCreatedTime" align="center" label="创建时间">
+        <el-table-column
+          prop="organizationCreatedTime"
+          align="center"
+          label="创建时间"
+        >
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="160">
           <template slot-scope="scope">
@@ -121,7 +159,7 @@
                 type="text"
                 size="small"
                 class="div-table-button--delete"
-                style="margin-left: 10px;"
+                style="margin-left: 10px"
                 >删除</el-button
               >
             </el-popconfirm>
@@ -218,7 +256,9 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 360;
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + 120
+        : this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -237,38 +277,41 @@ export default {
     this.getTableData();
   },
   methods: {
-    async handleExportModule () {
-      let url = "/heart/iccommunityselforganization/import-template-download"
-      
+    async handleExportModule() {
+      let url = "/heart/iccommunityselforganization/import-template-download";
 
-      let params = {}
+      let params = {};
       await this.$http({
-        method: 'POST',
+        method: "POST",
         url,
-        responseType: 'blob',
-        data: params
+        responseType: "blob",
+        data: params,
       })
-        .then(res => {
+        .then((res) => {
           // this.download(res.data, title + '.xls')
           if (res.headers["content-disposition"]) {
-            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var url = window.URL.createObjectURL(blob)
-            var aLink = document.createElement('a')
-            aLink.style.display = 'none'
-            aLink.href = url
-            aLink.setAttribute('download', fileName)
-            document.body.appendChild(aLink)
-            aLink.click()
-            document.body.removeChild(aLink) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
-          } else this.$message.error('下载失败')
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
         })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
     },
     // 上传大图标成功
     handleExcelSuccess(res, file) {
@@ -304,23 +347,28 @@ export default {
       this.importBtnTitle = "正在上传中...";
       this.$message({
         showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http
-        .post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => {
-          console.log('res-up', res)
-          if (res.data.code == 0 && res.data.msg == 'success') {
+        .post(
+          "/heart/iccommunityselforganization/importcommunityselforganization",
+          formData
+        )
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
             // this.$message.success('导入成功')
-            this.getTableData()
-          } else this.$message.error(res.data.msg)
-        }).catch(err => {
-          console.log('失败', err)
-          file.onError() //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
         })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
       // axios({
       //   url:
       //     window.SITE_CONFIG["apiURL"] +
@@ -344,8 +392,8 @@ export default {
       //   .catch((err) => {
       //     console.log("失败", err);
       //   });
-        this.importLoading = false
-      this.importBtnTitle = '导入'
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
       this.$refs.upload.clearFiles();
     },
 
@@ -370,8 +418,8 @@ export default {
       this.getTableData();
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields()
-      this.handleSearch()
+      this.$refs[formName].resetFields();
+      this.handleSearch();
     },
     async handleAdd() {
       this.formShow = true;
@@ -521,5 +569,4 @@ export default {
   position: relative;
   overflow: visible;
 }
-
 </style>

From 48f019c8e89ef40c744950a13aabfdd09eec5b75 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Mar 2022 09:54:42 +0800
Subject: [PATCH 8/8] =?UTF-8?q?table=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/store/modules/app.js                            |  6 ++++--
 src/views/modules/base/community/buildTable.vue        |  4 ++--
 src/views/modules/base/community/communityTable.vue    | 10 +++++-----
 src/views/modules/base/community/roomTable.vue         |  6 +++---
 .../communityService/ninePlaces/inspect/inspect.vue    |  8 +++-----
 .../communityService/ninePlaces/places/places.vue      |  8 +++-----
 .../modules/communityService/ninePlaces/team/team.vue  |  8 +++-----
 7 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/js/store/modules/app.js b/src/js/store/modules/app.js
index b9a493a9..4384a1c1 100644
--- a/src/js/store/modules/app.js
+++ b/src/js/store/modules/app.js
@@ -5,13 +5,15 @@ export default {
     clientHeight: document.documentElement.clientHeight,
     size: 'medium',
     resolution: 'medium',
-    env: 'dev'
+    env: 'dev',
+    iframeHeight:120
   },
   getters: {
     clientHeight: (state) => state.clientHeight,
     size: (state) => state.size,
     resolution: (state) => state.resolution,
-    env: (state) => state.env
+    env: (state) => state.env,
+    iframeHeight: (state) => state.iframeHeight
   },
   mutations: {
     [type.client_height](state, payload) {
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index f8e3dab5..342ef30f 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -235,11 +235,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 300)
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index cbe00837..27660e25 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -285,13 +285,13 @@ export default {
   },
   computed: {
     tableHeight () {
-      return (this.clientHeight - 300)
+
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
+
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 09909c8a..92710ca2 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -131,7 +131,7 @@
                        @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-if="scope.row.showBtn"
                        type="text"
-                      class="div-table-button--edit"
+                       class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
@@ -230,11 +230,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 300)
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 0a75b184..d2de837a 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -529,13 +529,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 420)
+      return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 888ae9a9..0e356e9a 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -464,13 +464,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 420)
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 4a29979c..1b05e70d 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -441,13 +441,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 370)
+      return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {