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/assets/img/shuju/measure/cheng.png b/src/assets/img/shuju/measure/cheng.png
new file mode 100644
index 000000000..7cd8dea6e
Binary files /dev/null and b/src/assets/img/shuju/measure/cheng.png differ
diff --git a/src/assets/img/shuju/people/ren-prop-4.png b/src/assets/img/shuju/people/ren-prop-4.png
index 3443f38d5..d01a786a1 100644
Binary files a/src/assets/img/shuju/people/ren-prop-4.png and b/src/assets/img/shuju/people/ren-prop-4.png differ
diff --git a/src/assets/img/shuju/people/ren-prop-5.png b/src/assets/img/shuju/people/ren-prop-5.png
index 00cd1a614..a1aaa3aae 100644
Binary files a/src/assets/img/shuju/people/ren-prop-5.png and b/src/assets/img/shuju/people/ren-prop-5.png differ
diff --git a/src/assets/img/shuju/people/ren-prop-6.png b/src/assets/img/shuju/people/ren-prop-6.png
index 4e3ad2be7..00cd1a614 100644
Binary files a/src/assets/img/shuju/people/ren-prop-6.png and b/src/assets/img/shuju/people/ren-prop-6.png differ
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/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/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index f89104834..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{
@@ -320,6 +321,12 @@
     font-weight: bold;
     color: #fac126;
   }
