diff --git a/src/assets/img/file-add.png b/src/assets/img/file-add.png
new file mode 100644
index 000000000..77435e3e4
Binary files /dev/null and b/src/assets/img/file-add.png differ
diff --git a/src/assets/scss/modules/visual/a_customize.scss b/src/assets/scss/modules/visual/a_customize.scss
index acafcce2a..382ec04aa 100644
--- a/src/assets/scss/modules/visual/a_customize.scss
+++ b/src/assets/scss/modules/visual/a_customize.scss
@@ -91,4 +91,30 @@
     }
   }
 }
+
+.visiual-form-pickerrange{
+  ::v-deep .el-date-editor {
+    width: 360px;
+    position: relative;
+    background: #06186d;
+    border: 1px solid #1a64cc;
+    .el-range-input {
+      color: #fff;
+      background: #06186d;
+      margin-left: 10px;
+    }
+    .el-range-separator {
+      color: #fff;
+    }
+    .el-range__icon {
+      position: absolute;
+      right: 5px;
+      // float: right;
+    }
+    .el-input__prefix {
+      left: unset;
+      right: 5px;
+    }
+  }
+}
   
\ No newline at end of file
diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index 747b9218c..1d0bc4fa8 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -184,7 +184,7 @@
 
   .wrap {
     position: relative;
-    margin: 120px auto;
+    margin: 60px auto;
     width: 1180px;
 
     .title {
diff --git a/src/views/main-shuju/main-theme-tools.vue b/src/views/main-shuju/main-theme-tools.vue
new file mode 100644
index 000000000..56d051517
--- /dev/null
+++ b/src/views/main-shuju/main-theme-tools.vue
@@ -0,0 +1,85 @@
+<template>
+  <div class="aui-theme-tools" v-show="false" :class="{ 'aui-theme-tools--open': isOpen }">
+    <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
+      <svg class="icon-svg" aria-hidden="true">
+        <use xlink:href="#icon-setting"></use>
+      </svg>
+    </div>
+    <div class="aui-theme-tools__content">
+      <div class="aui-theme-tools__item">
+        <h3>Navbar</h3>
+        <el-checkbox
+          v-model="$store.state.navbarLayoutType"
+          true-label="colorful"
+          >colorful 鲜艳</el-checkbox
+        >
+      </div>
+      <div class="aui-theme-tools__item">
+        <h3>Sidebar</h3>
+        <el-checkbox v-model="$store.state.sidebarLayoutSkin" true-label="dark"
+          >dark 黑色</el-checkbox
+        >
+      </div>
+      <div class="aui-theme-tools__item">
+        <h3>Theme</h3>
+        <el-radio-group v-model="themeColor" @change="themeColorChangeHandle">
+          <el-radio
+            v-for="item in themeList"
+            :key="item.name"
+            :label="item.name"
+            >{{ `${item.name} ${item.desc}` }}</el-radio
+          >
+        </el-radio-group>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      isOpen: false,
+      themeList: require('@/element-ui/config.js'),
+      themeColor: ''
+    }
+  },
+  created() {
+    let color = window.localStorage.getItem('themeColor') || 'blue'
+    this.themeColorChangeHandle(color)
+    this.themeColor = color
+  },
+  methods: {
+    themeColorChangeHandle(val) {
+      window.localStorage.setItem('themeColor', val)
+
+      var styleList = [
+        {
+          id: 'J_elementTheme',
+          url: `${
+            process.env.BASE_URL
+          }element-theme/${val}/index.css?t=${new Date().getTime()}`
+        },
+        {
+          id: 'J_auiTheme',
+          url: `${
+            process.env.BASE_URL
+          }element-theme/${val}/aui.css?t=${new Date().getTime()}`
+        }
+      ]
+      for (var i = 0; i < styleList.length; i++) {
+        var el = document.querySelector(`#${styleList[i].id}`)
+        if (el) {
+          el.href = styleList[i].url
+          continue
+        }
+        el = document.createElement('link')
+        el.id = styleList[i].id
+        el.href = styleList[i].url
+        el.rel = 'stylesheet'
+        document.querySelector('head').appendChild(el)
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index d6d29c1b6..869cd5b9c 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,25 +1,22 @@
 <template>
   <fixed1920>
-    <div
-      v-loading.fullscreen.lock="loading"
-      :element-loading-text="$t('loading')"
-      :class="[
+    <div v-loading.fullscreen.lock="loading"
+         :element-loading-text="$t('loading')"
+         :class="[
         'g-bd',
         { 'z-sidebar--fold': $store.state.sidebarFold },
         {
           'z-sidebar--noside': true,
         },
-      ]"
-    >
+      ]">
       <template v-if="!loading">
         <main-navbar ref="ref_navbar" />
 
         <div class="g-cnt">
-          <main-content
-            v-if="!$store.state.contentIsNeedRefresh"
-            @changeCustomerName="changeCustomerName"
-          />
+          <main-content v-if="!$store.state.contentIsNeedRefresh"
+                        @changeCustomerName="changeCustomerName" />
         </div>
+        <main-theme-tools v-if="!$store.state.inIframe" />
       </template>
     </div>
   </fixed1920>
@@ -33,12 +30,13 @@ import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
 import fixed1920 from "@/views/components/fixed1920.vue";
+import MainThemeTools from "./main-theme-tools";
 
 export default {
-  provide() {
+  provide () {
     return {
       // 刷新
-      refresh() {
+      refresh () {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -46,7 +44,7 @@ export default {
       },
     };
   },
-  data() {
+  data () {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -56,12 +54,13 @@ export default {
     MainNavbar,
     MainContent,
     fixed1920,
+    MainThemeTools
   },
 
   watch: {
     $route: "routeHandle",
   },
-  async created() {
+  async created () {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     Promise.all([this.getWorkUserInfo()]).then(() => {
@@ -70,11 +69,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName(customerName) {
+    changeCustomerName (customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle() {
+    windowResizeHandle () {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -86,7 +85,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle(route) {
+    routeHandle (route) {
       if (!route.meta.isTab) {
         this.$store.state.mainShuju.activeName = "";
         this.$store.state.mainShuju.contentTabsActiveName = "";
@@ -112,7 +111,7 @@ export default {
     },
 
     // 获取当前管理员信息
-    async getWorkUserInfo() {
+    async getWorkUserInfo () {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index a04859423..88be90743 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1016,8 +1016,9 @@ export default {
       typeList: [],
       // 性别字典
       genderList: [
-        { value: '1', label: '男' },
-        { value: '2', label: '女' },
+        { value: 1, label: '男' },
+        { value: 2, label: '女' },
+        { value: 0, label: '未知' },
       ],
       // 专兼职字典
       postList: [
@@ -1413,7 +1414,8 @@ export default {
         staffId: this.userStaffId,
         name: this.peoForm.name,
         mobile: this.peoForm.mobile,
-        gender: this.peoForm.gender === '男' ? 1 : 0,
+        // gender: this.peoForm.gender === '男' ? 1 : 0,
+        gender: this.peoForm.gender,
         workType: this.peoForm.post,
         roles: this.peoForm.duty,
         newRoles: this.peoForm.newRoles,
@@ -1744,7 +1746,8 @@ export default {
 
         this.peoForm.name = data.name
         this.peoForm.mobile = data.mobile
-        this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        // this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        this.peoForm.gender = data.gender
         this.peoForm.post = data.workType
         // 已有的权限（职责）
         let existedDutyArr = []
@@ -1786,7 +1789,8 @@ export default {
         this.peoForm.name = data.name
         this.peoForm.mobile = data.mobile
         this.peoForm.post = data.workType
-        this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        // this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        this.peoForm.gender = data.gender
         // 已有的权限（职责）
         let existedDutyArr = []
         data.roleList.forEach(function (sysDuty) {
@@ -1828,7 +1832,8 @@ export default {
       if (code === 0) {
         this.peoForm.name = data.name
         this.peoForm.mobile = data.mobile
-        this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        // this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        this.peoForm.gender = data.gender
         this.peoForm.post = data.workType
         // 已有的权限（职责）
         let existedDutyArr = []
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index c389b9d03..5666675ac 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -526,7 +526,7 @@ export default {
 
     async handleSync (row) {
 
-      this.$confirm("确认同步?", "提示", {
+      this.$confirm("确认同步到通讯录？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -580,11 +580,9 @@ export default {
           });
           this.loadTable()
         } else {
-          this.$message.error(msg)
+          this.$message.error(data.msg)
         }
 
-
-
       } else {
         this.$message.error(msg)
       }
@@ -611,7 +609,7 @@ export default {
           });
           this.loadTable()
         } else {
-          this.$message.error(msg)
+          this.$message.error(data.msg)
         }
       } else {
         this.$message.error(msg)
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index 5ebe9ae7a..6fa66fcb3 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -3,6 +3,7 @@
     <el-card :class="{'box-card':source==='visiual'}">
       <el-form label-width="120px"
                :model="form"
+               class="div_form"
                :rules="rules"
                ref="ruleForm">
         <el-form-item v-if="formType!=='add'"
@@ -48,13 +49,13 @@
             <el-input v-if="disabled"
                       v-model="form.gridName"
                       :disabled="disabled"
-                      class="input-width"></el-input>
+                      class="item_width_1"></el-input>
             <!-- <span >{{ form.gridName }}</span> -->
             <el-select v-else
                        v-model="form.gridId"
                        filterable
                        placeholder="请选择"
-                       class="input-width"
+                       class="item_width_1"
                        clearable
                        :disabled="disabled"
                        @change="handleGridChange">
@@ -74,14 +75,14 @@
             <el-input v-if="disabled"
                       v-model="form.categoryName"
                       :disabled="disabled"
-                      class="input-width"
+                      class="item_width_1"
                       clearable></el-input>
             <el-cascader v-else
                          v-model="form.categoryCodeArr"
                          :options="demandOptions"
                          :disabled="disabled"
                          clearable
-                         class="input-width"
+                         class="item_width_1"
                          @change="handleCateSlect"></el-cascader>
           </div>
         </el-form-item>
@@ -93,11 +94,11 @@
             <el-input v-if="disabled"
                       v-model="form.reportTypeName"
                       :disabled="disabled"
-                      class="input-width"></el-input>
+                      class="item_width_1"></el-input>
             <el-select v-else
                        v-model="form.reportType"
                        filterable
-                       class="input-width"
+                       class="item_width_1"
                        placeholder="请选择"
                        clearable
                        :disabled="disabled">
@@ -117,7 +118,7 @@
             <el-input v-model="form.reportUserName"
                       :disabled="disabled"
                       placeholder="请输入"
-                      class="input-width"
+                      class="item_width_1"
                       clearable></el-input>
           </div>
         </el-form-item>
@@ -129,7 +130,7 @@
             <el-input v-model="form.reportUserMobile"
                       :disabled="disabled"
                       placeholder="请输入"
-                      class="input-width"
+                      class="item_width_1"
                       maxlength="11"
                       clearable></el-input>
           </div>
@@ -141,7 +142,7 @@
           <div :class="{'visiual-form':source==='visiual'}">
             <el-date-picker v-model="form.reportTime"
                             type="datetime"
-                            class="input-width"
+                            class="item_width_1"
                             clearable
                             :disabled="disabled"
                             value-format="yyyy-MM-dd HH:mm:ss"
@@ -157,10 +158,10 @@
             <el-input v-if="disabled"
                       v-model="form.demandUserName"
                       :disabled="disabled"
-                      class="input-width"></el-input>
+                      class="item_width_1"></el-input>
             <el-select v-else
                        v-model="selectDemandUser"
-                       class="input-width"
+                       class="item_width_1"
                        filterable
                        :disabled="disabled"
                        placeholder="请选择"
@@ -216,11 +217,11 @@
             <template v-if="disabled && addType !== 'appoint'">
               <el-input v-model="form.serviceShowName"
                         :disabled="disabled"
-                        class="input-width"></el-input>
+                        class="item_width_1"></el-input>
             </template>
             <template v-else>
               <el-select v-model="form.serviceType"
-                         class="input-width-small"
+                         class="item_width_1-small"
                          placeholder="请选择"
                          clearable
                          :disabled="disabled && addType !== 'appoint'"
@@ -233,7 +234,7 @@
               </el-select>
               -
               <el-select v-model="form.serverId"
-                         class="input-width-middle"
+                         class="item_width_1-middle"
                          filterable
                          placeholder="请选择"
                          clearable
@@ -263,7 +264,7 @@
 
             <div :class="{'visiual-form':source==='visiual'}">
               <el-date-picker v-model="finishServiceTime"
-                              class="input-width-min"
+                              class="item_width_1-min"
                               clearable
                               :disabled="disabled && addType != 'finish'"
                               type="datetimerange"
@@ -313,9 +314,9 @@
                         :class="{'form-item':source==='visiual'}"
                         prop="serviceStartTime">
 
-            <div :class="{'visiual-form':source==='visiual'}">
+            <div :class="{'visiual-form-pickerrange':source==='visiual'}">
               <el-date-picker v-model="finishServiceTime"
-                              class="input-width-min"
+                              class="item_width_1-min"
                               clearable
                               :disabled="disabled && addType != 'finish'"
                               type="datetimerange"
@@ -329,18 +330,8 @@
           </el-form-item>
         </template>
       </el-form>
-      <!-- <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerClose">关闭</el-button>
-        <el-button v-if="addType != 'look'"
-                   type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleSubmit">提交</el-button>
-      </div> -->
 
-      <div v-if="source==='manage'"
-           class="div-btn ">
+      <div class="div-btn ">
         <el-button size="small"
                    @click="handlerClose">关闭</el-button>
         <el-button v-if="addType != 'look'"
@@ -349,14 +340,7 @@
                    size="small"
                    @click="handleSubmit">提交</el-button>
       </div>
-      <div v-else
-           class="div-btn">
-        <div class="item_btn"
-             @click="handlerClose()">关闭</div>
-        <div v-if="addType != 'look'"
-             class="item_btn mgl"
-             @click="handleSubmit()">提交</div>
-      </div>
+
     </el-card>
 
   </div>
@@ -381,7 +365,7 @@ export default {
     // },
     source: {//展示来源：manage  管理平台    visiual  可视化平台
       type: String,
-      default: 'visiual'
+      default: 'manage'
     }
   },
 
@@ -941,6 +925,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/form-main.scss";
 @import "@/assets/scss/modules/visual/a_customize.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 </style>
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 679399354..312ef51c0 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -133,7 +133,7 @@
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
-                         width="160">
+                         width="220">
           <template slot-scope="scope">
             <!-- <el-button
               @click="handleWatch(scope.$index)"
@@ -472,7 +472,7 @@ export default {
 
     async handleSync (row) {
 
-      this.$confirm("确认同步?", "提示", {
+      this.$confirm("确认同步到通讯录？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -524,9 +524,9 @@ export default {
             type: "success",
             message: "同步成功"
           });
-          this.loadTable()
+          this.getTableData();
         } else {
-          this.$message.error(msg)
+          this.$message.error(data.msg)
         }
 
 
@@ -555,9 +555,9 @@ export default {
             type: "success",
             message: "取消同步成功"
           });
-          this.loadTable()
+          this.getTableData();
         } else {
-          this.$message.error(msg)
+          this.$message.error(data.msg)
         }
       } else {
         this.$message.error(msg)
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 4fb809e53..23ed5ca4b 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -118,10 +118,24 @@
                          label="地址"
                          mix-width="230">
         </el-table-column>
+        <el-table-column prop="principal"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="负责人"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="联系电话"
+                         width="130">
+        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="250"
+                         width="200"
                          header-align="center"
                          align="center"
                          class="operate">
@@ -270,31 +284,31 @@ export default {
         responseType: "blob",
         data: params,
       })
-              .then((res) => {
-                // this.download(res.data, title + '.xls')
-                if (res.headers["content-disposition"]) {
-                  let fileName = window.decodeURI(
-                          res.headers["content-disposition"].split(";")[1].split("=")[1]
-                  );
-                  console.log("filename", fileName);
-                  let blob = new Blob([res.data], {
-                    type: "application/vnd.ms-excel",
-                  });
-                  var url = window.URL.createObjectURL(blob);
-                  var aLink = document.createElement("a");
-                  aLink.style.display = "none";
-                  aLink.href = url;
-                  aLink.setAttribute("download", fileName);
-                  document.body.appendChild(aLink);
-                  aLink.click();
-                  document.body.removeChild(aLink); //下载完成移除元素
-                  window.URL.revokeObjectURL(url); //释放掉blob对象
-                } else this.$message.error("下载失败");
-              })
-              .catch((err) => {
-                console.log("err", err);
-                return this.$message.error("网络错误");
-              });
+        .then((res) => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
     },
 
     //获取服务事项下拉框
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index af3dff975..39a61f484 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -26,14 +26,26 @@
                       prop="areaCovered"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.areaCovered}}</span>
+          <span>{{formData.areaCovered+' '}}</span>平方公里
 
         </el-form-item>
         <el-form-item label="容纳人数："
                       prop="capacity"
                       label-width="150px"
                       style="display: block">
-          <span>{{formData.capacity}}</span>
+          <span>{{formData.capacity+' '}}</span>人
+        </el-form-item>
+        <el-form-item label="负责人："
+                      prop="principal"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.principal?formData.principal:'无'}}</span>
+        </el-form-item>
+        <el-form-item label="联系电话："
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.mobile?formData.mobile:'无'}}</span>
         </el-form-item>
         <el-form-item label="地址："
                       style="display: block"
@@ -41,7 +53,8 @@
                       label-width="150px">
           <div class="item_width_1">
             <span>{{formData.address}}</span>
-            <div id="app" class="div_map"></div>
+            <div id="app"
+                 class="div_map"></div>
           </div>
         </el-form-item>
 
@@ -76,7 +89,7 @@ export default {
   },
   components: {},
   async mounted () {
-   await this.initMap()
+    await this.initMap()
   },
 
   methods: {
@@ -100,7 +113,7 @@ export default {
     initMap () {
       // 定义地图中心点坐标
       let { latitude, longitude } = this.$store.state.user;
-      console.log('lat'+latitude+',lon'+longitude)
+      console.log('lat' + latitude + ',lon' + longitude)
       if (!latitude || latitude == "" || latitude == "0") {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index a39a2b949..be715825f 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -76,24 +76,41 @@
                            v-model="formData.capacity"
                            :min="0"
                            :max="9999"
-                           label="容纳人数"></el-input-number>
+                           label="容纳人数"></el-input-number>人
         </el-form-item>
+
+        <el-form-item label="负责人"
+                      style="display: block"
+                      label-width="150px"
+                      prop="principal">
+          <el-input v-model="formData.principal"
+                    class="item_width_1"
+                    placeholder="请输入负责人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      style="display: block"
+                      label-width="150px"
+                      prop="mobile">
+          <el-input v-model="formData.mobile"
+                    class="item_width_1"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+
         <el-form-item label="地址"
                       prop="address"
                       label-width="150px"
                       style="display: block">
           <div class="item_width_1">
-            <el-input
-                    style="width:420px"
-                    :placeholder="'请输入所在地址'"
-                    v-model="formData.address">
+            <el-input style="width:420px"
+                      :placeholder="'请输入所在地址'"
+                      v-model="formData.address">
             </el-input>
-            <el-button
-                    style="margin-left: 10px"
-                    type="default"
-                    size="small"
-                    @click="handleSearchMap">查询</el-button>
-            <div id="app" class="div_map"></div>
+            <el-button style="margin-left: 10px"
+                       type="default"
+                       size="small"
+                       @click="handleSearchMap">查询</el-button>
+            <div id="app"
+                 class="div_map"></div>
           </div>
         </el-form-item>
       </el-form>
@@ -141,7 +158,9 @@ export default {
         capacity: 0,//容纳人数
         address: '', //详细地址
         longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
+        latitude: 120.38945519, //纬度
+        principal: '',
+        mobile: ''
       },
       cityManagement: {
 
@@ -205,14 +224,14 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        if (null != data){
-          data : this.cityManagement
+        if (null != data) {
+          data: this.cityManagement
         }
         this.formData = { ...data }
         // let { latitude, longitude } = this.$store.state.user;
         // const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude;
         // const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude;
-        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){
+        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
           map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
           this.setMarker(this.formData.latitude, this.formData.longitude)
         }
@@ -243,9 +262,9 @@ export default {
     },
     async addUnit () {
       let url = ''
-      if (this.formType === 'add'){
+      if (this.formType === 'add') {
         url = '/gov/org/icCityManagement/add'
-      }else {
+      } else {
         url = '/gov/org/icCityManagement/edit'
       }
       const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
@@ -273,7 +292,7 @@ export default {
     initMap () {
       // 定义地图中心点坐标
       let { latitude, longitude } = this.$store.state.user;
-      console.log('lat'+latitude+',lon'+longitude)
+      console.log('lat' + latitude + ',lon' + longitude)
       if (!latitude || latitude == "" || latitude == "0") {
         latitude = 39.9088810666821;
         longitude = 116.39743841556731;
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index f2925eae5..acb18f05f 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -90,12 +90,8 @@
 2、状态=未完成 （有操作id） -->
       <div v-if="(info.status==='processing'&&info.operationId)||(info.status==='closed_case'&&(info.satisfactionName||(!info.satisfactionName && user.id!=info.createdUserId)))"
            class="div-btn ">
-        <el-button v-if="source==='manage'"
-                   size="small"
+        <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
-        <div v-else
-             class="item_btn"
-             @click="handleCloseEvent()">关闭</div>
 
       </div>
 
@@ -128,8 +124,7 @@
 
       </div>
 
-      <div v-if="source==='manage'"
-           class="div-btn ">
+      <div class="div-btn ">
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
         <el-button style="margin-left:20px"
@@ -137,14 +132,6 @@
                    size="small"
                    @click="handleComfirmSatisfy">确定</el-button>
       </div>
-      <div v-else
-           class="div-btn">
-        <div class="item_btn"
-             @click="handleCloseEvent()">关闭</div>
-        <div class="item_btn mgl"
-             v-if="info.status==='pending'"
-             @click="handleComfirmSatisfy()">确认</div>
-      </div>
 
     </el-card>
     <el-dialog :visible.sync="showSatisfy"
@@ -156,8 +143,7 @@
                class="dialog-h"
                @closed="showSatisfy=false">
 
-      <div v-if="source==='manage'"
-           class="div-btn ">
+      <div class="div-btn ">
         <el-button size="small"
                    @click="showSatisfy=false">关闭</el-button>
         <el-button style="margin-left:20px"
@@ -165,14 +151,6 @@
                    size="small"
                    @click="handleComfirmSatisfy">确定</el-button>
       </div>
-      <div v-else
-           class="div-btn">
-        <div class="item_btn"
-             @click="showSatisfy=false">关闭</div>
-        <div class="item_btn mgl"
-             v-if="info.status==='pending'"
-             @click="handleComfirmSatisfy()">确认</div>
-      </div>
 
     </el-dialog>
 
@@ -246,7 +224,7 @@ export default {
     },
     source: {//展示来源：manage  管理平台    visiual  可视化平台
       type: String,
-      default: 'visiual'
+      default: 'manage'
     }
   },
 
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 815da6103..b4acb9e06 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -54,8 +54,7 @@
                           :eventId="eventId"
                           :eventDetailData="eventDetailData"></process-form>
 
-            <div v-if="source==='manage'"
-                 class="div-btn ">
+            <div class="div-btn ">
               <el-button size="small"
                          @click="handleClose">关闭</el-button>
               <el-button style="margin-left:20px"
@@ -63,13 +62,6 @@
                          size="small"
                          @click="handleComfirm">确定</el-button>
             </div>
-            <div v-else
-                 class="div-btn">
-              <div class="item_btn"
-                   @click="handleClose()">关闭</div>
-              <div class="item_btn mgl"
-                   @click="handleComfirm()">确认</div>
-            </div>
 
           </el-card>
         </div>
@@ -122,13 +114,13 @@
                       <div class="detail-value">{{ item.departmentName }}</div>
                     </div>
 
-                    <div class="detail"
+                    <!-- <div class="detail"
                          v-if="item.assistanceUnitName">
                       <div class="detail-field">协办单位：</div>
                       <div class="detail-value">
                         <fold-text :row="3">{{ item.assistanceUnitName }}</fold-text>
                       </div>
-                    </div>
+                    </div> -->
                     <div class="detail"
                          v-if="item.processName != '转项目' && item.publicReply">
                       <div class="detail-field">说 明：</div>
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
index 71fef5e66..3be3b4a8b 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue
@@ -75,7 +75,7 @@
         </el-popover>
       </el-form-item>
 
-      <el-form-item label="协办单位"
+      <!-- <el-form-item label="协办单位"
                     label-width="150px"
                     :class="{'form-item':source==='visiual'}"
                     prop="assistanceUnitIndex">
@@ -90,7 +90,7 @@
             </el-option>
           </el-select>
         </div>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="项目方案"
                     label-width="150px"
@@ -131,7 +131,11 @@
                    :on-success="handleImgSuccess"
                    :on-remove="handleImgRemove"
                    :before-upload="beforeImgUpload">
-          <i :class="['el-icon-plus', source==='manage'?'avatar-uploader-icon':'avatar-uploader-icon2']"></i>
+          <i v-if="source==='manage'"
+             :class="['el-icon-plus']"></i>
+          <img v-else
+               style="width:27px;height:27px"
+               src="@/assets/img/file-add.png">
         </el-upload>
       </el-form-item>
 
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index 9e781de2b..f1c7e7fad 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -116,9 +116,23 @@
                          label="地址"
                          mix-width="230">
         </el-table-column>
+        <el-table-column prop="principal"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="负责人"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="联系电话"
+                         width="130">
+        </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         width="250"
+                         width="200"
                          header-align="center"
                          align="center"
                          class="operate">
@@ -276,31 +290,31 @@ export default {
         responseType: "blob",
         data: params,
       })
-              .then((res) => {
-                // this.download(res.data, title + '.xls')
-                if (res.headers["content-disposition"]) {
-                  let fileName = window.decodeURI(
-                          res.headers["content-disposition"].split(";")[1].split("=")[1]
-                  );
-                  console.log("filename", fileName);
-                  let blob = new Blob([res.data], {
-                    type: "application/vnd.ms-excel",
-                  });
-                  var url = window.URL.createObjectURL(blob);
-                  var aLink = document.createElement("a");
-                  aLink.style.display = "none";
-                  aLink.href = url;
-                  aLink.setAttribute("download", fileName);
-                  document.body.appendChild(aLink);
-                  aLink.click();
-                  document.body.removeChild(aLink); //下载完成移除元素
-                  window.URL.revokeObjectURL(url); //释放掉blob对象
-                } else this.$message.error("下载失败");
-              })
-              .catch((err) => {
-                console.log("err", err);
-                return this.$message.error("网络错误");
-              });
+        .then((res) => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
     },
 
     //获取服务事项下拉框
@@ -619,8 +633,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/buttonstyle.scss";
-  @import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 .div_main {
   width: 100%;
 }
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
index 8a2578291..5a45beb7e 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@@ -35,13 +35,26 @@
                       style="display: block">
           <span>{{formData.capacity}}</span>
         </el-form-item>
+        <el-form-item label="负责人："
+                      prop="principal"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.principal}}</span>
+        </el-form-item>
+        <el-form-item label="联系电话："
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.mobile}}</span>
+        </el-form-item>
         <el-form-item label="地址："
                       style="display: block"
                       prop="address"
                       label-width="150px">
           <div class="item_width_1">
             <span>{{formData.address}}</span>
-            <div id="app" class="div_map"></div>
+            <div id="app"
+                 class="div_map"></div>
           </div>
         </el-form-item>
       </el-form>
@@ -57,193 +70,193 @@
 
 <script>
 
-  import { Loading } from 'element-ui' // 引入Loading服务
-
-  var map
-  var search
-  var markers
-  var infoWindowList
-  var geocoder // 新建一个正逆地址解析类
+import { Loading } from 'element-ui' // 引入Loading服务
 
-  let loading // 加载动画
-  export default {
-    data () {
-      return {
-        formData: {},
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
 
-      }
-    },
-    components: {},
-    mounted () {
-      this.initMap()
-    },
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formData: {},
 
-    methods: {
-      handleCancle () {
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
 
-        this.$emit('diaClose')
+  methods: {
+    handleCancle () {
 
-      },
+      this.$emit('diaClose')
 
-      async initForm (row) {
-        this.startLoading()
-        this.formData = { ...row }
-        map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-        this.setMarker(this.formData.latitude, this.formData.longitude)
+    },
 
-        this.endLoading()
+    async initForm (row) {
+      this.startLoading()
+      this.formData = { ...row }
+      map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+      this.setMarker(this.formData.latitude, this.formData.longitude)
 
-      },
+      this.endLoading()
 
-      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap () {
-        // 定义地图中心点坐标
-        var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-        // 定义map变量，调用 TMap.Map() 构造函数创建地图
-        map = new window.TMap.Map(document.getElementById('app'), {
-          center: center, // 设置地图中心点坐标
-          zoom: 17.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45 // 设置地图旋转角度
-        })
+    },
 
-        search = new window.TMap.service.Search({ pageSize: 10 })
-        // 新建一个地点搜索类
-        markers = new TMap.MultiMarker({
-          map: map,
-          geometries: []
-        })
-        infoWindowList = Array(10)
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+      this.convert()
+    },
 
-        geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
 
-        // 监听地图平移结束
-        map.on('panend', () => {
-          this.handleMoveCenter()
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.keyWords,
+          bounds: map.getBounds()
         })
-        this.handleMoveCenter()
-        this.convert()
-      },
-
-      setMarker (lat, lng) {
-        markers.setGeometries([])
-        markers.add([
-          {
-            id: '4',
-            styleId: 'marker',
-            position: new TMap.LatLng(lat, lng),
-            properties: {
-              title: 'marker4'
-            }
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+
+
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
           }
-        ])
-      },
-
-      handleSearchMap () {
-        infoWindowList.forEach((infoWindow) => {
-          infoWindow.close()
         })
-        infoWindowList.length = 0
-        markers.setGeometries([])
-        // 在地图显示范围内以给定的关键字搜索地点
-        search
-                .searchRectangle({
-                  keyword: this.keyWords,
-                  bounds: map.getBounds()
-                })
-                .then((result) => {
-                  let { data } = result
-                  if (Array.isArray(data) && data.length > 0) {
-                    const {
-                      location: { lat, lng }
-                    } = data[0]
-
-
-                    map.setCenter(new TMap.LatLng(lat, lng))
-                    this.setMarker(lat, lng)
-                    this.formData.latitude = lat
-                    this.formData.longitude = lng
-                    this.convert()
-                  } else {
-                    this.$message.error('未检索到相关位置坐标')
-                  }
-                })
-      },
-
-      handleMoveCenter () {
-        //修改地图中心点
-        const center = map.getCenter()
-        const lat = center.getLat()
-        const lng = center.getLng()
-        this.formData.latitude = lat
-        this.formData.longitude = lng
-        this.setMarker(lat, lng)
-        this.convert(lat, lng)
-      },
-
-      convert (lat, lng) {
-        markers.setGeometries([]);
-        // var input = document.getElementById('location').value.split(',');
-        let location
-        if (lat && lng) {
-          location = new TMap.LatLng(lat, lng);
-        } else {
-          location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-        }
+    },
 
-        // map.setCenter(location);
-        markers.updateGeometries([
-          {
-            id: 'main', // 点标注数据数组
-            position: location,
-          },
-        ]);
-        geocoder
-                .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-                .then((result) => {
-                  // this.formData.address = result.result.address
-                  // 显示搜索到的地址
-                });
-      },
-
-      // 开启加载动画
-      startLoading () {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: '正在加载……', // 加载中需要显示的文字
-          background: 'rgba(0,0,0,.7)' // 背景颜色
-        })
-      },
-      // 结束加载动画
-      endLoading () {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close()
-        }
-      }
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
     },
-    computed: {
+
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          // this.formData.address = result.result.address
+          // 显示搜索到的地址
+        });
     },
-    props: {
 
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
     }
+  },
+  computed: {
+  },
+  props: {
+
   }
+}
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
 <style scoped>
-  .detail_span {
-    width: 500px;
-    font-weight: bold;
-    text-align: left;
-    margin: 0 0;
-    font-size: 16px;
-  }
-
-  .form {
-    margin-top: 30px;
-  }
+.detail_span {
+  width: 500px;
+  font-weight: bold;
+  text-align: left;
+  margin: 0 0;
+  font-size: 16px;
+}
+
+.form {
+  margin-top: 30px;
+}
 </style>
 
 
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index 53de80d47..11ccaa900 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -60,22 +60,38 @@
                            :max="9999"
                            label="容纳人数"></el-input-number>
         </el-form-item>
+
+        <el-form-item label="负责人"
+                      style="display: block"
+                      label-width="150px"
+                      prop="principal">
+          <el-input v-model="formData.principal"
+                    class="item_width_1"
+                    placeholder="请输入负责人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      style="display: block"
+                      label-width="150px"
+                      prop="mobile">
+          <el-input v-model="formData.mobile"
+                    class="item_width_1"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
         <el-form-item label="地址"
                       prop="address"
                       label-width="150px"
                       style="display: block">
           <div class="item_width_1">
-            <el-input
-                    style="width:420px"
-                    :placeholder="'请输入所在地址'"
-                    v-model="formData.address">
+            <el-input style="width:420px"
+                      :placeholder="'请输入所在地址'"
+                      v-model="formData.address">
             </el-input>
-            <el-button
-                    style="margin-left: 10px"
-                    type="default"
-                    size="small"
-                    @click="handleSearchMap">查询</el-button>
-            <div id="app" class="div_map"></div>
+            <el-button style="margin-left: 10px"
+                       type="default"
+                       size="small"
+                       @click="handleSearchMap">查询</el-button>
+            <div id="app"
+                 class="div_map"></div>
           </div>
         </el-form-item>
       </el-form>
@@ -94,357 +110,359 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
-  import { Loading } from 'element-ui' // 引入Loading服务
-  import { requestPost } from '@/js/dai/request'
-
-
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      icPublicServiceId: '',
+      keyWords: '',
+      formData: {
+        name: '',//场所名称
+        category: '',
+        areaCovered: '',//占地面积
+        capacity: '',//容纳人数
+        address: '', //详细地址
+        longitude: 36.0722275, //经度
+        latitude: 120.38945519, //纬度
+        principal: '',
+        mobile: ''
+      },
+      serviceList: [],//服务list
+      publicServiceData: {},
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+
+    async initForm (type, icPublicServiceId) {
+      this.startLoading()
+      this.$refs.ref_form.resetFields();
+
+      //获取服务事项
+      await this.loadService()
+
+      this.formType = type
+      if (icPublicServiceId) {
+        this.icPublicServiceId = icPublicServiceId
+        this.formData.icPublicServiceId = icPublicServiceId
+        await this.loadFormData()
+      } else {
+        // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
+        // this.setMarker(36.0722275, 120.38945519)
+      }
 
-  var map
-  var search
-  var markers
-  var infoWindowList
-  var geocoder // 新建一个正逆地址解析类
+      this.endLoading()
 
-  let loading // 加载动画
-  export default {
-    data () {
-      return {
-        formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
-        btnDisable: false,
-
-        icPublicServiceId: '',
-        keyWords: '',
-        formData: {
-          name: '',//场所名称
-          category: '',
-          areaCovered: '',//占地面积
-          capacity: '',//容纳人数
-          address: '', //详细地址
-          longitude: 36.0722275, //经度
-          latitude: 120.38945519 //纬度
-        },
-        serviceList: [],//服务list
-        publicServiceData: {},
-      }
-    },
-    components: {},
-    mounted () {
-      this.initMap()
     },
 
-    methods: {
-
-      async initForm (type, icPublicServiceId) {
-        this.startLoading()
-        this.$refs.ref_form.resetFields();
+    //获取服务事项下拉框
+    async loadService () {
+      const url = "/gov/org/coverage/dict-select-list/public_service"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
+      let params = {
+      }
 
-        //获取服务事项
-        await this.loadService()
+      const { data, code, msg } = await requestPost(url, params)
 
-        this.formType = type
-        if (icPublicServiceId) {
-          this.icPublicServiceId = icPublicServiceId
-          this.formData.icPublicServiceId = icPublicServiceId
-          await this.loadFormData()
-        } else {
-          // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
-          // this.setMarker(36.0722275, 120.38945519)
-        }
+      if (code === 0) {
+        this.serviceList = data
 
-        this.endLoading()
+      } else {
+        this.$message.error(msg)
+      }
 
-      },
+    },
 
-      //获取服务事项下拉框
-      async loadService () {
-        const url = "/gov/org/coverage/dict-select-list/public_service"
-        // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
-        let params = {
+    //加载组织
+    async loadFormData () {
+      const url = '/gov/org/icPublicService/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
+      let params = {
+        icPublicServiceId: this.icPublicServiceId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log(data)
+        if (null != data) {
+          data: this.publicServiceData
         }
 
-        const { data, code, msg } = await requestPost(url, params)
-
-        if (code === 0) {
-          this.serviceList = data
-
-        } else {
-          this.$message.error(msg)
+        this.formData = { ...data }
+        // let { latitude, longitude } = this.$store.state.user;
+        // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
+        // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
+        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
+          map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+          this.setMarker(this.formData.latitude, this.formData.longitude)
         }
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-      },
 
-      //加载组织
-      async loadFormData () {
-        const url = '/gov/org/icPublicService/detail'
-        // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
-        let params = {
-          icPublicServiceId: this.icPublicServiceId
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          console.log(data)
-          if (null != data) {
-            data: this.publicServiceData
-          }
 
-          this.formData = { ...data }
-          // let { latitude, longitude } = this.$store.state.user;
-          // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
-          // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
-          if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){
-            map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
-            this.setMarker(this.formData.latitude, this.formData.longitude)
-          }
+    async handleComfirm () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
         } else {
-          this.$message.error(msg)
+          this.addUnit()
         }
-      },
-
 
+      })
 
-      async handleComfirm () {
-
-        this.btnDisable = true
-        setTimeout(() => {
-          this.btnDisable = false
-        }, 10000)
-        this.$refs['ref_form'].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj)
-            this.btnDisable = false
-          } else {
-            this.addUnit()
-          }
 
+    },
+    async addUnit () {
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/org/icPublicService/add'
+      } else {
+        url = '/gov/org/icPublicService/edit'
+      }
+      const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
         })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(internalMsg)
+      }
 
+    },
 
-      },
-      async addUnit () {
-        let url = ''
-        if (this.formType === 'add'){
-          url = '/gov/org/icPublicService/add'
-        }else {
-          url = '/gov/org/icPublicService/edit'
-        }
-        const { data, code, msg,internalMsg } = await requestPost(url, this.formData)
-        if (code === 0) {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          this.resetData()
-          this.$emit('dialogOk')
-          this.btnDisable = false
-        } else {
-          this.btnDisable = false
-          this.$message.error(internalMsg)
-        }
-
-      },
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
 
-      handleCancle () {
-        this.resetData()
-        this.$emit('dialogCancle')
+    },
 
-      },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(latitude, longitude);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      // this.handleMoveCenter()
+      this.convert()
+    },
 
-      // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-      initMap () {
-        let { latitude, longitude } = this.$store.state.user;
-        console.log('lat'+latitude+',lon'+longitude)
-        if (!latitude || latitude == "" || latitude == "0") {
-          latitude = 39.9088810666821;
-          longitude = 116.39743841556731;
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
         }
-        // 定义地图中心点坐标
-        var center = new window.TMap.LatLng(latitude, longitude);
-        // 定义map变量，调用 TMap.Map() 构造函数创建地图
-        map = new window.TMap.Map(document.getElementById('app'), {
-          center: center, // 设置地图中心点坐标
-          zoom: 17.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45 // 设置地图旋转角度
-        })
-
-        search = new window.TMap.service.Search({ pageSize: 10 })
-        // 新建一个地点搜索类
-        markers = new TMap.MultiMarker({
-          map: map,
-          geometries: []
-        })
-        infoWindowList = Array(10)
-
-        geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      ])
+    },
 
-        // 监听地图平移结束
-        map.on('panend', () => {
-          this.handleMoveCenter()
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.formData.address,
+          bounds: map.getBounds()
         })
-        // this.handleMoveCenter()
-        this.convert()
-      },
-
-      setMarker (lat, lng) {
-        markers.setGeometries([])
-        markers.add([
-          {
-            id: '4',
-            styleId: 'marker',
-            position: new TMap.LatLng(lat, lng),
-            properties: {
-              title: 'marker4'
-            }
+        .then((result) => {
+          let { data } = result
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng }
+            } = data[0]
+
+
+            map.setCenter(new TMap.LatLng(lat, lng))
+            this.setMarker(lat, lng)
+            this.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
           }
-        ])
-      },
-
-      handleSearchMap () {
-        infoWindowList.forEach((infoWindow) => {
-          infoWindow.close()
         })
-        infoWindowList.length = 0
-        markers.setGeometries([])
-        // 在地图显示范围内以给定的关键字搜索地点
-        search
-                .searchRectangle({
-                  keyword: this.formData.address,
-                  bounds: map.getBounds()
-                })
-                .then((result) => {
-                  let { data } = result
-                  if (Array.isArray(data) && data.length > 0) {
-                    const {
-                      location: { lat, lng }
-                    } = data[0]
-
-
-                    map.setCenter(new TMap.LatLng(lat, lng))
-                    this.setMarker(lat, lng)
-                    this.formData.latitude = lat
-                    this.formData.longitude = lng
-                    this.convert()
-                  } else {
-                    this.$message.error('未检索到相关位置坐标')
-                  }
-                })
-      },
+    },
 
-      handleMoveCenter () {
-        //修改地图中心点
-        const center = map.getCenter()
-        const lat = center.getLat()
-        const lng = center.getLng()
-        this.formData.latitude = lat
-        this.formData.longitude = lng
-        this.setMarker(lat, lng)
-        this.convert(lat, lng)
-      },
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
+    },
 
-      convert (lat, lng) {
-        markers.setGeometries([]);
-        // var input = document.getElementById('location').value.split(',');
-        let location
-        if (lat && lng) {
-          location = new TMap.LatLng(lat, lng);
-        } else {
-          location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-        }
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
 
-        // map.setCenter(location);
-        markers.updateGeometries([
-          {
-            id: 'main', // 点标注数据数组
-            position: location,
-          },
-        ]);
-        geocoder
-                .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-                .then((result) => {
-                  console.log(this.formData)
-                  // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
-                  this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
-                  // 显示搜索到的地址
-                });
-      },
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          console.log(this.formData)
+          // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
+          this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
+          // 显示搜索到的地址
+        });
+    },
 
 
-      resetData () {
-        this.icPublicServiceId = ''
-        this.keyWords = ''
-        this.formData = {
-          name: '',
-          category: '',
-          areaCovered: '',
-          capacity: '',
-          address: '', //详细地址
-          longitude: '', //经度
-          latitude: '' //纬度
-        }
-      },
-      // 开启加载动画
-      startLoading () {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: '正在加载……', // 加载中需要显示的文字
-          background: 'rgba(0,0,0,.7)' // 背景颜色
-        })
-      },
-      // 结束加载动画
-      endLoading () {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close()
-        }
+    resetData () {
+      this.icPublicServiceId = ''
+      this.keyWords = ''
+      this.formData = {
+        name: '',
+        category: '',
+        areaCovered: '',
+        capacity: '',
+        address: '', //详细地址
+        longitude: '', //经度
+        latitude: '' //纬度
       }
     },
-    computed: {
-      dataRule () {
-        return {
-
-          name: [
-            { required: true, message: '场所名称不能为空', trigger: 'blur' },
-          ],
-          category: [
-            { required: true, message: '场所类别不能为空', trigger: 'blur' }
-          ],
-          address: [
-            { required: true, message: '地址不能为空', trigger: 'blur' }
-          ],
-          /*longitude: [
-            { required: true, message: '坐标不能为空', trigger: 'blur' }
-          ],
-          latitude: [
-            { required: true, message: '坐标不能为空', trigger: 'blur' }
-          ]*/
-        }
-      },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
 
+        name: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' },
+        ],
+        category: [
+          { required: true, message: '场所类别不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '地址不能为空', trigger: 'blur' }
+        ],
+        /*longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ],
+        latitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]*/
+      }
     },
