From fe1ed8022da150eba59e4072ad5467d2794c7e0e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 18 Mar 2022 16:14:04 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8D=B7=E5=85=8B?=
 =?UTF-8?q?=E9=9A=BD=E9=9A=BE=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index edfe119de..74ed24d86 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -139,12 +139,12 @@
                    src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
               <div class="rel-text"
                    :class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
-                <div class="rel-call">岳父母或公婆</div>
-                <div class="rel-name">吉克隽逸</div>
-                <!-- <span class="rel-call">{{
+                <!-- <div class="rel-call">岳父母或公婆</div>
+                <div class="rel-name">吉克隽逸</div> -->
+                <span class="rel-call">{{
                   houseInfo.userList[0].relation
                 }}</span>
-                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span> -->
+                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span>
               </div>
             </div>
 

From 34a713bce9254071984e7001003561a03cd3277a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 22 Mar 2022 15:54:52 +0800
Subject: [PATCH 02/15] ss

---
 src/js/dai/request.js  |  8 ++++++++
 src/js/dai/request2.js |  8 ++++++++
 src/router/index.js    | 14 ++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index 8365bd3ee..92fb78314 100644
--- a/src/js/dai/request.js
+++ b/src/js/dai/request.js
@@ -38,6 +38,14 @@ const request = curry(
         if (res.data.code > 8000 && res.data.code < 10000) {
           // Message.error(res.data.msg);
         }
+        if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+          // 10005 token为空  10006登陆超时 10007别处登录
+          console.log("登录失效");
+          Message.error(res.data.msg);
+          return next({
+            name: "login",
+          });
+        }
 
         reslove(retData);
       };
diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js
index 8c38025d1..0d257d339 100644
--- a/src/js/dai/request2.js
+++ b/src/js/dai/request2.js
@@ -38,6 +38,14 @@ const request = curry(
         if (res.data.code > 8000 && res.data.code < 10000) {
           Message.error(res.data.msg);
         }
+        if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+          // 10005 token为空  10006登陆超时 10007别处登录
+          console.log("登录失效");
+          Message.error(res.data.msg);
+          return next({
+            name: "login",
+          });
+        }
 
         reslove(retData);
       };
diff --git a/src/router/index.js b/src/router/index.js
index 8b2d8ab65..b74146b38 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -179,7 +179,7 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   // 添加动态(菜单)路由
   // 已添加或者当前路由为页面路由, 可直接访问
