From cdb570d9b588f3ae992668b71750ef307a08e410 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 6 Sep 2022 10:52:45 +0800
Subject: [PATCH 01/37] 111

---
 src/views/modules/communityParty/calendar/index.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index fd3a8692a..a513d2054 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -48,6 +48,10 @@
                   <span>活动类型：</span>
                   <span>{{ item.actTypeName }}</span>
                 </div>
+                <div class="item-prop">
+                  <span>活动主题：</span>
+                  <span>{{ item.topic }}</span>
+                </div>
                 <div class="item-prop">
                   <span>开始时间：</span>
                   <span>{{ item.holdTime }}</span>
@@ -184,6 +188,10 @@
                         <span>活动类型：</span>
                         <span>{{ item.actTypeName }}</span>
                       </div>
+                      <div class="item-prop">
+                        <span>活动主题：</span>
+                        <span>{{ item.topic }}</span>
+                      </div>
                       <div class="item-prop">
                         <span>开始时间：</span>
                         <span>{{ item.holdTime }}</span>

From 1ba72f0bbd3652fc33c8c53c2fe72c3a2cf51e19 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 10:57:58 +0800
Subject: [PATCH 02/37] kuandu

---
 src/views/modules/communityParty/stas/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index b063e674b..04efa189a 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -75,42 +75,42 @@
                          header-align="center"
                          align="center"
                          label="支部党员大会(次)"
-                         min-width="80">
+                         >
         </el-table-column>
         <el-table-column prop="wyhNum"
                          header-align="center"
                          align="center"
                          label="支部委员会(次)"
                          show-overflow-tooltip
-                         max-width="100">
+                         >
         </el-table-column>
         <el-table-column prop="dxzhNum"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
                          label="党小组会(次)"
-                         mix-width="80">
+                         >
         </el-table-column>
         <el-table-column prop="dkNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="党课(次)"
-                         mix-width="80">
+                         >
         </el-table-column>
         <el-table-column prop="ztdrNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="主题党日(次)"
-                         width="100">
+                         >
         </el-table-column>
         <el-table-column prop="wmfwNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="为民服务活动(次)"
-                         width="130">
+                         >
         </el-table-column>
       </el-table>
     </div>

From 518c07a608c54f79138361398bdd26da9c9c6b46 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 11:15:47 +0800
Subject: [PATCH 03/37] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/calendar/cpts/calendar.vue | 4 ++--
 src/views/modules/communityParty/calendar/index.vue         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index c653429eb..439de3a20 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -197,8 +197,8 @@ export default {
       width: 14.285%;
       text-align: center;
       box-sizing: border-box;
-      padding: 8px 0;
-      height: 100px;
+      padding: 12px 0;
+      height: 125px;
       background-color: #ffffff;
       opacity: 0.4;
 
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index a513d2054..449217106 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -790,8 +790,8 @@ $red: #f33;
 
   .tip {
     position: relative;
-    margin: -15px 0px 0px 0px;
-    padding: 8px 2px 3px 12px;
+    margin: 0px 0px 0px 0px;
+    padding: 8px 2px 5px 12px;
     line-height: 18px;
     box-shadow: 0 0 10px 5px #eee;
     background-color: #ffffff;

From 3bb8193d7ac5f412928a86b9c24df0ce7ad8645d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 13:33:43 +0800
Subject: [PATCH 04/37] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/calendar/cpts/calendar.vue | 4 ++--
 src/views/modules/communityParty/calendar/index.vue         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 439de3a20..c653429eb 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -197,8 +197,8 @@ export default {
       width: 14.285%;
       text-align: center;
       box-sizing: border-box;
-      padding: 12px 0;
-      height: 125px;
+      padding: 8px 0;
+      height: 100px;
       background-color: #ffffff;
       opacity: 0.4;
 
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 449217106..a513d2054 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -790,8 +790,8 @@ $red: #f33;
 
   .tip {
     position: relative;
-    margin: 0px 0px 0px 0px;
-    padding: 8px 2px 5px 12px;
+    margin: -15px 0px 0px 0px;
+    padding: 8px 2px 3px 12px;
     line-height: 18px;
     box-shadow: 0 0 10px 5px #eee;
     background-color: #ffffff;

From fa7c121f5e263836f6d69c3e622b2cafc03b174b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 17:25:51 +0800
Subject: [PATCH 05/37] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../point/icpointnucleicmonitoring.vue        | 43 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index a4bbccfcf..29bf60173 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -153,13 +153,34 @@
           align="center"
           show-overflow-tooltip
         ></el-table-column>
+        <el-table-column
+                prop="enableFlag"
+                label="禁用/启用"
+                header-align="center"
+                align="center"
+                show-overflow-tooltip>
+          <template slot-scope="scope">
+          <span v-for="(item, index) in enableFlagList"
+                :key="item.value"
+                :value="item.label"
+                v-if="scope.row.enableFlag == item.value">
+              {{ item.label }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           header-align="center"
           align="center"
-          width="150"
+          width="180"
         >
           <template slot-scope="scope">
+            <el-button
+                    type="text"
+                    size="small"
+                    class="div-table-button--detail"
+                    @click="enableOrDisabled(scope.row.id)"
+            >{{ scope.row.enableFlag === 'enable' ? '禁用' : '启用' }}</el-button
+            >
             <el-button
               type="text"
               size="small"
@@ -243,6 +264,16 @@ export default {
   mixins: [mixinViewModule],
   data() {
     return {
+      enableFlagList: [
+        {
+          value: 'enable',
+          label: '启用'
+        },
+        {
+          value: 'disabled',
+          label: '禁用'
+        }
+      ],
       dataForm: {
         name: "",
         mobile: "",
@@ -361,6 +392,16 @@ export default {
     diaClose() {
       this.sendNoticeFormShow = false;
     },
+    // 启用/禁用
+    enableOrDisabled(id) {
+      this.$http
+              .post(`/epmetuser/appPoint/enableOrDisabled/` + id)
+              .then(({ data: res }) => {
+
+              })
+              .catch(() => {});
+      this.loadTable();
+    },
     // 新增 / 修改
     addOrUpdateHandle(id, title) {
       this.dialogTitle = title;

From 338b28fe5522567e0dc7f44fe6927af40bd28d64 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 7 Sep 2022 09:47:38 +0800
Subject: [PATCH 06/37] 11

---
 .env.development                                              | 4 ++--
 .../modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index af4564f4b..4e6cab176 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
-VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
index 29a783b6d..3189f5e92 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
@@ -159,7 +159,7 @@
                           placeholder="选择日期">
           </el-date-picker>
           <div v-else
-               class="div-content">{{ scope.row.patrolTime }}</div>
+               class="div-content">{{ scope.row.reviewTime }}</div>
         </template>
       </el-table-column>
 

From b8afc4a1f642945208ec68738b47f6ef4662b469 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 7 Sep 2022 09:47:55 +0800
Subject: [PATCH 07/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index af4564f4b..4e6cab176 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
-VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api

From 92f5188d18a10bcbcf1034453d8c6c14e35fa2c0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 7 Sep 2022 10:05:22 +0800
Subject: [PATCH 08/37] =?UTF-8?q?=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/point/icpointnucleicmonitoring.vue     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 29bf60173..8921683fa 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -178,9 +178,7 @@
                     type="text"
                     size="small"
                     class="div-table-button--detail"
-                    @click="enableOrDisabled(scope.row.id)"
-            >{{ scope.row.enableFlag === 'enable' ? '禁用' : '启用' }}</el-button
-            >
+                    @click="enableOrDisabled(scope.row.id)">{{ (scope.row.enableFlag === 'enable' && '禁用') || '启用' }}</el-button>
             <el-button
               type="text"
               size="small"
@@ -397,10 +395,9 @@ export default {
       this.$http
               .post(`/epmetuser/appPoint/enableOrDisabled/` + id)
               .then(({ data: res }) => {
-
+                this.loadTable();
               })
               .catch(() => {});
-      this.loadTable();
     },
     // 新增 / 修改
     addOrUpdateHandle(id, title) {

From 53da81fe2fae5084c5d9e48d46134cf4fd4e6cfb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 7 Sep 2022 13:45:39 +0800
Subject: [PATCH 09/37] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=9C=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/dai/nongli.js                          | 1102 +++++++++++++++++
 .../communityParty/calendar/cpts/calendar.vue |   73 +-
 .../modules/communityParty/calendar/index.vue |  350 +++---
 3 files changed, 1354 insertions(+), 171 deletions(-)
 create mode 100644 src/js/dai/nongli.js

diff --git a/src/js/dai/nongli.js b/src/js/dai/nongli.js
new file mode 100644
index 000000000..244759b55
--- /dev/null
+++ b/src/js/dai/nongli.js
@@ -0,0 +1,1102 @@
+/**
+ * @1900-2100区间内的公历、农历互转
+ * @charset UTF-8
+ * @Author  Jea杨(JJonline@JJonline.Cn)
+ * @Time    2014-7-21
+ * @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+ * @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+ * @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+ * @Version 1.0.3
+ * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+ * @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+ */
+export default {
+  /**
+   * 农历1900-2100的润大小信息表
+   * @Array Of Property
+   * @return Hex
+   */
+  lunarInfo: [
+    0x04bd8,
+    0x04ae0,
+    0x0a570,
+    0x054d5,
+    0x0d260,
+    0x0d950,
+    0x16554,
+    0x056a0,
+    0x09ad0,
+    0x055d2, //1900-1909
+    0x04ae0,
+    0x0a5b6,
+    0x0a4d0,
+    0x0d250,
+    0x1d255,
+    0x0b540,
+    0x0d6a0,
+    0x0ada2,
+    0x095b0,
+    0x14977, //1910-1919
+    0x04970,
+    0x0a4b0,
+    0x0b4b5,
+    0x06a50,
+    0x06d40,
+    0x1ab54,
+    0x02b60,
+    0x09570,
+    0x052f2,
+    0x04970, //1920-1929
+    0x06566,
+    0x0d4a0,
+    0x0ea50,
+    0x16a95,
+    0x05ad0,
+    0x02b60,
+    0x186e3,
+    0x092e0,
+    0x1c8d7,
+    0x0c950, //1930-1939
+    0x0d4a0,
+    0x1d8a6,
+    0x0b550,
+    0x056a0,
+    0x1a5b4,
+    0x025d0,
+    0x092d0,
+    0x0d2b2,
+    0x0a950,
+    0x0b557, //1940-1949
+    0x06ca0,
+    0x0b550,
+    0x15355,
+    0x04da0,
+    0x0a5b0,
+    0x14573,
+    0x052b0,
+    0x0a9a8,
+    0x0e950,
+    0x06aa0, //1950-1959
+    0x0aea6,
+    0x0ab50,
+    0x04b60,
+    0x0aae4,
+    0x0a570,
+    0x05260,
+    0x0f263,
+    0x0d950,
+    0x05b57,
+    0x056a0, //1960-1969
+    0x096d0,
+    0x04dd5,
+    0x04ad0,
+    0x0a4d0,
+    0x0d4d4,
+    0x0d250,
+    0x0d558,
+    0x0b540,
+    0x0b6a0,
+    0x195a6, //1970-1979
+    0x095b0,
+    0x049b0,
+    0x0a974,
+    0x0a4b0,
+    0x0b27a,
+    0x06a50,
+    0x06d40,
+    0x0af46,
+    0x0ab60,
+    0x09570, //1980-1989
+    0x04af5,
+    0x04970,
+    0x064b0,
+    0x074a3,
+    0x0ea50,
+    0x06b58,
+    0x05ac0,
+    0x0ab60,
+    0x096d5,
+    0x092e0, //1990-1999
+    0x0c960,
+    0x0d954,
+    0x0d4a0,
+    0x0da50,
+    0x07552,
+    0x056a0,
+    0x0abb7,
+    0x025d0,
+    0x092d0,
+    0x0cab5, //2000-2009
+    0x0a950,
+    0x0b4a0,
+    0x0baa4,
+    0x0ad50,
+    0x055d9,
+    0x04ba0,
+    0x0a5b0,
+    0x15176,
+    0x052b0,
+    0x0a930, //2010-2019
+    0x07954,
+    0x06aa0,
+    0x0ad50,
+    0x05b52,
+    0x04b60,
+    0x0a6e6,
+    0x0a4e0,
+    0x0d260,
+    0x0ea65,
+    0x0d530, //2020-2029
+    0x05aa0,
+    0x076a3,
+    0x096d0,
+    0x04afb,
+    0x04ad0,
+    0x0a4d0,
+    0x1d0b6,
+    0x0d250,
+    0x0d520,
+    0x0dd45, //2030-2039
+    0x0b5a0,
+    0x056d0,
+    0x055b2,
+    0x049b0,
+    0x0a577,
+    0x0a4b0,
+    0x0aa50,
+    0x1b255,
+    0x06d20,
+    0x0ada0, //2040-2049
+    /**Add By JJonline@JJonline.Cn**/
+    0x14b63,
+    0x09370,
+    0x049f8,
+    0x04970,
+    0x064b0,
+    0x168a6,
+    0x0ea50,
+    0x06b20,
+    0x1a6c4,
+    0x0aae0, //2050-2059
+    0x092e0,
+    0x0d2e3,
+    0x0c960,
+    0x0d557,
+    0x0d4a0,
+    0x0da50,
+    0x05d55,
+    0x056a0,
+    0x0a6d0,
+    0x055d4, //2060-2069
+    0x052d0,
+    0x0a9b8,
+    0x0a950,
+    0x0b4a0,
+    0x0b6a6,
+    0x0ad50,
+    0x055a0,
+    0x0aba4,
+    0x0a5b0,
+    0x052b0, //2070-2079
+    0x0b273,
+    0x06930,
+    0x07337,
+    0x06aa0,
+    0x0ad50,
+    0x14b55,
+    0x04b60,
+    0x0a570,
+    0x054e4,
+    0x0d160, //2080-2089
+    0x0e968,
+    0x0d520,
+    0x0daa0,
+    0x16aa6,
+    0x056d0,
+    0x04ae0,
+    0x0a9d4,
+    0x0a2d0,
+    0x0d150,
+    0x0f252, //2090-2099
+    0x0d520,
+  ], //2100
+
+  /**
+   * 公历每个月份的天数普通表
+   * @Array Of Property
+   * @return Number
+   */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+   * 天干地支之天干速查表
+   * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+   * @return Cn string
+   */
+  Gan: [
+    '\u7532',
+    '\u4e59',
+    '\u4e19',
+    '\u4e01',
+    '\u620a',
+    '\u5df1',
+    '\u5e9a',
+    '\u8f9b',
+    '\u58ec',
+    '\u7678',
+  ],
+
+  /**
+   * 天干地支之地支速查表
+   * @Array Of Property
+   * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+   * @return Cn string
+   */
+  Zhi: [
+    '\u5b50',
+    '\u4e11',
+    '\u5bc5',
+    '\u536f',
+    '\u8fb0',
+    '\u5df3',
+    '\u5348',
+    '\u672a',
+    '\u7533',
+    '\u9149',
+    '\u620c',
+    '\u4ea5',
+  ],
+
+  /**
+   * 天干地支之地支速查表<=>生肖
+   * @Array Of Property
+   * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+   * @return Cn string
+   */
+  Animals: [
+    '\u9f20',
+    '\u725b',
+    '\u864e',
+    '\u5154',
+    '\u9f99',
+    '\u86c7',
+    '\u9a6c',
+    '\u7f8a',
+    '\u7334',
+    '\u9e21',
+    '\u72d7',
+    '\u732a',
+  ],
+
+  /**
+   * 阳历节日
+   */
+  festival: {
+    '1-1': { title: '元旦节' },
+    '2-14': { title: '情人节' },
+    '5-1': { title: '劳动节' },
+    '5-4': { title: '青年节' },
+    '6-1': { title: '儿童节' },
+    '9-10': { title: '教师节' },
+    '10-1': { title: '国庆节' },
+    '12-25': { title: '圣诞节' },
+    '3-8': { title: '妇女节' },
+    '3-12': { title: '植树节' },
+    '4-1': { title: '愚人节' },
+    '5-12': { title: '护士节' },
+    '7-1': { title: '建党节' },
+    '8-1': { title: '建军节' },
+    '12-24': { title: '平安夜' },
+  },
+
+  /**
+   * 农历节日
+   */
+  lfestival: {
+    '1-1': { title: '春节' },
+    '1-15': { title: '元宵节' },
+    '5-5': { title: '端午节' },
+    '7-7': { title: '情人节' },
+    '7-15': { title: '中元节' },
+    '8-15': { title: '中秋节' },
+    '9-9': { title: '重阳节' },
+    '12-8': { title: '腊八节' },
+    '12-24': { title: '北小年' },
+    '12-25': { title: '南小年' },
+  },
+
+  /**
+   * 返回默认定义的阳历节日
+   */
+  getFestival() {
+    return this.festival
+  },
+
+  /**
+   * 返回默认定义的内容里节日
+   */
+  getLunarFestival() {
+    return this.lfestival
+  },
+
+  /**
+   *
+   * @param {Object} 按照festival的格式输入数据，设置阳历节日
+   */
+  setFestival(param = {}) {
+    this.festival = param
+  },
+
+  /**
+   *
+   * @param {Object} 按照lfestival的格式输入数据，设置农历节日
+   */
+  setLunarFestival(param = {}) {
+    this.lfestival = param
+  },
+
+  /**
+   * 24节气速查表
+   * @Array Of Property
+   * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+   * @return Cn string
+   */
+  solarTerm: [
+    '\u5c0f\u5bd2',
+    '\u5927\u5bd2',
+    '\u7acb\u6625',
+    '\u96e8\u6c34',
+    '\u60ca\u86f0',
+    '\u6625\u5206',
+    '\u6e05\u660e',
+    '\u8c37\u96e8',
+    '\u7acb\u590f',
+    '\u5c0f\u6ee1',
+    '\u8292\u79cd',
+    '\u590f\u81f3',
+    '\u5c0f\u6691',
+    '\u5927\u6691',
+    '\u7acb\u79cb',
+    '\u5904\u6691',
+    '\u767d\u9732',
+    '\u79cb\u5206',
+    '\u5bd2\u9732',
+    '\u971c\u964d',
+    '\u7acb\u51ac',
+    '\u5c0f\u96ea',
+    '\u5927\u96ea',
+    '\u51ac\u81f3',
+  ],
+
+  /**
+   * 1900-2100各年的24节气日期速查表
+   * @Array Of Property
+   * @return 0x string For splice
+   */
+  sTermInfo: [
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa',
+    '9778397bd19801ec9210c965cc920e',
+    '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e',
+    '97bd09801d98082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e',
+    '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2',
+    '9778397bd19801ec9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e',
+    '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa',
+    '97b6b97bd197c36c9210c9274c920e',
+    '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722',
+    '7f0e37f5307f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721',
+    '7f0e27f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa',
+    '97b6b7f0e47f149b0723b0787b0721',
+    '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2',
+    '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722',
+    '7f0e37f5307f595b0b0bc920fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd',
+    '7f07e7f0e37f149b0723b0787b0721',
+    '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722',
+    '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722',
+    '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e37f14998083b0787b0721',
+    '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14898082b0723b02d5',
+    '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722',
+    '7f0e36665b66aa89801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722',
+    '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e26665b66a449801e9808297c35',
+    '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722',
+  ],
+
+  /**
+   * 数字转中文速查表
+   * @Array Of Property
+   * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+   * @return Cn string
+   */
+  nStr1: [
+    '\u65e5',
+    '\u4e00',
+    '\u4e8c',
+    '\u4e09',
+    '\u56db',
+    '\u4e94',
+    '\u516d',
+    '\u4e03',
+    '\u516b',
+    '\u4e5d',
+    '\u5341',
+  ],
+
+  /**
+   * 日期转农历称呼速查表
+   * @Array Of Property
+   * @trans ['初','十','廿','卅']
+   * @return Cn string
+   */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+   * 月份转农历称呼速查表
+   * @Array Of Property
+   * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+   * @return Cn string
+   */
+  nStr3: [
+    '\u6b63',
+    '\u4e8c',
+    '\u4e09',
+    '\u56db',
+    '\u4e94',
+    '\u516d',
+    '\u4e03',
+    '\u516b',
+    '\u4e5d',
+    '\u5341',
+    '\u51ac',
+    '\u814a',
+  ],
+
+  /**
+   * 返回农历y年一整年的总天数
+   * @param lunar Year
+   * @return Number
+   * @eg:var count = calendar.lYearDays(1987) ;//count=387
+   */
+  lYearDays: function (y) {
+    var i,
+      sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) {
+      sum += this.lunarInfo[y - 1900] & i ? 1 : 0
+    }
+    return sum + this.leapDays(y)
+  },
+
+  /**
+   * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+   * @param lunar Year
+   * @return Number (0-12)
+   * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+   */
+  leapMonth: function (y) {
+    //闰字编码 \u95f0
+    return this.lunarInfo[y - 1900] & 0xf
+  },
+
+  /**
+   * 返回农历y年闰月的天数 若该年没有闰月则返回0
+   * @param lunar Year
+   * @return Number (0、29、30)
+   * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+   */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return this.lunarInfo[y - 1900] & 0x10000 ? 30 : 29
+    }
+    return 0
+  },
+
+  /**
+   * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+   * @param lunar Year
+   * @return Number (-1、29、30)
+   * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+   */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) {
+      return -1
+    } //月份参数从1至12，参数错误返回-1
+    return this.lunarInfo[y - 1900] & (0x10000 >> m) ? 30 : 29
+  },
+
+  /**
+   * 返回公历(!)y年m月的天数
+   * @param solar Year
+   * @return Number (-1、28、29、30、31)
+   * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+   */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) {
+      return -1
+    } //若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) {
+      //2月份的闰平规律测算后确认返回28或29
+      return (y % 4 == 0 && y % 100 != 0) || y % 400 == 0 ? 29 : 28
+    } else {
+      return this.solarMonth[ms]
+    }
+  },
+
+  /**
+   * 农历年份转换为干支纪年
+   * @param  lYear 农历年的年份数
+   * @return Cn string
+   */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10 //如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12 //如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+   * 公历月、日判断所属星座
+   * @param  cMonth [description]
+   * @param  cDay [description]
+   * @return Cn string
+   */
+  toAstro: function (cMonth, cDay) {
+    var s =
+      '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' //座
+  },
+
+  /**
+   * 传入offset偏移量返回干支
+   * @param offset 相对甲子的偏移量
+   * @return Cn string
+   */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+   * 传入公历(!)y年获得该年第n个节气的公历日期
+   * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+   * @return day Number
+   * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+   */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) {
+      return -1
+    }
+    if (n < 1 || n > 24) {
+      return -1
+    }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString(),
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2),
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+   * 传入农历数字月份返回汉语通俗表示法
+   * @param lunar month
+   * @return Cn string
+   * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+   */
+  toChinaMonth: function (m) {
+    // 月 => \u6708
+    if (m > 12 || m < 1) {
+      return -1
+    } //若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708' //加上月字
+    return s
+  },
+
+  /**
+   * 传入农历日期数字返回汉字表示法
+   * @param lunar day
+   * @return Cn string
+   * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+   */
+  toChinaDay: function (d) {
+    //日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'
+        break
+      case 20:
+        s = '\u4e8c\u5341'
+        break
+        break
+      case 30:
+        s = '\u4e09\u5341'
+        break
+        break
+      default:
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return s
+  },
+
+  /**
+   * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+   * @param y year
+   * @return Cn string
+   * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+   */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+  /**
+   * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+   * @param y  solar year
+   * @param m  solar month
+   * @param d  solar day
+   * @return JSON object
+   * @eg:console.log(calendar.solar2lunar(1987,11,01));
+   */
+  solar2lunar: function (y, m, d) {
+    //参数区间1900.1.31~2100.12.31
+    y = parseInt(y)
+    m = parseInt(m)
+    d = parseInt(d)
+    //年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1 // undefined转换为数字变为NaN
+    }
+    //公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    //未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i,
+      leap = 0,
+      temp = 0
+    //修正ymd参数
+    var y = objDate.getFullYear(),
+      m = objDate.getMonth() + 1,
+      d = objDate.getDate()
+    var offset =
+      (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) -
+        Date.UTC(1900, 0, 31)) /
+      86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp
+      i--
+    }
+
+    //是否今天
+    var isTodayObj = new Date(),
+      isToday = false
+    if (
+      isTodayObj.getFullYear() == y &&
+      isTodayObj.getMonth() + 1 == m &&
+      isTodayObj.getDate() == d
+    ) {
+      isToday = true
+    }
+    //星期几
+    var nWeek = objDate.getDay(),
+      cWeek = this.nStr1[nWeek]
+    //数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    //农历年
+    var year = i
+    var leap = this.leapMonth(i) //闰哪个月
+    var isLeap = false
+
+    //效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      //闰月
+      if (leap > 0 && i == leap + 1 && isLeap == false) {
+        --i
+        isLeap = true
+        temp = this.leapDays(year) //计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i) //计算农历普通月天数
+      }
+      //解除闰月
+      if (isLeap == true && i == leap + 1) {
+        isLeap = false
+      }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true
+        --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp
+      --i
+    }
+    //农历月
+    var month = i
+    //农历日
+    var day = offset + 1
+    //天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, m * 2 - 1) //返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, m * 2) //返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    //传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    //日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    //该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    var solarDate = y + '-' + m + '-' + d
+    var lunarDate = year + '-' + month + '-' + day
+
+    var festival = this.festival
+    var lfestival = this.lfestival
+    var festivalDate = m + '-' + d
+    var lunarFestivalDate = month + '-' + day
+    let obj = {
+      date: solarDate,
+      lunarDate: lunarDate,
+      festival: festival[festivalDate] ? festival[festivalDate].title : null,
+      lunarFestival: lfestival[lunarFestivalDate]
+        ? lfestival[lunarFestivalDate].title
+        : null,
+      lYear: year,
+      lMonth: month,
+      lDay: day,
+      Animal: this.getAnimal(year),
+      IMonthCn: (isLeap ? '\u95f0' : '') + this.toChinaMonth(month),
+      IDayCn: this.toChinaDay(day),
+      cYear: y,
+      cMonth: m,
+      cDay: d,
+      gzYear: gzY,
+      gzMonth: gzM,
+      gzDay: gzD,
+      isToday: isToday,
+      isLeap: isLeap,
+      nWeek: nWeek,
+      ncWeek: '\u661f\u671f' + cWeek,
+      isTerm: isTerm,
+      Term: Term,
+      astro: astro,
+    }
+    // console.log(obj.lYear, "obj")
+    return obj
+  },
+
+  /**
+   * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+   * @param y  lunar year
+   * @param m  lunar month
+   * @param d  lunar day
+   * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+   * @return JSON object
+   * @eg:console.log(calendar.lunar2solar(1987,9,10));
+   */
+  lunar2solar: function (y, m, d, isLeapMonth) {
+    //参数区间1900.1.31~2100.12.1
+    y = parseInt(y)
+    m = parseInt(m)
+    d = parseInt(d)
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && leapMonth != m) {
+      return -1
+    } //传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if ((y == 2100 && m == 12 && d > 1) || (y == 1900 && m == 1 && d < 31)) {
+      return -1
+    } //超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    //bugFix 2016-9-25
+    //if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) {
+      return -1
+    } //参数合法性效验
+
+    //计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0,
+      isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) {
+        //处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y)
+          isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    //转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) {
+      offset += day
+    }
+    //1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  },
+}
diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index c653429eb..22c2bc069 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -1,36 +1,43 @@
 <template>
   <div class="m-calendar">
     <div class="top-list">