-    props: {
 
-      typeList: {
-        type: Array,
-        default: []
-      },
+  },
+  props: {
+
+    typeList: {
+      type: Array,
+      default: []
+    },
 
-    }
   }
+}
 </script>
 <style scoped>
-  .div_map {
-    position: relative;
-  }
-  .div_searchmap {
-    z-index: 5000;
-    position: absolute;
-    top: 5px;
-    left: 5px;
-  }
+.div_map {
+  position: relative;
+}
+.div_searchmap {
+  z-index: 5000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
 </style>
 
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
new file mode 100644
index 000000000..5d71f7d4c
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -0,0 +1,901 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard"
+             class="search-card">
+      <el-form ref="searchForm"
+               :inline="true"
+               :model="fmData"
+               :label-width="'100px'"
+               class="demo-form-inline">
+        <div>
+          <el-form-item prop="category"
+                        label="居民类别">
+            <div class="resi-cell-value">
+              <el-form-item prop="category">
+                <el-select v-model.trim="fmData.category"
+                           placeholder="请选择居民类别"
+                           size="small"
+                           clearable
+                           class="resi-cell-select">
+                  <el-option v-for="(item,index) in jmlbOptions"
+                             @click.native="handleChangeJmlb(index)"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-form-item>
+          <el-form-item prop="gridId"
+                        label="所属组织">
+            <div class="resi-cell-value">
+              <el-cascader class="customer_cascader"
+                           ref="myCascader"
+                           clearable
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
+            </div>
+          </el-form-item>
+          <!-- <el-form-item prop="gridId" label="所属网格">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.gridId"
+                placeholder="请选择网格"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                @change="handleChangeGrid"
+              >
+                <el-option
+                  v-for="item in optionsG"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </el-form-item> -->
+
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <div class="resi-cell-col">
+                <el-form-item prop="villageId">
+                  <el-select v-model.trim="fmData.villageId"
+                             placeholder="请选择小区"
+                             size="small"
+                             clearable
+                             class="resi-cell-select"
+                             @change="handleChangeV">
+                    <el-option v-for="item in optionsV"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="buildId">
+                  <el-select v-model.trim="fmData.buildId"
+                             placeholder="楼号"
+                             size="small"
+                             clearable
+                             :disabled="changeVDisabled"
+                             class="resi-cell-select resi-cell-select-middle"
+                             @change="handleChangeB">
+                    <el-option v-for="item in optionsB"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="unitId">
+                  <el-select v-model.trim="fmData.unitId"
+                             placeholder="单元"
+                             size="small"
+                             clearable
+                             :disabled="changeBDisabled"
+                             class="resi-cell-select resi-cell-select-middle"
+                             @change="handleChangeD">
+                    <el-option v-for="item in optionsD"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="homeId">
+                  <el-select v-model.trim="fmData.homeId"
+                             placeholder="房号"
+                             size="small"
+                             clearable
+                             :disabled="changeDDisabled"
+                             class="resi-cell-select resi-cell-select-middle">
+                    <el-option v-for="item in optionsH"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+            </div>
+          </el-form-item>
+        </div>
+
+        <div>
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="fmData.name"
+                      class="resi-cell-input"
+                      size="small"
+                      clearable
+                      placeholder="请输入">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="fmData.mobile"
+                      class="resi-cell-input"
+                      size="small"
+                      clearable
+                      placeholder="请输入">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="身份证号"
+                        prop="idCard">
+            <el-input v-model="fmData.idCard"
+                      class="resi-cell-input"
+                      size="small"
+                      clearable
+                      placeholder="请输入">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button class="diy-button--search"
+                       size="small"
+                       @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset"
+                       size="small"
+                       @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button @click="handleChu"
+                   class="diy-button--reset"
+                   size="small">导出</el-button>
+      </div>
+      <el-table :data="tableData"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :height="tableHeight">
+        <el-table-column label="序号"
+                         fixed="left"
+                         type="index"
+                         align="center"
+                         width="50" />
+
+        <el-table-column prop="GRID_ID"
+                         align="center"
+                         label="所属网格"
+                         min-width="160"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="HOME_ID"
+                         label="所属房屋"
+                         align="center"
+                         min-width="160"
+                         :show-overflow-tooltip="true" />
+
+        <el-table-column prop="NAME"
+                         align="center"
+                         label="姓名"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="MOBILE"
+                         width="140"
+                         align="center"
+                         label="手机"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="GENDER"
+                         align="center"
+                         width="60"
+                         label="性别">
+        </el-table-column>
+
+        <el-table-column prop="ID_CARD"
+                         align="center"
+                         min-width="160"
+                         label="身份证号"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="BIRTHDAY"
+                         align="center"
+                         label="出生日期"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column prop="zhzlCategoryName"
+                         align="center"
+                         label="类别"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="REMARKS"
+                         align="center"
+                         label="备注"
+                         :show-overflow-tooltip="true">
+        </el-table-column>
+
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
+          <template slot-scope="scope">
+            <el-button @click="handleWatch(scope.$index)"
+                       type="text"
+                       size="small">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="parseInt(pageSize)"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
+                 :userId="currentPepeleId"
+                 :gridName="currentPepeleGridName"
+                 @close="showedPeopleMoreInfo = false" />
+
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               top="5vh"
+               class="dialog-h">
+      <diy-info v-if="diyDialog"
+                ref="ref_diy"
+                :list="exportList"
+                :search="computeQueryParams()"
+                @close="diyDialog = false"></diy-info>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import diyInfo from "@/views/modules/base/diyInfo.vue";
+
+export default {
+  props: {
+
+  },
+
+  components: { peopleMore, diyInfo },
+  data () {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "",
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      orgOptions: [],
+      jmlbOptions: [],
+      orgOptionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+      agencyIdArray: [],
+
+      optionsWelfare: [
+        {
+          value: "1",
+          label: "是",
+        },
+        {
+          value: "0",
+          label: "否",
+        },
+      ],
+
+      fmData: {
+        agencyId: "",
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+        category: "",
+      },
+      rangeTime: [],
+
+      searchH: 0,
+      tableHeight: 0,
+
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+
+      diyDialog: false,
+      exportList: [],
+
+      elseParams: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    maxTableHeight () {
+      console.log("computed-searchH---", this.searchH);
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
+      return this.$store.state.inIframe ? h : _h;
+    },
+
+    changeVDisabled () {
+      return !this.fmData.villageId;
+    },
+    changeBDisabled () {
+      return !this.fmData.buildId;
+    },
+    changeDDisabled () {
+      return !this.fmData.unitId;
+    },
+  },
+  watch: {
+    rangeTime: function (val) {
+      console.log("val----", val);
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0];
+        this.fmData.endTime = val[1];
+      } else {
+        this.fmData.startTime = "";
+        this.fmData.endTime = "";
+      }
+    },
+    searchH () {
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
+
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h;
+      });
+    },
+  },
+  async mounted () {
+    await this.getJmlb();
+    this.getOrgTreeList();
+    this.getGridList();
+    this.getValiheList();
+    this.getTableData();
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
+    console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
+  },
+  methods: {
+    async handleWatch (rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentPepeleId = item.icResiUserId;
+      this.currentPepeleGridName = item.GRID_ID;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
+    },
+
+    handleClearVillage () {
+      this.fmData.buildId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearBuild () {
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearDan () {
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleChangeGrid (val) {
+      console.log("val", val);
+      this.fmData.villageId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getValiheList();
+    },
+    handleChangeV (val) {
+      console.log("val", val);
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getBuildList();
+    },
+    handleChangeB (val) {
+      console.log("val", val);
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getUniList();
+    },
+    handleChangeD (val) {
+      console.log("val", val);
+      this.fmData.homeId = "";
+      this.getHouseList();
+    },
+    handleChangeJmlb (index) {
+      // debugger
+      let selItem = this.jmlbOptions[index]
+      this.elseParams = []
+      let temp = {
+        queryType: selItem.queryType,
+        tableName: selItem.tableName,
+        columnName: selItem.columnName,
+        columnValue: [selItem.columnValue],
+      }
+
+      this.elseParams.push(temp)
+    },
+
+    async getJmlb () {
+      const url = '/data/aggregator/coverage/zhzl-category-option'
+      let params = {}
+      const { data, code, msg } = await requestPost(url, params);
+
+
+      if (code === 0) {
+        this.jmlbOptions = []
+        this.jmlbOptions = data
+        if (this.jmlbOptions.length > 0) {
+          this.fmData.category = this.jmlbOptions[0].value
+          let temp = {
+            queryType: this.jmlbOptions[0].queryType,
+            tableName: this.jmlbOptions[0].tableName,
+            columnName: this.jmlbOptions[0].columnName,
+            columnValue: [this.jmlbOptions[0].columnValue],
+          }
+
+          this.elseParams.push(temp)
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+    getOrgTreeList () {
+
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customeragency/agencygridtree', {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
+
+
+
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    getGridList () {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getValiheList () {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.fmData.gridId,
+          agencyId: this.fmData.agencyId,
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getBuildList () {
+      this.$http
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.fmData.villageId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList () {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.fmData.buildId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList () {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose () {
+      this.formShow = false;
+    },
+    handleSearch (val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.handleSearch();
+    },
+
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+
+      if (obj) {
+        if (obj.level === 'grid') {
+          this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.fmData.agencyId = ''
+        } else {
+          this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.fmData.gridId = ''
+        }
+
+      } else {
+        this.fmData.agencyId = ''
+        this.fmData.gridId = ''
+      }
+
+
+      this.fmData.villageId = ''
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getValiheList()
+    },
+
+    computeQueryParams () {
+      const { pageSize, pageNo, elseParams, fmData } = this;
+      let conditions = []
+      if (fmData.agencyId) {
+        conditions.push({
+          queryType: "like",
+          tableName: "ic_resi_user",
+          columnName: "AGENCY_ID",
+          columnValue: [fmData.agencyId],
+        })
+      }
+
+      if (fmData.gridId) {
+        conditions.push(
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "GRID_ID",
+            columnValue: [fmData.gridId],
+          }
+        )
+      }
+
+      if (fmData.villageId) {
+        conditions.push(
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "VILLAGE_ID",
+            columnValue: [fmData.villageId],
+          }
+        )
+      }
+
+      if (fmData.buildId) {
+        conditions.push({
+          queryType: "equal",
+          tableName: "ic_resi_user",
+          columnName: "BUILD_ID",
+          columnValue: [fmData.buildId],
+        })
+      }
+
+      if (fmData.unitId) {
+        conditions.push({
+          queryType: "equal",
+          tableName: "ic_resi_user",
+          columnName: "UNIT_ID",
+          columnValue: [fmData.unitId],
+        })
+      }
+
+      if (fmData.homeId) {
+        conditions.push({
+          queryType: "equal",
+          tableName: "ic_resi_user",
+          columnName: "HOME_ID",
+          columnValue: [fmData.homeId],
+        })
+      }
+
+      if (fmData.name) {
+        conditions.push({
+          queryType: "like",
+          tableName: "ic_resi_user",
+          columnName: "NAME",
+          columnValue: [fmData.name],
+        })
+      }
+      if (fmData.mobile) {
+        conditions.push({
+          queryType: "like",
+          tableName: "ic_resi_user",
+          columnName: "MOBILE",
+          columnValue: [fmData.mobile],
+        })
+      }
+      if (fmData.idCard) {
+        conditions.push({
+          queryType: "like",
+          tableName: "ic_resi_user",
+          columnName: "ID_CARD",
+          columnValue: [fmData.idCard],
+        })
+      }
+
+      return {
+        formCode: "resi_base_info",
+        pageSize,
+        pageNo,
+        conditions: [
+
+          ...conditions,
+
+          ...elseParams,
+        ],
+      };
+    },
+
+    async handleChu () {
+      this.getExportList();
+    },
+
+    async getExportList () {
+      const url = "/oper/customize//icformitemgroup/list";
+      let params = {
+        formCode: "resi_base_info",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        data.forEach((item) => {
+          (async (id) => {
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = [];
+          })(item.id);
+        });
+        this.exportList = [...data];
+        this.$nextTick(() => {
+          this.diyDialog = true;
+        });
+        console.log("获取详情成功getExportList----", this.exportList);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getTableData () {
+      const url = "/epmetuser/icresiuser/listresi-zhzl";
+      const { data, code, msg } = await requestPost(url, {
+        ...this.computeQueryParams(),
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+            return item;
+          })
+          : [];
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 120px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index a77e51220..28e4ffcfc 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -229,7 +229,7 @@
                 </el-popover>
               </el-form-item>
 
-              <el-form-item v-if="fmData.operateType != 'back'"
+              <!-- <el-form-item v-if="fmData.operateType != 'back'"
                             label="协办单位："
                             prop="assistanceUnitIndex">
                 <el-select v-model.trim="fmData.assistanceUnitIndex"
@@ -241,7 +241,7 @@
                              :value="index">
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
 
               <el-form-item v-if="fmData.operateType == 'back'"
                             label="退回到："
@@ -368,11 +368,11 @@
                   <div class="detail-value">{{ item.departmentName }}</div>
                 </div>
 
-                <div class="detail"
+                <!-- <div class="detail"
                      v-if="item.assistanceUnitName">
                   <div class="detail-field">协办单位：</div>
                   <div class="detail-value">{{ item.assistanceUnitName }}</div>
-                </div>
+                </div> -->
 
                 <div class="detail"
                      v-if="item.processName != '转项目' && item.publicReply">
@@ -572,7 +572,7 @@ export default {
     },
     source: {//展示来源：manage  管理平台    visiual  可视化平台
       type: String,
-      default: 'visiual'
+      default: 'manage'
     }
   },
 
diff --git a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue
index 04bee8078..7e260517e 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue
@@ -49,7 +49,7 @@ export default {
       loading: false,
 
       pageType: 'dispose',
-      eventId: '1529724450524061698',
+      eventId: '1552537796854706177',
       eventDetailData: {},
     };
   },
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index ed76d7d09..07a2796be 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -367,16 +367,16 @@
             :uid="selUserId"
             ref="ref_people"></people>
 
-    <!-- <event-info v-if="pageType==='dispose'"
+    <event-info v-if="pageType==='dispose'"
                 ref="eleEditForm"
-                @handleClose="handleClose" /> -->
+                @handleClose="handleClose" />
 
     <!-- <service-info v-if="pageType==='dispose'"
                   ref="eleEditForm"
                   @handleClose="handleClose" /> -->
-    <fuwu-info v-if="pageType==='dispose'"
+    <!-- <fuwu-info v-if="pageType==='dispose'"
                ref="eleEditForm"
-               @handleClose="handleClose" />
+               @handleClose="handleClose" /> -->
 
   </div>
 
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index 13a5aba1f..4168a3e85 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -95,8 +95,7 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.defaultRole!=='1'"
-                       type="text"
+            <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -262,7 +261,7 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
+        this.$refs.ref_form.initForm('edit', row.id, row.defaultRole)
       })
     },
     handleDetail (row) {
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 0e0304a2a..8b21186db 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -14,6 +14,7 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
+                    :disabled="defaultRole==='1'"
                     placeholder="请输入角色名称"
                     clearable
                     v-model="formData.name">
@@ -27,6 +28,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
+                    :disabled="defaultRole==='1'"
                     maxlength="500"
                     show-word-limit
                     :autosize="{ minRows: 5, maxRows: 10 }"
@@ -104,7 +106,7 @@ export default {
         customerId: ''
       },
 
-
+      defaultRole: '',
 
     }
   },
@@ -116,7 +118,7 @@ export default {
 
   methods: {
 
-    async initForm (type, roleId) {
+    async initForm (type, roleId, defaultRole) {
       this.startLoading()
       this.customerId = localStorage.getItem("customerId");
       this.formData.customerId = this.customerId
@@ -132,6 +134,7 @@ export default {
       if (roleId) {
         this.roleId = roleId
         this.formData.id = roleId
+        this.defaultRole = defaultRole
         this.loadFormData()
       }