+  .wsc{
+    font-size: 35px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #fc8452;
+  }
 
   .colorwhite{
     font-size: 35px;
@@ -336,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/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/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: {
diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index c653429eb..59c7ef23d 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,37 @@ export default {
     },
   },
   watch: {
-    visibleCalendar () {
+    visibleCalendar() {
       this.init();
+      // this.iniDate();
     },
   },
-  mounted () {
+  mounted() {
     console.log("123", this.time);
     this.init();
   },
   methods: {
-    init () {
+    computeNongliText(y, m, d) {
+      let item = nongli.solar2lunar(y, m + 1, 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.iniDate();
       }
     },
 
-    handleClickDate (item) {
+    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;
 
@@ -152,8 +171,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;
   }
 
@@ -165,8 +184,8 @@ export default {
       width: 14.285%;
       padding: 20px 0;
       font-size: 20px;
-      font-weight:bold;
-      background-color: #E6A23C;
+      font-weight: bold;
+      background-color: rgba(#ccc, 0.2);
       text-align: center;
 
       &::after {
@@ -177,9 +196,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 {
@@ -210,8 +229,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;
       }
 
@@ -220,19 +239,39 @@ 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;
+        color: #bbb;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      &.z-weekend {
+        .date {
+          color: #ff3333;
+        }
       }
 
       &.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 {
@@ -244,12 +283,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 fd3a8692a..ec6458769 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>
@@ -48,6 +55,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>
@@ -60,23 +71,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 +114,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 +144,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 +220,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>
@@ -184,6 +233,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>
@@ -199,21 +252,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 +296,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 +355,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 +372,7 @@ export default {
     addActivity,
     scheduleForm,
   },
-  data () {
+  data() {
     let todayObj = new Date();
 
     return {
@@ -357,10 +423,10 @@ export default {
     };
   },
   computed: {
-    currentYear () {
+    currentYear() {
       return parseInt(this.currentYearStr);
     },
-    apiParams () {
+    apiParams() {
       const { currentYear, fmData } = this;
       return {
         yearId: currentYear,
@@ -384,16 +450,17 @@ export default {
     },
     currentYear: function (val) {
       console.log("watch--currentYear", val);
+      this.currentMonth = 0;
       this.getMonthData();
     },
   },
-  async mounted () {
+  async mounted() {
     await this.getPartyOptions();
     this.getMonthData();
   },
   methods: {
     // 添加活动
-    addHudong () {
+    addHudong() {
       this.icPartyActId = "";
       this.addDiaTitle = "新增活动计划";
       this.formType = "add";
@@ -401,14 +468,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 +519,7 @@ export default {
       }
     },
 
-    async publishActivity () {
+    async publishActivity() {
       const url = `/resi/partymember/icPartyAct/publish/${this.icPartyActId}`;
 
       const { data, code, msg } = await requestPost(url, {});
@@ -465,7 +532,7 @@ export default {
       }
     },
 
-    async cancelActivity () {
+    async cancelActivity() {
       const url = "/resi/partymember/icPartyAct/del";
 
       let params = [];
@@ -482,7 +549,7 @@ export default {
     },
 
     // 点击日程操作
-    handleClickRicheng (type, item) {
+    handleClickRicheng(type, item) {
       console.log(type, item);
       this.scheduleId = item.scheduleId;
       if (type == "edit") {
@@ -507,7 +574,7 @@ export default {
       }
     },
 
-    async cancelSchedule () {
+    async cancelSchedule() {
       const url = "/resi/partymember/icSchedule/del";
 
       let params = [];
@@ -524,15 +591,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 +608,7 @@ export default {
       this.getCurrentDateData();
     },
 
-    computeAllListClass (index) {
+    computeAllListClass(index) {
       let x = index % 7;
       let y = Math.floor(index / 7);
       if (x < 3) {
@@ -559,12 +626,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 +669,7 @@ export default {
       }
     },
 
-    async getMonthData () {
+    async getMonthData() {
       const url = "/resi/partymember/icPartyAct/homeMonthTotal";
 
       if (!this.apiParams.orgId) return;
@@ -616,14 +683,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 +707,7 @@ export default {
       }
     },
 
-    async getPartyOptions () {
+    async getPartyOptions() {
       const url = "/resi/partymember/icPartyOrg/getSearchTreelist";
       let params = {
         customerId: localStorage.getItem("customerId"),
@@ -657,25 +724,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();
     },
@@ -731,6 +798,8 @@ $red: #f33;
           font-size: 14px;
           font-weight: bold;
           cursor: pointer;
+          opacity: 0.7;
+          transform: scale(0.94);
         }
       }
     }
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>
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 4b8a5179e..4dd705c94 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -12,13 +12,28 @@
           :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">
-          <el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
+          <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"
+                      :value="item.label"
+                      v-if="scope.row.partyOrgType == item.value">
+                  {{ item.label }}</span>
+              </template>
+          </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'"
+                             @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 +71,39 @@
                         @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="refPrincipalRules"
+                   :inline="true"
+                   :model="editPrincipalData"
+                   :rules="principalRules"
+                   class="div_form">
+              <el-form-item label="负责人"
+                            label-width="150px"
+                            prop="principal">
+                  <el-select v-model="editPrincipalData.principal"
+                             placeholder="请选择"
+                             clearable
+                             style="width: 200px"
+                             class="item_width_4">
+                      <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="handleClose">取 消</el-button>
+            <el-button type="primary" @click="editPrincipal">确 定</el-button>
+          </span>
+      </el-dialog>
   </el-card>
 </template>
 
@@ -67,6 +115,14 @@
     export default {
     data () {
       return {
+        principalShow: false,
+        staffs: [],
+          editPrincipalData: {
+              principal: '',
+              principalMobile: '',
+              partyOrgId: '',
+              principalStaffId: ''
+          },
         searchH: 0,
         dataForm: {
           id: '',
@@ -76,6 +132,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 +179,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: 'blur'}
+              ]
+          }
       }
     },
     mounted() {
@@ -109,6 +202,56 @@
       // this.pageLoading = true
     },
     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 }) =>{
+                if (res.code !== 0) {
+                    return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                } else {
+                    this.staffs = res.data
+                }
+            }).catch(() => {})
+        },
+        editPrincipal(row) {
+            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
+                }
+            })
+            this.$refs['refPrincipalRules'].validate((valid) => {
+                if (!valid) {
+                    return false
+                }
+                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
+            this.resetEditPrincipalData()
+        },
+        resetEditPrincipalData() {
+            this.editPrincipalData = {
+                principal: '',
+                principalMobile: '',
+                partyOrgId: '',
+                principalStaffId: ''
+            }
+        },
       // 查询列表
       async getTableData () {
         this.tableLoading = true
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index a4bbccfcf..8921683fa 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -153,13 +153,32 @@
           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 +262,16 @@ export default {
   mixins: [mixinViewModule],
   data() {
     return {
+      enableFlagList: [
+        {
+          value: 'enable',
+          label: '启用'
+        },
+        {
+          value: 'disabled',
+          label: '禁用'
+        }
+      ],
       dataForm: {
         name: "",
         mobile: "",
@@ -361,6 +390,15 @@ export default {
     diaClose() {
       this.sendNoticeFormShow = false;
     },
+    // 启用/禁用
+    enableOrDisabled(id) {
+      this.$http
+              .post(`/epmetuser/appPoint/enableOrDisabled/` + id)
+              .then(({ data: res }) => {
+                this.loadTable();
+              })
+              .catch(() => {});
+    },
     // 新增 / 修改
     addOrUpdateHandle(id, title) {
       this.dialogTitle = title;
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="手机号"
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>
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>
 
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..17fbd6709
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseList.vue
@@ -0,0 +1,237 @@
+<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"
+                :info="info"
+                @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..1a21ce5a0
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseMore.vue
@@ -0,0 +1,124 @@
+<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 item2">
+            <span class="item-field">所属小区：</span>
+            <span>{{ info.neighborHoodName }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">所属楼栋：</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 item2">
+            <span class="item-field">房屋状态：</span>
+            <span>{{ info. rentFlag==='1'?'出租':info.rentFlag==='0'?'自住':info.rentFlag==='2'?'闲置':'未出售'}}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">房主姓名：</span>
+            <span>{{ info. ownerName?info.ownerName:'--' }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">房主电话：</span>
+            <span>{{ info. ownerPhone?info.ownerPhone:'--' }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">证件号：</span>
+            <span>{{ info.ownerIdCard?info.ownerIdCard:'--'  }}</span>
+          </div>
+          <div class="item item2">
+            <span class="item-field">备注：</span>
+            <span>{{ info.remark?info.remark:'--' }}</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 462110fa1..8cf156b0a 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,23 +46,32 @@
 
           <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 "
+                 @click="handleClickHouse('3')">
+              <div class="pie-table-total-count wsc">{{houseData.wscHouseTotal}}</div>
+              <div class="pie-table-title">未出售房屋数</div>
+            </div>
           </div>
 
           <div class="loading-status"
@@ -93,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>
@@ -134,39 +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"
+                       @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>
@@ -187,6 +213,21 @@
       </div>
 
     </cpt-card>
+
+    <house-list v-if="showHouseList "
+                :orgId="selOrgId"
+                :orgType="selOrgType"
+                :rentType="rentType"
+                @close="showHouseList = false">
+
+    </house-list>
+    <people-list v-if="showPeopleList "
+                 :orgId="selOrgId"
+                 :orgType="selOrgType"
+                 :type="type"
+                 @close="showPeopleList = false">
+
+    </people-list>
   </div>
 </template>
 
@@ -199,6 +240,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 {
@@ -207,7 +250,9 @@ export default {
     cptCard,
     screenTable,
     screenEchartsFrame,
-    ScreenLoading
+    ScreenLoading,
+    houseList,
+    peopleList
   },
   data () {
     return {
@@ -232,8 +277,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 +295,10 @@ export default {
         {
           name: '闲置房屋数',
           url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
+        },
+        {
+          name: '未出售房屋数',
+          url: require('../../../../../assets/img/shuju/measure/cheng.png')
         }
       ],
 
@@ -278,6 +329,13 @@ export default {
       zoom: null,
       parentPolygon: [],
 
+      rentType: '',//点击房屋数类型
+      type: '',//点击人员数类型
+      showPeopleList: false,
+      showHouseList: false,
+      selOrgId: '',
+      selOrgType: '',
+
     };
   },
   async mounted () {
@@ -301,9 +359,35 @@ export default {
       this.getHousePie()
       this.getUserPie()
 
+    },
 
-
+    //点击房屋数
+    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, 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
+    },
+
     housePieInitOk (dom) {
       console.log('pie准备好了', dom)
       this.housePieChartS = dom
@@ -335,7 +419,6 @@ export default {
           this.$refs.housePieChart.hideLoading()
         }
 
-
       } else {
         this.houseData = {}
         this.$message.error(msg);
@@ -379,10 +462,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 = {
@@ -575,33 +663,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 = '人员列表'
+      }
 
     },
 
@@ -609,6 +700,7 @@ export default {
     //返回所选组织
     handleClickAgency (index) {
 
+
       const cutNum = this.runAgencyArray.length - index//要减去的长度
       this.runNum = this.runNum - cutNum
 
@@ -622,6 +714,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..4107a6b0e
--- /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>
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 81190d694..74eda8d40 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>
+
                   <p>
-                    月薪:
+                    联系电话:
                     {{
-                      info.financialSituation.monthlyIncome || "--"
-                    }}，退休金：{{
-                      info.financialSituation.retirementAmount || "--"
+                      info.mobile || "--"
                     }}
                   </p>
                 </div>
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 8deb8b7e4..6da2debf4 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -185,6 +185,26 @@
                            size="small"
                            label="描述文字"></el-input-number> 人/楼栋
         </el-form-item>
+
+        <el-form-item v-if="form.columnName==='IS_YLFN'"
+                      label="自动匹配">
+          <el-switch v-model="autoMatching"></el-switch>
+        </el-form-item>
+
+        <el-form-item v-if="form.columnName==='IS_YLFN' && autoMatching"
+                      label="匹配规则">
+          <span>年龄：</span>
+          <el-input-number v-model="ageMin"
+                           :min="0"
+                           size="small"
+                           label="描述文字"></el-input-number>
+
+          <span>{{' — '}}</span>
+          <el-input-number v-model="ageMax"
+                           :min="ageMin"
+                           size="small"
+                           label="描述文字"></el-input-number>
+        </el-form-item>
       </el-form>
       <div class="resi-btns">
         <el-button size="small"
@@ -290,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' }],
@@ -430,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 () {
@@ -440,6 +482,21 @@ export default {
           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 = {
             ...this.form,