-  if(to.name==='caiji'){
+  if (to.name === "caiji") {
     return next();
   }
   if (
@@ -356,11 +356,13 @@ router.beforeEach((to, from, next) => {
   http
     .get("/gov/access/menu/nav")
     .then(({ data: res }) => {
-      if (res.code !== 0) {
-        // Vue.prototype.$message.error(res.msg)
-        // return next({
-        //   name: "login",
-        // });
+      if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+        // 10005 token为空  10006登陆超时 10007别处登录
+        console.log("登录失效");
+        Vue.prototype.$message.error(res.msg);
+        return next({
+          name: "login",
+        });
       }
       window.SITE_CONFIG["menuList"] = res.data;
       fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);

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 03/15] =?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 a042d1c40..344df3f9c 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 04/15] =?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 7f91ed38c..1708c943d 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 05/15] 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 344df3f9c..7075c8b1b 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 06/15] 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 7075c8b1b..81865803d 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 07/15] 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 81865803d..302a0a04d 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 08/15] 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 302a0a04d..8173f6524 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 09/15] 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 a12416698..9e347e835 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 10/15] =?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 b9a493a92..4384a1c18 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 f8e3dab5a..342ef30f3 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 cbe008371..27660e257 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 09909c8ac..92710ca28 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 0a75b1845..d2de837a2 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 888ae9a9b..0e356e9a5 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 4a29979c8..1b05e70de 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: {
 

From 0324a529fea90786724b724856c0ced64593885a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Mar 2022 11:14:21 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      | 10 ++++--
 src/views/modules/base/community/roomForm.vue | 12 +++----
 .../modules/base/community/roomTable.vue      | 35 ++++++++++++-------
 .../regionalParty/activitys.vue               |  8 ++---
 .../communityParty/regionalParty/units.vue    |  8 ++---
 src/views/modules/visual/basicinfo/people.vue |  2 +-
 6 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 1708c943d..ece5784a9 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -98,12 +98,16 @@ export default {
   },
   computed: {
     rowHeight () {
-      return (this.clientHeight - 120) + 'px'
+
+      return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px'
+
     },
     treeHeight () {
-      return (this.clientHeight - 200) + 'px'
+      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
+
     },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     async loadTree (isRefresh) {
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index dfdda8440..b60fe6c61 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -11,7 +11,7 @@
         <el-form-item label="所属楼栋"
                       label-width="150px"
                       style="display: block">
-          <span>{{ agencyObj.communityName }}—{{agencyObj.label}}</span>
+          <span>{{ agencyObj.neighborHoodName }}—{{agencyObj.label}}</span>
         </el-form-item>
 
         <el-form-item label="单元号"
@@ -231,7 +231,7 @@ export default {
 
     async addRoom () {
       const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
-      if (regCard.test(this.dataForm.ownerIdCard) === false) {
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -240,7 +240,7 @@ export default {
         return false;
       }
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.dataForm.ownerPhone) === false) {
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
@@ -335,13 +335,13 @@ export default {
           { required: true, message: '是否出租不能为空', trigger: 'blur' }
         ],
         ownerPhone: [
-          { required: true, message: '房主电话不能为空', trigger: 'blur' }
+          { required: false }
         ],
         ownerName: [
-          { required: true, message: '房主姓名不能为空', trigger: 'blur' }
+          { required: false }
         ],
         ownerIdCard: [
-          { required: true, message: '房主身份证号不能为空', trigger: 'blur' }
+          { required: false }
         ],
       }
     },
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 92710ca28..614159a97 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -80,34 +80,41 @@
                          :selectable="checkSelect"
                          width="55">
         </el-table-column>
-        <el-table-column prop="houseName"
+        <el-table-column prop="houseNameShow"
                          label="房屋名称"
-                         width="120">
+                         min-width="160">
         </el-table-column>
         <el-table-column prop="neighborHoodName"
                          label="所属小区"
-                         width="160">
+                         min-width="150">
         </el-table-column>
         <el-table-column prop="buildingName"
-                         label="所属楼栋">
+                         label="所属楼栋"
+                         width="80">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号">
+        <el-table-column prop="unitNumShow"
+                         label="单元号"
+                         width="70">
         </el-table-column>
         <el-table-column prop="doorName"
-                         label="门牌号">
+                         label="门牌号"
+                         width="70">
         </el-table-column>
         <el-table-column prop="houseType"
-                         label="类型">
+                         label="类型"
+                         width="50">
         </el-table-column>
         <el-table-column prop="purpose"
-                         label="用途">
+                         label="用途"
+                         width="50">
         </el-table-column>
         <el-table-column prop="rentFlag"
-                         label="是否出租">
+                         label="是否出租"
+                         width="80">
         </el-table-column>
         <el-table-column prop="ownerName"
-                         label="房主姓名">
+                         label="房主姓名"
+                         width="90">
         </el-table-column>
         <el-table-column prop="ownerPhone"
                          label="房主电话"
@@ -214,6 +221,8 @@ export default {
       selection: [],
       showDeletBtn: false,
 
+      tableData: [],
+
       //form相关
       formShow: false,
       formTitle: '新增房屋',
@@ -229,7 +238,6 @@ export default {
   },
   computed: {
     tableHeight () {
-
       return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
@@ -298,6 +306,8 @@ export default {
         this.total = data.total
         this.validTableDataNum = 0
         data.list.forEach(item => {
+          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
+          item.unitNumShow = item.unitNum + '单元'
           if (item.agencyId === this.staffAgencyId) {
             item.showBtn = true
             this.validTableDataNum++
@@ -327,6 +337,7 @@ export default {
     },
 
     handleAdd () {
+
       this.formTitle = '新增房屋'
       this.formShow = true
       this.$nextTick(() => {
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 0fbdc0063..d98baa208 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -634,13 +634,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 430)
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index cb0696ce3..9c6d5b6b5 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -675,13 +675,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 430)
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 74ed24d86..146a16d0d 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -126,7 +126,7 @@
                    src="@/assets/img/shuju/people/huzhu.png" />
               <img class="huzhu-ico"
                    src="@/assets/img/shuju/people/huzhu-home.png" />
-              <div class="huzhu-name">{{ houseInfo.ownerName }}</div>
+              <div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div>
               <p>（户主）</p>
             </div>
 

From 884d4f54871eab36a9486e4923da920c4d5027e9 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 11:16:44 +0800
Subject: [PATCH 12/15] dd

---
 src/utils/index.js                  | 30 ++++++++++++++++
 src/views/components/editResi.vue   |  2 +-
 src/views/components/resiForm.vue   | 55 +++++++----------------------
 src/views/components/resiSearch.vue |  2 +-
 4 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index fe742c9ac..c2232ac77 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -115,3 +115,33 @@ export function dateFormats(fmt, date) {
   }
   return fmt
 }
+//  根据身份证计算出生日期，性别，年龄
+export function computedCard(idCard) {
+  let sex = null;
+  let birth = null;
+  let myDate = new Date();
+  let month = myDate.getMonth() + 1;
+  let day = myDate.getDate();
+  let age = 0;
+
+  if(idCard.length===18){
+    age = myDate.getFullYear() - idCard.substring(6, 10) - 1;
+    sex = idCard.substring(16,17);
+    birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14);
+    if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++;
+
+  }
+  if(idCard.length===15){
+    age = myDate.getFullYear() - idCard.substring(6, 8) - 1901;
+    sex = idCard.substring(13,14);
+    birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12);
+    if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++;
+  }
+
+  if(sex%2 === 0)
+    sex = '0';  // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
+  else
+    sex = '1';
+  return  {age , sex, birth}
+}
+
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index d7afc877c..fba7172b6 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -33,7 +33,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item label="所属家庭" required>
+              <el-form-item label="所属房屋" required>
                 <div class="resi-cell-value">
                   <div class="resi-cell-col">
                     <el-form-item prop="VILLAGE_ID">
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 506c2265c..6ed432b42 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -32,7 +32,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item label="所属家庭" required>
+              <el-form-item label="所属房屋" required>
                 <div class="resi-cell-value">
                   <div class="resi-cell-col">
                     <el-form-item prop="VILLAGE_ID">
@@ -99,48 +99,7 @@
                 </div>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="6">
-              <el-form-item :prop="form.BUILD_ID" label="所属楼宇">
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                  clearable class="resi-cell-select" @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-              <el-form-item :prop="form.HOME_ID" label="所属家庭">
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
-                  clearable class="resi-cell-select resi-cell-select-small"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                  <el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
-                  clearable class="resi-cell-select-small"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-            </el-form-item>
-          </el-col> -->
+          
         </el-row>
         <el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row">
             <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
@@ -158,6 +117,7 @@
                         size="small"
                         clearable
                         placeholder="请输入内容"
+                        @blur="handleValidBlur(n)"
                         >
                       </el-input>
                       <el-input
@@ -267,6 +227,7 @@
 
 <script>
 import { isCard, isMobile } from '@/utils/validate'
+import { computedCard } from '@/utils/index'
 
 export default {
   name: 'resiForm',
@@ -525,6 +486,14 @@ export default {
         // }
       })
     },
+    handleValidBlur(n) {
+      console.log('n---', n)
+      if (n.columnName !== 'ID_CARD') return
+      if (!isCard(this.form.ID_CARD)) return
+      const { sex, birth } = computedCard(this.form.ID_CARD)
+      this.form.BIRTHDAY = birth
+      this.form.GENDER = sex == 1 ? '1' : '2'
+    },
     handleOpenSearch () {
       this.openSearch = !this.openSearch
     },
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 1c2cd5494..6cc4a41a7 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -28,7 +28,7 @@
           </el-col>
           <el-col :span="18">
             <div class="resi-cell">
-              <div class="resi-cell-label">所属小区</div>
+              <div class="resi-cell-label">所属房屋</div>
               <div class="resi-cell-value">
                 <el-select
                   v-model.trim="form.VILLAGE_ID"

From 7b2a81191eab48da2e2ab9018ec22683659719ad Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 25 Mar 2022 13:50:40 +0800
Subject: [PATCH 13/15] =?UTF-8?q?ai=E5=AE=89=E9=98=B2=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=AE=89=E9=98=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index 9712a81a9..d0f37f371 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -315,7 +315,7 @@ router.beforeEach((to, from, next) => {
     {
       icon: "icon-setting",
       id: "44rq22222q2222",
-      name: "AI安防",
+      name: "智慧安防",
       // url: "visual/basicinfo/basicInfoMain",
       children: [
         {

From 36161bfd842c3e53e17165da273ba44f9c2a3721 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 14:07:47 +0800
Subject: [PATCH 14/15] dd

---
 src/views/modules/base/collect.vue            | 12 ++++++-----
 src/views/modules/base/resi.vue               | 18 ++++++++++++++---
 .../modules/communityParty/elegant/index.vue  | 14 +++++++++++--
 .../communityService/measure/index.vue        | 13 ++++++++++--
 .../modules/communityService/sqzzz/index.vue  |  4 ++--
 src/views/modules/importRecord/index.vue      | 11 ++++++----
 .../difficulty/difficultyList.vue             | 12 ++++++-----
 .../secretaryLog/humanisticCare/careList.vue  | 12 ++++++-----
 .../modules/secretaryLog/workLog/index.vue    |  7 ++++---
 .../serviceMatter/service.vue                 | 12 +++++------
 .../modules/workPc/guidance/categoryList.vue  | 11 +++++++---
 .../modules/workPc/guidance/guidanceList.vue  |  6 ++++--
 src/views/modules/workSys/demandCate.vue      | 14 +++++++++++--
 src/views/modules/workSys/elegantCate.vue     | 20 +++++++++++++------
 src/views/modules/workSys/resiCate.vue        | 14 +++++++++++--
 15 files changed, 127 insertions(+), 53 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 8f6c49af9..155f675eb 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -61,7 +61,7 @@
         border
         style="width: 100%"
         class="resi-table"
-        :height="maxTableHeight"
+        :height="tableHeight"
         :span-method="arraySpanMethod"
       >
         <el-table-column label="序号" prop="desc" align="center" width="50" />
@@ -189,10 +189,12 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
-      return this.clientHeight - 360;
-    },
-    ...mapGetters(["clientHeight"]),
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
+    }
   },
   watch: {
     timeRange(val) {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9e35e8d64..95b645a5f 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -297,7 +297,7 @@ export default {
       currentPage: 1,
       pageSize: 20,
       total: null,
-      tableHeight: 0,
+      searchH: 0,
       conditions: [],
       activeName: '',
       tableData: [],
@@ -336,6 +336,14 @@ export default {
     }
 
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
   async created () {
     if (this.$route.query) {
       let query = this.$route.query
@@ -352,12 +360,16 @@ export default {
     // this.handleSearch()
     // this.getTableData()
     this.pageLoading = true
+    this.searchH = this.$refs.resiSearch.$el.offsetHeight
     console.log('storeoooo----0000', this.$store)
     console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight)
-    this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    
   },
   mounted () {
-
+    
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    // })
     console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
   },
   methods: {
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 1366c6734..c1cce0edb 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -235,6 +235,7 @@
 
 <script>
 import axios from 'axios'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -253,7 +254,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      tableHeight: 400,
+      searchH: 0,
       unloadPencent: 0,
       addLevel: '1',
       addType: 'add',
@@ -321,6 +322,14 @@ export default {
         mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
       }
     }
+  },
+   computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
   },
   async created() {
     this.customerId = localStorage.getItem('customerId')
@@ -340,10 +349,11 @@ export default {
     
     // this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
   },
+  
   mounted() {
     
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
       console.log('tableHeight', this.tableHeight)
     })
     
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index e54a23553..db1af9a5f 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -589,6 +589,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -601,7 +602,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      tableHeight: 400,
+      searchH: 0,
       addLevel: "1",
       addType: "add",
       value: "",
@@ -846,6 +847,14 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
   async created() {
     this.customerId = localStorage.getItem("customerId");
 
@@ -860,7 +869,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
       console.log('tableHeight', this.tableHeight)
     })
   },
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 9e347e835..669cbc1bb 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -257,10 +257,10 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 360 + 120
+        ? this.clientHeight - 360 + this.iframeHeigh
         : this.clientHeight - 360;
     },
-    ...mapGetters(["clientHeight"]),
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
     "fmData.createTime": function (val) {
diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index f4fe8a58c..75557687f 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -6,7 +6,7 @@
         :data="tableData"
         border
         style="width: 100%"
-         :height="maxTableHeight"
+         :height="tableHeight"
         class="resi-table"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
@@ -82,10 +82,13 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
-      return this.clientHeight - 280;
+    tableHeight () {
+      const h = this.clientHeight - 240 + this.iframeHeigh
+      const _h = this.clientHeight - 240
+      return this.$store.state.inIframe ? h : _h
     },
-    ...mapGetters(["clientHeight"]),
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {},
   mounted() {
diff --git a/src/views/modules/secretaryLog/difficulty/difficultyList.vue b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
index 933474da3..3471a3176 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -218,7 +218,7 @@ export default {
         scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd	
         scheduledEndTime: '',//预计处理结束时间	yyyy-mm-dd
       },
-
+      sHeight: 0,
       tableData: [],
 
       //form相关
@@ -239,6 +239,7 @@ export default {
 
     //获取网格下拉框数据
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -473,12 +474,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 380)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
 
diff --git a/src/views/modules/secretaryLog/humanisticCare/careList.vue b/src/views/modules/secretaryLog/humanisticCare/careList.vue
index fcd3354ae..157714278 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careList.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -288,7 +288,7 @@ export default {
         scheduledStartTime: '',//预计关怀开始时间	yyyy-mm-dd
         scheduledEndTime: '',//预计关怀结束时间	yyyy-mm-dd
       },
-
+      sHeight: 0,
       tableData: [],
 
       //form相关
@@ -308,6 +308,7 @@ export default {
 
     //获取网格下拉框数据
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -546,12 +547,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 430)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
 
diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue
index 3edcfe906..a438e5074 100644
--- a/src/views/modules/secretaryLog/workLog/index.vue
+++ b/src/views/modules/secretaryLog/workLog/index.vue
@@ -414,12 +414,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - this.sHeight)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
 
diff --git a/src/views/modules/systemManagement/serviceMatter/service.vue b/src/views/modules/systemManagement/serviceMatter/service.vue
index ce2e09702..cbcaf2314 100644
--- a/src/views/modules/systemManagement/serviceMatter/service.vue
+++ b/src/views/modules/systemManagement/serviceMatter/service.vue
@@ -256,14 +256,12 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 210)
-
+      const h = this.clientHeight - 210 + this.iframeHeigh
+      const _h = this.clientHeight - 210
+      return this.$store.state.inIframe ? h : _h
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index d2f8db1e9..775ecd426 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -123,6 +123,7 @@
 <script>
 import Sortable from 'sortablejs'
 import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'RoleList',
@@ -164,9 +165,13 @@ export default {
 
   },
   computed: {
-    tableHeight() {
-      return document.documentElement.clientHeight - 220;
-    }
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
 
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 8c5d436d5..feed668fb 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -201,10 +201,12 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.clientHeight - 360
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
     },
 
-    ...mapGetters(['clientHeight', 'env'])
+    ...mapGetters(['clientHeight', 'iframeHeight', 'env'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 56cd8c450..976e1da71 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -136,6 +136,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   data () {
     return {
@@ -148,7 +149,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      tableHeight: 500,
+      sHeight: 0,
       addLevel: '1',
       addType: 'add',
       value: '',
@@ -192,6 +193,15 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
   async created () {
     this.customerId = localStorage.getItem('customerId')
     this.getTableData()
@@ -200,7 +210,7 @@ export default {
   },
   mounted () {
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 280
       console.log('tableHeight', this.tableHeight)
     })
   },
diff --git a/src/views/modules/workSys/elegantCate.vue b/src/views/modules/workSys/elegantCate.vue
index 8c4d47072..bc3af0a07 100644
--- a/src/views/modules/workSys/elegantCate.vue
+++ b/src/views/modules/workSys/elegantCate.vue
@@ -69,6 +69,7 @@
 
 import { requestPost } from '@/js/dai/request'
 import elegantEdit from './elegantEdit.vue'
+import { mapGetters } from 'vuex'
 export default {
 
   data () {
@@ -79,7 +80,7 @@ export default {
       tableParams: {
         customerId: ''
       },
-      tableHeight: 500,
+      // tableHeight: 500,
       search: '',
       dataList: [],
 
@@ -101,7 +102,14 @@ export default {
       }
       console.log('this.dataList', this.dataList)
       return this.dataList
-    }
+    },
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   components: {
     elegantEdit
@@ -112,10 +120,10 @@ export default {
     this.initData(user.customerId, user.customerName)
   },
   mounted() {
-    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
-      console.log('tableHeight', this.tableHeight)
-    })
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
+    //   console.log('tableHeight', this.tableHeight)
+    // })
   },
   methods: {
     cellStyle ({ row, column, rowIndex, columnIndex }) {
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index d6594778d..4c1914b92 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -192,6 +192,7 @@
 <script>
 import axios from 'axios'
 import Sortable from 'sortablejs'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -206,7 +207,7 @@ export default {
       total: null,
       conditions: [],
       tableData: [],
-      tableHeight: 500,
+      sHeight: 0,
       isWarn: null,
       level: null,
       options: [
@@ -286,6 +287,15 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
   async created() {
     this.customerId = localStorage.getItem('customerId')
     this.getTableData()
@@ -294,7 +304,7 @@ export default {
   mounted() {
     this.rowDrop()
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 230 + 'px'
+      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 230
       console.log('tableHeight', this.tableHeight)
     })
   },

From 823b2483f8c1bf2a21cb073fe970c4c82b13437b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 14:28:01 +0800
Subject: [PATCH 15/15] dd

---
 src/i18n/zh-CN.js   |  4 +--
 src/router/index.js | 62 ++++++++++++++++++++++-----------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 789f50f84..9a495765f 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -3,9 +3,9 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '数字社区工作平台'
+t.brand.lg = '数字社区综合服务平台'
 t.brand.mini = '数字'
-t.brand.work = '数字社区工作平台'
+t.brand.work = '数字社区综合服务平台'
 t.brand.workMini = '工作端'
 
 t.add = '新增'
diff --git a/src/router/index.js b/src/router/index.js
index 9712a81a9..e78885829 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -237,6 +237,29 @@ router.beforeEach((to, from, next) => {
       name: "人员预警",
       url: "visual/warning/index",
     },
+    {
+      icon: "icon-setting",
+      id: "2221321001",
+      name: "社区党建",
+      // url: "visual/basicinfo/basicInfoMain",
+      children: [
+        {
+          url: "/visual/communityParty/party",
+          name: "党员信息统计",
+          id: "5feawfwaefwa578",
+        },
+        {
+          url: "/visual/communityParty/community",
+          name: "区域化党建",
+          id: "5fwaefwaefawef588",
+        },
+        {
+          url: "/visual/communityParty/elegant",
+          name: "党员风采榜",
+          id: "5fwaefwaefawef589",
+        },
+      ],
+    },
     {
       icon: "icon-setting",
       id: "6",
@@ -244,63 +267,40 @@ router.beforeEach((to, from, next) => {
       children: [
         {
           url: "visual/communityGovern/processAnalyze",
-          name: "项目处理分析",
+          name: "事件处置分析",
           id: "processAnalyze",
         },
         {
           url: "/visual/communityGovern/typeAnalyze",
-          name: "项目分类分析",
+          name: "事件分类分析",
           id: "typeAnalyze",
         },
         {
           url: "/visual/communityGovern/resibuzz",
-          name: "居民热议",
+          name: "居民热议分析",
           id: "resibuzz",
         },
         {
           url: "/visual/communityGovern/distributionAnalyze",
-          name: "项目分布分析",
+          name: "事件分布分析",
           id: "distributionAnalyze",
         },
       ],
     },
-    {
-      icon: "icon-setting",
-      id: "2221321001",
-      name: "社区党建",
-      // url: "visual/basicinfo/basicInfoMain",
-      children: [
-        {
-          url: "/visual/communityParty/party",
-          name: "党员信息统计",
-          id: "5feawfwaefwa578",
-        },
-        {
-          url: "/visual/communityParty/community",
-          name: "区域化党建",
-          id: "5fwaefwaefawef588",
-        },
-        {
-          url: "/visual/communityParty/elegant",
-          name: "党员风采",
-          id: "5fwaefwaefawef589",
-        },
-      ],
-    },
     {
       icon: "icon-setting",
       id: "2221321123",
-      name: "措施清单",
+      name: "社区服务",
       // url: "visual/basicinfo/basicInfoMain",
       children: [
         {
           url: "/visual/measure/service",
-          name: "服务措施分析",
+          name: "需求服务分析",
           id: "5feawfwaefwa57",
         },
         {
           url: "/visual/measure/volunteer",
-          name: "志愿者服务分析",
+          name: "志愿服务分析",
           id: "5fwaefwaefawef58",
         },
       ],
@@ -315,7 +315,7 @@ router.beforeEach((to, from, next) => {
     {
       icon: "icon-setting",
       id: "44rq22222q2222",
-      name: "AI安防",
+      name: "智慧安防",
       // url: "visual/basicinfo/basicInfoMain",
       children: [
         {