-      <div class="top"
-           v-for="(item, index) in top"
-           :class="{ 'z-weekend': index > 4 }"
-           :key="item">
+      <div
+        class="top"
+        v-for="(item, index) in top"
+        :class="{ 'z-weekend': index > 4 }"
+        :key="item"
+      >
         {{ item }}
       </div>
     </div>
     <!-- 日历号 -->
     <div class="date-list">
-      <div class="date-item"
-           :class="{
+      <div
+        class="date-item"
+        :class="{
           'z-on': item.format == currentDate,
           'z-this-month': item.thisMonth,
           'z-today': item.isToday,
           'z-after-today': item.afterToday,
           'z-weekend': item.day == 6 || item.day == 0,
         }"
-           v-for="(item, index) in visibleCalendar"
-           :key="index"
-           @click="handleClickDate(item)">
+        v-for="(item, index) in visibleCalendar"
+        :key="index"
+        @click="handleClickDate(item)"
+      >
         <div class="date">{{ item.date }}</div>
-        <slot name="date-item"
-              v-bind:item="item"
-              v-bind:index="index"></slot>
+        <div class="nongli">
+          {{ computeNongliText(item.year, item.month, item.date) }}
+        </div>
+        <slot name="date-item" v-bind:item="item" v-bind:index="index"> </slot>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import nongli from "@/js/dai/nongli";
+
 export default {
   props: {
     currentYear: {
@@ -42,7 +49,7 @@ export default {
       default: new Date().getMonth(),
     },
   },
-  data () {
+  data() {
     return {
       top: ["一", "二", "三", "四", "五", "六", "日"],
       currentDate: "",
@@ -50,7 +57,7 @@ export default {
   },
   computed: {
     // 获取当前月份显示日历,共42天
-    visibleCalendar () {
+    visibleCalendar() {
       // 获取今天的年月日
       const { currentYear, currentMonth } = this;
       const today = new Date();
@@ -111,25 +118,30 @@ export default {
     },
   },
   watch: {
-    visibleCalendar () {
+    visibleCalendar() {
       this.init();
     },
   },
-  mounted () {
+  mounted() {
     console.log("123", this.time);
     this.init();
   },
   methods: {
-    init () {
+    computeNongliText(y, m, d) {
+      let item = nongli.solar2lunar(y, m, d);
+      return item.festival || item.lunarFestival || item.Term || item.IDayCn;
+    },
+
+    init() {
       if (!this.currentDate) {
         this.handleClickDate(
           this.visibleCalendar.find((item) => item.isToday) ||
-          this.visibleCalendar.filter((item) => item.thisMonth)[0]
+            this.visibleCalendar.filter((item) => item.thisMonth)[0]
         );
       }
     },
 
-    handleClickDate (item) {
+    handleClickDate(item) {
       console.log("点击日历日期", item);
       this.currentDate = item.format;
 
@@ -165,8 +177,8 @@ export default {
       width: 14.285%;
       padding: 20px 0;
       font-size: 20px;
-      font-weight:bold;
-      background-color: #E6A23C;
+      font-weight: bold;
+      background-color: #e6a23c;
       text-align: center;
 
       &::after {
@@ -220,19 +232,30 @@ export default {
         line-height: 50px;
         font-size: 28px;
         font-weight: bold;
-        color:#3e8ef7;
+        color: #3e8ef7;
+      }
+
+      .nongli{
+        position: absolute;
+        z-index: 0;
+        left: 0;
+        right: 0;
+        text-align: center;
       }
 
       &.z-on {
         z-index: 21;
         box-shadow: 0 0 15px 5px #a8cee0;
-        background:#3E8EF7;
-        
+        background: #3e8ef7;
+
         .date {
           font-size: 30px;
-          color:#ffffff;
+          color: #ffffff;
           font-weight: bold;
         }
+        .nongli {
+          color: #ffffff;
+        }
       }
 
       &.z-this-month {
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index fd3a8692a..792ae46b4 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -1,25 +1,28 @@
 <template>
   <div>
-    <div v-if="showType === 'list'"
-         class="g-cnt">
+    <div v-if="showType === 'list'" class="g-cnt">
       <el-row :gutter="15">
         <el-col :span="6">
           <div class="m-sizer">
             <div class="item">
-              <el-cascader class="customer_cascader"
-                           ref="myCascader"
-                           size="big"
-                           v-model="fmData.orgId"
-                           :options="partyOptions"
-                           :props="partyOptionsProps"
-                           :show-all-levels="false"
-                           @change="handleChangeParty"></el-cascader>
+              <el-cascader
+                class="customer_cascader"
+                ref="myCascader"
+                size="big"
+                v-model="fmData.orgId"
+                :options="partyOptions"
+                :props="partyOptionsProps"
+                :show-all-levels="false"
+                @change="handleChangeParty"
+              ></el-cascader>
             </div>
             <div class="item">
-              <el-radio v-model="fmData.isSelf"
-                        label="1">本人创建的活动</el-radio>
-              <el-radio v-model="fmData.isSelf"
-                        label="0">本组织所有活动</el-radio>
+              <el-radio v-model="fmData.isSelf" label="1"
+                >本人创建的活动</el-radio
+              >
+              <el-radio v-model="fmData.isSelf" label="0"
+                >本组织所有活动</el-radio
+              >
             </div>
           </div>
 
@@ -31,16 +34,20 @@
             <div class="date-week">{{ currentDate.dayFormat }}</div>
           </div>
 
-          <div class="m-list"
-               v-if="
+          <div
+            class="m-list"
+            v-if="
               currentDateData.activityList.length > 0 ||
               currentDateData.scheduleList.length > 0
-            ">
+            "
+          >
             <div class="list-title">今日活动/日程</div>
             <div class="list">
-              <div class="item"
-                   :key="item.activityId"
-                   v-for="item in currentDateData.activityList">
+              <div
+                class="item"
+                :key="item.activityId"
+                v-for="item in currentDateData.activityList"
+              >
                 <div class="item-title">
                   {{ item.theme }}
                 </div>
@@ -60,23 +67,33 @@
                   <span>参加组织：</span>
                   <span>{{ item.joinOrgs.join("、") }}</span>
                 </div>
-                <div v-if="item.isMe"
-                     class="item-ope">
-                  <el-button type="primary"
-                             v-if="item.isPublish === '0'"
-                             size="mini"
-                             @click="handleClickHuodong('publish', item)">发布</el-button>
-                  <el-button type="success"
-                             size="mini"
-                             @click="handleClickHuodong('edit', item)">修改</el-button>
-                  <el-button size="mini"
-                             @click="handleClickHuodong('del', item)">删除</el-button>
+                <div v-if="item.isMe" class="item-ope">
+                  <el-button
+                    type="primary"
+                    v-if="item.isPublish === '0'"
+                    size="mini"
+                    @click="handleClickHuodong('publish', item)"
+                    >发布</el-button
+                  >
+                  <el-button
+                    type="success"
+                    size="mini"
+                    @click="handleClickHuodong('edit', item)"
+                    >修改</el-button
+                  >
+                  <el-button
+                    size="mini"
+                    @click="handleClickHuodong('del', item)"
+                    >删除</el-button
+                  >
                 </div>
               </div>
 
-              <div class="item"
-                   :key="item.scheduleId"
-                   v-for="item in currentDateData.scheduleList">
+              <div
+                class="item"
+                :key="item.scheduleId"
+                v-for="item in currentDateData.scheduleList"
+              >
                 <div class="item-title">
                   {{ item.title }}
                 </div>
@@ -93,22 +110,29 @@
                   <span>{{ item.remark }}</span>
                 </div>
                 <div class="item-ope">
-                  <el-button type="success"
-                             size="mini"
-                             @click="handleClickRicheng('edit', item)">修改</el-button>
-                  <el-button size="mini"
-                             @click="handleClickRicheng('del', item)">删除</el-button>
+                  <el-button
+                    type="success"
+                    size="mini"
+                    @click="handleClickRicheng('edit', item)"
+                    >修改</el-button
+                  >
+                  <el-button
+                    size="mini"
+                    @click="handleClickRicheng('del', item)"
+                    >删除</el-button
+                  >
                 </div>
               </div>
             </div>
           </div>
 
           <div class="m-ope">
-            <el-button type="warning"
-                       style="width: 48%"
-                       @click="addHudong">添加活动计划</el-button>
-            <el-button style="width: 48%"
-                       @click="addRicheng">添加日程</el-button>
+            <el-button type="warning" style="width: 48%" @click="addHudong"
+              >添加活动计划</el-button
+            >
+            <el-button style="width: 48%" @click="addRicheng"
+              >添加日程</el-button
+            >
           </div>
         </el-col>
 
@@ -116,54 +140,74 @@
           <div class="m-cal">
             <div class="hd">
               <div class="hd-year">
-                <el-date-picker v-model="currentYearStr"
-                                value-format="yyyy"
-                                type="year"
-                                placeholder="选择年度"
-                                size="big"
-                                style="width: 100px;">
+                <el-date-picker
+                  v-model="currentYearStr"
+                  value-format="yyyy"
+                  type="year"
+                  placeholder="选择年度"
+                  size="big"
+                  style="width: 100px"
+                  :editable="false"
+                  :clearable="false"
+                >
                 </el-date-picker>
               </div>
               <div class="hd-month">
-                <div class="month-item"
-                     :class="{ 'z-on': m - 1 == currentMonth }"
-                     :key="'month' + m"
-                     @click="currentMonth = m - 1"
-                     v-for="m in 12">
-                  <el-badge :value="monthData[m-1]"
-                            :hidden="monthData[m-1] == 0"
-                            class="item">
+                <div
+                  class="month-item"
+                  :class="{ 'z-on': m - 1 == currentMonth }"
+                  :key="'month' + m"
+                  @click="currentMonth = m - 1"
+                  v-for="m in 12"
+                >
+                  <el-badge
+                    :value="monthData[m - 1]"
+                    :hidden="monthData[m - 1] == 0"
+                    class="item"
+                  >
                     <div class="month-text">{{ m }}月</div>
                   </el-badge>
                 </div>
               </div>
               <div class="hd-btn">
-                <el-button type="primary"
-                           size="big"
-                           @click="handleAddYearPlan"
-                           style="padding-left:10px; padding-right:10px;">生成年度活动计划</el-button>
+                <el-button
+                  type="primary"
+                  size="big"
+                  @click="handleAddYearPlan"
+                  style="padding-left: 10px; padding-right: 10px"
+                  >生成年度活动计划</el-button
+                >
               </div>
             </div>
-            <calendar :currentYear="currentYear"
-                      :currentMonth="currentMonth"
-                      @rangeChange="handleRangeChange"
-                      @clickDate="handleChangeDate">
+            <calendar
+              :currentYear="currentYear"
+              :currentMonth="currentMonth"
+              @rangeChange="handleRangeChange"
+              @clickDate="handleChangeDate"
+            >
               <template v-slot:date-item="{ item, index }">
-                <div class="tip"
-                     v-if="
+                <div
+                  class="tip"
+                  v-if="
                     rangeData[item.dateId] &&
                     rangeData[item.dateId].activityList.length > 0
-                  ">
-                  <div class="tip-num"
-                       v-if="rangeData[item.dateId].activityList.length > 1">
+                  "
+                >
+                  <div
+                    class="tip-num"
+                    v-if="rangeData[item.dateId].activityList.length > 1"
+                  >
                     {{ rangeData[item.dateId].activityList.length }}
                   </div>
 
                   <div class="tip-text">
                     <span class="z-on">
-                      {{ rangeData[item.dateId].activityList[0].actTypeName }}</span>
+                      {{
+                        rangeData[item.dateId].activityList[0].actTypeName
+                      }}</span
+                    >
                     {{
-                      rangeData[item.dateId].activityList[0].isPublish==='0'
+                      rangeData[item.dateId].activityList[0].isPublish === "0"
                         ? "(未发布)"
                         : "(已发布)"
                     }}
@@ -172,11 +216,12 @@
                     {{ rangeData[item.dateId].activityList[0].topic }}
                   </div>
 
-                  <div class="all-list"
-                       :class="computeAllListClass(index)">
-                    <div class="item"
-                         :key="item.activityId"
-                         v-for="item in rangeData[item.dateId].activityList">
+                  <div class="all-list" :class="computeAllListClass(index)">
+                    <div
+                      class="item"
+                      :key="item.activityId"
+                      v-for="item in rangeData[item.dateId].activityList"
+                    >
                       <div class="item-title">
                         {{ item.theme }}
                       </div>
@@ -199,21 +244,24 @@
                     </div>
                   </div>
                 </div>
-                <div class="corn"
-                     v-if="
+                <div
+                  class="corn"
+                  v-if="
                     rangeData[item.dateId] &&
                     rangeData[item.dateId].scheduleList.length > 0
-                  ">
+                  "
+                >
                   <div class="corn-num">
                     {{ rangeData[item.dateId].scheduleList.length }}
                   </div>
                   <div class="corn-text">日程</div>
 
-                  <div class="all-list"
-                       :class="computeAllListClass(index)">
-                    <div class="item"
-                         :key="item.scheduleId"
-                         v-for="item in rangeData[item.dateId].scheduleList">
+                  <div class="all-list" :class="computeAllListClass(index)">
+                    <div
+                      class="item"
+                      :key="item.scheduleId"
+                      v-for="item in rangeData[item.dateId].scheduleList"
+                    >
                       <div class="item-title">
                         {{ item.title }}
                       </div>
@@ -240,42 +288,52 @@
     </div>
 
     <div v-if="showType === 'yearplan'">
-      <yearplan-list :currentYearStr="currentYearStr"
-                     @handleOk="handleAddPlanOk"
-                     @handleClose="handleAddPlanClose"></yearplan-list>
+      <yearplan-list
+        :currentYearStr="currentYearStr"
+        @handleOk="handleAddPlanOk"
+        @handleClose="handleAddPlanClose"
+      ></yearplan-list>
     </div>
 
-    <el-dialog v-if="showAdd"
-               :visible.sync="showAdd"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="addDiaTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showAdd = false">
-      <add-activity ref="ref_add_form"
-                    :formType="formType"
-                    :icPartyActId="icPartyActId"
-                    :defaultTime="currentDate.dateId"
-                    @handleOk="handleOk"
-                    @handleClose="handleClose"></add-activity>
+    <el-dialog
+      v-if="showAdd"
+      :visible.sync="showAdd"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="addDiaTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showAdd = false"
+    >
+      <add-activity
+        ref="ref_add_form"
+        :formType="formType"
+        :icPartyActId="icPartyActId"
+        :defaultTime="currentDate.dateId"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      ></add-activity>
     </el-dialog>
 
-    <el-dialog v-if="showSchedule"
-               :visible.sync="showSchedule"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="scheduleDiaTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showSchedule = false">
-      <schedule-form ref="ref_schedule_form"
-                     :formType="formType"
-                     :scheduleId="scheduleId"
-                     @handleOk="handleOk"
-                     @handleClose="handleClose">
+    <el-dialog
+      v-if="showSchedule"
+      :visible.sync="showSchedule"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="scheduleDiaTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showSchedule = false"
+    >
+      <schedule-form
+        ref="ref_schedule_form"
+        :formType="formType"
+        :scheduleId="scheduleId"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      >
       </schedule-form>
     </el-dialog>
   </div>
@@ -289,7 +347,7 @@ import yearplanList from "../orgActivity/activivityList/yearplanList";
 import addActivity from "../orgActivity/activivityList/addActivity";
 import scheduleForm from "../orgActivity/activivityList/scheduleForm";
 
-function doAfter (fn) {
+function doAfter(fn) {
   return new Promise(async (resolve) => {
     while (!fn()) {
       await nextTick(100);
@@ -306,7 +364,7 @@ export default {
     addActivity,
     scheduleForm,
   },
-  data () {
+  data() {
     let todayObj = new Date();
 
     return {
@@ -357,10 +415,10 @@ export default {
     };
   },
   computed: {
-    currentYear () {
+    currentYear() {
       return parseInt(this.currentYearStr);
     },
-    apiParams () {
+    apiParams() {
       const { currentYear, fmData } = this;
       return {
         yearId: currentYear,
@@ -387,13 +445,13 @@ export default {
       this.getMonthData();
     },
   },
-  async mounted () {
+  async mounted() {
     await this.getPartyOptions();
     this.getMonthData();
   },
   methods: {
     // 添加活动
-    addHudong () {
+    addHudong() {
       this.icPartyActId = "";
       this.addDiaTitle = "新增活动计划";
       this.formType = "add";
@@ -401,14 +459,14 @@ export default {
     },
 
     // 添加日程
-    addRicheng () {
+    addRicheng() {
       this.formType = "schedule";
-      this.scheduleId = ''
+      this.scheduleId = "";
       this.showSchedule = true;
     },
 
     // 点击活动操作
-    handleClickHuodong (type, item) {
+    handleClickHuodong(type, item) {
       console.log(type, item);
       this.icPartyActId = item.activityId;
 
@@ -452,7 +510,7 @@ export default {
       }
     },
 
-    async publishActivity () {
+    async publishActivity() {
       const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`;
 
       const { data, code, msg } = await requestPost(url, {});
@@ -465,7 +523,7 @@ export default {
       }
     },
 
-    async cancelActivity () {
+    async cancelActivity() {
       const url = "/resi/partymember/icPartyAct/del";
 
       let params = [];
@@ -482,7 +540,7 @@ export default {
     },
 
     // 点击日程操作
-    handleClickRicheng (type, item) {
+    handleClickRicheng(type, item) {
       console.log(type, item);
       this.scheduleId = item.scheduleId;
       if (type == "edit") {
@@ -507,7 +565,7 @@ export default {
       }
     },
 
-    async cancelSchedule () {
+    async cancelSchedule() {
       const url = "/resi/partymember/icSchedule/del";
 
       let params = [];
@@ -524,15 +582,15 @@ export default {
     },
 
     //刷新日历
-    refreshData () {
+    refreshData() {
       this.getMonthData();
       this.getRangeData();
       this.getCurrentDateData();
     },
 
-    handleChangeParty () { },
+    handleChangeParty() {},
 
-    handleChangeDate (item) {
+    handleChangeDate(item) {
       console.log("handleChangeDate");
       this.currentYearStr = item.year + "";
       this.currentMonth = item.month;
@@ -541,7 +599,7 @@ export default {
       this.getCurrentDateData();
     },
 
-    computeAllListClass (index) {
+    computeAllListClass(index) {
       let x = index % 7;
       let y = Math.floor(index / 7);
       if (x < 3) {
@@ -559,12 +617,12 @@ export default {
       }
     },
 
-    handleRangeChange (arr) {
+    handleRangeChange(arr) {
       this.rangeDateList = arr;
       this.getRangeData();
     },
 
-    async getRangeData () {
+    async getRangeData() {
       const arr = this.rangeDateList;
       const url = "/resi/partymember/icPartyAct/homeSearch";
 
@@ -602,7 +660,7 @@ export default {
       }
     },
 
-    async getMonthData () {
+    async getMonthData() {
       const url = "/resi/partymember/icPartyAct/homeMonthTotal";
 
       if (!this.apiParams.orgId) return;
@@ -616,14 +674,14 @@ export default {
             this.monthData[index] = parseInt(item.count);
           });
           console.log("--------------monthData", this.monthData);
-          this.$forceUpdate()
+          this.$forceUpdate();
         }
       } else {
         this.$message.error(msg);
       }
     },
 
-    async getCurrentDateData () {
+    async getCurrentDateData() {
       const url = "/resi/partymember/icPartyAct/actAndScheduleList";
 
       if (!this.apiParams.orgId) return;
@@ -640,7 +698,7 @@ export default {
       }
     },
 
-    async getPartyOptions () {
+    async getPartyOptions() {
       const url = "/resi/partymember/icPartyOrg/getSearchTreelist";
       let params = {
         customerId: localStorage.getItem("customerId"),
@@ -657,25 +715,25 @@ export default {
       }
     },
 
-    handleAddYearPlan () {
+    handleAddYearPlan() {
       this.showType = "yearplan";
     },
 
-    handleAddPlanOk () {
+    handleAddPlanOk() {
       this.showType = "list";
       this.refreshData();
     },
-    handleAddPlanClose () {
+    handleAddPlanClose() {
       this.showType = "list";
     },
 
-    handleClose () {
+    handleClose() {
       this.formType = "";
       this.showAdd = false;
       this.showSchedule = false;
     },
 
-    handleOk () {
+    handleOk() {
       this.handleClose();
       this.refreshData();
     },

From 23b4ca95bdb589d23112c6898ad50f4596290813 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 7 Sep 2022 15:07:44 +0800
Subject: [PATCH 10/37] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/measure/cheng.png        | Bin 0 -> 1594 bytes
 .../basicinfo/houseStatic/houseStatic.vue     |  22 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/img/shuju/measure/cheng.png

diff --git a/src/assets/img/shuju/measure/cheng.png b/src/assets/img/shuju/measure/cheng.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cd8dea6ed630e94a3eda8af0ebafc59a88ba5c5
GIT binary patch
literal 1594
zcmaJ>eNYr-96nG}Pa#Jk;hfQJF-&rAKkjz-?f~VuFHSi@#NbTSz1{b?6YuuiTf74_
zlQP6H#QZ2jE$xpO#+pE<C?(R+{3siy0C7?xF^$pGu&6L-4><D=$DP@I-+lM@Jiq7n
zwUyb6Em3lXTqcu6Su>0|(#lEq<Oxqn&)udtR$AgkQ@*&AcZvZ<05UztI{;+$Fohro
zFkH#Hb09?~8}phwH($)RW$IYoqhvxh%Am(5p=Gj^1wkLf76B1*fI_!76~1%48HU_k
zDx62!Fq_W+T<(lg0W2+DoXeILv04sZFds?@>LdaW5E&@wS?l%df~oK@uTI*Bj!_sI
zHW7<b;So{!wrt423jiXO6vE<a4Mb~|IHkr^)I5m5a4m{yP+WyzxDKOqBn^#Tu;fkP
zoVpyNdDNHmmI}K>(WgVvKp>zDsFb`=h~iqU#6h40fk+mJzr-stLB#7%2s0RgpB3Cb
z(an3I5F_K@i^Wt}QaTcX$7i!WB=-786D6e#4Kh9yS7NBg6N+ot+ArpS|7ASZ+MiqE
z185HL^Th%y)x(((21~hnvZIipq(+w|xTT^nYmGcx>;YcUYD|TtFG|kM=}4zm%}^|j
zFf5BB7^Nl=E$iSAoW(Fg1)LbeU}2ue;q|26Oq<Lm!bGOyxXGv|4BB*>q%;JD(^^s;
z##+68k@2!1?AtB*9>p4;h}9Vcz=*t%%kyi)U6AeKMc(h?eUQNrsyYolpXc^+e84|9
zRHl)rjX-d(2b@{pJ<xETb?(P#060NwRWv}<fMpR4r^XQnPE&}6c90CFR?`62z@vEX
zk^GJHsdOU6;S0;rsR@8FG^IvV8k#_G97vQH!yz1_r7)6osAvZZqmo24)H;u}Qus*f
z&(QYaU`Q_yM+<nRc@m_-={RA{m&qbCtww!r@bZzormFU|$tx0`U7|NwtQQuour9Lr
zW1}LCC8#g!-;I?O#)Z}7_S;dPXS_&tt}44#-?8@wYDmedd607XQcL;_=Eu(Uy$eno
zh6bBvb`{<1zm{BOzd1B@@ZH-5zjd$Lo&3iYYw!Vbt7KAH*Qu4ti?QF`)*l``pV(Se
z-}J@Q)hDj>+>@O&4`FHd%AAARXh+ktyA@-p9mTE9iDsYT#<8lMUh^IO#pS<FKBVej
zl(rtb+8WVTo<ZTb<&6*9jfBPIx}P(SXt|sa(UjZ;Whb@Q?pJ<)CBB-j*>L=)wt{1|
z_4{_(TjjH>BGuO#j$RsveiGSePpmz7AbR|m--~zkM>QCF_SzTDD4%J5GmxD<MX`oe
z5X*OIyA<*>vkf9ud-I$4>W-QXS=DsJcAI$zIsW?H!n*pz2L*Ah@~`Up<~CJpAUT!B
zG@mzL=-m3st?TU-XSPz^fA8rpl)rbDhTc!!_|nli+kS>FUOVre4cWUt9_nl9?L(n~
zfv?97HUF^mxxQ`B?El4|p4axakTgAZFB$zhTpE*KaCp4MGPb8LaTcm*Qz~j+h(Z6c
z?A)*aEaK3S0+aFdQ2gn+Y@I{4rK(`rp3dG`X@6EW&v8wdzNR<R{=p`@>H3!LhO(zy
zKwFLLB=c%g`hlc*G3OLEqN46dTy=$Qe(c2f@;RPU2B#3Myt?c!;;khU-x)YNWqKys
zp0;{gW?X6J{e&?+9b6+gxOvija@xj~cN=3XUyk{7UCq|o*4#j&Z_~a*{ibgR626r2
XQyVO^Hg|0a{mreW#m0})SC{_>X5&qx

literal 0
HcmV?d00001

diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 462110fa1..d38d7b33f 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -62,6 +62,10 @@
               <div class="pie-table-total-count xz">{{houseData.xzHouseTotal}}</div>
               <div class="pie-table-title">闲置房屋数</div>
             </div>
+            <div class="pie-table-total ">
+              <div class="pie-table-total-count xz">{{houseData.wscHouseTotal}}</div>
+              <div class="pie-table-title">未出售房屋数</div>
+            </div>
           </div>
 
           <div class="loading-status"
@@ -153,6 +157,11 @@
                   <div class="pie-table-title table-table-title">{{item.xzHouseRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">闲置房屋数</div>
                 </div>
+                <div class="pie-table-total ">
+                  <div class="pie-table-total-count colorwhite">{{item.wscHouseTotal}}</div>
+                  <div class="pie-table-title table-table-title">{{item.wscHouseRatio+'%'}}</div>
+                  <div class="pie-table-title table-table-title">未出售房屋数</div>
+                </div>
               </div>
               <div class="item_right">
                 <div class="pie-table-total">
@@ -232,8 +241,10 @@ export default {
         czHouseRatio: '5%',//房屋出租总数占比（保留两位小数，带百分号的）	
         xzHouseTotal: 200,//房屋闲置总数		
         xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的）	
+        wscHouseTotal: 100,//房屋未售出总数
+        wscHouseRatio: '20%',//房屋未售出总数占比
       },
-      houseColorArray: ['#3dda83', '#e43c26', '#fac126'],
+      houseColorArray: ['#3dda83', '#e43c26', '#fac126', '#fc8452'],
       housePieData: [],
 
       legendArray: [
@@ -248,6 +259,10 @@ export default {
         {
           name: '闲置房屋数',
           url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
+        },
+        {
+          name: '未出售房屋数',
+          url: require('../../../../../assets/img/shuju/measure/cheng.png')
         }
       ],
 
@@ -379,10 +394,15 @@ export default {
           name: '闲置房屋数',
           value: this.houseData.xzHouseRatio
         }
+        let obj4 = {
+          name: '未出售房屋数',
+          value: this.houseData.wscHouseRatio
+        }
 
         this.housePieData.push(obj1)
         this.housePieData.push(obj2)
         this.housePieData.push(obj3)
+        this.housePieData.push(obj4)
 
         this.housePieOption.title.text = this.houseData.houseTotal
         this.housePieOption.series[1].itemStyle = {

From 21bbe4f953f5c1d10353869f24ec9b9eab88e430 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 7 Sep 2022 15:47:45 +0800
Subject: [PATCH 11/37] =?UTF-8?q?=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/houseStatic.scss             | 6 ++++++
 .../modules/visual/basicinfo/houseStatic/houseStatic.vue    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index f89104834..084e53f0e 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -320,6 +320,12 @@
     font-weight: bold;
     color: #fac126;
   }
+  .wsc{
+    font-size: 35px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #fc8452;
+  }
 
   .colorwhite{
     font-size: 35px;
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index d38d7b33f..20dbb3cf2 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -63,7 +63,7 @@
               <div class="pie-table-title">闲置房屋数</div>
             </div>
             <div class="pie-table-total ">
-              <div class="pie-table-total-count xz">{{houseData.wscHouseTotal}}</div>
+              <div class="pie-table-total-count wsc">{{houseData.wscHouseTotal}}</div>
               <div class="pie-table-title">未出售房屋数</div>
             </div>
           </div>

From d5d62dfd540e0957606d5a3048636d978b5c6505 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 7 Sep 2022 16:02:29 +0800
Subject: [PATCH 12/37] =?UTF-8?q?=E6=97=A5=E5=8E=86=E5=B0=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/calendar/cpts/calendar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 22c2bc069..401f2c828 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -128,7 +128,7 @@ export default {
   },
   methods: {
     computeNongliText(y, m, d) {
-      let item = nongli.solar2lunar(y, m, d);
+      let item = nongli.solar2lunar(y, m+1, d);
       return item.festival || item.lunarFestival || item.Term || item.IDayCn;
     },
 

From 6715bb7876e10462733e88e751c41ac6ceb45ceb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 7 Sep 2022 17:03:52 +0800
Subject: [PATCH 13/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partymember/icpartyorgtree.vue    | 121 ++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 4b8a5179e..ebc87f1ce 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -17,8 +17,24 @@
           :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
           :height="tableHeight">
           <el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
+          <el-table-column prop="partyOrgType" label="类别">
+              <template slot-scope="scope">
+                <span v-for="(item, index) in partyOrgTypes"
+                      :key="item.value"
+                      :value="item.label"
+                      v-if="scope.row.partyOrgType == item.value">
+                  {{ item.label }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column prop="principal" label="负责人"></el-table-column>
+          <el-table-column prop="principalMobile" label="联系方式"></el-table-column>
           <el-table-column label="操作" align="center" width="300">
               <template slot-scope="scope">
+                  <el-button v-if="scope.row.partyOrgType != '6'"
+                             @click="principal(scope.row)"
+                             type="text"
+                             size="small"
+                             class="div-table-button--detail">{{'负责人'}}</el-button>
                 <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '6'"
                           @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
                           type="text"
@@ -56,6 +72,37 @@
                         @lookMemberCancle="lookMemberCancle"
                         @lookMemberOk="lookMemberOk"></look-Member>
       </el-dialog>
+      <el-dialog
+              title="负责人"
+              :visible.sync="principalShow"
+              width="850px"
+              top="5vh"
+              class="dialog-h"
+              :before-close="handleClose">
+          <el-form ref="ref_form"
+                   :inline="true"
+                   :model="editPrincipalData"
+                   class="div_form">
+              <el-form-item label="负责人"
+                            label-width="150px"
+                            prop="principal">
+                  <el-select v-model="editPrincipalData.principal"
+                             placeholder="请选择"
+                             clearable
+                             class="item_width_1">
+                      <el-option v-for="item in staffs"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                  </el-select>
+              </el-form-item>
+          </el-form>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="principalShow = false">取 消</el-button>
+            <el-button type="primary" @click="editPrincipal">确 定</el-button>
+          </span>
+      </el-dialog>
   </el-card>
 </template>
 
@@ -67,6 +114,13 @@
     export default {
     data () {
       return {
+        principalShow: false,
+        staffs: [],
+          editPrincipalData: {
+              principal: '',
+              principalMobile: '',
+              partyOrgId: ''
+          },
         searchH: 0,
         dataForm: {
           id: '',
@@ -76,6 +130,36 @@
         },
         tableLoading: false,
         tableData: [],
+          partyOrgTypes: [
+              {
+                  value: '0',
+                  label: '省委'
+              },
+              {
+                  value: '1',
+                  label: '市委'
+              },
+              {
+                  value: '2',
+                  label: '区委'
+              },
+              {
+                  value: '3',
+                  label: '党工委'
+              },
+              {
+                  value: '4',
+                  label: '党委'
+              },
+              {
+                  value: '5',
+                  label: '支部'
+              },
+              {
+                  value: '6',
+                  label: '党小组'
+              }
+          ],
         agencyId: '',
         addOrUpdateVisible: false,
         lookMemberShow: false,
@@ -93,6 +177,13 @@
         const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
         const _h = this.clientHeight - 230 - this.searchH
         return this.$store.state.inIframe ? h : _h
+      },
+        principalRules() {
+          return {
+              principal: [
+                  {required: true, message: '负责人不能为空', trigger: 'change'},
+              ]
+          }
       }
     },
     mounted() {
@@ -109,6 +200,36 @@
       // this.pageLoading = true
     },
     methods:{
+        principal(row) {
+            this.principalShow = true
+            this.editPrincipalData.partyOrgId = row.id
+            this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
+                if (res.code !== 0) {
+                    return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                } else {
+                    this.staffs = res.data
+                    console.log(this.staffs)
+                }
+            }).catch(() => {})
+        },
+        editPrincipal(row) {
+            this.staffs.forEach(s => {
+                if (this.editPrincipalData.principal === s.value){
+                    this.editPrincipalData.principal = s.name
+                    this.editPrincipalData.principalMobile = s.mobile
+                }
+            })
+            this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
+                if (res.code !== 0) {
+                    return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                }
+            }).catch(() => {})
+            this.principalShow = false
+            this.getTableData()
+        },
+        handleClose() {
+          this.principalShow = false
+        },
       // 查询列表
       async getTableData () {
         this.tableLoading = true

From 0b0bcffd0a50b843e13bbe222653de037459ca0c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 08:51:20 +0800
Subject: [PATCH 14/37] 11

---
 .../basicinfo/houseStatic/houseList.vue       | 236 ++++++++++++++++++
 .../basicinfo/houseStatic/houseMore.vue       | 111 ++++++++
 .../basicinfo/houseStatic/houseStatic.vue     | 102 ++++++--
 .../basicinfo/houseStatic/peopleList.vue      | 235 +++++++++++++++++
 4 files changed, 663 insertions(+), 21 deletions(-)
 create mode 100644 src/views/modules/visual/basicinfo/houseStatic/houseList.vue
 create mode 100644 src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
 create mode 100644 src/views/modules/visual/basicinfo/houseStatic/peopleList.vue

diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
new file mode 100644
index 000000000..72abe99c1
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
@@ -0,0 +1,236 @@
+<template>
+  <div class="div_people_search">
+
+    <div class="list_box">
+      <div class="info_tip">
+        <img src="@/assets/img/shuju/title-tip.png"
+             alt />
+        <div class="tip_title">{{tableTitle}}</div>
+      </div>
+      <div class="warning-table">
+        <div class="table">
+          <div class="table-header">
+            <div class="td td1">序号</div>
+            <div class="td td2">所属小区</div>
+            <div class="td td2">所属楼栋</div>
+            <div class="td td1">单元号</div>
+            <div class="td td1">门牌号</div>
+            <div class="td td1">房屋类型</div>
+            <div class="td td1">房屋用途</div>
+            <div class="td td1">房屋状态</div>
+            <div class="td td1">房主姓名</div>
+            <div class="td td2">房主电话</div>
+            <div class="td td2">身份证号</div>
+            <div class="td td1">操作</div>
+
+          </div>
+          <div v-if="!loading && tableData.length> 0"
+               class="table-body">
+            <div class="table-body-tr"
+                 v-for="(item,index) in tableData"
+                 :key='index'>
+              <div class="td td1">{{index+1}} </div>
+              <div class="td td2">{{item.neighborHoodName}} </div>
+              <div class="td td2">{{item.buildingName}} </div>
+              <div class="td td1">{{item.unitNum}} </div>
+              <!-- <div class="td td1">{{item.buildNum}} </div> -->
+              <div class="td td1">{{item.doorName}} </div>
+              <div class="td td1">{{item.houseType==='1'?'楼房':item.houseType==='2'?'平方':'别墅'}} </div>
+              <div class="td td1">{{item.purpose}} </div>
+              <div class="td td1">{{item.rentFlag==='1'?'出租':item.rentFlag==='0'?'自住':item.rentFlag==='2'?'闲置':'未出售'}} </div>
+              <div class="td td1">{{item.ownerName}} </div>
+              <div class="td td2">{{item.ownerPhone}} </div>
+              <div class="td td2">{{item.ownerIdCard}} </div>
+              <div @click="handleToHouse(item)"
+                   class="td td1 btn_detail">{{'查看'}} </div>
+
+            </div>
+          </div>
+
+          <div class="table-status"
+               v-if="loading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+
+          <div class="table-status"
+               v-if="tableData.length == 0 && !loading">
+            <div class="no-data">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
+            </div>
+          </div>
+
+        </div>
+
+      </div>
+      <div class="pagination">
+        <el-pagination hide-on-single-page
+                       background
+                       layout="prev, pager, next, total"
+                       :current-page="pageNo"
+                       :page-size="pageSize"
+                       :total="total"
+                       @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+      </div>
+    </div>
+
+    <house-more v-show="showedMoreInfo"
+                @close="showedMoreInfo = false" />
+  </div>
+
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import houseMore from "./houseMore";
+
+export default {
+  name: "people-list",
+  components: {
+    ScreenLoading, houseMore
+  },
+  data () {
+    return {
+      showedMoreInfo: false,
+      tableTitle: '房屋列表',
+      loading: false,
+
+      tableData: [],
+
+      pageSize: 10,
+      pageNo: 1,
+      total: 0,
+      info: {}
+    };
+  },
+  mounted () {
+
+    this.tableData = []
+
+    this.loadList()
+
+  },
+  deactivated () {
+
+  },
+
+  methods: {
+
+    async loadList () {
+      this.loading = true
+      const url = "/gov/org/house/housestatislistdetail"
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType,
+        rentType: this.rentType,
+        pageSize: this.pageSize,
+        pageNo: this.pageNo
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.loading = false
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //点击查看
+    handleToHouse (item) {
+
+      // this.toSubAgency('people', this.tableData[index].userId)
+      this.info = { ...item }
+      this.showedMoreInfo = true
+    },
+
+    pageCurrentChangeHandle (val) {
+      this.pageNo = val
+      this.loadList()
+    },
+
+
+  },
+  destroyed () {
+    console.log("我已经离开了！");
+
+  },
+
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+    orgType: {
+      type: String,
+      default: "",
+    },
+    rentType: {
+      type: String,
+      default: "",
+    },
+  },
+
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/basicInfoMain.scss"
+  scoped
+></style>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/searchPerson.scss"
+  scoped
+></style>
+
+
+
+<style lang="scss" scoped>
+.div_search_list {
+  .el-input__inner[WarningColor="warning"] {
+    border-radius: 8px 0 0 8px;
+    height: 53px;
+    background-color: #01106800;
+    border: 2px solid #0082fb;
+    padding-left: 70px;
+    font-size: 18px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
+.list_box {
+  width: 100%;
+  height: 780px;
+  margin: 0 auto;
+}
+.warning-table {
+  height: 640px;
+}
+.pagination {
+  padding-right: 0;
+  margin-top: 0;
+  text-align: right;
+}
+.g-bread {
+  padding: 10px 10px 15px;
+  ::v-deep .el-breadcrumb__item {
+    font-size: 16px;
+    .el-breadcrumb__inner {
+      color: #fff;
+    }
+  }
+  ::v-deep .el-breadcrumb__item:first-child {
+    .el-breadcrumb__inner {
+      color: #a0c3d9;
+    }
+  }
+}
+</style>
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
new file mode 100644
index 000000000..b6d9495a7
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
@@ -0,0 +1,111 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>更多信息</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <div class="list">
+          <div class="item">
+            <span class="item-field">所属网格：</span>
+            <span>{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属小区：</span>
+            <span>{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属楼栋：</span>
+            <span>{{ 11 }}-{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属家庭：</span>
+            <span>{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属家庭：</span>
+            <span>{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属家庭：</span>
+            <span>{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属家庭：</span>
+            <span>{{ 11 }}</span>
+          </div>
+          <div class="item">
+            <span class="item-field">所属家庭：</span>
+            <span>{{ 11 }}</span>
+          </div>
+
+        </div>
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
+
+export default {
+  name: "peopleMore",
+  props: {
+    info: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+
+  },
+
+  components: {
+    cptCard,
+    cptTb,
+  },
+
+  data () {
+    return {
+
+    };
+  },
+
+  computed: {
+
+  },
+
+  watch: {
+
+  },
+
+  mounted () {
+
+  },
+
+  methods: {
+
+    handleClose () {
+      this.$emit("close");
+    },
+
+
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 20dbb3cf2..a00a224b1 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -12,7 +12,8 @@
         <span class="router_child">{{orgName}}</span>
       </div>
     </div>
-    <cpt-card :min-full-screen="true">
+    <cpt-card v-if="!showHouseList&&!showPeopleList"
+              :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon"
              src="@/assets/img/shuju/title-tip.png" />
@@ -45,24 +46,29 @@
 
           <div v-if="!dataLoading"
                class="pie-table">
-            <div class="pie-table-total">
+            <div class="pie-table-total"
+                 @click="handleClickHouse('')">
               <div class="pie-table-total-count">{{houseData.houseTotal}}</div>
               <div class="pie-table-title">房屋总数</div>
             </div>
             <div class="pie-table-line"></div>
-            <div class="pie-table-total ">
+            <div class="pie-table-total "
+                 @click="handleClickHouse('0')">
               <div class="pie-table-total-count zz">{{houseData.zzHouseTotal}}</div>
               <div class="pie-table-title">自住房屋数</div>
             </div>
-            <div class="pie-table-total ">
+            <div class="pie-table-total "
+                 @click="handleClickHouse('1')">
               <div class="pie-table-total-count cz">{{houseData.czHouseTotal}}</div>
               <div class="pie-table-title">出租房屋数</div>
             </div>
-            <div class="pie-table-total ">
+            <div class="pie-table-total "
+                 @click="handleClickHouse('2')">
               <div class="pie-table-total-count xz">{{houseData.xzHouseTotal}}</div>
               <div class="pie-table-title">闲置房屋数</div>
             </div>
-            <div class="pie-table-total ">
+            <div class="pie-table-total "
+                 @click="handleClickHouse('3')">
               <div class="pie-table-total-count wsc">{{houseData.wscHouseTotal}}</div>
               <div class="pie-table-title">未出售房屋数</div>
             </div>
@@ -97,16 +103,19 @@
 
           <div v-if="!dataLoading"
                class="pie-table">
-            <div class="pie-table-total">
+            <div class="pie-table-total"
+                 @click="handleClickPeople('all')">
               <div class="pie-table-total-count">{{userData.userTotal}}</div>
               <div class="pie-table-title">居民总数</div>
             </div>
             <div class="pie-table-line"></div>
-            <div class="pie-table-total ">
+            <div class="pie-table-total "
+                 @click="handleClickPeople('cz')">
               <div class="pie-table-total-count zz">{{userData.czUserTotal}}</div>
               <div class="pie-table-title">常住人口数</div>
             </div>
-            <div class="pie-table-total ">
+            <div class="pie-table-total "
+                 @click="handleClickPeople('ld')">
               <div class="pie-table-total-count cz">{{userData.ldUserTotal}}</div>
               <div class="pie-table-title">流动人口数</div>
             </div>
@@ -196,6 +205,21 @@
       </div>
 
     </cpt-card>
+
+    <house-list v-if="showHouseList "
+                :orgId="orgId"
+                :orgType="orgType"
+                :rentType="rentType"
+                @close="showHouseList = false">
+
+    </house-list>
+    <people-list v-if="showPeopleList "
+                 :orgId="orgId"
+                 :orgType="orgType"
+                 :type="type"
+                 @close="showPeopleList = false">
+
+    </people-list>
   </div>
 </template>
 
@@ -208,6 +232,8 @@ import screenEchartsFrame from "../../components/screen-echarts-frame";
 import ScreenLoading from "@/views/modules/visual/components/screen-loading";
 import { housePieOption } from './options'
 import { userPieOption } from './userOptions'
+import houseList from './houseList'
+import peopleList from './peopleList'
 
 import * as echarts from 'echarts';
 export default {
@@ -216,7 +242,9 @@ export default {
     cptCard,
     screenTable,
     screenEchartsFrame,
-    ScreenLoading
+    ScreenLoading,
+    houseList,
+    peopleList
   },
   data () {
     return {
@@ -293,6 +321,11 @@ export default {
       zoom: null,
       parentPolygon: [],
 
+      rentType: '',//点击房屋数类型
+      type: '',//点击人员数类型
+      showPeopleList: false,
+      showHouseList: false
+
     };
   },
   async mounted () {
@@ -316,9 +349,21 @@ export default {
       this.getHousePie()
       this.getUserPie()
 
+    },
 
-
+    //点击房屋数
+    handleClickHouse (rentType) {
+      this.toSubAgency('house')
+      this.rentType = rentType
+      this.showHouseList = true
+    },
+    //点击人员数
+    handleClickPeople (type) {
+      this.toSubAgency('people')
+      this.type = type
+      this.showPeopleList = true
     },
+
     housePieInitOk (dom) {
       console.log('pie准备好了', dom)
       this.housePieChartS = dom
@@ -350,6 +395,9 @@ export default {
           this.$refs.housePieChart.hideLoading()
         }
 
+        this.orgId = data.orgId
+        this.orgType = data.orgType
+
 
       } else {
         this.houseData = {}
@@ -595,33 +643,36 @@ export default {
 
     async handleToSubAgency (item) {
       if (!this.dataLoading) {
-        this.toSubAgency(item)
+        this.toSubAgency('subAgency', item)
 
         await this.getApiData()
       }
 
-
-
-
     },
 
     //下钻到下一级 
-    async toSubAgency (item) {
-
+    async toSubAgency (type, item) {
       this.runNum++
       let obj = {
         orgId: this.orgId,
         orgType: this.orgType,
         orgName: this.orgName,
+        type: type
       }
+      this.runAgencyArray.push(obj)
 
+      if (type === 'subAgency') {
 
-      this.runAgencyArray.push(obj)
+        this.orgId = item.orgId
+        this.orgType = item.orgType
+        this.orgName = item.orgName
 
-      this.orgId = item.orgId
-      this.orgType = item.orgType
-      this.orgName = item.orgName
+      } else if (type === 'house') {
 
+        this.orgName = '房屋列表'
+      } else if (type === 'people') {
+        this.orgName = '人员列表'
+      }
 
     },
 
@@ -629,6 +680,7 @@ export default {
     //返回所选组织
     handleClickAgency (index) {
 
+
       const cutNum = this.runAgencyArray.length - index//要减去的长度
       this.runNum = this.runNum - cutNum
 
@@ -642,6 +694,14 @@ export default {
       this.orgId = orgData.orgId
       this.orgType = orgData.orgType
       this.orgName = orgData.orgName
+      this.showHouseList = false
+      this.showPeopleList = false
+      // if (orgData.type === 'house') {
+      //   this.showHouseList = false
+      // }
+      // if (orgData.type === 'people') {
+      //   this.showPeopleList = false
+      // }
 
       this.getApiData()
 
diff --git a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
new file mode 100644
index 000000000..edb79cf8d
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class="div_people_search">
+
+    <div class="list_box">
+      <div class="info_tip">
+        <img src="@/assets/img/shuju/title-tip.png"
+             alt />
+        <div class="tip_title">{{tableTitle}}</div>
+      </div>
+      <div class="warning-table">
+        <div class="table">
+          <div class="table-header">
+            <div class="td td1">序号</div>
+            <div class="td td1">姓名</div>
+            <div class="td td3">所属网格</div>
+            <div class="td td3">所属房屋</div>
+            <div class="td td2">手机</div>
+            <div class="td td3">身份证</div>
+            <div class="td td1">性别</div>
+            <div class="td td2">出生日期</div>
+            <div class="td td1">操作</div>
+
+          </div>
+          <div v-if="!loading && tableData.length> 0"
+               class="table-body">
+            <div class="table-body-tr"
+                 v-for="(item,index) in tableData"
+                 :key='index'>
+              <div class="td td1">{{item.sort}} </div>
+              <div class="td td1">{{item.name}} </div>
+              <div class="td td3">{{item.gridName}} </div>
+              <div class="td td3">{{item.neighborHoodName + item.buildNum}} </div>
+              <!-- <div class="td td1">{{item.buildNum}} </div> -->
+              <div class="td td2">{{item.mobile}} </div>
+              <div class="td td3">{{item.idCard}} </div>
+              <div class="td td1">{{item.gender}} </div>
+              <div class="td td2">{{item.birthday}} </div>
+              <div @click="handelToPeople(item)"
+                   class="td td1 btn_detail">{{'查看'}} </div>
+
+            </div>
+          </div>
+
+          <div class="table-status"
+               v-if="loading">
+            <screen-loading>加载中</screen-loading>
+          </div>
+
+          <div class="table-status"
+               v-if="tableData.length == 0 && !loading">
+            <div class="no-data">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
+            </div>
+          </div>
+
+        </div>
+
+      </div>
+      <div class="pagination">
+        <el-pagination hide-on-single-page
+                       background
+                       layout="prev, pager, next, total"
+                       :current-page="pageNo"
+                       :page-size="pageSize"
+                       :total="total"
+                       @current-change="pageCurrentChangeHandle">
+        </el-pagination>
+      </div>
+
+    </div>
+
+    <people-more v-show="showedMoreInfo"
+                 v-if="info.userId"
+                 :userId="info.userId"
+                 :gridName="info.gridName"
+                 @close="showedMoreInfo = false" />
+  </div>
+
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
+
+export default {
+  name: "people-list",
+  components: {
+    ScreenLoading, peopleMore
+  },
+  data () {
+    return {
+      showedMoreInfo: false,
+      tableTitle: '人员列表',
+      loading: false,
+
+      tableData: [],
+
+      pageSize: 10,
+      pageNo: 1,
+      total: 0,
+      info: {},
+
+    };
+  },
+  mounted () {
+
+    this.tableData = []
+
+    this.loadList()
+
+  },
+  deactivated () {
+
+  },
+
+  methods: {
+
+    async loadList () {
+      this.loading = true
+      const url = "/epmetuser/icresiuser/icuserstatislist"
+      let params = {
+        orgId: this.orgId,
+        orgType: this.orgType,
+        type: this.type,
+        pageSize: this.pageSize,
+        pageNo: this.pageNo
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.loading = false
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //点击查看
+    handelToPeople (item) {
+      // this.toSubAgency('people', this.tableData[index].userId)
+      this.info = { ...item }
+      this.showedMoreInfo = true
+    },
+
+    pageCurrentChangeHandle (val) {
+      this.pageNo = val
+      this.loadList()
+    },
+
+
+  },
+  destroyed () {
+    console.log("我已经离开了！");
+
+  },
+
+
+  props: {
+    orgId: {
+      type: String,
+      default: "",
+    },
+    orgType: {
+      type: String,
+      default: "",
+    },
+    type: {
+      type: String,
+      default: "",
+    },
+  },
+
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/basicInfoMain.scss"
+  scoped
+></style>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/searchPerson.scss"
+  scoped
+></style>
+
+
+
+<style lang="scss" scoped>
+.div_search_list {
+  .el-input__inner[WarningColor="warning"] {
+    border-radius: 8px 0 0 8px;
+    height: 53px;
+    background-color: #01106800;
+    border: 2px solid #0082fb;
+    padding-left: 70px;
+    font-size: 18px;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
+.list_box {
+  width: 100%;
+  height: 780px;
+  margin: 0 auto;
+}
+.warning-table {
+  height: 640px;
+}
+.pagination {
+  padding-right: 0;
+  margin-top: 0;
+  text-align: right;
+}
+.g-bread {
+  padding: 10px 10px 15px;
+  ::v-deep .el-breadcrumb__item {
+    font-size: 16px;
+    .el-breadcrumb__inner {
+      color: #fff;
+    }
+  }
+  ::v-deep .el-breadcrumb__item:first-child {
+    .el-breadcrumb__inner {
+      color: #a0c3d9;
+    }
+  }
+}
+</style>

From 69c109df78eab5e7db8c3733ec66cd0aad81bad4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 09:14:31 +0800
Subject: [PATCH 15/37] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/houseStatic.scss      |  2 +
 src/assets/scss/modules/visual/people.scss    |  4 ++
 .../basicinfo/houseStatic/houseList.vue       |  1 +
 .../basicinfo/houseStatic/houseMore.vue       | 59 +++++++++++--------
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index 084e53f0e..d02c6e7fa 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -298,6 +298,7 @@
     font-family: PingFang SC;
     font-weight: bold;
     color: #FFFFFF;
+    cursor: pointer;
   }
 
   .zz{
@@ -342,6 +343,7 @@
     font-weight: 400;
     color: #FFFFFF;
     min-width:62px;
+    
   }
 
   .table-table-title{
diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index 1d0bc4fa8..b624578ba 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -243,6 +243,10 @@
           border-radius: 3px;
         }
       }
+
+      .item2{
+        width: 49%;
+      }
     }
 
     .line {
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
index 72abe99c1..162621949 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
@@ -76,6 +76,7 @@
     </div>
 
     <house-more v-show="showedMoreInfo"
+                :info="info"
                 @close="showedMoreInfo = false" />
   </div>
 
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
index b6d9495a7..fc99058d6 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
@@ -13,37 +13,50 @@
         </div>
 
         <div class="list">
-          <div class="item">
-            <span class="item-field">所属网格：</span>
-            <span>{{ 11 }}</span>
-          </div>
-          <div class="item">
+
+          <div class="item item2">
             <span class="item-field">所属小区：</span>
-            <span>{{ 11 }}</span>
+            <span>{{ info.neighborHoodName }}</span>
           </div>
-          <div class="item">
+          <div class="item item2">
             <span class="item-field">所属楼栋：</span>
-            <span>{{ 11 }}-{{ 11 }}</span>
+            <span>{{ info.buildingName }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">单元号：</span>
+            <span>{{ info.unitNum }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">门牌号：</span>
+            <span>{{ info. doorName}}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">房屋类型：</span>
+            <span>{{ info.houseType==='1'?'楼房':info.houseType==='2'?'平方':'别墅' }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">房屋用途：</span>
+            <span>{{ info.purpose }}</span>
           </div>
-          <div class="item">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ 11 }}</span>
+          <div class="item item2">
+            <span class="item-field">房屋状态：</span>
+            <span>{{ info. rentFlag==='1'?'出租':info.rentFlag==='0'?'自住':info.rentFlag==='2'?'闲置':'未出售'}}</span>
           </div>
-          <div class="item">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ 11 }}</span>
+          <div class="item item2">
+            <span class="item-field">房主姓名：</span>
+            <span>{{ info. ownerName?info.ownerName:'--' }}</span>
           </div>
-          <div class="item">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ 11 }}</span>
+          <div class="item item2">
+            <span class="item-field">房主电话：</span>
+            <span>{{ info. ownerPhone?info.ownerPhone:'--' }}</span>
           </div>
-          <div class="item">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ 11 }}</span>
+          <div class="item item2">
+            <span class="item-field">身份证号：</span>
+            <span>{{ info.ownerIdCard?info.ownerIdCard:'--'  }}</span>
           </div>
-          <div class="item">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ 11 }}</span>
+          <div class="item item2">
+            <span class="item-field">备注：</span>
+            <span>{{ info.remark?info.remark:'--' }}</span>
           </div>
 
         </div>

From 4ef1056df6bc62869953a56b31988ab6f219f295 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 09:20:21 +0800
Subject: [PATCH 16/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partymember/icpartyorgtree.vue    | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index ebc87f1ce..45d0e6b88 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -82,6 +82,7 @@
           <el-form ref="ref_form"
                    :inline="true"
                    :model="editPrincipalData"
+                   :rules="principalRules"
                    class="div_form">
               <el-form-item label="负责人"
                             label-width="150px"
@@ -89,7 +90,8 @@
                   <el-select v-model="editPrincipalData.principal"
                              placeholder="请选择"
                              clearable
-                             class="item_width_1">
+                             style="width: 200px"
+                             class="item_width_4">
                       <el-option v-for="item in staffs"
                                  :key="item.value"
                                  :label="item.label"
@@ -99,7 +101,7 @@
               </el-form-item>
           </el-form>
           <span slot="footer" class="dialog-footer">
-            <el-button @click="principalShow = false">取 消</el-button>
+            <el-button @click="handleClose">取 消</el-button>
             <el-button type="primary" @click="editPrincipal">确 定</el-button>
           </span>
       </el-dialog>
@@ -222,13 +224,23 @@
             this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
                 if (res.code !== 0) {
                     return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                }else {
+                    this.principalShow = false
+                    this.getTableData()
+                    this.resetEditPrincipalData()
                 }
             }).catch(() => {})
-            this.principalShow = false
-            this.getTableData()
         },
         handleClose() {
-          this.principalShow = false
+            this.principalShow = false
+            this.resetEditPrincipalData()
+        },
+        resetEditPrincipalData() {
+            this.editPrincipalData = {
+                principal: '',
+                principalMobile: '',
+                partyOrgId: ''
+            }
         },
       // 查询列表
       async getTableData () {

From 1cb3aea3d3a85a31b17ed17f8f0f249ed14734a3 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 10:50:11 +0800
Subject: [PATCH 17/37] 11

---
 src/assets/scss/modules/shequzhili/event-info.scss |  2 +-
 src/views/modules/shequzhili/event/cpts/add.vue    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss
index afcd0fa34..6c2bf3cca 100644
--- a/src/assets/scss/modules/shequzhili/event-info.scss
+++ b/src/assets/scss/modules/shequzhili/event-info.scss
@@ -143,7 +143,7 @@
   width: 450px
 }
 .cell-width-2{
-  width: 350px
+  width: 300px
 }
 
 .cell-width-map {
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index d3581582a..f983260e2 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -28,15 +28,18 @@
                         prop="name"
                         label-width="150px"
                         style="display: block">
+
             <el-input class="cell-width-1"
                       maxlength="10"
                       placeholder="请输入报事人姓名"
                       v-model="formData.name">
             </el-input>
-            <el-button style="margin-left: 10px"
-                       type="primary"
-                       size="mini"
-                       @click="handleShowPersonList">居民信息中选择</el-button>
+            <div>
+              <el-button style="margin-top: 10px"
+                         type="primary"
+                         size="mini"
+                         @click="handleShowPersonList">居民信息中选择</el-button>
+            </div>
 
           </el-form-item>
           <el-form-item label="手机号"

From 03672179437554a185cae541e29e0b45ae9a8b8a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 10:55:04 +0800
Subject: [PATCH 18/37] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/calendar/cpts/calendar.vue | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 401f2c828..0b2840ab2 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -1,35 +1,33 @@
 <template>
   <div class="m-calendar">
     <div class="top-list">
-      <div
-        class="top"
-        v-for="(item, index) in top"
-        :class="{ 'z-weekend': index > 4 }"
-        :key="item"
-      >
+      <div class="top"
+           v-for="(item, index) in top"
+           :class="{ 'z-weekend': index > 4 }"
+           :key="item">
         {{ item }}
       </div>
     </div>
     <!-- 日历号 -->
     <div class="date-list">
-      <div
-        class="date-item"
-        :class="{
+      <div class="date-item"
+           :class="{
           'z-on': item.format == currentDate,
           'z-this-month': item.thisMonth,
           'z-today': item.isToday,
           'z-after-today': item.afterToday,
           'z-weekend': item.day == 6 || item.day == 0,
         }"
-        v-for="(item, index) in visibleCalendar"
-        :key="index"
-        @click="handleClickDate(item)"
-      >
+           v-for="(item, index) in visibleCalendar"
+           :key="index"
+           @click="handleClickDate(item)">
         <div class="date">{{ item.date }}</div>
         <div class="nongli">
           {{ computeNongliText(item.year, item.month, item.date) }}
         </div>
-        <slot name="date-item" v-bind:item="item" v-bind:index="index"> </slot>
+        <slot name="date-item"
+              v-bind:item="item"
+              v-bind:index="index"> </slot>
       </div>
     </div>
   </div>
@@ -49,7 +47,7 @@ export default {
       default: new Date().getMonth(),
     },
   },
-  data() {
+  data () {
     return {
       top: ["一", "二", "三", "四", "五", "六", "日"],
       currentDate: "",
@@ -57,7 +55,7 @@ export default {
   },
   computed: {
     // 获取当前月份显示日历,共42天
-    visibleCalendar() {
+    visibleCalendar () {
       // 获取今天的年月日
       const { currentYear, currentMonth } = this;
       const today = new Date();
@@ -118,30 +116,30 @@ export default {
     },
   },
   watch: {
-    visibleCalendar() {
+    visibleCalendar () {
       this.init();
     },
   },
-  mounted() {
+  mounted () {
     console.log("123", this.time);
     this.init();
   },
   methods: {
-    computeNongliText(y, m, d) {
-      let item = nongli.solar2lunar(y, m+1, d);
+    computeNongliText (y, m, d) {
+      let item = nongli.solar2lunar(y, m + 1, d);
       return item.festival || item.lunarFestival || item.Term || item.IDayCn;
     },
 
-    init() {
+    init () {
       if (!this.currentDate) {
         this.handleClickDate(
           this.visibleCalendar.find((item) => item.isToday) ||
-            this.visibleCalendar.filter((item) => item.thisMonth)[0]
+          this.visibleCalendar.filter((item) => item.thisMonth)[0]
         );
       }
     },
 
-    handleClickDate(item) {
+    handleClickDate (item) {
       console.log("点击日历日期", item);
       this.currentDate = item.format;
 
@@ -235,7 +233,7 @@ export default {
         color: #3e8ef7;
       }
 
-      .nongli{
+      .nongli {
         position: absolute;
         z-index: 0;
         left: 0;

From 55f28e74f4911a8daaface48f3ebbc64fc3f20e5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 8 Sep 2022 11:04:32 +0800
Subject: [PATCH 19/37] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/calendar/cpts/calendar.vue | 33 ++++++++++---------
 .../modules/communityParty/calendar/index.vue |  2 ++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 401f2c828..dfcba51b2 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -128,7 +128,7 @@ export default {
   },
   methods: {
     computeNongliText(y, m, d) {
-      let item = nongli.solar2lunar(y, m+1, d);
+      let item = nongli.solar2lunar(y, m + 1, d);
       return item.festival || item.lunarFestival || item.Term || item.IDayCn;
     },
 
@@ -164,8 +164,8 @@ export default {
     left: 0;
     right: 0;
     bottom: 0;
-    border-left: 1px solid #eee;
-    border-top: 1px solid #eee;
+    border-left: 1px solid #e5e5e5;
+    border-top: 1px solid #e5e5e5;
     pointer-events: none;
   }
 
@@ -178,7 +178,7 @@ export default {
       padding: 20px 0;
       font-size: 20px;
       font-weight: bold;
-      background-color: #e6a23c;
+      background-color: rgba(#ccc, 0.2);
       text-align: center;
 
       &::after {
@@ -189,9 +189,9 @@ export default {
         left: 0;
         right: 0;
         bottom: 0;
-        border-right: 1px solid #eee;
+        border-right: 1px solid #e5e5e5;
         pointer-events: none;
-        border-bottom: 1px solid #eee;
+        border-bottom: 1px solid #e5e5e5;
       }
 
       &.z-weekend {
@@ -222,8 +222,8 @@ export default {
         left: 0;
         right: 0;
         bottom: 0;
-        border-right: 1px solid #eee;
-        border-bottom: 1px solid #eee;
+        border-right: 1px solid #e5e5e5;
+        border-bottom: 1px solid #e5e5e5;
         pointer-events: none;
       }
 
@@ -235,12 +235,21 @@ export default {
         color: #3e8ef7;
       }
 
-      .nongli{
+      .nongli {
         position: absolute;
         z-index: 0;
         left: 0;
         right: 0;
         text-align: center;
+        color: #bbb;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      &.z-weekend {
+        .date {
+          color: #ff3333;
+        }
       }
 
       &.z-on {
@@ -267,12 +276,6 @@ export default {
           font-weight: 700;
         }
       }
-
-      &.z-weekend {
-        .date {
-          color: #ff3333;
-        }
-      }
     }
   }
 }
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 792ae46b4..4ba40f08d 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -789,6 +789,8 @@ $red: #f33;
           font-size: 14px;
           font-weight: bold;
           cursor: pointer;
+          opacity: 0.7;
+          transform: scale(0.94);
         }
       }
     }

From 81fd6d82d27dd0f4d1bca0692d64dd77416b53e3 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 13:46:08 +0800
Subject: [PATCH 20/37] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicinfo/houseStatic/houseStatic.vue     | 58 +++++++++++++------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index a00a224b1..8cf156b0a 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -147,44 +147,52 @@
             <div class="item_data">
               <div class="item_left">
                 <div class="pie-table-total">
-                  <div class="pie-table-total-count">{{item.houseTotal}}</div>
+                  <div class="pie-table-total-count"
+                       @click="handleClickHouse('',item)">{{item.houseTotal}}</div>
                   <div class="pie-table-title">房屋总数</div>
                 </div>
                 <div class="pie-table-line"></div>
                 <div class="pie-table-total ">
-                  <div class="pie-table-total-count colorwhite">{{item.zzHouseTotal}}</div>
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('0',item)">{{item.zzHouseTotal}}</div>
                   <div class="pie-table-title table-table-title">{{item.zzHouseRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">自住房屋数</div>
                 </div>
                 <div class="pie-table-total ">
-                  <div class="pie-table-total-count colorwhite">{{item.czHouseTotal}}</div>
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('1',item)">{{item.czHouseTotal}}</div>
                   <div class="pie-table-title table-table-title">{{item.czHouseRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">出租房屋数</div>
                 </div>
                 <div class="pie-table-total ">
-                  <div class="pie-table-total-count colorwhite">{{item.xzHouseTotal}}</div>
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('2',item)">{{item.xzHouseTotal}}</div>
                   <div class="pie-table-title table-table-title">{{item.xzHouseRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">闲置房屋数</div>
                 </div>
                 <div class="pie-table-total ">
-                  <div class="pie-table-total-count colorwhite">{{item.wscHouseTotal}}</div>
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickHouse('3',item)">{{item.wscHouseTotal}}</div>
                   <div class="pie-table-title table-table-title">{{item.wscHouseRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">未出售房屋数</div>
                 </div>
               </div>
               <div class="item_right">
                 <div class="pie-table-total">
-                  <div class="pie-table-total-count">{{item.userTotal}}</div>
+                  <div class="pie-table-total-count"
+                       @click="handleClickPeople('all',item)">{{item.userTotal}}</div>
                   <div class="pie-table-title">居民总数</div>
                 </div>
                 <div class="pie-table-line"></div>
                 <div class="pie-table-total ">
-                  <div class="pie-table-total-count colorwhite">{{item.czUserTotal}}</div>
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickPeople('cz',item)">{{item.czUserTotal}}</div>
                   <div class="pie-table-title table-table-title">{{item.czUserRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">常住人口数</div>
                 </div>
                 <div class="pie-table-total ">
-                  <div class="pie-table-total-count colorwhite">{{item.ldUserTotal}}</div>
+                  <div class="pie-table-total-count colorwhite"
+                       @click="handleClickPeople('ld',item)">{{item.ldUserTotal}}</div>
                   <div class="pie-table-title table-table-title">{{item.ldUserRatio+'%'}}</div>
                   <div class="pie-table-title table-table-title">流动人口数</div>
                 </div>
@@ -207,15 +215,15 @@
     </cpt-card>
 
     <house-list v-if="showHouseList "
-                :orgId="orgId"
-                :orgType="orgType"
+                :orgId="selOrgId"
+                :orgType="selOrgType"
                 :rentType="rentType"
                 @close="showHouseList = false">
 
     </house-list>
     <people-list v-if="showPeopleList "
-                 :orgId="orgId"
-                 :orgType="orgType"
+                 :orgId="selOrgId"
+                 :orgType="selOrgType"
                  :type="type"
                  @close="showPeopleList = false">
 
@@ -324,7 +332,9 @@ export default {
       rentType: '',//点击房屋数类型
       type: '',//点击人员数类型
       showPeopleList: false,
-      showHouseList: false
+      showHouseList: false,
+      selOrgId: '',
+      selOrgType: '',
 
     };
   },
@@ -352,13 +362,27 @@ export default {
     },
 
     //点击房屋数
-    handleClickHouse (rentType) {
+    handleClickHouse (rentType, item) {
+      if (item) {
+        this.selOrgId = item.orgId
+        this.selOrgType = item.orgType
+      } else {
+        this.selOrgId = this.houseData.orgId
+        this.selOrgType = this.houseData.orgType
+      }
       this.toSubAgency('house')
       this.rentType = rentType
       this.showHouseList = true
     },
     //点击人员数
-    handleClickPeople (type) {
+    handleClickPeople (type, item) {
+      if (item) {
+        this.selOrgId = item.orgId
+        this.selOrgType = item.orgType
+      } else {
+        this.selOrgId = this.houseData.orgId
+        this.selOrgType = this.houseData.orgType
+      }
       this.toSubAgency('people')
       this.type = type
       this.showPeopleList = true
@@ -395,10 +419,6 @@ export default {
           this.$refs.housePieChart.hideLoading()
         }
 
-        this.orgId = data.orgId
-        this.orgType = data.orgType
-
-
       } else {
         this.houseData = {}
         this.$message.error(msg);

From bc272b1ff07ef31a8df3f5e161a73b8cfcde9e86 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 13:54:47 +0800
Subject: [PATCH 21/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 45d0e6b88..980ef2f7b 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -205,12 +205,12 @@
         principal(row) {
             this.principalShow = true
             this.editPrincipalData.partyOrgId = row.id
+            this.editPrincipalData.principal = row.principal
             this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
                 if (res.code !== 0) {
                     return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                 } else {
                     this.staffs = res.data
-                    console.log(this.staffs)
                 }
             }).catch(() => {})
         },

From 62be514affd260223274e4cd37fe3b4ac55f63f7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 14:10:22 +0800
Subject: [PATCH 22/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/partymember/icpartyorgtree.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 980ef2f7b..11f62d4f3 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -12,7 +12,6 @@
           :data="tableData"
           :default-expand-all="true"
           row-key="id"
-          border
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
           :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
           :height="tableHeight">

From b66cf63631ee1bd7cb617cd19a0bfab56ccec5f7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 14:47:01 +0800
Subject: [PATCH 23/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partymember/icpartyorgtree.vue    | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 11f62d4f3..dd69f1160 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -15,8 +15,8 @@
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
           :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
           :height="tableHeight">
-          <el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
-          <el-table-column prop="partyOrgType" label="类别">
+          <el-table-column prop="partyOrgName" min-width="250" label="党组织名称"></el-table-column>
+          <el-table-column prop="partyOrgType" min-width="150" label="类别">
               <template slot-scope="scope">
                 <span v-for="(item, index) in partyOrgTypes"
                       :key="item.value"
@@ -25,8 +25,8 @@
                   {{ item.label }}</span>
               </template>
           </el-table-column>
-          <el-table-column prop="principal" label="负责人"></el-table-column>
-          <el-table-column prop="principalMobile" label="联系方式"></el-table-column>
+          <el-table-column prop="principal" width="120" label="负责人"></el-table-column>
+          <el-table-column prop="principalMobile" width="150" label="联系方式"></el-table-column>
           <el-table-column label="操作" align="center" width="300">
               <template slot-scope="scope">
                   <el-button v-if="scope.row.partyOrgType != '6'"
@@ -78,7 +78,7 @@
               top="5vh"
               class="dialog-h"
               :before-close="handleClose">
-          <el-form ref="ref_form"
+          <el-form ref="principalRules"
                    :inline="true"
                    :model="editPrincipalData"
                    :rules="principalRules"
@@ -220,15 +220,20 @@
                     this.editPrincipalData.principalMobile = s.mobile
                 }
             })
-            this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
-                if (res.code !== 0) {
-                    return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
-                }else {
-                    this.principalShow = false
-                    this.getTableData()
-                    this.resetEditPrincipalData()
+            this.$refs['principalRules'].validate((valid) => {
+                if (!valid) {
+                    return false
                 }
-            }).catch(() => {})
+                this.$http.post('/resi/partymember/icPartyOrg/editPrincipal',this.editPrincipalData).then(({ data: res }) =>{
+                    if (res.code !== 0) {
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                    }else {
+                        this.principalShow = false
+                        this.getTableData()
+                        this.resetEditPrincipalData()
+                    }
+                }).catch(() => {})
+            })
         },
         handleClose() {
             this.principalShow = false

From c870e84abc2d65e0e55e0be06eb277475028bcb4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 15:31:10 +0800
Subject: [PATCH 24/37] 111

---
 src/views/modules/workSys/resiCate.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 8deb8b7e4..a0d639e19 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -185,6 +185,24 @@
                            size="small"
                            label="描述文字"></el-input-number> 人/楼栋
         </el-form-item>
+
+        <el-form-item label="自动匹配">
+          <el-switch v-model="form.warn"></el-switch>
+        </el-form-item>
+
+        <el-form-item label="匹配规则">
+          <span>年龄</span>
+          <el-input-number v-model="form.level2"
+                           :min="form.level1"
+                           size="small"
+                           label="描述文字"></el-input-number>
+
+          <span>—</span>
+          <el-input-number v-model="form.level2"
+                           :min="form.level1"
+                           size="small"
+                           label="描述文字"></el-input-number>
+        </el-form-item>
       </el-form>
       <div class="resi-btns">
         <el-button size="small"

From e973e794e2b68727449c2d2ce2ac63e654b7f8e5 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 15:31:41 +0800
Subject: [PATCH 25/37] 11

---
 src/views/modules/visual/basicinfo/houseStatic/peopleList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
index edb79cf8d..4107a6b0e 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/peopleList.vue
@@ -15,7 +15,7 @@
             <div class="td td3">所属网格</div>
             <div class="td td3">所属房屋</div>
             <div class="td td2">手机</div>
-            <div class="td td3">身份证</div>
+            <div class="td td3">证件号</div>
             <div class="td td1">性别</div>
             <div class="td td2">出生日期</div>
             <div class="td td1">操作</div>

From 1043f97452dbe9c9c24afdb63c91771ada1a6437 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 15:44:28 +0800
Subject: [PATCH 26/37] =?UTF-8?q?=E5=B9=B4=E9=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/resiCate.vue | 39 ++++++++++++++++++++------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index a0d639e19..a25ca42cd 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -186,20 +186,22 @@
                            label="描述文字"></el-input-number> 人/楼栋
         </el-form-item>
 
-        <el-form-item label="自动匹配">
-          <el-switch v-model="form.warn"></el-switch>
+        <el-form-item v-if="form.columnName==='IS_YLFN'"
+                      label="自动匹配">
+          <el-switch v-model="autoMatching"></el-switch>
         </el-form-item>
 
-        <el-form-item label="匹配规则">
-          <span>年龄</span>
-          <el-input-number v-model="form.level2"
-                           :min="form.level1"
+        <el-form-item v-if="form.columnName==='IS_YLFN'"
+                      label="匹配规则">
+          <span>年龄：</span>
+          <el-input-number v-model="ageMin"
+                           :min="0"
                            size="small"
                            label="描述文字"></el-input-number>
 
-          <span>—</span>
-          <el-input-number v-model="form.level2"
-                           :min="form.level1"
+          <span>{{' — '}}</span>
+          <el-input-number v-model="ageMax"
+                           :min="ageMin"
                            size="small"
                            label="描述文字"></el-input-number>
         </el-form-item>
@@ -308,6 +310,10 @@ export default {
         level2: 0,
         level3: 0
       },
+
+      autoMatching: false,
+      ageMin: 0,
+      ageMax: 1,
       rules: {
         managementIcon: [{ required: true, message: '管理平台图标不能为空', trigger: 'blur' }],
         dataIcon: [{ required: true, message: '数据平台图标不能为空', trigger: 'blur' }],
@@ -457,6 +463,21 @@ export default {
         if (valid) {
           if (this.form.warn) {
             if (!this.form.level1) return this.$message.error('黄色预警不能为0')
+
+            if (this.form.columnName === 'IS_YLFN') {
+              this.form.autoMatching = this.autoMatching ? '1' : '0'
+
+              if (this.autoMatching) {
+                if ((this.ageMin > 0 || this.ageMin === 0) && (this.ageMax > 0 || this.ageMax === 0)) {
+                  this.form.ylfnValue = this.ageMin + ',' + this.ageMax
+                } else {
+                  return this.$message.error('年龄范围不能为空')
+                }
+              }
+
+            } else {
+
+            }
           }
           this.btnLoading = true
           const _form = {

From e230e624b0f650ddebdb06cebeeb19d37d001634 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 15:45:15 +0800
Subject: [PATCH 27/37] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/houseStatic/houseList.vue | 2 +-
 src/views/modules/visual/basicinfo/houseStatic/houseMore.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
index 162621949..17fbd6709 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
@@ -20,7 +20,7 @@
             <div class="td td1">房屋状态</div>
             <div class="td td1">房主姓名</div>
             <div class="td td2">房主电话</div>
-            <div class="td td2">身份证号</div>
+            <div class="td td2">证件号</div>
             <div class="td td1">操作</div>
 
           </div>
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
index fc99058d6..1a21ce5a0 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
@@ -51,7 +51,7 @@
             <span>{{ info. ownerPhone?info.ownerPhone:'--' }}</span>
           </div>
           <div class="item item2">
-            <span class="item-field">身份证号：</span>
+            <span class="item-field">证件号：</span>
             <span>{{ info.ownerIdCard?info.ownerIdCard:'--'  }}</span>
           </div>
           <div class="item item2">

From 07b89be40723f9cc13882747b7b26420eafb3fcd Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 16:01:10 +0800
Subject: [PATCH 28/37] 111

---
 src/views/modules/workSys/resiCate.vue | 42 ++++++++++++++++++--------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index a25ca42cd..6da2debf4 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -191,7 +191,7 @@
           <el-switch v-model="autoMatching"></el-switch>
         </el-form-item>
 
-        <el-form-item v-if="form.columnName==='IS_YLFN'"
+        <el-form-item v-if="form.columnName==='IS_YLFN' && autoMatching"
                       label="匹配规则">
           <span>年龄：</span>
           <el-input-number v-model="ageMin"
@@ -454,8 +454,26 @@ export default {
         warn: row.warn == '1' ? true : false,
         level1: row.level1 || 0,
         level2: row.level2 || 0,
-        level3: row.level3 || 0
+        level3: row.level3 || 0,
+
+      }
+
+      if (row.columnName === 'IS_YLFN') {
+        if (row.autoMatching === '1') {
+          this.autoMatching = true
+        } else {
+          this.autoMatching = false
+        }
+
+        if (row.ylfnValue) {
+          let array = row.ylfnValue.split(',')
+
+          this.ageMin = array[0]
+          this.ageMax = array[1]
+        }
+
       }
+
       this.dialogVisible = true
     },
     async handleSUbmit () {
@@ -463,21 +481,21 @@ export default {
         if (valid) {
           if (this.form.warn) {
             if (!this.form.level1) return this.$message.error('黄色预警不能为0')
+          }
 
-            if (this.form.columnName === 'IS_YLFN') {
-              this.form.autoMatching = this.autoMatching ? '1' : '0'
+          if (this.form.columnName === 'IS_YLFN') {
+            this.form.autoMatching = this.autoMatching ? '1' : '0'
 
-              if (this.autoMatching) {
-                if ((this.ageMin > 0 || this.ageMin === 0) && (this.ageMax > 0 || this.ageMax === 0)) {
-                  this.form.ylfnValue = this.ageMin + ',' + this.ageMax
-                } else {
-                  return this.$message.error('年龄范围不能为空')
-                }
+            if (this.autoMatching) {
+              if ((this.ageMin > 0 || this.ageMin === 0) && (this.ageMax > 0 || this.ageMax === 0)) {
+                this.form.ylfnValue = this.ageMin + ',' + this.ageMax
+              } else {
+                return this.$message.error('年龄范围不能为空')
               }
+            }
 
-            } else {
+          } else {
 
-            }
           }
           this.btnLoading = true
           const _form = {

From 3b5bc65599f17b2c6dcf9d69859087bfc102709e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 8 Sep 2022 17:02:57 +0800
Subject: [PATCH 29/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index dd69f1160..b1debb759 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -182,7 +182,7 @@
         principalRules() {
           return {
               principal: [
-                  {required: true, message: '负责人不能为空', trigger: 'change'},
+                  {required: true, message: '负责人不能为空', trigger: 'blur'}
               ]
           }
       }

From 6ac6b290bca8ebb2ef49f81a6badad55c0be25d1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 9 Sep 2022 09:21:21 +0800
Subject: [PATCH 30/37] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/calendar/cpts/calendar.vue     | 15 +++++++++++----
 .../modules/communityParty/calendar/index.vue     |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index dfcba51b2..59c7ef23d 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -120,6 +120,7 @@ export default {
   watch: {
     visibleCalendar() {
       this.init();
+      // this.iniDate();
     },
   },
   mounted() {
@@ -134,13 +135,19 @@ export default {
 
     init() {
       if (!this.currentDate) {
-        this.handleClickDate(
-          this.visibleCalendar.find((item) => item.isToday) ||
-            this.visibleCalendar.filter((item) => item.thisMonth)[0]
-        );
+        this.iniDate();
       }
     },
 
+    iniDate() {
+      this.handleClickDate(
+        this.visibleCalendar
+          .filter((item) => item.thisMonth)
+          .find((item) => item.isToday) ||
+          this.visibleCalendar.filter((item) => item.thisMonth)[0]
+      );
+    },
+
     handleClickDate(item) {
       console.log("点击日历日期", item);
       this.currentDate = item.format;
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 56bc7f71a..ec6458769 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -450,6 +450,7 @@ export default {
     },
     currentYear: function (val) {
       console.log("watch--currentYear", val);
+      this.currentMonth = 0;
       this.getMonthData();
     },
   },

From f311e2d22f66ce8e4df6c0b84b633b7d94d8546b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 10:03:45 +0800
Subject: [PATCH 31/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index b1debb759..865e41de4 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -78,7 +78,7 @@
               top="5vh"
               class="dialog-h"
               :before-close="handleClose">
-          <el-form ref="principalRules"
+          <el-form ref="refPrincipalRules"
                    :inline="true"
                    :model="editPrincipalData"
                    :rules="principalRules"
@@ -203,6 +203,9 @@
     methods:{
         principal(row) {
             this.principalShow = true
+            this.$nextTick(() => {
+                this.$refs['refPrincipalRules'].resetFields();
+            })
             this.editPrincipalData.partyOrgId = row.id
             this.editPrincipalData.principal = row.principal
             this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
@@ -220,7 +223,7 @@
                     this.editPrincipalData.principalMobile = s.mobile
                 }
             })
-            this.$refs['principalRules'].validate((valid) => {
+            this.$refs['refPrincipalRules'].validate((valid) => {
                 if (!valid) {
                     return false
                 }

From a7bf3d397ab88839af95d75e9634b7a2604a6c85 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 13:56:08 +0800
Subject: [PATCH 32/37] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 865e41de4..4dd705c94 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -120,7 +120,8 @@
           editPrincipalData: {
               principal: '',
               principalMobile: '',
-              partyOrgId: ''
+              partyOrgId: '',
+              principalStaffId: ''
           },
         searchH: 0,
         dataForm: {
@@ -220,6 +221,7 @@
             this.staffs.forEach(s => {
                 if (this.editPrincipalData.principal === s.value){
                     this.editPrincipalData.principal = s.name
+                    this.editPrincipalData.principalStaffId = s.value
                     this.editPrincipalData.principalMobile = s.mobile
                 }
             })
@@ -246,7 +248,8 @@
             this.editPrincipalData = {
                 principal: '',
                 principalMobile: '',
-                partyOrgId: ''
+                partyOrgId: '',
+                principalStaffId: ''
             }
         },
       // 查询列表

From 208f9478f1aaff8834eba5db1aa9db69d03685ea Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 15:07:00 +0800
Subject: [PATCH 33/37] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/people/ren-prop-4.png    | Bin 10761 -> 10691 bytes
 src/assets/img/shuju/people/ren-prop-5.png    | Bin 10694 -> 10837 bytes
 src/views/modules/visual/basicinfo/people.vue |  26 ++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/assets/img/shuju/people/ren-prop-4.png b/src/assets/img/shuju/people/ren-prop-4.png
index 3443f38d514b8de8b288d6c38b05260b84bf7626..d01a786a139bb35d0319c8c60f0eb40fff8056d0 100644
GIT binary patch
literal 10691
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

literal 10761
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
Hu0mjfTJ_8q

diff --git a/src/assets/img/shuju/people/ren-prop-5.png b/src/assets/img/shuju/people/ren-prop-5.png
index 00cd1a614b9f8a3fdbd578904db1a18e9a704e1e..a1aaa3aae27e1eb2a84e22ca63a54264f863a76f 100644
GIT binary patch
literal 10837
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

literal 10694
zcmV;%DLK}OP)<h;3K|Lk000e1NJLTq003M7003GD1^@s6HMTKD00001b5ch_0Itp)
z=>PyJfJsC_RCwC$T?cqn)wZ6q&(KkkA~hii5L#%V2}<vR0#XE#A|MC~QU%3=9rSW9
zPw^sNefN10>5$MnB=nL1X_WLn>5~vrK$y4wwa=M3lc4l=Kl6R-OEPonzt{O!-TRnK
z5BkSuQ#26<Q6GSaBBGf7D}NjSD+X}QBqc~nl9bY<v?gWlq3Fld&rwo4uh}pNj_dm`
z0on*~DG7w7oXM72-jtU1gefEANmFL#Q!H6o74D1R*f<Z)hx79Jc|b}P8Gy$Wc!xIY
zK$qs5#0}%-t=6YaIXRU~mo8Nyd4}ck<?1FIf#Mh-vtj?+mz<o+rrg}BEc!WcK75{?
zU6BWZ2fz-#4*X+8H_o)-02<nbo76!7xOsUsNnA{MnXW9kxz$W*)|P5a%0M+Ht*;uN
z`hpq*p}%iOV$=H3etk@7IraIt`B}AD_&hjYUM)I*4L%<R0M`X2kieJLXh(fKfOh~b
zsRJ5>8<HAagKsuJ%grJA5O)^ZM_jOcA-06)i@i}fB-wW)dwAb8b8LEdlZ^l_u-37k
z!!FwSF$fa;s{F)3F>Fa?4OF8(nxH$l+M(6Z8fdiCW*1Yw)tztt(xrx`n3VSB(4^k#
znWUH1z{KHdK>P@EU}AUWNSu#25N#8FF?TP=V&|#>iLc<;EI7~Egu!Z9@(ZS@)DEW1
z+$M4`=(=>^q4A)a;@Yk}iZr5uO-2bE4XuVo=jFMY3bN}GU3ja(mVWAyn6YAi^qXQY
z34Z&N_(e}t{bL3x{?Wd|pTN3%xkktRMD>dqhhvLFB>vj@G*J)6PM`rFXi83RZ7Rs|
zB+akQiUDoMQ_1|!pg%&I?ra=O*}(=sO1^X@;2W!<$$iA$$Vv35zpWmQdtD7qdf6Od
z>1v8kZ%Z20oVM{Y+0vd6VU{1o)(9KXf|R{?AliOvM9M&V!aVud5S+)7-qswE+(iva
z?5`e=9ZlQ5#n%*+G=RTnn#ptJrxFz74EiI$=?<_<GWS6<bg-c@Non5d;n<O4d*lrD
zXzXZncuG&Yv1X)E_4#qOkv6fLMmL0?l#F%+`e!0Md5*Z4Jlihkli$5%xnP+qE~Lyb
zB@vxD*%g3C=fin%{!5u&=15C7^+fz@VrS%Zdcww=Vlvt>$LpZuek8q=vK!Ke47Mu4
zri%jiG1$b11qB|agp6nD(VZxEMZTk+v-BfQZ%WiskLkrmPXTefIo8@uB;?K%mMi}d
zDZl?JthVn(j_nJQuk2#IZTXU9fylV_zas70a+3eh@xK#^xwF)m>^`Ps;%OV%7hDIZ
zBsaGSDMBwz+ozbr(>iO0w)P)_{!lbsp134?Be3qw*#Mg^mW(2E<-VB7=9siDd}9Sx
z4<3-z?7HGY`upn1q(kDD{pZEpe@2Vpvl2v)F&5EjM2hG-(xOR<=mr^;BDzCHOX=|k
zqJNL=yN$Ncz82ACgoTgs%8X<&XGyg9*Y5M`k@yoLH2o_Az7b!uuJN&%&#Qj16U3hA
zsix?(PCOuRCjmOUjqJThBl-}%l2Xib;5!&dfC}SykPIVfj5(ULr7)*~W;|Wgn4Gb~
zKPpgs{8OB0)h|qSX?{?7ronclyvqhrqUvg)R$j%wbtws{wpx^~;gB*l*W6Hy+h8Av
zb{ypimkmm_M%z_4Z-3FEcZitvKk;Jsx$`1CXND<@jb%+%io}feY-CAU@PzXH0CadS
z>@qT+n;$&2*r|j@U8fRu`*J+h!1zH-BNvkUm<lg7W_QbK^$_QBeiZ-Oks>+_3Q(S`
zy;&(+Yn@Wob*=K0$9kn=z4c1v`WsoEX(Xj;V;`34kS0D#4M<a8mYU5SqJPHHMB855
zmxYd1rNIU|#|Gso_jO8nI%jz|U)8(!QL%V^stC2NViysbTzIJ=o=7&N$Kqcjpd0ZM
zke5-*KrIj0Rdi@~X^l#%$Y_p&n5fi_e6c6vhMRK9ILctBrV^CpD?VJ7rBowrE?aXQ
z-+V>S4N4^fqKYmJH%Oqpq||^k^-*d;noDtM;rpkeZ-;#_NY$IjWAPwr$JfvIgxh+h
zQr%5r`Zq~RVCsHTIzNdu!Rd$(#O{bG=5tBC*dAq(_X2m3eRNI(JU}hCYd3ipl1gf_
zc4uDlf>r=<lZ75fd`4O!&gcHGcz<c0Ql^FvY4utLx}xWL`;9XYjW<Y;n>avrY2l-|
z5{RzezKUBbDITpiDIRS$Dei5YfAin;9dG9?_i@z+ps5cZ*A9MTdCtlWH!4rp-KdnQ
zxn4~EJWUBq-(*Tpm-m7c19>g%xe!H4&n3gfKrN*h^amK=lyRmKYaR1Bvh+J5W+J#@
zBShRTVhi38i#J|To^;y=PG!od1h7eP!@5R0KnAdzSlk)h%}U*8H!JnpY0`cRiznoH
zDf(wD?d0|z5Zc$RwLBIEpe6>OsidZ=1bP(=GMyhZQ_gj>c>jkyaWQv+DU}q7sL^~e
zrMuW2IZZuHK013>#OHWoK`j=hmiwIODsCt%^QcQh*^;BTLowq_saY*dHYA1e+KO#q
z5yHD?fG|~B!C>39TGMDe_5cB3Kr`Jm4c0*hunh>*h8?%EH0ne`zZ-YjrZny>r4jwz
zNc#@k)bFrW4u&=W0N>pRJn?=l(2bX!zR1w7QtLi@Sgbsrs-_k6)zZaH`H3at4`a&I
z0_p^{u-C!{^geO9lXjD#L^KH_1MSYqsgFoaY!9D-KtlIl#rd2c#M@sa2~lw+b2b}9
z15fK(Eh)nRw647X4nTSlkWIR6Q<`?$&eE*=jYWP>gV1#w?_&oa$I~=l2Odun8(dHg
z8P;bS`H+Y7n|S4&II=feOc@*{*MzIcT7EKa7#mQ|yU^#L(o_!EO5PtWmw=mjRH5Cv
zp@grB0B3j96!m!gtHf`OK{Kl5azC;1aFXKUy^W32GYuu!RW-2f^g&>|Gtire5;n6o
zLsJ=K0<L+FZA!DA+ZFF#JCv5aN&4(mTD@>%!FMfbyB58+^FB>!-zJ@P@HGl*zuC_B
zF5Z&kG4R!z__9(wQ{PuC@wKW+SKeSyb8;H60o@Tb(;SoBg{egv&}yu7_sxLXgB;>6
za2U8uX8szfN8?8zz=1aKXBm05l%t7z#K4Im?D|QtNi?JAq}2p;UDCe#&k;=!C{4N$
zSkU4gJ0!?`b}*Q2`|eWOzeF-%m-5_z-NmK<ZvO6B+NMoEeE<MH2^|aC&%k#e(CJ*v
z^8`Ew9LAYlOmZv9sH>fa93#UYXiCX#$|(v;ZfVK2@tkk5vYY6_l<Ls(dl>dR@+C5&
z1cxEXV>c|M-GNDiIPFRoAueW36<@DRRi3W1)$UhAv!O}2F;~`VdBb?znL0XeV>)QT
zn!M8vG5`di9R}@DIu72WbRM!t=`?h&(xr&tvySu~wtN0%ISAOdH5~)T@}{Q)T92m&
zoR4$XYbTAeq!=IFuNUQ9)`$<5T0}_tLRKtFfFY&J`4%_?r1gj^99qs1Xo-6R_#a1<
zb;vk2hmk~@lT)0`c^Qqx?(<=yWuHLh39|k=g+Q|%U`wusR<i*l5WvCEXn>=G{QN)(
zG63y1e4o<o)qP5j*Y-;pxnJ!$@&E*XOBu1Bx9dv60|4;p80|>=+d}J!axkFKb{N}+
z0G$RL*8*eh%G$n3soKy-ZPdX}tT`TsTn}q=N>(!@-^Biyx7g)HRGOLTS|kF!2L{xx
z-I}3fHxSxwt%K1Pdm^TCLLV1EPk;!&^qrWpFpb<mUvmGXfvj$z5pbswY-k*FG-)8H
zfVFv`)Z(tgB+vw~+H=$awfC3<YM(KFYTvPb>Wf7LpW(aSqYfy&4B&U6V{{z6S9yMb
zq#UERdv)2$pnDoX*Ny4Zb$!IBInfjlt>>&Gaku?xrlJNv&7c<f1XR)@(7Vi=8?{@H
zD7i*RUI=)NGJ(i#6R)*E>eHNB&|9oJk*IpMKdh9e0EgYa#y-Ws_SD=w@O2AKtJ@LS
z00gwaKtr2Ji~A7BeF?~Z<Nei_-XNK9P<?6QL3IGhz)4c@H$LO<XuB83`Kd3w&I80x
z1CG_@71H)W5_D)g3@n~1Xu9r3GU%G?2%F>HYQOklt3{2@8KZR+G^14R2oCHhqGoqk
zH=y^#O)P3C^@tMrlCw$3m(1Yg6mrMJ>q<zDj~Mn&vM5ny6;X+n|7f;RdLtUx?1dBo
z8x+!kG!S6x8qGkH)&f9)`SPSg>Y&Mo)xmEaR)<VEq7E%0_>8}!?Jx)o{y2XgENFfA
z5&L)`K~Z>$+P=7py&h<~PA|}OHl)nyo0JM3>qPI7k?JwaaZ|EZ|BOw29w}Vp&`lYX
zCj#g<GN5-+c`wbQCk<t7cK+j1JFo!>NEoU;T2G7QE0e@O*5y!c!iO$&y_Rs=$ZnVJ
zW5XrWX~etdPNnq=yO>{@r%405zq*fU<3$Z<00*Fl5Rk*(IYM$&9X9>wTigBOA?j<h
zj<JlGE``4*d1a~`n1QtK01bH3c&3_e!}s#JU|az@^E!Dkl3uhxsSUJz6W>FndcI=b
z(n}(?@JsC}Z-{CUD;q`D_L?ZDh4U<IKyNbwbx?`aZrxCFzJwAxM`A~D^p%|6hJ&B1
zE6v2d$kU?JkTay+D<#-o4&Fwj2jkRG16yjg18its_YwOg*yH`w{u2*50sZQXqw2_+
z$JLRukIy-H(z4fPvq9z_3P@4M%ss&}nq=f`2!TKI7zRcirfEHZhsM7!){jA_bFm?Y
zHzPHDr(M%QFK|;qf3;h07Uf-6tId0y6uv=m=Cu4SOsj~h;U*r4eFJ~ni_ple%aYt}
zWD|=<l=gfH3?&&3<V&F4A&D<?&_myei#ZF#yd}vL9<O2U1K>3bc@Z{}bR)PS@Fx7@
zXX!>^9J^>>gF>K*{og#qAhAXhXwcwM?;bDv=KNFtxEPbYi-0!D;)vMnC#QZMsE+^O
zlsazSNp<XdasX&>?7)L^25F$<=^+Emybc$W>7}1Er0`zgGJ?;c<pemWg>vny#DtHN
zMOfByQzp?T0Zaz82j`7Y3(etjp$Ahgr*I8!;!Qz!M3hE1Q1*79us{_N6c=Q^gdU@$
zOC5zzV3gXR;{l~&oeeVoY}9VLa6NiNKm*rL_eS7}*lC0e9k^Q8>Jg;X1hhJ4&WU=T
zd>_0#GrM310Sx&yGrJI?|Gy$Dr_l4uWuXL0fcnOVrwII$>g(@oz|)iQ>U2pnL*A00
zlWkx(67+&6O!r>!<lzZKR9a8h@|K$^`rN40_TEO-sWdeqZ>W|_p*%~%NO&#MP1LGG
z4lUOU6}Jkw(G7&5%&v!)0-S&g!8ieprgA!Utr$HwTzSfEBO6LRM}lM&E*KXM?RHR!
z!yD-aut!O-;b}<CCaoqu9!+46eg8z)pVo$NzJC4s76KNsG&wD=)U>b8l$pNp%nz3I
zJpJ>{*KM}$zxYOpH$Mp!Z_X#+Khl6FjUNSVpK+82QrC1HbUa}l;Jv&g`JCNFQjP|i
zs|YQ3B?C&zBnD16s~kz#PbET`IW*?}Wud~L<+tJ{IwHy<`4TP&w-W~<Cvg=dGqZ`w
zmQ_KG%6?5O-JYscYrKc^5IW!pk#$39*KVc~a{v18WGbQHgaem;L?cG9N6a|RnoaaD
zYO7zuCIVBJ4}&jeim6|n71I{l<)e^@EaNs~b{<I<lRrC6zz2wl^QFdvW=3kp6}%2_
zhdF(WAN%Xf=L4k?^(H=VLQf*>4ZIe2-D_#KNvTwSlUVp$ia3|~p4JoDPz_8NjOrFz
zFARAWJ)5ZaD=IfBEZFlUj%*+$rr7@^w}{%uY9Y!}k0zWDorazl<!Y|s5WcDw<REY`
zx`9X_LA%=;sH6w;HqpqqgRFH!K_k#?GJIp_otzUGmcD@i)MeD3W65Ir*JnwB#LT}1
zi5cGn({Gm1`%a`7x1AeA1M~LhrzP<70~vH^I(S{@bQom}w$A4rhwSAiuXP{kDndz&
zzB%rR?osvbbwX?ly=aP|q6FMwibvD~QExEKqWvSAo_xEOJLOrFo0ZLE1>TnLhAbH>
z*{D@=VS(sI#N~e`<}S4=<=i$AoycMWb2s_jI(LIkpee|az~^N{IS9V?UXC1b!vo)x
z-pH$xvn$P55cqXma_$-ePM1!<Zix{y80cUzYf-S6{f`iqcQv8EyR6<BXWVB|QtIW(
zA1w)C&?ge;;|cUJI_UHy;heA;tmPCObsZ|BQP>wKhwib|;|Nq1FW?MRaQ6{!ewHjk
zGycsufog-3`*Ot1g%{@XqFQdg5#Ysh-7uD!nO^J$Qd=75OSqpT?|HE$I9zSg?Icyi
zSJ|~&H<rl2>3MCY6Ve!tCi~0aru%T|mGq~`agb&t$s6(d`p3{^xp`Mszz~uwv0f^y
zv*?!#47LvRyNg4_oc{@Bnft92?f<&p{uc3lcCLN@f8`ZiZSvj9a50HMhe3rGGkVSm
zJGH=Fg#BPGr+}-Y=9{-<k7XMxOTBhmIKicd{1xi1Q|q=nB>v-{q$XV+phci9py8@t
zw9F~xYh3`&MQ3s2s8Z){?wrbU<NN{KA5`GssURB|Rq!p<0JDVYY3IU%olaUg=%jI1
z2c5t;fiDrV_oW*}V1vh-w7bW0-^gDGBwap;jL#`IcX6<oLG&?uQ4nkLTmtqz0{Fe}
zLdE-#C7OIEKcnxSnE%7M4`Y&YjmPS>c2_KEx-_I@h}DtrN-c-o=s!^gMc{H!9VidV
zp&L(j5ue@6^-<g#X*suH44!IH!Y=tx3KyMR9%$R+LInjyn(=gDmT=TR)f@4*qfRNc
zyNT)_Jx2A9l7&=TP9<~x)y`tYkyxcp+ucg3>TB&)cLv-`hVk%D5LMPkphHCf7^3#1
zIdH*9lh_SJUIg4dY}%2LdyXXiM8N1W?%3HhGKgoWntqnShGs*H0qi^ic;5G6nw(?#
zK>vS<9FRGSL&u#8%`hHwr2nZDHlpy?5hRV6Nwh+);s6?SqBahQkY(&Z!B8twj%HNE
zfU+Rumptxk?*u?W#kKiP@z1TPYWDBLxP^}0#MqJQKGO0eYb&;MU<pV1)?AdoOK4GL
zWv#Wr)s&d|9Li>P?M9Fjl{;I^T$CwH<$vXDpk94PRuCyz23*T?>)r_r5e!l%GEChG
za5k0`4w{EgIWj%uV&+n~dz#FOh|LjGzC0tQX`KD89c&3I!2OUw{&1;5zL$dU-d_@?
zgWh}F!6f6cr=5?onkN#qy#C%v_FC+2BBc?K=<3EUqVBE8K&YY4<E^ynkQevM2-8z5
zD4UoeBJ&nAW~}AuUB$MDS?o3gKhO%;!eKlWBj7rn$QEO=w(8l$m+S>pj95WIJ?ffT
zCHjq{5Wezir*?;Dv;u>hw<9Cyr2&pd6pt#?2_>e;P(ic4zMOaEI|9Ne6V8%{@ea9u
z#M`Y`Y>Vx;_qe6cu49&d<cZYyc4Y(u`_T_l=KpY>MgQLcy5x2mtfv3=iC$EA<(hu{
zg=8a|Em?7aeRG{w;3D?XTtwIyB-6b6XpyJJ<L+AOwmMh*eYm5m<B$Ml$GLr`tjh=j
zs}l>fB3m~}JrVZ`N1wpaVLVG20T=v%o}`le(-5UI^-%0+rW5R3Sm>p04m?4cyO&F6
z6{uSZfOD<V>&Ad1F@&lMJOFqCy)^!&5PlK736l9)*#)0ox_kwHPY8>&vX4!!-z*Ap
z^lc!|Z}v}e0($;3O|<`^?MyGameZ3l`|lxDzx?^!+|-PG{Wy)kU4DU#rwoRMynVzT
z2=yGfkDo#qcjoc#8sM5gZU>z16~z^gHao@t?F%<wy4scKwldQSxzAjRL*uIKHLs>M
z50!QpP6>GFV*E|X8Le8~kROjLSDK4e2V*EBxS3A~z;*sE3OE}~_}>ILN@XyZ;79=e
zA{)#@?jJ2aJNUry<nmKK4|tD4_XXhZuqdnMYX^_J5R;A1bn#xdH^Bk;GP~6NX=8Mm
zuYSJB-+k~;Nj+plJ$_gl1;E*7r$Kz<d~|l}|M*6-Uk<?GiXyGcITp=5bTXXXWp3q0
zfWuKJ>#|<_eO<cxyREM_f2jd?FCg4UQY)_*kE=$&%NQEzUE#!oPLTIz-x9oj#pW%3
z-J3$ja-&kA&iZ12%lyfo0?z(70DoB;O!kW@D4Bot_v@d+xIx3GOE>WC<n%mzrc2u`
z2a}9om;C(a3w@3TrSpCliTiaeC&0TB72)$&Ln5qCeY)%%KQ(WEfe2Ld$=ProBft-H
zq{~SyD%TYSys;sf1;C+H8sJ2$tHi<;mk96y3^=M_7pV40ULAFCwXp;4NNC*vaOr<*
zfK#v&Oj9xt+Ovk+nv0cwamthKzEZ>Mt}6z(lS_DOfR}yilYlveSAPEh02u&p?Ry~c
z#gm~K{UE2pGF^V$7;Oanl?$;s*hiNMmW=%IiK%%I<LA>aUA}tH0Y~>(nd)oBqScuM
zct0I*b3|%yu{~loC$#k0at?p|Pc)o32(1s8gv1&SzzYi-3*S=#)Ml`Ydj#*2QrJtN
zY+e}xd<FqNhrk(XpcHlo;d{dfvUjrdoRLymZatKYeQqW_4+W+=0M}eY27I~%{I)1X
z103yf)N><#-W^G<a#zh$siR(`sFP-U+=_-5<!~=<X4ErboT4qLqxgldQ+tg%CDbab
z@78E?v_}zUnaQ67OeMf)5IBPjM$-;Bf|_}nJ7_SPRlZ*nHU0W^8}`HR*OJomMkJ(M
zhD^%MyNb^tO;+!S71I`+5pR9w0Q@eECW0Te{ea`@))0SFR&H~~O>Y`P&PjJP{)EGe
zdnrfA;vS?TF;_LH6`5Q{anU+Yy!E+7n941`Tepz4i?pl^fiQsppG@HN1K^rl$l?4P
z3gsE_B@Q24a|4H^WaeWZh}-h5vG~sXF+ByETR1+yfR8!x>eXw4Qo3UDr-5Rk7UJKn
zTWET6xfnLhLOt(4$gC=b^I9(=X3pKrOHqo1^|jCfz)2Zc+(hcAq9hh}H0NIJE`HvX
zLbDcpl``CVd}o0VYK>fMn0~bMn;)GTMSzb*7#<d3r4;NLJFOH6d`eL0?zUokT-!ru
z(y%?G`#G8nOJKhkmwb6R@%2zDNSMhjthsbeq`pn>b5YhhKdp->KkJ(_cNO>`ntqBL
zhRRgyT)4`rX4%Ftm<SAsM%d9fl`w>8q#onw9NsI%iw>yp=#eIR22oB6O?-*7gz^AY
zL}<>x#mLzy!t}&{Sj%rav?s%fo76)4(i1;CHIx7!PQY{ti_D_b>KP90q2)zFd$(0P
z<FK7BgGq~_`Chw^S&X0eOUo({v;P*<g<MPH=g*=JS~Rrpd#j;+b4e#9s{ST=kBL(P
z()W;(%GuRKCx|dP(xiw}n=)CGxxHAV`A4}FYRsf5f3IPFC88)E1R5A~`qi#t)v*M%
zPU{1lEwmfXJ4;@b9{>J{{sj2T2yQ|nvMA9MD8qZ=@*>Hrx|<FpVmn<r$60bQ5dALa
zUp0OXG0$EUTzkcq7~^N{D9?V!$twU3&#YFnJ>s8RQq_d~kqjiFN_)moZ`U^RH>YUT
zKh73%-#4oC`L)q^LRqj$=8&Xb=ERI1YE<e_Y)%=&MdIy+nM$de>-i#B!?mWL+f2`v
z9{b+$UIh3H1W22Z@J!^dIgf1z-I1QH_RFRiY^O^fGM1%3U3R|WKi5PWKW};>I32d2
zXF=ib#?Kq?KAd>R=~>Q)du$LR-;EPzGuD{Gi6&5>A$!Ngbz}>}lKZl~lXkGmpJfYg
z(ECk>z-o2p?%4e?%V|1w7R`fCLI0pBJ+G$N6CNtOd!H4hYp%MR0z}Ez=N#))SonKa
z0;D+rf8(P7u1&s0Rhy{{dXTXIQQ^B)5w$7I$M%rcahA&%43C|Mk{btxWi&h%#9({w
zJ(jF*<8?eJwc=MlhL#xj{>eKoK+uy+J%@+H`V-Nn2+A)(F)`B_#dUv*%Js<zvOm7Y
z&GO;JCrZ)eQPS$31oRpEf&-XZeJXwpYk7oqqFAspjr#DmQIT~$H9>A*KlL_CY$Zp{
zKH82n@i}N<(D_W1*u(@4bZGii@}Iee>0DxKMwKD#199DcD5=zkOG3+jvNWtTReCBd
zTNAE-*Out!?n-RhtceO98_94di=fm6a<Lnt5`8iPPr%X}gS6_sqy6m<s`vIO(po<X
z{jWx(jwZut69)|o2keQ=SHqKsU>EKK@B2n5P5*Or%HC!Xxx|R+M_Li!Z3rCCfRJ>(
zh>U^(a@gcQlaL{uy5O|2h+OuwWnpcoqL2OlOsf32>f&7&ktvm-b{tH7<Kcm(1g&!x
z0b!z?0E}EX))cVUG?}|^HpQ@LPYOR0wi4n@;!mvEI^g@GZS?pY<55h^d5&f}BoK}4
z<oq~5uXTHE5+#OBIn<N@Z;l`(_wp6b@R)2*YVh%ljMF4G$CD~RwTL1(cmdT=)L3=X
z{sioEGpT(j&~nFZ5&)Zh??xNN(k&TkbpB{<W`rkCMxf-LEUsrh=hU0xJc(Ahl}4a4
znuRTGN=Ru&loH3ZqJxeB2u_~K)N(HCTQOxptSDV=)txi~l^8PlU?T$NR;2QJDwk29
z1aYOd3FCLQ!y>Y3(`S%|*REaHKd+abnSaNPK$MKbgex&(W~6dD)5nxX+?;`lWZ88w
zpGoYBeg~}*oKe+hxfN~FzeT`HY4b42kF=E~a6cCNqMX+x@r#M1j!|j|qQb<s&<m<}
z&%*@zN_&`pi>+?v0dM$wq^9T9$;mCOW6hD0eW|!mxL%LEnR4I!e2!DBB$YSskFQI<
zc=aQvQ;e-{Pyezp0^8O&b|$3+KD(1vH`t-4Jl3l9pYs<hk66%-&6<n8a5U&st2R%y
z;q_MR++F2PI<Fj4OhEiNh{ftoJboH<Vh0==ACT~O*7CT5nd0N0bEpq*H5Znv7t!+K
z&73>$q?wZ&Hb-j>oJP6ZW=^ALf@V&Djq87+_F6IJE2{|4`<~}!TD3kMDm!ALm3=aT
z-a%`uVcv2Fty4p%);(*>uBcwLyy`?Ne*F6~m*9x+)f1KjqR*%pAu9hW=g2qFJeF3z
z_p)8t-kyAa+m(Hx-J*T}FtIlx%oLs8Kyw4@qidK$_``8yIA?-B6c|x_FSWbW?N22v
z>LzLng(*j3*HWvllL1wZ#_h%~YEt3L;-}qdh{Tlgwb$DHax}NQKUNL-zH;`4*A7e$
z6XDs@8H@DvhFH`_J)JN_?2ews%aUM9xbrNCGPg!0f81;62!_DvNm(69%QKz09A3)>
z%Xn!(bN)}fJ};RbMVZtx8qmjO$_Zw)RrcH{UY>kWIceExisW?`WkiX{8-<yZiNoxM
z(s`wc5_i6yO3@i?HVL{2i2p|HbJlWkFgAn-g%*7go6bb4jXE9!|Irk0pT}-e6_lh-
zn>}LrfdutpW<RD>tTe$zV(LPJp^U*)aLrI6rG3w4vKbAio`|tzdXbi2EaoN#C4DBf
zJmX`UrjbmgxJ|qyhnzO(Q*7Fx=OZ?4(1oWB`ik;yYsA}M#*5P_%XkJGw<pt_)bmt6
zgLYGqffwDe8WuZnxPf;KxMTW>-k=Xq!;+>^vc_OQqXBxNDK@R8Dc)8_-4}UMbb2L#
zOL0}TiLtdF)rqm1W<%(yR9p1$6I+79O|evXNlUBFxozZ24#_3?xFCbp<l@VD+_Ra;
zj(PTca0>fL+o`(Y??f&5`()fN7-=;=Z=m>bN2*+ihDve9^-zi}Xz&P3{l+yRntal2
zwOH_Lwus4_p{<cyN9IdtA{EsJFx7->1K@OLLs{b9&bK!jP#N-<RHM>fqG0Hf<{oN!
z7FsVbJb5q%NCaiB5ToZrQq$)ON6!3FT-<<H4x-g0p7~Am9eY7Nk?Lnk)S5BD)0m8~
zFLE-vh<P%CZYUiSV(-I}Ohxl7TE0M>j9>1g<^D0(DH!^kx68irtk`fWo+GsqRaZJz
z|1m7zp;OGmT)qQUoN}&fxUlfko=i2ha4=s#w43H)ssVAYAlJ>45sZe?IU9J-SCc5d
zUJASxjQ)Od6L~ev=wxv^aTX_bP{6?Az2TSV(+Y0+in;0rQQBqoBe_6Lg}Q60xoN$a
z^hLG^u`V-3N0*ih?+{O89uLZl$d_PI1LJxr7P}iL?&l&k&g)%~l@{lcXNt2)i_wQj
z?QtWyMF5#IJO!9|6_CDJjQ==?sAV;+)ZhU9p)SFsEj&i{g%+kkzjvZ~F#a&b8MU=F
z#yxqeH}WNNGC~`<?v*wl(^$#5udBNmvx&0)DHp~?v4U2#6uYRs84Kv5mjxFMj-#7U
zk0u`#6F*5uPdQbHR&(c4rH8o47;FjkdDA*vtHki>lnJFcB7xRIk)Bw6ZWBSiL|?Ll
z7n5W+(Ad~xelSbv6`g#gPn<;~46U?)`7XRzO^&RHFwdn}J(M$<Tf~>YSe5$i_XxG>
z8s!NO*)CT}U*WCjGI~w!ZW+BAMV8UybI`de)?LSoN4mDyN)?<m^<?S+Q_^K`zD~G+
zh#-+K!E9r655rJ0m9U}ItMH{B+zOq>Jd2~~?83!UR6wZ8kF`a3Ru=$A6$FDr(=)`y
zOY?+pAkC-z^rGt4>VWd3$2Lk5Q70;8<*+aeWgE$WNkIVeq%Q7j#8d8TkWjKq1xVes
z#?P>gV;_=oB<0B<q8IY%Iz9yUHX4}yV$|GoV)fxfYWesZRxsjwkuG2ZUJV+Ck_rpF
z0<^wv;VqTT9_Y%PJUv`C@}q){ewISy8`y8Hqq&o12>50qAZfAKa`v29NKN)*KRQQi
z#fFOJeL_To&cUKlw@}ffTZm}foqqQS(InJKnn8L=Df*pbpAgZgE4B#{U0)5M98Z||
z>eq0wF(6zVPyET0ko~Nda(!A)yW(28zXY?=0=Tihfn0LwR?B7&Ld)@p>C1b7=g?bD
zH9np&%7s-d^h;W9H7+Siz{jQ4P=iy4iqN#LMOfNzN=Vvvl6@>eY5VPR7XPR2zby&Y
zju8w=-6?|8R^vQsaLQ{GL3%LI`ZePTWUz@&Xpvt|y;2pP=IXT6mO*tfP{~8k?qb1^
zeRbt3+Pr)ZS~t9<T=1825209tmNcb+Z_JamDN}pNhP(;&0bQ?|DG=vHnas*7ht}gK
zkgktsqR|pdoSY(eR|YtmSK=H|K7`ekZ{(XBn?b?n$Ujh$UhE)xfgg+REncXdK+o3Z
ztAiV}$Q6SC1PBHLV*LAdML%ZI|8YJfop64QLeNX123h(;IXG8>Rh4Bkk86>I#7a87
zXzAfE+HPMEp{jj_e6&4Nb0Zg9(JTXAM-8x$-Npv?1>AMFtEhm6?v-R~PZ-V%+X984
z5*a6@aD7-ufL8Q3ybGe*4OUcsh%4mZ@Es7E5t5+S(%i-RcwE)P(XS&X!F?RGb`-aT
zVeKe-F9T=btQ0Wew-oPNkehAW(jcw)JhYmT`8>T{1@0@>31_~J8PBUIJ67H_fNkgP
z5|7S%eVi8oE@gi`f#md>@+~K%VWjQm3-rzfs+REENAQ*tYKMk)!K=CNg7bhjkch&B
zF<Q3@Id1u?1nm_BdW*4M;d<oWa&qHhMJc8i7*d4)vKzOS{Y6Q*IXt?g-MC@AA3_ba
zyrhOD4Y;p@^HB6?4o~h(9#SjWxRbBFK#8<kzS*R*;q?Qh9<GtR?YEw2E+e#Ez7njO
zTp2D)awJ-Mr5OKqy-#91kBj4#WITCQz9I}-EvxQjwCguNx^Jo~4!X0p<3=R#@`ZP}
zNp1Cf{rwPsEZV!;Zd-~Ss}`Tn@gBBk_<C?%j#q*i`TB8x2_9~UG+uv=qy92Hi1Dq1
z_eZMO&jpaJ^0hXSr=5USAK#aoI=@d-b*38JWRZ7j8sDpVucg?#H0>Z8sYCtmc#-Li
zwZ7<EV~uZ)wM*@5*FJNnhRoX$>~n)-l`QhMSo7np&G+%gBilCLJ%_-&1;Ms|A$AXb
z+@fvsNo+TfzreniKdwh@^Ieb8^pYFN(Z9gHKcM?woA2U#-DVVg_7^hu@u$|ZYx8UV
sc-;oU-+v+U0DfwGb!|T6alH2b2V_<25yvuV7ytkO07*qoM6N<$f;;-yfB*mh

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 81190d694..7f2c8d110 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -70,22 +70,22 @@
 
               <div class="ren-prop z-4">
                 <img src="@/assets/img/shuju/people/ren-prop-4.png" />
-                <span>志愿者类别</span>
+                <span>住户类别</span>
 
                 <div class="ren-cnt">
-                  <h5>志愿者类别：</h5>
+                  <h5>住户类别：</h5>
                   <p>
                     {{
-                      info.volunteerCategory.length == 0
+                      info.isTenant == null || info.isTenant == ''
                         ? "--"
-                        : info.volunteerCategory.join("、")
+                        : info.isTenant == '1' ? '租户' : '业主'
                     }}
                   </p>
                 </div>
               </div>
 
-              <div class="ren-prop z-5">
-                <img src="@/assets/img/shuju/people/ren-prop-5.png" />
+              <div class="ren-prop z-6">
+                <img src="@/assets/img/shuju/people/ren-prop-6.png" />
                 <span>房屋信息</span>
 
                 <div class="ren-cnt">
@@ -100,18 +100,16 @@
                 </div>
               </div>
 
-              <div class="ren-prop z-6">
-                <img src="@/assets/img/shuju/people/ren-prop-6.png" />
-                <span>经济状况</span>
+              <div class="ren-prop z-5">
+                <img src="@/assets/img/shuju/people/ren-prop-5.png" />
+                <span>联系电话</span>
 
                 <div class="ren-cnt">
-                  <h5>经济状况：</h5>
+                  <h5>联系电话：</h5>
                   <p>
-                    月薪:
+                    联系电话:
                     {{
-                      info.financialSituation.monthlyIncome || "--"
-                    }}，退休金：{{
-                      info.financialSituation.retirementAmount || "--"
+                      info.mobile || "--"
                     }}
                   </p>
                 </div>

From d7b32c016b0380372891e1f6163a4a055a50db0a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 15:17:37 +0800
Subject: [PATCH 34/37] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 7f2c8d110..74eda8d40 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -105,7 +105,7 @@
                 <span>联系电话</span>
 
                 <div class="ren-cnt">
-                  <h5>联系电话：</h5>
+
                   <p>
                     联系电话:
                     {{

From 099999aaa2a88c49bef35157d284816d2be0782e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 9 Sep 2022 15:24:52 +0800
Subject: [PATCH 35/37] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/people/ren-prop-6.png | Bin 10516 -> 10694 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/img/shuju/people/ren-prop-6.png b/src/assets/img/shuju/people/ren-prop-6.png
index 4e3ad2be7731b7749200f1a85b593c44dcffa5f8..00cd1a614b9f8a3fdbd578904db1a18e9a704e1e 100644
GIT binary patch
literal 10694
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

literal 10516
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
WdsoZ*UJSti0000<MNUMnLSTX_hH#w#


From e60e9b99e9c17a9c2cb1ac658153aa3e909c1106 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 9 Sep 2022 16:14:44 +0800
Subject: [PATCH 36/37] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/event/cpts/event-detail.vue    |  4 +-
 .../modules/shequzhili/event/eventList.vue    | 46 ++++++++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index acb18f05f..4a4adcbc0 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -10,8 +10,8 @@
             <span>{{ info.gridName }}</span>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
-            <span class="info-title-2">上报时间：</span>
-            <span>{{ info.createdTime }}</span>
+            <span class="info-title-2">发生时间：</span>
+            <span>{{ info.happenTime }}</span>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">事件内容：</span>
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index b4a8e2a08..7d993f4ce 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -48,18 +48,23 @@
             </el-form-item>
             <el-form-item label="事件类型"
                           prop="firstIdList">
-              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
-                collapse-tags
-                :show-all-levels="false"
-                :props="{
+              <el-cascader ref="cascaderEvent"
+                           v-model="eventTypeCheck"
+                           :options="cateOptions"
+                           collapse-tags
+                           :show-all-levels="false"
+                           :props="{
                   multiple: true,
                   checkStrictly: false,
                   emitPath: false,
                   children:'subCategory',
                   label:'name',
                   value:'id'
-                }" clearable class="item_width_2" @change="handleEventType" />
-                <!-- <template slot-scope="{ node, data }">
+                }"
+                           clearable
+                           class="item_width_2"
+                           @change="handleEventType" />
+              <!-- <template slot-scope="{ node, data }">
                   <div @click="cascaderClick(node, data)">
                     <span>{{ data.name }}</span>
                   </div>
@@ -177,14 +182,12 @@
                            label="所属网格"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column
-            prop="categoryName"
-            label="事件类型"
-            min-width="140"
-            align="center"
-            :show-overflow-tooltip="true"
-          />
-            <!-- <template slot-scope="scope">
+          <el-table-column prop="categoryName"
+                           label="事件类型"
+                           min-width="140"
+                           align="center"
+                           :show-overflow-tooltip="true" />
+          <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
             </template>
           </el-table-column> -->
@@ -259,11 +262,11 @@
           </template> -->
           </el-table-column>
 
-          <el-table-column prop="createdTime"
+          <el-table-column prop="happenTime"
                            align="center"
                            width="140"
                            :show-overflow-tooltip="true"
-                           label="上报时间">
+                           label="发生时间">
           </el-table-column>
           <el-table-column prop="operationTypeShow"
                            align="center"
@@ -505,7 +508,7 @@ export default {
     this.getCateOptions()
   },
   methods: {
-    handleEventType(val) {
+    handleEventType (val) {
       // console.log('val-----eee', val)
       console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
       const nodes = this.$refs.cascaderEvent.getCheckedNodes()
@@ -709,11 +712,11 @@ export default {
         this.delEvent(rowData.icEventId);
       }).catch((err) => { });
     },
-    async delEvent (eventId){
+    async delEvent (eventId) {
       const url = "/gov/project/icEvent/delete";
       let idsArr = [eventId];
 
-      const { data, code, msg } =await requestPost(url, idsArr);
+      const { data, code, msg } = await requestPost(url, idsArr);
 
       if (code === 0) {
         this.$message.success("删除成功！");
@@ -757,7 +760,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getCateOptions() {
+    async getCateOptions () {
       const url = "/gov/issue/issueprojectcategorydict/list";
 
       const { data, code, msg } = await requestPost(url, {});
@@ -807,7 +810,7 @@ export default {
       this.getTableData();
       // this.loadTable()
     },
-    deepTree(arr, child) {
+    deepTree (arr, child) {
       if (Array.isArray(arr) && arr.length > 0) {
         return arr.map(item => {
           // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
@@ -831,5 +834,4 @@ export default {
     width: 200px;
   }
 }
-
 </style>

From cf493adf8a39ff4f5508ed55c2bf1c033549ffb3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 13 Sep 2022 13:54:45 +0800
Subject: [PATCH 37/37] =?UTF-8?q?=E4=BC=98=E5=8C=96disabled=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=96=87=E6=9C=AC=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/common.scss       | 5 +++++
 src/views/components/editResi.vue | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index b64e02d22..b27efca2e 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -829,3 +829,8 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
   -moz-appearance: textfield;
 }
+
+// 默认输入框placeholder样式
+html .el-input.is-disabled .el-input__inner {
+  color: #333;
+}
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index d01d2e4e3..a25951546 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -385,6 +385,7 @@ export default {
     let constForm = {
       ...form
     }
+    console.log('-----------------哈哈哈哈哈哈rules', rules)
     return {
       openSearch: false,
       fixedForm: {