diff --git a/package.json b/package.json
index 4ff492c18..072ff4d9e 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,9 @@
     "et:list": "gulp themes"
   },
   "dependencies": {
-    "@antv/l7": "^2.9.14",
-    "@antv/l7-draw": "^3.0.5",
-    "@antv/l7-maps": "^2.9.14",
+    "@antv/l7": "2.9.14",
+    "@antv/l7-draw": "3.0.5",
+    "@antv/l7-maps": "2.9.14",
     "@riophae/vue-treeselect": "^0.4.0",
     "@tinymce/tinymce-vue": "^3.2.8",
     "async-validator": "^4.2.5",
diff --git a/src/assets/img/shuju/grid/IS_KC.png b/src/assets/img/shuju/grid/IS_KC.png
new file mode 100644
index 000000000..48bd3208c
Binary files /dev/null and b/src/assets/img/shuju/grid/IS_KC.png differ
diff --git a/src/assets/img/shuju/grid/sr_gc.png b/src/assets/img/shuju/grid/sr_gc.png
new file mode 100644
index 000000000..c5a00bb7e
Binary files /dev/null and b/src/assets/img/shuju/grid/sr_gc.png differ
diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index e79c35498..31f16237f 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -17,7 +17,7 @@
 }
 
 .div-btn{
-  margin-top:50px;
+  margin-top:30px;
   // margin-bottom:20px;
   display: flex;
   justify-content: center;
diff --git a/src/router/index.js b/src/router/index.js
index ad83c604f..bd58de930 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -121,20 +121,20 @@ function cookApiDataItem(item) {
   function n2one(v) {
     let ret = [];
     for (let i = 0; i < v.length; i++) {
-      console.log("xxxxx", v[i]);
+      // console.log("xxxxx", v[i]);
       ret.push(v[i]);
       if (Array.isArray(v[i].children) && v[i].children.length > 0) {
         ret.push(...n2one(v[i].children));
       }
     }
-    console.log("aaaa", ret);
+    // console.log("aaaa", ret);
     return ret;
   }
 
   let allChildrenUrl = n2one(item.children)
     .filter((i) => i.url != "" && i.showFlag == 1)
     .map((i) => i.url);
-  console.log("))))))))))))", allChildrenUrl);
+  // console.log("))))))))))))", allChildrenUrl);
 
   if (item.children.length > 0) {
     if (item.url == "" || !allChildrenUrl.find((i) => i.url == item.url)) {
diff --git a/src/views/modules/base/community/buildDetail.vue b/src/views/modules/base/community/buildDetail.vue
index 31039d156..270e0ae72 100644
--- a/src/views/modules/base/community/buildDetail.vue
+++ b/src/views/modules/base/community/buildDetail.vue
@@ -68,7 +68,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -120,6 +124,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 97fd4eb2f..b8d5ecafc 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -14,7 +14,8 @@
                    size="small"
                    @click="handleExportModule('building')">下载楼栋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_building"
                    :multiple='false'
                    :show-file-list='false'
@@ -31,7 +32,8 @@
                    size="small"
                    @click="handleExportModule('room')">下载房屋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_room"
                    :multiple='false'
                    :show-file-list='false'
@@ -206,7 +208,8 @@
                width="900px"
                class="dialog-h"
                @closed="detailFormCancle">
-      <build-detail ref="ref_form_detail"></build-detail>
+      <build-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></build-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue
index b04e4f30f..26367608e 100644
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@@ -61,7 +61,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -106,6 +110,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index ede5b04ce..519ffa792 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -26,7 +26,8 @@
                    size="small"
                    @click="handleExportModule('community')">下载小区模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload_community"
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload_community"
                    style=""
                    :multiple='false'
                    :show-file-list='false'
@@ -44,7 +45,8 @@
                    size="small"
                    @click="handleExportModule('building')">下载楼栋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_building"
                    :multiple='false'
                    :show-file-list='false'
@@ -61,7 +63,8 @@
                    size="small"
                    @click="handleExportModule('room')">下载房屋模板</el-button>
 
-        <el-upload :headers="$getElUploadHeaders()"  style=""
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
                    ref="upload_room"
                    :multiple='false'
                    :show-file-list='false'
@@ -193,7 +196,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <community-detail ref="ref_form_detail"></community-detail>
+      <community-detail ref="ref_form_detail"
+                        @diaDetailClose="detailFormCancle"></community-detail>
     </el-dialog>
 
     <!-- 修改弹出框 -->
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index fe7d74547..45bc21fc3 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -66,7 +66,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -117,7 +121,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      // this.diaDestroy()
+      this.$emit('diaDetailClose')
 
+    },
     diaDestroy () {
       if (map) {
         map.destroy()
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index a0b92e4ce..354b3684d 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -8,7 +8,8 @@
                  @click="handleAdd">新增房屋</el-button>
       <div class="btn_upload"
            v-if="showImportBtn">
-        <el-button :headers="$getElUploadHeaders()" style="float: left"
+        <el-button :headers="$getElUploadHeaders()"
+                   style="float: left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载房屋模板</el-button>
@@ -196,7 +197,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <room-detail ref="ref_form_detail"></room-detail>
+      <room-detail ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></room-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
index 31792bc5b..a0dd6da8e 100644
--- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
@@ -131,7 +131,7 @@ export default {
       formData: {
         visitTime: '',//随访时间
         content: '',//内容
-        realIdCard: '',
+        idCard: '',
         name: '',
         mobile: '',
         origin: ''
@@ -150,7 +150,7 @@ export default {
 
     async initTable (row, origin) {
 
-      this.formData.realIdCard = row.realIdCard
+      this.formData.idCard = row.realIdCard
       this.formData.name = row.name
       this.formData.mobile = row.mobile
       this.formData.origin = origin
@@ -167,7 +167,7 @@ export default {
       // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/followup/page'
       let params = {
         name: this.formData.name,
-        idCard: this.formData.realIdCard,
+        idCard: this.formData.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         origin: this.formData.origin
@@ -225,7 +225,7 @@ export default {
 
       const url = "/epmetuser/followup/export"
       let params = {
-        idCard: this.formData.realIdCard,
+        idCard: this.formData.idCard,
         name: this.formData.name,
         origin: this.formData.origin
       }
diff --git a/src/views/modules/base/huji/chusheng/cpts/detail.vue b/src/views/modules/base/huji/chusheng/cpts/detail.vue
index 95a0f4058..b68fae161 100644
--- a/src/views/modules/base/huji/chusheng/cpts/detail.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/detail.vue
@@ -71,7 +71,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -132,7 +136,11 @@ export default {
 
   methods: {
 
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
 
+    },
     async initForm (row) {
 
       await this.getInfo(row.id);
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 659071823..a4112360a 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -168,7 +168,8 @@
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()" v-if="false"
+        <el-upload :headers="$getElUploadHeaders()"
+                   v-if="false"
                    ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -350,7 +351,9 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
+
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
index 84e595d76..fcdafa994 100644
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -71,7 +71,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -99,7 +103,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
 
+    },
     async initForm (id) {
 
       await this.getDatail(id)
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index be5ccf66f..a15e65ba0 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -357,7 +357,8 @@
                class="dialog-h"
                @closed="detailFormCancle">
       <detail-form v-if="detailShow"
-                   ref="ref_form_detail"></detail-form>
+                   ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index b4d2f635a..7853ade91 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,835 +1,1049 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-col :span="24"
-              style="margin-left: 10px;margin-top: 10px;margin-bottom: 20px;">
+      <el-col
+        :span="24"
+        style="margin-left: 10px; margin-top: 10px; margin-bottom: 20px"
+      >
         <el-breadcrumb separator-class="el-icon-arrow-right">
-          <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr"
-                              :key="breadcrumb.id">
-            <el-link v-if="breadcrumb.id === currentBreadcrumbKey"
-                     type="primary"
-                     @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-            <el-link v-else
-                     type="info"
-                     @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-            <el-link v-if="index === breadcrumbArr.length - 1"
-                     type="primary"
-                     @click.native="modifyOrgInfo"
-                     style="margin-left:10px;margin-top:0px;color:#3E8EF7;cursor:pointer"
-                     icon="el-icon-edit">修改</el-link>
+          <el-breadcrumb-item
+            v-for="(breadcrumb, index) in breadcrumbArr"
+            :key="breadcrumb.id"
+          >
+            <el-link
+              v-if="breadcrumb.id === currentBreadcrumbKey"
+              type="primary"
+              @click.native="refreshThisPage(index)"
+              >{{ breadcrumb.name }}</el-link
+            >
+            <el-link
+              v-else
+              type="info"
+              @click.native="refreshThisPage(index)"
+              >{{ breadcrumb.name }}</el-link
+            >
+            <el-link
+              v-if="index === breadcrumbArr.length - 1"
+              type="primary"
+              @click.native="modifyOrgInfo"
+              style="
+                margin-left: 10px;
+                margin-top: 0px;
+                color: #3e8ef7;
+                cursor: pointer;
+              "
+              icon="el-icon-edit"
+              >修改</el-link
+            >
           </el-breadcrumb-item>
         </el-breadcrumb>
       </el-col>
-
     </el-row>
     <!-- 组织列表 -->
-    <el-table v-show="agencyTableFlag"
-              height="250"
-              :data="agencyTableListData"
-              style="width: 100%">
-      <el-table-column prop="agencyName"
-                       label="下级组织"></el-table-column>
-      <el-table-column prop="contacts"
-                       label="联系人"></el-table-column>
-      <el-table-column prop="mobile"
-                       label="联系人电话"></el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
+    <el-table
+      v-show="agencyTableFlag"
+      height="250"
+      :data="agencyTableListData"
+      style="width: 100%"
+    >
+      <el-table-column prop="agencyName" label="下级组织"></el-table-column>
+      <el-table-column prop="contacts" label="联系人"></el-table-column>
+      <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot="header">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addAgency()">新增</el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addAgency()"
+            >新增</el-button
+          >
         </template>
         <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-arrow-right"
-                     @click="entryAgency(scope.row.agencyId)">进入</el-button>
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-arrow-right"
+            @click="entryAgency(scope.row.agencyId)"
+            >进入</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 下级机关单位/基层科室列表 -->
-    <el-table v-show="departmentTableFlag"
-              height="250"
-              :data="departmentTableListData"
-              style="width: 100%">
-      <el-table-column prop="departmentName"
-                       label="下级机关单位/基层科室"></el-table-column>
-      <el-table-column prop="departmentTypeShow"
-                       label="部门类型"></el-table-column>
-      <el-table-column prop="contacts"
-                       label="联系人"></el-table-column>
-      <el-table-column prop="mobile"
-                       label="联系人电话"></el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addCommunity(scope.row)">新增</el-button>
+    <el-table
+      v-show="departmentTableFlag"
+      height="250"
+      :data="departmentTableListData"
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="departmentName"
+        label="下级机关单位/基层科室"
+      ></el-table-column>
+      <el-table-column
+        prop="departmentTypeShow"
+        label="部门类型"
+      ></el-table-column>
+      <el-table-column prop="contacts" label="联系人"></el-table-column>
+      <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot="header" slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addCommunity(scope.row)"
+            >新增</el-button
+          >
         </template>
         <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-arrow-right"
-                     @click="entryDepartment(scope.row)">进入</el-button>
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-arrow-right"
+            @click="entryDepartment(scope.row)"
+            >进入</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 网格列表 -->
-    <el-table v-show="gridTableFlag"
-              height="250"
-              :data="gridTableListData"
-              style="width: 100%">
-      <el-table-column prop="gridName"
-                       label="直属网格"></el-table-column>
-      <el-table-column prop="gridTypeName"
-                       label="网格类型"></el-table-column>
-      <el-table-column prop="contacts"
-                       label="联系人"></el-table-column>
-      <el-table-column prop="mobile"
-                       label="联系人电话"></el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addGrid(scope.row)">新增</el-button>
+    <el-table
+      v-show="gridTableFlag"
+      height="250"
+      :data="gridTableListData"
+      style="width: 100%"
+    >
+      <el-table-column prop="gridName" label="直属网格"></el-table-column>
+      <el-table-column prop="gridTypeName" label="网格类型"></el-table-column>
+      <el-table-column prop="contacts" label="联系人"></el-table-column>
+      <el-table-column prop="mobile" label="联系人电话"></el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot="header" slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addGrid(scope.row)"
+            >新增</el-button
+          >
         </template>
         <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-arrow-right"
-                     @click="entryGrid(scope.row.gridId)">进入</el-button>
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-arrow-right"
+            @click="entryGrid(scope.row.gridId)"
+            >进入</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 本级工作人员 -->
-    <el-table v-show="currentAgencyStaffTableFlag"
-              :data="agencyStaffTableListData"
-              style="width: 100%"
-              height="350">
-      <el-table-column prop="name"
-                       label="本级工作人员名字"
-                       width="260"></el-table-column>
-      <el-table-column prop="roles"
-                       label="本级工作人员职责"
-                       width="260">
+    <el-table
+      v-show="currentAgencyStaffTableFlag"
+      :data="agencyStaffTableListData"
+      style="width: 100%"
+      height="350"
+    >
+      <el-table-column
+        prop="name"
+        label="本级工作人员名字"
+        width="260"
+      ></el-table-column>
+      <el-table-column prop="roles" label="本级工作人员职责" width="260">
         <template slot-scope="scope">
-          <el-tag type="primary"
-                  size="mini"
-                  v-for="(role, index) in scope.row.roles"
-                  :key="index"
-                  disable-transitions>{{ role }}</el-tag>
+          <el-tag
+            type="primary"
+            size="mini"
+            v-for="(role, index) in scope.row.roles"
+            :key="index"
+            disable-transitions
+            >{{ role }}</el-tag
+          >
         </template>
       </el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addPeo(scope.row)">新增</el-button>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot="header" slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addPeo(scope.row)"
+            >新增</el-button
+          >
         </template>
         <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-edit"
-                     @click="xiuPeo(scope.row)">修改</el-button>
-          <el-button size="mini"
-                     type="success"
-                     icon="el-icon-view"
-                     @click="lookAngency(scope.row)">查看</el-button>
-          <el-button size="mini"
-                     type="info"
-                     icon="el-icon-rank"
-                     @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-edit"
+            @click="xiuPeo(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="success"
+            icon="el-icon-view"
+            @click="lookAngency(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="info"
+            icon="el-icon-rank"
+            @click="transfer(scope.row)"
+            >调动</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-circle-close"
+            @click="DisablePeo(scope.row)"
+            >禁用</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 下级机关单位/基层科室工作人员 -->
-    <el-table height="350"
-              v-show="departmentStaffTableFlag"
-              :data="departmentStaffTableListData"
-              style="width: 100%">
-      <el-table-column prop="name"
-                       label="下级机关单位/基层科室工作人员"
-                       width="260"></el-table-column>
-      <el-table-column prop="roles"
-                       label="下级机关单位/基层科室工作人员职责"
-                       width="260">
+    <el-table
+      height="350"
+      v-show="departmentStaffTableFlag"
+      :data="departmentStaffTableListData"
+      style="width: 100%"
+    >
+      <el-table-column
+        prop="name"
+        label="下级机关单位/基层科室工作人员"
+        width="260"
+      ></el-table-column>
+      <el-table-column
+        prop="roles"
+        label="下级机关单位/基层科室工作人员职责"
+        width="260"
+      >
         <template slot-scope="scope">
-          <el-tag type="primary"
-                  size="mini"
-                  v-for="(role, index) in scope.row.roles"
-                  :key="index"
-                  disable-transitions>{{ role }}</el-tag>
+          <el-tag
+            type="primary"
+            size="mini"
+            v-for="(role, index) in scope.row.roles"
+            :key="index"
+            disable-transitions
+            >{{ role }}</el-tag
+          >
         </template>
       </el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button v-if="selDeptType==='duty'"
-                     size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addCommunityPeo(scope.row)">新增</el-button>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot="header" slot-scope="scope">
+          <el-button
+            v-if="selDeptType === 'duty'"
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addCommunityPeo(scope.row)"
+            >新增</el-button
+          >
         </template>
         <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-edit"
-                     @click="xiuCommunityPeo(scope.row)">修改</el-button>
-          <el-button size="mini"
-                     type="success"
-                     icon="el-icon-view"
-                     @click="lookAngency(scope.row)">查看</el-button>
-          <el-button v-if="selDeptType==='duty'"
-                     size="mini"
-                     type="info"
-                     icon="el-icon-rank"
-                     @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-edit"
+            @click="xiuCommunityPeo(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="success"
+            icon="el-icon-view"
+            @click="lookAngency(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            v-if="selDeptType === 'duty'"
+            size="mini"
+            type="info"
+            icon="el-icon-rank"
+            @click="transfer(scope.row)"
+            >调动</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-circle-close"
+            @click="DisablePeo(scope.row)"
+            >禁用</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 网格工作人员 -->
-    <el-table v-show="gridStaffTableFlag"
-              :data="gridStaffTableListData"
-              style="width: 100%"
-              height="350">
-      <el-table-column prop="name"
-                       label="网格工作人员名字"
-                       width="260"></el-table-column>
-      <el-table-column prop="roles"
-                       label="网格工作人员职责"
-                       width="260">
+    <el-table
+      v-show="gridStaffTableFlag"
+      :data="gridStaffTableListData"
+      style="width: 100%"
+      height="350"
+    >
+      <el-table-column
+        prop="name"
+        label="网格工作人员名字"
+        width="260"
+      ></el-table-column>
+      <el-table-column prop="roles" label="网格工作人员职责" width="260">
         <template slot-scope="scope">
-          <el-tag type="primary"
-                  size="mini"
-                  v-for="(role, index) in scope.row.roles"
-                  :key="index"
-                  disable-transitions>{{ role }}</el-tag>
+          <el-tag
+            type="primary"
+            size="mini"
+            v-for="(role, index) in scope.row.roles"
+            :key="index"
+            disable-transitions
+            >{{ role }}</el-tag
+          >
         </template>
       </el-table-column>
-      <el-table-column label="操作"
-                       align="center"
-                       class-name="small-padding fixed-width">
-        <template slot="header"
-                  slot-scope="scope">
-          <el-button size="mini"
-                     type="primary"
-                     icon="el-icon-plus"
-                     @click="addGridPeo(scope.row)">新增</el-button>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot="header" slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="addGridPeo(scope.row)"
+            >新增</el-button
+          >
         </template>
         <template slot-scope="scope">
-          <el-button size="mini"
-                     type="warning"
-                     icon="el-icon-edit"
-                     @click="xiuGridPeo(scope.row)">修改</el-button>
-          <el-button size="mini"
-                     type="success"
-                     icon="el-icon-view"
-                     @click="lookAngency(scope.row)">查看</el-button>
-          <el-button size="mini"
-                     type="info"
-                     icon="el-icon-rank"
-                     @click="transfer(scope.row)">调动</el-button>
-          <el-button size="mini"
-                     type="danger"
-                     icon="el-icon-circle-close"
-                     @click="DisablePeo(scope.row)">禁用</el-button>
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-edit"
+            @click="xiuGridPeo(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="success"
+            icon="el-icon-view"
+            @click="lookAngency(scope.row)"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="info"
+            icon="el-icon-rank"
+            @click="transfer(scope.row)"
+            >调动</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-circle-close"
+            @click="DisablePeo(scope.row)"
+            >禁用</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 新增下级机关单位/基层科室 -->
-    <el-dialog title="新增部门"
-               :visible.sync="dialogVisible"
-               width="30%"
-               :before-close="handleClose">
-      <el-form :rules="rules">
-        <el-form-item label="部门名称"
-                      prop="addDepartmentName">
-          <el-input v-model="insertForm.departmentName"
-                    placeholder="请输入部门名称"></el-input>
+    <el-dialog
+      title="新增部门"
+      :visible.sync="dialogVisible"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px" :rules="rules">
+        <el-form-item label="部门名称" prop="addDepartmentName">
+          <el-input
+            v-model="insertForm.departmentName"
+            placeholder="请输入部门名称"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="组织编码"
-                      prop="code">
-          <el-input v-model="insertForm.code"
-                    placeholder="请输入组织编码"></el-input>
+        <el-form-item label="组织编码" prop="code">
+          <el-input
+            v-model="insertForm.code"
+            placeholder="请输入组织编码"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="联系人"
-                      prop="contacts">
-          <el-input v-model="insertForm.contacts"
-                    placeholder="请输入联系人姓名"></el-input>
+        <el-form-item label="联系人" prop="contacts">
+          <el-input
+            v-model="insertForm.contacts"
+            placeholder="请输入联系人姓名"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="mobile">
-          <el-input v-model="insertForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
+        <el-form-item label="联系电话" prop="mobile">
+          <el-input
+            v-model="insertForm.mobile"
+            placeholder="请输入联系电话"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary"
-                   @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
       </div>
     </el-dialog>
 
     <!-- 新增网格 -->
     <div v-if="dialogVisibleGrid">
-      <el-dialog title="新增网格"
-                 :visible.sync="dialogVisibleGrid"
-                 width="60%"
-                 :before-close="handleClose">
-        <el-form :rules="rules">
-          <el-form-item label="网格名称"
-                        prop="gridName">
-            <el-input v-model="GridForm.gridName"
-                      placeholder="请输入部门名称"></el-input>
+      <el-dialog
+        title="新增网格"
+        :visible.sync="dialogVisibleGrid"
+        width="850"
+        :before-close="handleClose"
+      >
+        <el-form label-width="120px" :rules="rules">
+          <el-form-item label="网格名称" prop="gridName">
+            <el-input
+              v-model="GridForm.gridName"
+              placeholder="请输入部门名称"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="网格编码"
-                        prop="GridCode">
-            <el-input v-model="GridForm.code"
-                      placeholder="请输入网格编码"></el-input>
+          <el-form-item label="网格编码" prop="GridCode">
+            <el-input
+              v-model="GridForm.code"
+              placeholder="请输入网格编码"
+            ></el-input>
           </el-form-item>
 
           <!-- 网格类型，下拉框 -->
-          <el-form-item label="网格类型"
-                        prop="typeTag">
-            <el-select v-model="GridForm.gridType"
-                       clearable
-                       placeholder="网格类型">
-              <el-option v-for="item in typeList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item label="网格类型" prop="typeTag">
+            <el-select
+              v-model="GridForm.gridType"
+              clearable
+              placeholder="网格类型"
+            >
+              <el-option
+                v-for="item in typeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="联系人"
-                        prop="GridContacts">
-            <el-input v-model="GridForm.contacts"
-                      placeholder="请输入联系人姓名"></el-input>
+          <el-form-item label="联系人" prop="GridContacts">
+            <el-input
+              v-model="GridForm.contacts"
+              placeholder="请输入联系人姓名"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="GridMobile">
-            <el-input v-model="GridForm.mobile"
-                      placeholder="请输入联系电话"></el-input>
+          <el-form-item label="联系电话" prop="GridMobile">
+            <el-input
+              v-model="GridForm.mobile"
+              placeholder="请输入联系电话"
+            ></el-input>
           </el-form-item>
 
           <!-- 组织位置 -->
-          <el-form-item>
-            <div id="container">当前点击坐标为：<span id="position"></span></div>
+          <el-form-item label="坐标">
+            <div id="con"></div>
           </el-form-item>
-
         </el-form>
 
         <div slot="footer">
           <el-button @click="cancelGrid">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitGrid">确 定</el-button>
+          <el-button type="primary" @click="submitGrid">确 定</el-button>
         </div>
       </el-dialog>
     </div>
 
     <!-- 新增人员 -->
     <div v-if="dialogVisiblePeo">
-      <el-dialog title="新增人员"
-                 :visible.sync="dialogVisiblePeo"
-                 width="30%"
-                 :before-close="handleClose">
-        <el-form>
-          <el-form-item label="姓名"
-                        prop="peoName">
-            <el-input v-model="peoForm.name"
-                      placeholder="请输入姓名"></el-input>
+      <el-dialog
+        title="新增人员"
+        :visible.sync="dialogVisiblePeo"
+        width="850"
+        :before-close="handleClose"
+      >
+        <el-form
+          :model="peoForm"
+          label-width="120px"
+          ref="addPeoForm"
+          :rules="rulesPeo"
+        >
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="peoForm.name"
+              placeholder="请输入姓名"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="手机号"
-                        prop="mobile">
-            <el-input v-model="peoForm.mobile"
-                      placeholder="请输入手机号"></el-input>
+          <el-form-item label="手机号" prop="mobile">
+            <el-input
+              v-model="peoForm.mobile"
+              placeholder="请输入手机号"
+            ></el-input>
           </el-form-item>
           <!-- 性别下拉框 -->
-          <el-form-item label="性别"
-                        prop="gender">
-            <el-select v-model="peoForm.gender"
-                       clearable
-                       placeholder="性别">
-              <el-option v-for="item in genderList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item label="性别" prop="gender">
+            <el-select v-model="peoForm.gender" clearable placeholder="性别">
+              <el-option
+                v-for="item in genderList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <!-- 专兼职下拉框 -->
-          <el-form-item label="专兼职"
-                        prop="post">
-            <el-select v-model="peoForm.post"
-                       clearable
-                       placeholder="专兼职">
-              <el-option v-for="item in postList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item label="专兼职" prop="post">
+            <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+              <el-option
+                v-for="item in postList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <!-- 职责下拉框 -->
-          <el-form-item label="职责"
-                        prop="duty">
-            <el-select v-model="peoForm.duty"
-                       multiple
-                       placeholder="请选择">
-              <el-option v-for="item in dutyList"
-                         :key="item.roleId"
-                         :label="item.roleName"
-                         :value="item.roleId"
-                         :disabled="item.disabled">
+          <el-form-item label="职责" prop="duty">
+            <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+              <el-option
+                v-for="item in dutyList"
+                :key="item.roleId"
+                :label="item.roleName"
+                :value="item.roleId"
+                :disabled="item.disabled"
+              >
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="角色"
-                        prop="newRoles">
-            <el-select v-model="peoForm.newRoles"
-                       multiple
-                       placeholder="请选择">
-              <el-option v-for="item in roleList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
+          <el-form-item label="角色" prop="newRoles">
+            <el-select v-model="peoForm.newRoles" multiple placeholder="请选择">
+              <el-option
+                v-for="item in roleList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
               </el-option>
             </el-select>
           </el-form-item>
-
         </el-form>
         <div slot="footer">
           <el-button @click="cancelPeo">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitPeo">确 定</el-button>
+          <el-button type="primary" @click="submitPeo">确 定</el-button>
         </div>
       </el-dialog>
     </div>
 
     <!-- 人员修改 -->
-    <el-dialog title="人员修改"
-               :visible.sync="modifyPeo"
-               width="30%"
-               :before-close="handleClose">
-      <el-form>
-        <el-form-item label="姓名"
-                      prop="peoName">
-          <el-input v-model="peoForm.name"
-                    placeholder="请输入姓名"></el-input>
+    <el-dialog
+      v-if="modifyPeo"
+      title="人员修改"
+      :visible.sync="modifyPeo"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form
+        :model="peoForm"
+        label-width="120px"
+        ref="editPeoForm"
+        :rules="rulesPeo"
+      >
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
         </el-form-item>
-        <el-form-item label="手机号"
-                      prop="mobile">
-          <el-input v-model="peoForm.mobile"
-                    placeholder="请输入手机号"></el-input>
+        <el-form-item label="手机号" prop="mobile">
+          <el-input
+            v-model="peoForm.mobile"
+            placeholder="请输入手机号"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="性别"
-                      prop="gender">
-          <el-select v-model="peoForm.gender"
-                     clearable
-                     placeholder="性别">
-            <el-option v-for="item in genderList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item label="性别" prop="gender">
+          <el-select v-model="peoForm.gender" clearable placeholder="性别">
+            <el-option
+              v-for="item in genderList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="专兼职"
-                      prop="post">
-          <el-select v-model="peoForm.post"
-                     clearable
-                     placeholder="专兼职">
-            <el-option v-for="item in postList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item label="专兼职" prop="post">
+          <el-select v-model="peoForm.post" clearable placeholder="专兼职">
+            <el-option
+              v-for="item in postList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="职责"
-                      prop="duty">
-          <el-select v-model="peoForm.duty"
-                     multiple
-                     placeholder="请选择">
-            <el-option v-for="item in dutyList"
-                       :key="item.roleId"
-                       :label="item.roleName"
-                       :value="item.roleId"
-                       :disabled="item.disabled">
+        <el-form-item label="职责" prop="duty">
+          <el-select v-model="peoForm.duty" multiple placeholder="请选择">
+            <el-option
+              v-for="item in dutyList"
+              :key="item.roleId"
+              :label="item.roleName"
+              :value="item.roleId"
+              :disabled="item.disabled"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="角色"
-                      prop="newRoles">
-          <el-select v-model="peoForm.newRoles"
-                     multiple
-                     placeholder="请选择">
-            <el-option v-for="item in roleList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
+        <el-form-item label="角色" prop="newRoles">
+          <el-select v-model="peoForm.newRoles" multiple placeholder="请选择">
+            <el-option
+              v-for="item in roleList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-
       </el-form>
       <div slot="footer">
         <el-button @click="cancelXiugai">取 消</el-button>
-        <el-button type="primary"
-                   @click="updatePeo">确 定</el-button>
+        <el-button type="primary" @click="updatePeo">确 定</el-button>
       </div>
     </el-dialog>
 
     <!-- 禁用弹窗 -->
-    <el-dialog title="确认禁用"
-               :visible.sync="Disable"
-               width="30%"
-               :before-close="handleClose">
+    <el-dialog
+      v-if="Disable"
+      title="确认禁用"
+      :visible.sync="Disable"
+      width="850"
+      :before-close="handleClose"
+    >
       <span>禁用后该用户将无法登录系统，是否继续？</span>
       <div slot="footer">
         <el-button @click="cancelDisable">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitDisable">确 定</el-button>
+        <el-button type="primary" @click="submitDisable">确 定</el-button>
       </div>
     </el-dialog>
 
     <!-- 人员查看 -->
-    <el-dialog title="人员详情"
-               :visible.sync="details"
-               width="30%"
-               :before-close="handleClosePeoView">
-      <el-form>
+    <el-dialog
+      v-if="details"
+      title="人员详情"
+      :visible.sync="details"
+      width="850"
+      :before-close="handleClosePeoView"
+    >
+      <el-form label-width="120px">
         <el-form-item label="姓名">
-          <el-input v-model="peoForm.name"
-                    placeholder="姓名"
-                    :disabled="true"></el-input>
+          <el-input
+            v-model="peoForm.name"
+            placeholder="姓名"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input v-model="peoForm.mobile"
-                    placeholder="手机号"
-                    :disabled="true"></el-input>
+          <el-input
+            v-model="peoForm.mobile"
+            placeholder="手机号"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
         <el-form-item label="组织/部门">
-          <el-input v-model="peoForm.zuzhi"
-                    placeholder="组织/部门"
-                    :disabled="true"></el-input>
+          <el-input
+            v-model="peoForm.zuzhi"
+            placeholder="组织/部门"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
         <el-form-item label="激活时间">
-          <el-input v-model="peoForm.activeTime"
-                    placeholder="激活时间"
-                    :disabled="true"></el-input>
+          <el-input
+            v-model="peoForm.activeTime"
+            placeholder="激活时间"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
         <el-form-item label="职位">
-          <el-input v-model="peoForm.duty"
-                    placeholder="职位"
-                    :disabled="true"></el-input>
+          <el-input
+            v-model="peoForm.duty"
+            placeholder="职位"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
         <el-form-item label="是否禁用">
-          <el-input v-model="peoForm.disableFlag"
-                    placeholder="是否禁用"
-                    :disabled="true"></el-input>
+          <el-input
+            v-model="peoForm.disableFlag"
+            placeholder="是否禁用"
+            :disabled="true"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button type="primary"
-                   style="margin-right:170px"
-                   @click="cancelDetails">关 闭</el-button>
+        <el-button
+          type="primary"
+          style="margin-right: 170px"
+          @click="cancelDetails"
+          >关 闭</el-button
+        >
       </div>
     </el-dialog>
 
     <!-- 人员调动 -->
-    <el-dialog title="人员调动"
-               :visible.sync="transferPeo"
-               width="30%"
-               :before-close="handleClose">
-      <el-form :model="agencyForm">
+    <el-dialog
+      v-if="transferPeo"
+      title="人员调动"
+      :visible.sync="transferPeo"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px" :model="agencyForm">
         <el-form-item label="姓名">
-          <el-input v-model="transferForm.name"
-                    placeholder="姓名"></el-input>
+          <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
         </el-form-item>
         <el-form-item label="调动至">
-          <el-cascader clearable
-                       :props="{ checkStrictly: true }"
-                       v-model="selectValue"
-                       :options="options"
-                       @change="handleChange">
+          <el-cascader
+            clearable
+            :props="{ checkStrictly: true }"
+            v-model="selectValue"
+            :options="options"
+            @change="handleChange"
+          >
           </el-cascader>
         </el-form-item>
         <el-form-item label="调动原因">
-          <el-input type="textarea"
-                    :rows="2"
-                    placeholder="请输入内容"
-                    maxlength="500"
-                    show-word-limit
-                    v-model="transferForm.remarks">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+            maxlength="500"
+            show-word-limit
+            v-model="transferForm.remarks"
+          >
           </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="cancelTransfer">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitTransfer">确 定</el-button>
+        <el-button type="primary" @click="submitTransfer">确 定</el-button>
       </div>
     </el-dialog>
 
     <!-- 新增组织 -->
-    <el-dialog title="新增组织"
-               :visible.sync="createAgencyDialogFlag"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
+    <el-dialog
+      v-if="createAgencyDialogFlag"
+      title="新增组织"
+      :visible.sync="createAgencyDialogFlag"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px">
         <el-form-item label="组织名称">
-          <el-input v-model="agencyForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
+          <el-input
+            v-model="agencyForm.agencyName"
+            placeholder="请输入组织名称"
+          ></el-input>
         </el-form-item>
 
         <!-- 组织区划 -->
         <el-form-item label="组织区划">
-          <el-select v-model="agencyForm.areaCode"
-                     placeholder="请选择组织区划"
-                     @change="handelZoing">
-            <el-option v-for="item in zonings"
-                       :key="item.areaCode"
-                       :label="item.areaName"
-                       :value="item.areaCode">
+          <el-select
+            v-model="agencyForm.areaCode"
+            placeholder="请选择组织区划"
+            @change="handelZoing"
+          >
+            <el-option
+              v-for="item in zonings"
+              :key="item.areaCode"
+              :label="item.areaName"
+              :value="item.areaCode"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="agencyForm.code"
-                    placeholder="请输入组织编码"></el-input>
+          <el-input
+            v-model="agencyForm.code"
+            placeholder="请输入组织编码"
+          ></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="agencyForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
+          <el-input
+            v-model="agencyForm.contacts"
+            placeholder="请输入负责人名字"
+          ></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="agencyForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
+          <el-input
+            v-model="agencyForm.mobile"
+            placeholder="请输入联系电话"
+          ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item label="坐标">
           <div id="con"></div>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="canceladdNewAgency">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitaddNewAgency">确 定</el-button>
+        <el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
       </div>
     </el-dialog>
 
     <!-- 修改市区级组织 -->
-    <el-dialog title="修改组织"
-               :visible.sync="modifyCityOrgPop"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
+    <el-dialog
+      v-if="modifyCityOrgPop"
+      title="修改组织"
+      :visible.sync="modifyCityOrgPop"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px">
         <el-form-item label="组织名称">
-          <el-input v-model="OrgDetailsForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.agencyName"
+            placeholder="请输入组织名称"
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="OrgDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.code"
+            placeholder="请输入组织编码"
+          ></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="OrgDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.contacts"
+            placeholder="请输入负责人名字"
+          ></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.mobile"
+            placeholder="请输入联系电话"
+          ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item label="坐标">
           <div id="con"></div>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="sunmitModifyCityOrgPop">确 定</el-button>
+        <el-button type="primary" @click="sunmitModifyCityOrgPop"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
 
     <!-- 修改街道/社区级组织 -->
-    <el-dialog title="修改组织"
-               :visible.sync="streetOrCommunity"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
+    <el-dialog
+      v-if="streetOrCommunity"
+      title="修改组织"
+      :visible.sync="streetOrCommunity"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px">
         <el-form-item label="组织名称">
-          <el-input v-model="OrgDetailsForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.agencyName"
+            placeholder="请输入组织名称"
+          ></el-input>
         </el-form-item>
 
         <!-- 组织区划 -->
         <el-form-item label="组织区划">
-          <el-select v-model="OrgDetailsForm.areaCode"
-                     placeholder="请选择组织区划"
-                     @change="handelStreeOrCommunityZoing">
-            <el-option v-for="item in zonings"
-                       :key="item.areaCode"
-                       :label="item.areaName"
-                       :value="item.areaCode">
+          <el-select
+            v-model="OrgDetailsForm.areaCode"
+            placeholder="请选择组织区划"
+            @change="handelStreeOrCommunityZoing"
+          >
+            <el-option
+              v-for="item in zonings"
+              :key="item.areaCode"
+              :label="item.areaName"
+              :value="item.areaCode"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="OrgDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.code"
+            placeholder="请输入组织编码"
+          ></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="OrgDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.contacts"
+            placeholder="请输入负责人名字"
+          ></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
+          <el-input
+            v-model="OrgDetailsForm.mobile"
+            placeholder="请输入联系电话"
+          ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item label="坐标">
           <div id="con"></div>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="cancelstreetOrCommunity">取 消</el-button>
-        <el-button type="primary"
-                   @click="sunmitModifyCityOrgPop">确 定</el-button>
+        <el-button type="primary" @click="sunmitModifyCityOrgPop"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
 
     <!-- 修改下级机关单位 -->
-    <el-dialog title="修改部门"
-               :visible.sync="OrgUnitPop"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
+    <el-dialog
+      v-if="OrgUnitPop"
+      title="修改部门"
+      :visible.sync="OrgUnitPop"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px">
         <el-form-item label="部门名称">
-          <el-input v-model="OrgUnitDetailsForm.departmentName"
-                    placeholder="请输入组织名称"></el-input>
+          <el-input
+            v-model="OrgUnitDetailsForm.departmentName"
+            placeholder="请输入组织名称"
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="OrgUnitDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
+          <el-input
+            v-model="OrgUnitDetailsForm.code"
+            placeholder="请输入组织编码"
+          ></el-input>
         </el-form-item>
         <el-form-item label="负责人">
-          <el-input v-model="OrgUnitDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
+          <el-input
+            v-model="OrgUnitDetailsForm.contacts"
+            placeholder="请输入负责人名字"
+          ></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="OrgUnitDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
+          <el-input
+            v-model="OrgUnitDetailsForm.mobile"
+            placeholder="请输入联系电话"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="cancelOrgUnitPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="sunmitOrgUnitForm">确 定</el-button>
+        <el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
       </div>
     </el-dialog>
 
     <!-- 修改网格 -->
-    <el-dialog title="修改网格"
-               :visible.sync="modifyGridPop"
-               width="60%"
-               :before-close="handleClose">
-      <el-form>
+    <el-dialog
+      v-if="modifyGridPop"
+      title="修改网格"
+      :visible.sync="modifyGridPop"
+      width="850"
+      :before-close="handleClose"
+    >
+      <el-form label-width="120px">
         <el-form-item label="网格名称">
-          <el-input v-model="modifyGridFrom.gridName"
-                    placeholder="请输入组织名称"></el-input>
+          <el-input
+            v-model="modifyGridFrom.gridName"
+            placeholder="请输入组织名称"
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="组织编码">
-          <el-input v-model="modifyGridFrom.code"
-                    placeholder="请输入组织编码"></el-input>
+          <el-input
+            v-model="modifyGridFrom.code"
+            placeholder="请输入组织编码"
+          ></el-input>
         </el-form-item>
 
         <!-- 网格类型下拉框 -->
-        <el-form-item label="网格类型"
-                      prop="typeTag">
-          <el-select v-model="modifyGridFrom.gridType"
-                     clearable
-                     placeholder="网格类型">
-            <el-option v-for="item in typeList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item label="网格类型" prop="typeTag">
+          <el-select
+            v-model="modifyGridFrom.gridType"
+            clearable
+            placeholder="网格类型"
+          >
+            <el-option
+              v-for="item in typeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
         <!-- 排序 -->
         <el-form-item label="排序">
-          <el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number>
+          <el-input-number
+            v-model="modifyGridFrom.gridSort"
+            :min="1"
+            label="排序"
+          ></el-input-number>
         </el-form-item>
 
         <el-form-item label="负责人">
-          <el-input v-model="modifyGridFrom.contacts"
-                    placeholder="请输入负责人名字"></el-input>
+          <el-input
+            v-model="modifyGridFrom.contacts"
+            placeholder="请输入负责人名字"
+          ></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="modifyGridFrom.mobile"
-                    placeholder="请输入联系电话"></el-input>
+          <el-input
+            v-model="modifyGridFrom.mobile"
+            placeholder="请输入联系电话"
+          ></el-input>
         </el-form-item>
 
         <!-- 组织位置,地图 -->
-        <el-form-item>
+        <el-form-item label="坐标">
           <div id="con"></div>
         </el-form-item>
-
       </el-form>
       <div slot="footer">
         <el-button @click="cancelModifyGridPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitModifyGrid">确 定</el-button>
+        <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-
 import { requestPost, requestGet } from "@/js/dai/request";
 
 export default {
-  data () {
+  data() {
     return {
       // 新增组织弹窗
       createAgencyDialogFlag: false,
@@ -871,31 +1085,31 @@ export default {
       // 用户所属组织ID
       userAgencyId: localStorage.getItem("agencyId"),
       // 修改时操作的用户staffId
-      userStaffId: '',
+      userStaffId: "",
       // 当前被操作的组织的ID
       currentAgencyId: localStorage.getItem("agencyId"),
       // 当前被操作的部门的ID
-      currentDepartmentId: '14f572e724eecf7668b655505d789cab',
+      currentDepartmentId: "14f572e724eecf7668b655505d789cab",
       // 当前被操作的网格的ID
-      currentGridOrgId: '63d5ff92ea981b1c58e4914ac894c610',
+      currentGridOrgId: "63d5ff92ea981b1c58e4914ac894c610",
 
       // 当前被操作的组织的级别
       currentAgencyLevel: localStorage.getItem("level"),
-      currentAreaCode: '',
-      parentAreaCode: '',
+      currentAreaCode: "",
+      parentAreaCode: "",
       parentAgencyId: localStorage.getItem("agencyId"),
       parentAgencyLevel: localStorage.getItem("level"),
 
       // 经纬度坐标
-      lat: '11',
-      lng: '11',
-      latitude: '11',
-      longitude: '11',
-      Navigation: '',
+      lat: "",
+      lng: "",
+      latitude: "",
+      longitude: "",
+      Navigation: "",
       // 查询参数
       queryParams: {
         deptName: undefined,
-        status: undefined
+        status: undefined,
       },
       // 状态列表
       dictList: [],
@@ -919,118 +1133,118 @@ export default {
       transferPeo: false,
       // 社区添加表单项
       insertForm: {
-        departmentName: '',
-        code: '',
-        contacts: '',
-        mobile: '',
-        agencyId: '',
-        departmentDuty: '123'
+        departmentName: "",
+        code: "",
+        contacts: "",
+        mobile: "",
+        agencyId: "",
+        departmentDuty: "123",
       },
       // 网格添加表单项
       GridForm: {
-        gridName: '',
-        code: '',
-        contacts: '',
-        mobile: '',
-        agencyId: '',
-        manageDistrict: '',
-        gridType: '',
-        location: '', //坐标位置
-        longitude: '11', //经度
-        latitude: '11',//纬度
-        centerAddress: ''
+        gridName: "",
+        code: "",
+        contacts: "",
+        mobile: "",
+        agencyId: "",
+        manageDistrict: "",
+        gridType: "",
+        location: "", //坐标位置
+        longitude: "", //经度
+        latitude: "", //纬度
+        centerAddress: "",
       },
       // 新增组织
       agencyForm: {
-        parentAgencyId: '',
-        agencyName: '',
-        level: '',
-        areaCodeSwitch: '',
-        areaCode: '',
-        areaName: '',
-        contacts: '',
-        mobile: '',
-        code: ''
+        parentAgencyId: "",
+        agencyName: "",
+        level: "",
+        areaCodeSwitch: "",
+        areaCode: "",
+        areaName: "",
+        contacts: "",
+        mobile: "",
+        code: "",
       },
       // 树
       tree: [],
       // 新增人员表单项
       peoForm: {
-        name: '',
-        mobile: '',
-        gender: '',
-        post: '',
+        name: "",
+        mobile: "",
+        gender: "",
+        post: "",
         duty: [],
-        orgType: '',
-        activeTime: '',
-        zuzhi: '',
-        disableFlag: '',
-        newRoles: []
+        orgType: "",
+        activeTime: "",
+        zuzhi: "",
+        disableFlag: "",
+        newRoles: [],
       },
       // 人员调动
       transferForm: {
-        name: '',
-        remarks: '',
-        transferTo: '',
-        staffId: '',
-        orgId: '',
-        orgType: ''
+        name: "",
+        remarks: "",
+        transferTo: "",
+        staffId: "",
+        orgId: "",
+        orgType: "",
       },
       // 人员禁用
       DisableForm: {
-        staffId: '',
-        agencyId: '',
-        customerId: ''
+        staffId: "",
+        agencyId: "",
+        customerId: "",
       },
       // 组织详细信息
       OrgDetailsForm: {
-        level: '',
-        agencyName: '',
-        code: '',
-        contacts: '',
-        mobile: '',
-        centerAddress: '',
-        areaCode: '',
-        agencyId: '',
-        areaName: ''
+        level: "",
+        agencyName: "",
+        code: "",
+        contacts: "",
+        mobile: "",
+        centerAddress: "",
+        areaCode: "",
+        agencyId: "",
+        areaName: "",
       },
       // 下级机关单位
       OrgUnitDetailsForm: {
-        code: '',
-        contacts: '',
-        departmentId: '',
-        departmentName: '',
-        mobile: ''
+        code: "",
+        contacts: "",
+        departmentId: "",
+        departmentName: "",
+        mobile: "",
       },
       // 网格修改表单
       modifyGridFrom: {
-        gridName: '',
-        code: '',
-        gridTypeName: '',
-        contacts: '',
-        mobile: '',
-        latitude: '',
-        longitude: '',
-        agencyId: '',
-        gridType: '',
-        manageDistrict: '',
-        griId: '',
+        gridName: "",
+        code: "",
+        gridTypeName: "",
+        contacts: "",
+        mobile: "",
+        latitude: "",
+        longitude: "",
+        agencyId: "",
+        gridType: "",
+        manageDistrict: "",
+        griId: "",
         // 排序
         gridSort: 0,
       },
       judgeOrgInfoLevel: [],
-      keyWords: '',
+      keyWords: "",
       typeList: [],
       // 性别字典
       genderList: [
-        { value: 1, label: '男' },
-        { value: 2, label: '女' },
-        { value: 0, label: '未知' },
+        { value: 1, label: "男" },
+        { value: 2, label: "女" },
+        { value: 0, label: "未知" },
       ],
       // 专兼职字典
       postList: [
-        { value: 'fulltime', label: '专职' },
-        { value: 'parttime', label: '兼职' }
+        { value: "fulltime", label: "专职" },
+        { value: "parttime", label: "兼职" },
       ],
       // 职责字典
       dutyList: [],
@@ -1042,288 +1256,284 @@ export default {
       // 级联数据
       options: [
         {
-          value: '',
-          label: '',
+          value: "",
+          label: "",
           children: [
             {
-              value: '',
-              label: '',
-              children: []
+              value: "",
+              label: "",
+              children: [],
             },
             {
-              value: '',
-              label: '',
-              children: []
-            }
+              value: "",
+              label: "",
+              children: [],
+            },
           ],
-        }
+        },
       ],
       selectValue: [],
       // 顶部 面包屑
       breadcrumbArr: [],
       // 面包屑 当前所属机构ID
-      currentBreadcrumbKey: '',
+      currentBreadcrumbKey: "",
       // 组织区划数据
       zonings: [],
       // 校验
       rules: {
         departmentName: [
-          { required: true, message: '社区名称必填', trigger: 'blur' }
+          { required: true, message: "社区名称必填", trigger: "blur" },
         ],
         gridName: [
-          { required: true, message: '网格名称必填', trigger: 'blur' }
+          { required: true, message: "网格名称必填", trigger: "blur" },
         ],
         addDepartmentName: [
-          { required: true, message: '部门名称必填', trigger: 'blur' }
-        ]
+          { required: true, message: "部门名称必填", trigger: "blur" },
+        ],
       },
 
-      selDeptType: '',
-    }
+      rulesPeo: {
+        name: [{ required: true, message: "姓名必填", trigger: "blur" }],
+        mobile: [{ required: true, message: "手机号必填", trigger: "blur" }],
+        gender: [{ required: true, message: "性别必填", trigger: "blur" }],
+        post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
+        duty: [{ required: true, message: "职责必填", trigger: "blur" }],
+        newRoles: [{ required: true, message: "角色必填", trigger: "blur" }],
+      },
+
+      selDeptType: "",
+    };
   },
-  created () {
-    this.getAgencyList()
-    this.getDepartmentList()
-    this.getGridList()
-    this.getAgencyStaffListData()
-    this.getDutyList()
-    this.getRoleList()
+  created() {
+    this.getAgencyList();
+    this.getDepartmentList();
+    this.getGridList();
+    this.getAgencyStaffListData();
+    this.getDutyList();
+    this.getRoleList();
     // this.getNavigation()
     // 更新顶部面包屑
-    this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
+    this.assembleBreadcrumbArr(localStorage.getItem("agencyId"), "agency");
   },
 
   watch: {
-    dialogVisibleGrid (val) {
+    dialogVisibleGrid(val) {
       if (val) {
         setTimeout(() => {
-          let _that = this
-          this.initMap(_that)
+          this.createMap();
         }, 1000);
       }
     },
-    createAgencyDialogFlag (val) {
+    createAgencyDialogFlag(val) {
       if (val) {
         setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
+          this.createMap();
         }, 1000);
       }
     },
-    modifyCityOrgPop (val) {
+    modifyCityOrgPop(val) {
       if (val) {
         setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
+          this.createMap();
         }, 1000);
       }
     },
-    streetOrCommunity (val) {
+    streetOrCommunity(val) {
       if (val) {
         setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
+          this.createMap();
         }, 1000);
       }
     },
-    modifyGridPop (val) {
+    modifyGridPop(val) {
       if (val) {
         setTimeout(() => {
-          let _t = this
-          this.createMap(_t)
+          this.createMap();
         }, 1000);
       }
-    }
+    },
   },
-  mounted () {
+  mounted() {
     // this.initMap()
   },
   methods: {
     // 点击后获取id
-    handleChange (e) {
-      this.transferForm.orgId = e[1]
-      if (this.transferForm.orgId != null || '') {
+    handleChange(e) {
+      this.transferForm.orgId = e[1];
+      if (this.transferForm.orgId != null || "") {
         if (this.transferForm.orgId === 0) {
-          if (e[2] == null || '') {
-            this.transferForm.orgType = 'dept'
-            this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
+          if (e[2] == null || "") {
+            this.transferForm.orgType = "dept";
+            this.transferForm.orgId = "14f572e724eecf7668b655505d789cab";
           } else {
-            this.transferForm.orgId = e[2]
-            this.transferForm.orgType = 'dept'
+            this.transferForm.orgId = e[2];
+            this.transferForm.orgType = "dept";
           }
         } else {
-          if (e[2] == null || '') {
-            this.transferForm.orgType = 'grid'
-            this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
+          if (e[2] == null || "") {
+            this.transferForm.orgType = "grid";
+            this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610";
           } else {
-            this.transferForm.orgId = e[2]
-            this.transferForm.orgType = 'grid'
+            this.transferForm.orgId = e[2];
+            this.transferForm.orgType = "grid";
           }
-
         }
       } else {
-        this.transferForm.orgId = e[0]
-        this.transferForm.orgType = 'agency'
+        this.transferForm.orgId = e[0];
+        this.transferForm.orgType = "agency";
       }
     },
     /** 查询系统工作人员角色（职责） */
-    async getDutyList () {
-      const url = "/gov/org/staff/rolelist"
+    async getDutyList() {
+      const url = "/gov/org/staff/rolelist";
       let params = {
-        agencyId: this.currentAgencyId
-      }
-      const { data, code, msg } = await requestPost(url, params)
+        agencyId: this.currentAgencyId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.dutyList = data
+        this.dutyList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     /** 查询系统工作人员角色（职责） */
-    async getRoleList () {
-      this.tableLoading = true
-
-      const url = "/gov/access/govrole/list"
+    async getRoleList() {
+      this.tableLoading = true;
 
-      let params = {
+      const url = "/gov/access/govrole/list";
 
-      }
+      let params = {};
 
-      const { data, code, msg } = await requestGet(url, params)
+      const { data, code, msg } = await requestGet(url, params);
 
       if (code === 0) {
-
-        this.roleList = data
-
+        this.roleList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-      this.tableLoading = false
+      this.tableLoading = false;
     },
     /** 查询组织列表 */
-    async getAgencyList () {
-      const url = "/gov/org/agency/agencylist"
+    async getAgencyList() {
+      const url = "/gov/org/agency/agencylist";
       let params = {
-        agencyId: this.currentAgencyId
-      }
+        agencyId: this.currentAgencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.agencyTableListData = data
+        this.agencyTableListData = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     /** 查询社区列表 */
-    async getDepartmentList () {
-      const url = "/gov/org/department/departmentlist"
+    async getDepartmentList() {
+      const url = "/gov/org/department/departmentlist";
 
       let params = {
-        agencyId: this.currentAgencyId
-      }
+        agencyId: this.currentAgencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.departmentTableListData = data
-
-        this.departmentTableListData.forEach(element => {
-          if (element.deptType === 'duty') {
-            element.departmentTypeShow = '职能部门'
-          } else if (element.deptType === 'party_unit') {
-            element.departmentTypeShow = '联建单位'
-          } else if (element.deptType === 'community_org') {
-            element.departmentTypeShow = '社会自组织'
+        this.departmentTableListData = data;
+
+        this.departmentTableListData.forEach((element) => {
+          if (element.deptType === "duty") {
+            element.departmentTypeShow = "职能部门";
+          } else if (element.deptType === "party_unit") {
+            element.departmentTypeShow = "联建单位";
+          } else if (element.deptType === "community_org") {
+            element.departmentTypeShow = "社会自组织";
           } else {
-            element.departmentTypeShow = ''
+            element.departmentTypeShow = "";
           }
-
         });
       } else {
-        this.$message.error(msg)
-
+        this.$message.error(msg);
       }
     },
     /** 查询网格列表 */
-    async getGridList () {
-      const url = "/gov/org/grid/allgrids"
+    async getGridList() {
+      const url = "/gov/org/grid/allgrids";
 
       let params = {
-        agencyId: this.currentAgencyId
-      }
+        agencyId: this.currentAgencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.gridTableListData = data
+        this.gridTableListData = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 查询网格人员列表
-    async getGridStaffListData () {
-      const url = "/data/aggregator/org/stafflist"
+    async getGridStaffListData() {
+      const url = "/data/aggregator/org/stafflist";
 
       let params = {
         orgId: this.currentGridOrgId,
-        orgType: 'grid',
+        orgType: "grid",
         pageNo: 1,
-        pageSize: 100
-      }
+        pageSize: 100,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.gridStaffTableListData = data.staffList
+        this.gridStaffTableListData = data.staffList;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 查询组织工作人员
-    async getAgencyStaffListData () {
-      const url = "/data/aggregator/org/stafflist"
+    async getAgencyStaffListData() {
+      const url = "/data/aggregator/org/stafflist";
 
       let params = {
         orgId: this.currentAgencyId,
-        orgType: 'agency',
+        orgType: "agency",
         pageNo: 1,
-        pageSize: 100
-      }
+        pageSize: 100,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.agencyStaffTableListData = data.staffList
+        this.agencyStaffTableListData = data.staffList;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 查询部门人员
-    async getDepartmentStaffListData () {
-      const url = "/data/aggregator/org/stafflist"
+    async getDepartmentStaffListData() {
+      const url = "/data/aggregator/org/stafflist";
 
       let params = {
         orgId: this.currentDepartmentId,
-        orgType: 'dept',
+        orgType: "dept",
         pageNo: 1,
-        pageSize: 100
-      }
+        pageSize: 100,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.departmentStaffTableListData = data.staffList
+        this.departmentStaffTableListData = data.staffList;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 添加组织
-    async submit () {
-
-      const url = "/gov/org/department/adddepartment"
+    async submit() {
+      const url = "/gov/org/department/adddepartment";
 
       let params = {
         agencyId: this.insertForm.agencyId,
@@ -1331,26 +1541,26 @@ export default {
         departmentDuty: this.insertForm.departmentDuty,
         contacts: this.insertForm.contacts,
         mobile: this.insertForm.mobile,
-        code: this.insertForm.code
-      }
+        code: this.insertForm.code,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("添加成功")
-        this.dialogVisible = false
-        this.insertForm = []
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
+        this.$message.success("添加成功");
+        this.dialogVisible = false;
+        this.insertForm = [];
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 添加网格
-    async submitGrid () {
-      const url = "/gov/org/grid/addgrid"
+    async submitGrid() {
+      const url = "/gov/org/grid/addgrid";
 
       let params = {
         agencyId: this.GridForm.agencyId,
@@ -1361,29 +1571,41 @@ export default {
         manageDistrict: this.GridForm.manageDistrict,
         gridType: this.GridForm.gridType,
         latitude: this.lat,
-        longitude: this.lng
-      }
+        longitude: this.lng,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("添加成功")
-        this.dialogVisibleGrid = false
-        this.GridForm = []
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-
+        this.$message.success("添加成功");
+        this.dialogVisibleGrid = false;
+        this.GridForm = [];
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
+    async submitPeo() {
+      this.$refs["addPeoForm"].validate((valid, err) => {
+        if (valid) {
+          this.submitPeoDo();
+        } else {
+          app.util.validateRule(err);
+          return console.log("error submit!!", valid, err);
+        }
+      });
+    },
+
     // 添加人员
-    async submitPeo () {
-      const url = "/gov/org/staff/addstaffv2"
-      const {peoForm:{orgType}} = this;
+    async submitPeoDo() {
+      const url = "/gov/org/staff/addstaffv2";
+      const {
+        peoForm: { orgType },
+      } = this;
       let params = {
         orgType: this.peoForm.orgType,
         name: this.peoForm.name,
@@ -1392,37 +1614,50 @@ export default {
         workType: this.peoForm.post,
         roles: this.peoForm.duty,
         newRoles: this.peoForm.newRoles,
-        orgId: orgType=='agency' ? this.currentAgencyId : (orgType=='dept' ? this.currentDepartmentId : this.currentGridOrgId),
-
-      }
+        orgId:
+          orgType == "agency"
+            ? this.currentAgencyId
+            : orgType == "dept"
+            ? this.currentDepartmentId
+            : this.currentGridOrgId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        this.$message.success("添加成功")
-        this.dialogVisiblePeo = false
-        this.peoForm = []
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-        this.insertFormRest()
-        if(orgType=='dept'){
-          this.getDepartmentStaffListData()
-        } else if(orgType=='grid'){
-          this.getGridStaffListData()
+        this.$message.success("添加成功");
+        this.dialogVisiblePeo = false;
+        this.peoForm = [];
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
+        this.insertFormRest();
+        if (orgType == "dept") {
+          this.getDepartmentStaffListData();
+        } else if (orgType == "grid") {
+          this.getGridStaffListData();
         } else {
-          this.getAgencyStaffListData()
+          this.getAgencyStaffListData();
         }
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
+    async updatePeo() {
+      this.$refs["editPeoForm"].validate((valid, err) => {
+        if (valid) {
+          this.updatePeoDo();
+        } else {
+          app.util.validateRule(err);
+          return console.log("error updatePeo!!", valid, err);
+        }
+      });
+    },
     // 人员修改
-    async updatePeo () {
-      const url = "/gov/org/staff/editstaff"
+    async updatePeoDo() {
+      const url = "/gov/org/staff/editstaff";
 
       let params = {
         staffId: this.userStaffId,
@@ -1434,576 +1669,558 @@ export default {
         roles: this.peoForm.duty,
         newRoles: this.peoForm.newRoles,
         agencyId: this.currentAgencyId,
-      }
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("修改成功")
-        this.modifyPeo = false
-
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-        this.getDepartmentStaffListData()
-        this.getGridStaffListData()
-        this.insertFormRest()
-
+        this.$message.success("修改成功");
+        this.modifyPeo = false;
+
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
+        this.getDepartmentStaffListData();
+        this.getGridStaffListData();
+        this.insertFormRest();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 字典
-    async getDictionaries () {
-      const url = "/sys/dict/data/dictlist"
+    async getDictionaries() {
+      const url = "/sys/dict/data/dictlist";
 
       let params = {
-        dictType: 'grid_type'
-      }
+        dictType: "grid_type",
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.typeList = data
+        this.typeList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     /** 搜索按钮操作 */
-    handleQuery () {
-      this.getList()
+    handleQuery() {
+      this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery () {
-      this.queryParams.deptName = undefined
-      this.queryParams.status = undefined
+    resetQuery() {
+      this.queryParams.deptName = undefined;
+      this.queryParams.status = undefined;
       this.handleQuery();
     },
     /** 新增按钮操作 */
-    handleAdd (row) {
-      this.dialogVisible = true
+    handleAdd(row) {
+      this.dialogVisible = true;
     },
     // 社区弹框关闭函数
-    handleClose (done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          this.insertFormRest()
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          this.insertFormRest();
           done();
         })
-        .catch(_ => { });
+        .catch((_) => {});
     },
     // 人员查看叉号关闭
-    handleClosePeoView (done) {
-      this.insertFormRest()
+    handleClosePeoView(done) {
+      this.insertFormRest();
       done();
     },
     // 社区新增弹框重置函数
-    insertFormRest () {
-      this.insertForm.name = ''
-      this.insertForm.contacts = ''
-      this.insertForm.code = ''
-      this.insertForm.mobile = ''
-      this.insertForm.departmentName = ''
+    insertFormRest() {
+      this.insertForm.name = "";
+      this.insertForm.contacts = "";
+      this.insertForm.code = "";
+      this.insertForm.mobile = "";
+      this.insertForm.departmentName = "";
 
       this.peoForm = {
-        name: '',
-        mobile: '',
-        gender: '',
-        post: '',
+        name: "",
+        mobile: "",
+        gender: "",
+        post: "",
         duty: [],
-        orgType: '',
-        activeTime: '',
-        zuzhi: '',
-        disableFlag: '',
-        newRoles: []
-      }
+        orgType: "",
+        activeTime: "",
+        zuzhi: "",
+        disableFlag: "",
+        newRoles: [],
+      };
     },
     // 网格新增弹框重置函数
-    GridFormRest () {
-      this.GridForm.gridName = '',
-        this.GridForm.code = '',
-        this.GridForm.centerAddress = '',
-        this.GridForm.contacts = '',
-        this.GridForm.mobile = '',
-        this.GridForm.agencyId = '',
-        this.GridForm.manageDistrict = '',
-        this.GridForm.gridType = '',
-        this.GridForm.location = '',
-        this.GridForm.longitude = '',
-        this.GridForm.latitude = ''
+    GridFormRest() {
+      (this.GridForm.gridName = ""),
+        (this.GridForm.code = ""),
+        (this.GridForm.centerAddress = ""),
+        (this.GridForm.contacts = ""),
+        (this.GridForm.mobile = ""),
+        (this.GridForm.agencyId = ""),
+        (this.GridForm.manageDistrict = ""),
+        (this.GridForm.gridType = ""),
+        (this.GridForm.location = ""),
+        (this.GridForm.longitude = ""),
+        (this.GridForm.latitude = "");
     },
     /** 人员清空 */
-    peoFormRest () {
-      this.peoForm.name = '',
-        this.peoForm.mobile = '',
-        this.peoForm.gender = '',
-        this.peoForm.post = '',
-        this.peoForm.duty = ''
-      this.peoForm.newRoles = []
-
+    peoFormRest() {
+      (this.peoForm.name = ""),
+        (this.peoForm.mobile = ""),
+        (this.peoForm.gender = ""),
+        (this.peoForm.post = ""),
+        (this.peoForm.duty = "");
+      this.peoForm.newRoles = [];
     },
     // 人员调动
-    transferRest () {
-      this.transferForm.name = '',
-        this.transferForm.remarks = '',
-        this.transferForm.transferTo = ''
-      this.transferForm.staffId = '',
-        this.transferForm.orgId = '',
-        this.transferForm.orgType = ''
-      this.selectValue = ''
-      this.options[0] = []
+    transferRest() {
+      (this.transferForm.name = ""),
+        (this.transferForm.remarks = ""),
+        (this.transferForm.transferTo = "");
+      (this.transferForm.staffId = ""),
+        (this.transferForm.orgId = ""),
+        (this.transferForm.orgType = "");
+      this.selectValue = "";
+      this.options[0] = [];
     },
     // 新增组织
-    addNewAgencyRest () {
-      this.agencyForm.parentAgencyId = '',
-        this.agencyForm.agencyName = '',
-        this.agencyForm.level = '',
-        this.agencyForm.areaCodeSwitch = '',
-        this.agencyForm.areaCode = '',
-        this.agencyForm.areaName = '',
-        this.agencyForm.contacts = '',
-        this.agencyForm.mobile = '',
-        this.agencyForm.code = '',
-        this.latitude = '',
-        this.longitude = ''
+    addNewAgencyRest() {
+      (this.agencyForm.parentAgencyId = ""),
+        (this.agencyForm.agencyName = ""),
+        (this.agencyForm.level = ""),
+        (this.agencyForm.areaCodeSwitch = ""),
+        (this.agencyForm.areaCode = ""),
+        (this.agencyForm.areaName = ""),
+        (this.agencyForm.contacts = ""),
+        (this.agencyForm.mobile = ""),
+        (this.agencyForm.code = ""),
+        (this.latitude = ""),
+        (this.longitude = "");
     },
     // 修改市级组织
-    cancelModifyCityOrgPopRest () {
-      this.OrgDetailsForm.level = '',
-        this.OrgDetailsForm.agencyName = '',
-        this.OrgDetailsForm.code = '',
-        this.OrgDetailsForm.contacts = '',
-        this.OrgDetailsForm.mobile = '',
-        this.OrgDetailsForm.centerAddress = '',
-        this.OrgDetailsForm.areaCode = ''
-      this.OrgDetailsForm.agencyId = ''
-      this.latitude = '',
-        this.longitude = ''
+    cancelModifyCityOrgPopRest() {
+      (this.OrgDetailsForm.level = ""),
+        (this.OrgDetailsForm.agencyName = ""),
+        (this.OrgDetailsForm.code = ""),
+        (this.OrgDetailsForm.contacts = ""),
+        (this.OrgDetailsForm.mobile = ""),
+        (this.OrgDetailsForm.centerAddress = ""),
+        (this.OrgDetailsForm.areaCode = "");
+      this.OrgDetailsForm.agencyId = "";
+      (this.latitude = ""), (this.longitude = "");
     },
     // 修改下级机关单位
-    OrgUnitDetailsRest () {
-      this.OrgUnitDetailsForm.code = '',
-        this.OrgUnitDetailsForm.contacts = '',
-        this.OrgUnitDetailsForm.departmentId = '',
-        this.OrgUnitDetailsForm.departmentName = '',
-        this.OrgUnitDetailsForm.mobile = ''
+    OrgUnitDetailsRest() {
+      (this.OrgUnitDetailsForm.code = ""),
+        (this.OrgUnitDetailsForm.contacts = ""),
+        (this.OrgUnitDetailsForm.departmentId = ""),
+        (this.OrgUnitDetailsForm.departmentName = ""),
+        (this.OrgUnitDetailsForm.mobile = "");
     },
     // 修改网格清空
-    ModifyGridPopRest () {
-      this.modifyGridFrom.gridName = '',
-        this.modifyGridFrom.code = '',
-        this.modifyGridFrom.gridTypeName = '',
-        this.modifyGridFrom.contacts = '',
-        this.modifyGridFrom.mobile = '',
-        this.latitude = '',
-        this.longitude = '',
-        this.modifyGridFrom.agencyId = '',
-        this.modifyGridFrom.gridType = '',
-        this.modifyGridFrom.manageDistrict = '',
-        this.modifyGridFrom.griId = ''
-        
+    ModifyGridPopRest() {
+      (this.modifyGridFrom.gridName = ""),
+        (this.modifyGridFrom.code = ""),
+        (this.modifyGridFrom.gridTypeName = ""),
+        (this.modifyGridFrom.contacts = ""),
+        (this.modifyGridFrom.mobile = ""),
+        (this.latitude = ""),
+        (this.longitude = ""),
+        (this.modifyGridFrom.agencyId = ""),
+        (this.modifyGridFrom.gridType = ""),
+        (this.modifyGridFrom.manageDistrict = ""),
+        (this.modifyGridFrom.griId = "");
     },
     // 社区新增弹框取消按钮
-    cancel () {
-      this.dialogVisible = false
-      this.insertFormRest()
+    cancel() {
+      this.dialogVisible = false;
+      this.insertFormRest();
     },
     // 网格新增弹框取消按钮
-    cancelGrid () {
-      this.dialogVisibleGrid = false
-      this.GridFormRest()
-
+    cancelGrid() {
+      this.dialogVisibleGrid = false;
+      this.GridFormRest();
     },
     /** 取消按钮 */
-    cancelPeo () {
-      this.dialogVisiblePeo = false
-      this.peoFormRest()
+    cancelPeo() {
+      this.dialogVisiblePeo = false;
+      this.peoFormRest();
     },
     // 修改取消
-    cancelXiugai () {
-      this.modifyPeo = false
-      this.peoFormRest()
+    cancelXiugai() {
+      this.modifyPeo = false;
+      this.peoFormRest();
     },
     // 查看弹窗
-    cancelDetails () {
-      this.details = false
+    cancelDetails() {
+      this.details = false;
     },
     /** 人员调动取消按钮 */
-    cancelTransfer () {
-      this.transferRest()
-      this.transferPeo = false
+    cancelTransfer() {
+      this.transferRest();
+      this.transferPeo = false;
     },
     // 新增组织取消按钮
-    canceladdNewAgency () {
-      this.addNewAgencyRest()
-      this.createAgencyDialogFlag = false
+    canceladdNewAgency() {
+      this.addNewAgencyRest();
+      this.createAgencyDialogFlag = false;
     },
     // 修改市级组织取消按钮
-    cancelModifyCityOrgPop () {
-      this.cancelModifyCityOrgPopRest()
-      this.modifyCityOrgPop = false
+    cancelModifyCityOrgPop() {
+      this.cancelModifyCityOrgPopRest();
+      this.modifyCityOrgPop = false;
     },
     // 修改街道/社区级取消按钮
-    cancelstreetOrCommunity () {
-      this.cancelModifyCityOrgPopRest()
-      this.streetOrCommunity = false
+    cancelstreetOrCommunity() {
+      this.cancelModifyCityOrgPopRest();
+      this.streetOrCommunity = false;
     },
     // 取消修改下级机关单位按钮
-    cancelOrgUnitPop () {
-      this.OrgUnitPop = false
-      this.OrgUnitDetailsRest()
+    cancelOrgUnitPop() {
+      this.OrgUnitPop = false;
+      this.OrgUnitDetailsRest();
     },
     // 取消修改网格按钮
-    cancelModifyGridPop () {
-      this.modifyGridPop = false
-      this.ModifyGridPopRest()
+    cancelModifyGridPop() {
+      this.modifyGridPop = false;
+      this.ModifyGridPopRest();
     },
     // 进入网格，查询网格所属人员
-    entryGrid (gridId) {
-      console.log(gridId)
-      this.gridStaffTableListData = []
-      this.departmentStaffTableListData = []
-      this.agencyStaffTableListData = []
-      this.currentGridOrgId = gridId
-      this.gridStaffTableFlag = true
-      this.departmentStaffTableFlag = false
-      this.currentAgencyStaffTableFlag = false
-      this.agencyTableFlag = false
-      this.departmentTableFlag = false
-      this.gridTableFlag = false
-      this.getGridStaffListData()
-      this.assembleBreadcrumbArr(gridId, 'grid')
+    entryGrid(gridId) {
+      console.log(gridId);
+      this.gridStaffTableListData = [];
+      this.departmentStaffTableListData = [];
+      this.agencyStaffTableListData = [];
+      this.currentGridOrgId = gridId;
+      this.gridStaffTableFlag = true;
+      this.departmentStaffTableFlag = false;
+      this.currentAgencyStaffTableFlag = false;
+      this.agencyTableFlag = false;
+      this.departmentTableFlag = false;
+      this.gridTableFlag = false;
+      this.getGridStaffListData();
+      this.assembleBreadcrumbArr(gridId, "grid");
     },
     // 进入部门，查询部门所属人员
-    entryDepartment (row) {
-      console.log(row)
-      this.gridStaffTableListData = []
-      this.departmentStaffTableListData = []
-      this.agencyStaffTableListData = []
-      this.currentDepartmentId = row.departmentId
-      this.departmentStaffTableFlag = true
-      this.currentAgencyStaffTableFlag = false
-      this.gridStaffTableFlag = false
-      this.gridTableFlag = false
-      this.agencyTableFlag = false
-      this.departmentTableFlag = false
-
-      this.selDeptType = row.deptType
-      this.getDepartmentStaffListData()
-      this.assembleBreadcrumbArr(row.departmentId, 'department')
+    entryDepartment(row) {
+      console.log(row);
+      this.gridStaffTableListData = [];
+      this.departmentStaffTableListData = [];
+      this.agencyStaffTableListData = [];
+      this.currentDepartmentId = row.departmentId;
+      this.departmentStaffTableFlag = true;
+      this.currentAgencyStaffTableFlag = false;
+      this.gridStaffTableFlag = false;
+      this.gridTableFlag = false;
+      this.agencyTableFlag = false;
+      this.departmentTableFlag = false;
+
+      this.selDeptType = row.deptType;
+      this.getDepartmentStaffListData();
+      this.assembleBreadcrumbArr(row.departmentId, "department");
     },
 
     // 进入组织，重新渲染
-    entryAgency (agencyId) {
-
-      this.currentAgencyId = agencyId
-
-      this.agencyTableListData = []
-      this.departmentTableListData = []
-      this.gridTableListData = []
-      this.gridStaffTableListData = []
-      this.agencyStaffTableListData = []
-      this.departmentStaffTableListData = []
-
-      this.getDepartmentList()
-      this.getGridList()
-      this.getAgencyStaffListData()
-      this.getAgencyList()
-      this.assembleBreadcrumbArr(agencyId, 'agency')
+    entryAgency(agencyId) {
+      this.currentAgencyId = agencyId;
+
+      this.agencyTableListData = [];
+      this.departmentTableListData = [];
+      this.gridTableListData = [];
+      this.gridStaffTableListData = [];
+      this.agencyStaffTableListData = [];
+      this.departmentStaffTableListData = [];
+
+      this.getDepartmentList();
+      this.getGridList();
+      this.getAgencyStaffListData();
+      this.getAgencyList();
+      this.assembleBreadcrumbArr(agencyId, "agency");
     },
     // 新增组织
-    addCommunity (row) {
-      this.insertForm.agencyId = this.currentAgencyId
-      this.dialogVisible = true
+    addCommunity(row) {
+      this.insertForm.agencyId = this.currentAgencyId;
+      this.dialogVisible = true;
     },
     // 新增网格
-    addGrid (row) {
-      this.GridForm.agencyId = this.currentAgencyId
-      this.getDictionaries()
-      this.dialogVisibleGrid = true
+    addGrid(row) {
+      this.GridForm.agencyId = this.currentAgencyId;
+      this.getDictionaries();
+      this.dialogVisibleGrid = true;
     },
 
     // 新增人员
-    addPeo (row) {
-      this.dialogVisiblePeo = true
-      this.peoForm.orgType = 'agency'
-
+    addPeo(row) {
+      this.dialogVisiblePeo = true;
+      this.peoForm.orgType = "agency";
     },
 
     // 新增社区人员
-    addCommunityPeo () {
-      this.dialogVisiblePeo = true
-      this.peoForm.orgType = 'dept'
-
+    addCommunityPeo() {
+      this.dialogVisiblePeo = true;
+      this.peoForm.orgType = "dept";
     },
 
     // 新增网格人员
-    addGridPeo () {
-      this.dialogVisiblePeo = true
-      this.peoForm.orgType = 'grid'
-
+    addGridPeo() {
+      this.dialogVisiblePeo = true;
+      this.peoForm.orgType = "grid";
     },
     // 修改网格人员
-    async xiuGridPeo (row) {
-      this.modifyPeo = true
-      this.peoForm.orgType = 'grid'
+    async xiuGridPeo(row) {
+      this.modifyPeo = true;
+      this.peoForm.orgType = "grid";
 
-      this.userStaffId = row.staffId
+      this.userStaffId = row.staffId;
 
-      const url = "/gov/org/staff/editstaffinit"
+      const url = "/gov/org/staff/editstaffinit";
       let params = {
         staffId: row.staffId,
-        agencyId: this.currentAgencyId
-      }
-      const { data, code, msg } = await requestPost(url, params)
+        agencyId: this.currentAgencyId,
+      };
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile
+        this.peoForm.name = data.name;
+        this.peoForm.mobile = data.mobile;
         // this.peoForm.gender = data.gender === 1 ? '男' : '女'
-        this.peoForm.gender = data.gender
-        this.peoForm.post = data.workType
+        this.peoForm.gender = data.gender;
+        this.peoForm.post = data.workType;
         // 已有的权限（职责）
-        let existedDutyArr = []
+        let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
           if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId)
+            existedDutyArr.push(sysDuty.roleId);
           }
-        })
-        this.peoForm.duty = existedDutyArr
+        });
+        this.peoForm.duty = existedDutyArr;
         // 已有的权限（角色）
-        let existedRoleArr = []
+        let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
           if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId)
+            existedRoleArr.push(sysRole.roleId);
           }
-        })
-        this.peoForm.newRoles = existedRoleArr
+        });
+        this.peoForm.newRoles = existedRoleArr;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 修改人员
-    async xiuPeo (row) {
-      this.modifyPeo = true
-      this.peoForm.orgType = 'agency'
+    async xiuPeo(row) {
+      this.modifyPeo = true;
+      this.peoForm.orgType = "agency";
 
-      this.userStaffId = row.staffId
+      this.userStaffId = row.staffId;
 
-      const url = "/gov/org/staff/editstaffinit"
+      const url = "/gov/org/staff/editstaffinit";
 
       let params = {
         staffId: row.staffId,
-        agencyId: this.currentAgencyId
-      }
+        agencyId: this.currentAgencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile
-        this.peoForm.post = data.workType
+        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
+        this.peoForm.gender = data.gender;
         // 已有的权限（职责）
-        let existedDutyArr = []
+        let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
           if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId)
+            existedDutyArr.push(sysDuty.roleId);
           }
-        })
-        this.peoForm.duty = existedDutyArr
+        });
+        this.peoForm.duty = existedDutyArr;
         // 已有的权限（角色）
-        let existedRoleArr = []
+        let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
           if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId)
+            existedRoleArr.push(sysRole.roleId);
           }
-        })
-        this.peoForm.newRoles = existedRoleArr
+        });
+        this.peoForm.newRoles = existedRoleArr;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
     },
     // 修改社区人员
-    async xiuCommunityPeo (row) {
-      this.modifyPeo = true
-      this.peoForm.orgType = 'dept'
+    async xiuCommunityPeo(row) {
+      this.modifyPeo = true;
+      this.peoForm.orgType = "dept";
 
-      this.userStaffId = row.staffId
+      this.userStaffId = row.staffId;
 
-      const url = '/gov/org/staff/editstaffinit'
+      const url = "/gov/org/staff/editstaffinit";
 
       let params = {
         staffId: row.staffId,
-        agencyId: this.currentAgencyId
-      }
+        agencyId: this.currentAgencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile
+        this.peoForm.name = data.name;
+        this.peoForm.mobile = data.mobile;
         // this.peoForm.gender = data.gender === 1 ? '男' : '女'
-        this.peoForm.gender = data.gender
-        this.peoForm.post = data.workType
+        this.peoForm.gender = data.gender;
+        this.peoForm.post = data.workType;
         // 已有的权限（职责）
-        let existedDutyArr = []
+        let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
           if (sysDuty.selected === true) {
-            existedDutyArr.push(sysDuty.roleId)
+            existedDutyArr.push(sysDuty.roleId);
           }
-        })
-        this.peoForm.duty = existedDutyArr
+        });
+        this.peoForm.duty = existedDutyArr;
         // 已有的权限（角色）
-        let existedRoleArr = []
+        let existedRoleArr = [];
         data.newRoleList.forEach(function (sysRole) {
           if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId)
+            existedRoleArr.push(sysRole.roleId);
           }
-        })
-        this.peoForm.newRoles = existedRoleArr
+        });
+        this.peoForm.newRoles = existedRoleArr;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
     },
     // 取消禁用按钮
-    cancelDisable () {
-      this.Disable = false
+    cancelDisable() {
+      this.Disable = false;
     },
     // 人员禁用
-    DisablePeo (row) {
-      this.DisableForm.staffId = row.staffId
-      this.Disable = true
+    DisablePeo(row) {
+      this.DisableForm.staffId = row.staffId;
+      this.Disable = true;
     },
     // 确定禁用
-    async submitDisable () {
-      const url = "/epmetuser/customerstaff/disabledstaff"
+    async submitDisable() {
+      const url = "/epmetuser/customerstaff/disabledstaff";
 
       let params = {
         staffId: this.DisableForm.staffId,
         agencyId: this.DisableForm.agencyId,
-        customerId: this.DisableForm.customerId
-      }
+        customerId: this.DisableForm.customerId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("禁用成功")
-        this.Disable = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
+        this.$message.success("禁用成功");
+        this.Disable = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 查看按钮
-    async lookAngency (row) {
-      const url = "/data/aggregator/org/staffdetailv2"
+    async lookAngency(row) {
+      const url = "/data/aggregator/org/staffdetailv2";
 
       let params = {
-        staffId: row.staffId
-      }
+        staffId: row.staffId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.peoForm.name = data.name
-        this.peoForm.mobile = data.mobile.substr(0, 3) + "****" + data.mobile.substr(7)
-        this.peoForm.activeTime = data.activeTime
-        this.peoForm.duty = data.roles
-        this.peoForm.zuzhi = data.orgName
-        if (data.enableFlag === 'enable') {
-          this.peoForm.disableFlag = '已启用'
+        this.peoForm.name = data.name;
+        this.peoForm.mobile =
+          data.mobile.substr(0, 3) + "****" + data.mobile.substr(7);
+        this.peoForm.activeTime = data.activeTime;
+        this.peoForm.duty = data.roles;
+        this.peoForm.zuzhi = data.orgName;
+        if (data.enableFlag === "enable") {
+          this.peoForm.disableFlag = "已启用";
         } else {
-          this.peoForm.disableFlag = '已禁用'
+          this.peoForm.disableFlag = "已禁用";
         }
       }
-      this.details = true
+      this.details = true;
     },
 
     // 人员调动
-    async transfer (row) {
-
-      this.transferForm.name = row.name
-      this.transferForm.staffId = row.staffId
+    async transfer(row) {
+      this.transferForm.name = row.name;
+      this.transferForm.staffId = row.staffId;
 
-      this.transferPeo = true
-      const url = "/gov/org/customeragency/orgtree"
+      this.transferPeo = true;
+      const url = "/gov/org/customeragency/orgtree";
 
-      let params = {
-
-      }
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.options[0].label = data.agencyName
-        this.options[0].value = data.agencyId
+        this.options[0].label = data.agencyName;
+        this.options[0].value = data.agencyId;
 
-        console.log('--------', this.options)
-        let depart = Array.from(data.departmentList)
-        let gr = Array.from(data.gridList)
+        console.log("--------", this.options);
+        let depart = Array.from(data.departmentList);
+        let gr = Array.from(data.gridList);
 
-        depart.forEach(item => {
+        depart.forEach((item) => {
           const ob = {
             value: item.deptId,
-            label: item.deptName
-          }
-          this.options[0].children[0].children.push(ob)
-        })
-        this.options[0].children[0].value = 0
-        this.options[0].children[0].label = "部门"
-        this.options[0].children[1].value = 1
-        this.options[0].children[1].label = "网格"
-        gr.forEach(item => {
+            label: item.deptName,
+          };
+          this.options[0].children[0].children.push(ob);
+        });
+        this.options[0].children[0].value = 0;
+        this.options[0].children[0].label = "部门";
+        this.options[0].children[1].value = 1;
+        this.options[0].children[1].label = "网格";
+        gr.forEach((item) => {
           const obj = {
             value: item.gridId,
-            label: item.gridName
-          }
-          this.options[0].children[1].children.push(obj)
-        })
+            label: item.gridName,
+          };
+          this.options[0].children[1].children.push(obj);
+        });
       } else {
-        this.$message.error("树查询失败", msg)
+        this.$message.error("树查询失败", msg);
       }
-
     },
     // 人员调动确定
-    async submitTransfer () {
-      const url = "/gov/org/staff/stafftransferv2"
+    async submitTransfer() {
+      const url = "/gov/org/staff/stafftransferv2";
 
       let params = {
         staffId: this.transferForm.staffId,
         orgId: this.transferForm.orgId,
         orgType: this.transferForm.orgType,
-        remarks: this.transferForm.remarks
-      }
+        remarks: this.transferForm.remarks,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("调动成功")
-        this.transferRest()
-        this.transferPeo = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
-        this.getDepartmentStaffListData()
-        this.getAgencyStaffListData()
-        this.getGridStaffListData()
-
+        this.$message.success("调动成功");
+        this.transferRest();
+        this.transferPeo = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
+        this.getDepartmentStaffListData();
+        this.getAgencyStaffListData();
+        this.getGridStaffListData();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
@@ -2022,131 +2239,155 @@ export default {
     //         this.Navigation = data.agencyName
     //     }
     // 组装顶部面包屑数组
-    async assembleBreadcrumbArr (id, orgType) {
-      this.currentBreadcrumbKey = id
-      if (orgType === 'agency') {
-        const url = '/gov/org/agency/agencydetail'
+    async assembleBreadcrumbArr(id, orgType) {
+      this.currentBreadcrumbKey = id;
+      if (orgType === "agency") {
+        const url = "/gov/org/agency/agencydetail";
         let params = {
           agencyId: id,
-        }
-        const { data, code, msg } = await requestPost(url, params)
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
           // 社区级为最低级组织，不展示下级组织列表
-          this.currentAgencyLevel = data.level
-          this.currentAreaCode = data.areaCode
+          this.currentAgencyLevel = data.level;
+          this.currentAreaCode = data.areaCode;
           if (data.parentList && data.parentList.length > 0) {
-            this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode
-            this.parentAgencyId = data.parentList[data.parentList.length - 1].id
-            this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level
+            this.parentAreaCode =
+              data.parentList[data.parentList.length - 1].areaCode;
+            this.parentAgencyId =
+              data.parentList[data.parentList.length - 1].id;
+            this.parentAgencyLevel =
+              data.parentList[data.parentList.length - 1].level;
           }
-          if (data.level === 'community') {
-            this.agencyTableFlag = false
+          if (data.level === "community") {
+            this.agencyTableFlag = false;
           } else {
-            this.agencyTableFlag = true
+            this.agencyTableFlag = true;
           }
           if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [{ id: data.agencyId, name: data.agencyName, type: orgType }]
+            this.breadcrumbArr = [
+              { id: data.agencyId, name: data.agencyName, type: orgType },
+            ];
           } else {
-            let hasBreadcrumbArr = false
+            let hasBreadcrumbArr = false;
             this.breadcrumbArr.forEach(function (bc) {
               if (bc.id === id) {
-                hasBreadcrumbArr = true
+                hasBreadcrumbArr = true;
               }
-            })
+            });
             if (hasBreadcrumbArr === false) {
-              let breadcrumb = { id: data.agencyId, name: data.agencyName, type: orgType }
-              this.breadcrumbArr.push(breadcrumb)
+              let breadcrumb = {
+                id: data.agencyId,
+                name: data.agencyName,
+                type: orgType,
+              };
+              this.breadcrumbArr.push(breadcrumb);
             }
           }
         } else {
-          this.$message.error(msg)
+          this.$message.error(msg);
         }
-      } else if (orgType === 'department') {
-        const url = '/gov/org/department/departmentdetail'
+      } else if (orgType === "department") {
+        const url = "/gov/org/department/departmentdetail";
         let params = {
           departmentId: id,
-        }
-        const { data, code, msg } = await requestPost(url, params)
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
           if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [{ id: data.departmentId, name: data.departmentName, type: orgType }]
+            this.breadcrumbArr = [
+              {
+                id: data.departmentId,
+                name: data.departmentName,
+                type: orgType,
+              },
+            ];
           } else {
-            let hasBreadcrumbArr = false
+            let hasBreadcrumbArr = false;
             this.breadcrumbArr.forEach(function (bc) {
               if (bc.id === id) {
-                hasBreadcrumbArr = true
+                hasBreadcrumbArr = true;
               }
-            })
+            });
             if (hasBreadcrumbArr === false) {
-              let breadcrumb = { id: data.departmentId, name: data.departmentName, type: orgType }
-              this.breadcrumbArr.push(breadcrumb)
+              let breadcrumb = {
+                id: data.departmentId,
+                name: data.departmentName,
+                type: orgType,
+              };
+              this.breadcrumbArr.push(breadcrumb);
             }
           }
         } else {
-          this.$message.error(msg)
+          this.$message.error(msg);
         }
-      } else if (orgType === 'grid') {
-        const url = '/gov/org/grid/griddetail'
+      } else if (orgType === "grid") {
+        const url = "/gov/org/grid/griddetail";
         let params = {
           gridId: id,
-        }
-        const { data, code, msg } = await requestPost(url, params)
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
           if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [{ id: data.grid, name: data.gridName, type: orgType }]
+            this.breadcrumbArr = [
+              { id: data.grid, name: data.gridName, type: orgType },
+            ];
           } else {
-            let hasBreadcrumbArr = false
+            let hasBreadcrumbArr = false;
             this.breadcrumbArr.forEach(function (bc) {
               if (bc.id === id) {
-                hasBreadcrumbArr = true
+                hasBreadcrumbArr = true;
               }
-            })
+            });
             if (hasBreadcrumbArr === false) {
-              let breadcrumb = { id: data.grid, name: data.gridName, type: orgType }
-              this.breadcrumbArr.push(breadcrumb)
+              let breadcrumb = {
+                id: data.grid,
+                name: data.gridName,
+                type: orgType,
+              };
+              this.breadcrumbArr.push(breadcrumb);
             }
           }
         } else {
-          this.$message.error(msg)
+          this.$message.error(msg);
         }
       }
     },
 
-    async refreshThisPage (index) {
-
+    async refreshThisPage(index) {
       // 点击最后一级不触发响应
       if (index === this.breadcrumbArr.length - 1) {
-        return
-      }
-
-      const selectOrg = this.breadcrumbArr[index]
-      this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1)
-
-      const orgId = selectOrg.id
-      const orgType = selectOrg.type
-
-      if (orgType === 'agency') {
-        this.agencyTableListData = []
-        this.agencyStaffTableListData = []
-        this.departmentTableListData = []
-        this.departmentStaffTableListData = []
-        this.gridTableListData = []
-        this.gridStaffTableListData = []
-        this.userAgencyId = orgId
-        this.currentAgencyId = orgId
-
-        this.agencyTableFlag = true
-        this.currentAgencyStaffTableFlag = true
-        this.departmentTableFlag = true
-        this.departmentStaffTableFlag = false
-        this.gridTableFlag = true
-        this.gridStaffTableFlag = false
-
-        this.assembleBreadcrumbArr(orgId, 'agency')
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
+        return;
+      }
+
+      const selectOrg = this.breadcrumbArr[index];
+      this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1);
+
+      const orgId = selectOrg.id;
+      const orgType = selectOrg.type;
+
+      if (orgType === "agency") {
+        this.agencyTableListData = [];
+        this.agencyStaffTableListData = [];
+        this.departmentTableListData = [];
+        this.departmentStaffTableListData = [];
+        this.gridTableListData = [];
+        this.gridStaffTableListData = [];
+        this.userAgencyId = orgId;
+        this.currentAgencyId = orgId;
+
+        this.agencyTableFlag = true;
+        this.currentAgencyStaffTableFlag = true;
+        this.departmentTableFlag = true;
+        this.departmentStaffTableFlag = false;
+        this.gridTableFlag = true;
+        this.gridStaffTableFlag = false;
+
+        this.assembleBreadcrumbArr(orgId, "agency");
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
       }
       // 当点击最后一级不触发响应
       // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
@@ -2185,193 +2426,202 @@ export default {
       } */
     },
     // 获取组织区划信息
-    async getZoning (areaCode, parentAgencyId, parentAgencyLevel) {
-      const url = '/data/aggregator/org/nextlevelareacodelist'
+    async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
+      const url = "/data/aggregator/org/nextlevelareacodelist";
 
       let params = {
         areaCode: areaCode,
         level: parentAgencyLevel,
-        parentAgencyId: parentAgencyId
-      }
+        parentAgencyId: parentAgencyId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.zonings = data
+        this.zonings = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handelZoing (val) {
-      this.zonings.forEach(item => {
+    handelZoing(val) {
+      this.zonings.forEach((item) => {
         if (item.areaCode == val) {
-          this.agencyForm.level = item.level
-          this.agencyForm.areaName = item.areaName
-          this.agencyForm.areaCode = item.areaCode
+          this.agencyForm.level = item.level;
+          this.agencyForm.areaName = item.areaName;
+          this.agencyForm.areaCode = item.areaCode;
         }
-      })
+      });
     },
-    handelStreeOrCommunityZoing (val) {
-      this.zonings.forEach(item => {
+    handelStreeOrCommunityZoing(val) {
+      this.zonings.forEach((item) => {
         if (item.areaCode == val) {
-          this.OrgDetailsForm.level = item.level
-          this.OrgDetailsForm.areaName = item.areaName
-          this.OrgDetailsForm.areaCode = item.areaCode
+          this.OrgDetailsForm.level = item.level;
+          this.OrgDetailsForm.areaName = item.areaName;
+          this.OrgDetailsForm.areaCode = item.areaCode;
         }
-      })
+      });
     },
 
-    addAgency () {
-      this.createAgencyDialogFlag = true
-      this.addNewAgencyRest()
-      this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel)
+    addAgency() {
+      this.createAgencyDialogFlag = true;
+      this.addNewAgencyRest();
+      this.getZoning(
+        this.currentAreaCode,
+        this.currentAgencyId,
+        this.currentAgencyLevel
+      );
     },
     // 新增组织确定按钮
-    async submitaddNewAgency () {
-      const url = '/gov/org/agency/addagency-v2'
+    async submitaddNewAgency() {
+      const url = "/gov/org/agency/addagency-v2";
 
       let params = {
         parentAgencyId: this.parentAgencyId,
         agencyName: this.agencyForm.agencyName,
         level: this.agencyForm.level,
-        areaCodeSwitch: 'closed',
+        areaCodeSwitch: "closed",
         areaCode: this.agencyForm.areaCode,
         areaName: this.agencyForm.areaName,
         contacts: this.agencyForm.contacts,
         mobile: this.agencyForm.mobile,
         code: this.agencyForm.code,
         latitude: this.latitude,
-        longitude: this.longitude
-      }
+        longitude: this.longitude,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("添加成功")
-        this.createAgencyDialogFlag = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.getAgencyStaffListData()
+        this.$message.success("添加成功");
+        this.createAgencyDialogFlag = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 修改面包屑
-    modifyOrgInfo () {
-      this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length - 1]
+    modifyOrgInfo() {
+      this.judgeOrgInfoLevel =
+        this.breadcrumbArr[this.breadcrumbArr.length - 1];
       if (this.judgeOrgInfoLevel.type === "agency") {
-        this.getOrgDetailsById()
+        this.getOrgDetailsById();
         setTimeout(() => {
           if (this.OrgDetailsForm.level === "district") {
             /** 修改市区级弹窗 */
-            this.modifyCityOrgPop = true
+            this.modifyCityOrgPop = true;
           } else {
             /** 街道级和社区级弹窗 */
-            this.getZoning(this.parentAreaCode, this.parentAgencyId, this.parentAgencyLevel)
-            this.streetOrCommunity = true
+            this.getZoning(
+              this.parentAreaCode,
+              this.parentAgencyId,
+              this.parentAgencyLevel
+            );
+            this.streetOrCommunity = true;
           }
         }, 1000);
       } else if (this.judgeOrgInfoLevel.type === "department") {
         /** 下级机关单位修改 */
-        this.OrgUnitPop = true
-        this.getOrgUnitDetailsById()
+        this.OrgUnitPop = true;
+        this.getOrgUnitDetailsById();
       } else {
         /** 网格修改 */
-        this.getDictionaries()
-        this.modifyGridPop = true
-        this.getGridDetailsById()
+        this.getDictionaries();
+        this.modifyGridPop = true;
+        this.getGridDetailsById();
       }
     },
 
     // 根据id获取组织机构详细信息
-    async getOrgDetailsById () {
-      const url = '/gov/org/agency/agencydetail'
+    async getOrgDetailsById() {
+      const url = "/gov/org/agency/agencydetail";
 
       let params = {
-        agencyId: this.judgeOrgInfoLevel.id
-      }
+        agencyId: this.judgeOrgInfoLevel.id,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        this.currentAgencyLevel = data.level
-        this.currentAreaCode = data.areaCode
+        this.currentAgencyLevel = data.level;
+        this.currentAreaCode = data.areaCode;
         if (data.parentList && data.parentList.length > 0) {
-          this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode
-          this.parentAgencyId = data.parentList[data.parentList.length - 1].id
-          this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level
+          this.parentAreaCode =
+            data.parentList[data.parentList.length - 1].areaCode;
+          this.parentAgencyId = data.parentList[data.parentList.length - 1].id;
+          this.parentAgencyLevel =
+            data.parentList[data.parentList.length - 1].level;
         }
 
-        this.OrgDetailsForm.level = data.level
-        this.OrgDetailsForm.agencyName = data.agencyName
-        this.OrgDetailsForm.code = data.code
-        this.OrgDetailsForm.contacts = data.contacts
-        this.OrgDetailsForm.centerAddress = data.centerAddress
-        this.OrgDetailsForm.areaCode = data.areaCode
-        this.OrgDetailsForm.mobile = data.mobile
-        this.latitude = data.latitude
-        this.longitude = data.longitude
-        this.OrgDetailsForm.agencyId = data.agencyId
+        this.OrgDetailsForm.level = data.level;
+        this.OrgDetailsForm.agencyName = data.agencyName;
+        this.OrgDetailsForm.code = data.code;
+        this.OrgDetailsForm.contacts = data.contacts;
+        this.OrgDetailsForm.centerAddress = data.centerAddress;
+        this.OrgDetailsForm.areaCode = data.areaCode;
+        this.OrgDetailsForm.mobile = data.mobile;
+        this.latitude = data.latitude;
+        this.longitude = data.longitude;
+        this.OrgDetailsForm.agencyId = data.agencyId;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 根据id获取下级机关单位详情
-    async getOrgUnitDetailsById () {
-      const url = '/gov/org/department/departmentdetail'
+    async getOrgUnitDetailsById() {
+      const url = "/gov/org/department/departmentdetail";
 
       let params = {
-        departmentId: this.judgeOrgInfoLevel.id
-      }
+        departmentId: this.judgeOrgInfoLevel.id,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.OrgUnitDetailsForm.code = data.code
-        this.OrgUnitDetailsForm.contacts = data.contacts
-        this.OrgUnitDetailsForm.departmentId = data.departmentId
-        this.OrgUnitDetailsForm.departmentName = data.departmentName
-        this.OrgUnitDetailsForm.mobile = data.mobile
+        this.OrgUnitDetailsForm.code = data.code;
+        this.OrgUnitDetailsForm.contacts = data.contacts;
+        this.OrgUnitDetailsForm.departmentId = data.departmentId;
+        this.OrgUnitDetailsForm.departmentName = data.departmentName;
+        this.OrgUnitDetailsForm.mobile = data.mobile;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 根据id获取网格详情
-    async getGridDetailsById () {
-      const url = '/gov/org/grid/griddetail'
+    async getGridDetailsById() {
+      const url = "/gov/org/grid/griddetail";
 
       let params = {
-        gridId: this.judgeOrgInfoLevel.id
-      }
+        gridId: this.judgeOrgInfoLevel.id,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.modifyGridFrom.gridName = data.gridName
-        this.modifyGridFrom.code = data.code
-        this.modifyGridFrom.gridTypeName = data.gridTypeName
-        this.modifyGridFrom.contacts = data.contacts
-        this.modifyGridFrom.mobile = data.mobile
-        this.modifyGridFrom.agencyId = data.agencyId
-        this.modifyGridFrom.gridType = data.gridType
-        this.modifyGridFrom.manageDistrict = data.manageDistrict
-        this.modifyGridFrom.griId = data.grid
-        this.modifyGridFrom.gridSort = data.gridSort
+        this.modifyGridFrom.gridName = data.gridName;
+        this.modifyGridFrom.code = data.code;
+        this.modifyGridFrom.gridTypeName = data.gridTypeName;
+        this.modifyGridFrom.contacts = data.contacts;
+        this.modifyGridFrom.mobile = data.mobile;
+        this.modifyGridFrom.agencyId = data.agencyId;
+        this.modifyGridFrom.gridType = data.gridType;
+        this.modifyGridFrom.manageDistrict = data.manageDistrict;
+        this.modifyGridFrom.griId = data.grid;
+        this.modifyGridFrom.gridSort = data.gridSort;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     // 市级/街道/社区级组织修改确定按钮
-    async sunmitModifyCityOrgPop () {
-      const url = '/gov/org/agency/editagency'
+    async sunmitModifyCityOrgPop() {
+      const url = "/gov/org/agency/editagency";
 
       let params = {
         agencyId: this.OrgDetailsForm.agencyId,
@@ -2380,51 +2630,51 @@ export default {
         mobile: this.OrgDetailsForm.mobile,
         code: this.OrgDetailsForm.code,
         latitude: this.latitude,
-        longitude: this.longitude
-      }
+        longitude: this.longitude,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("修改成功")
-        this.modifyCityOrgPop = false
-        this.streetOrCommunity = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.agencyPeo()
+        this.$message.success("修改成功");
+        this.modifyCityOrgPop = false;
+        this.streetOrCommunity = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.agencyPeo();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 修改下级机关单位确定按钮
-    async sunmitOrgUnitForm () {
-      const url = '/gov/org/department/editdepartment'
+    async sunmitOrgUnitForm() {
+      const url = "/gov/org/department/editdepartment";
 
       let params = {
         code: this.OrgUnitDetailsForm.code,
         contacts: this.OrgUnitDetailsForm.contacts,
         departmentId: this.OrgUnitDetailsForm.departmentId,
         departmentName: this.OrgUnitDetailsForm.departmentName,
-        mobile: this.OrgUnitDetailsForm.mobile
-      }
+        mobile: this.OrgUnitDetailsForm.mobile,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("修改成功")
-        this.OrgUnitPop = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.agencyPeo()
+        this.$message.success("修改成功");
+        this.OrgUnitPop = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.agencyPeo();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     // 修改网格确定按钮
-    async submitModifyGrid () {
-      const url = '/gov/org/grid/editgrid'
+    async submitModifyGrid() {
+      const url = "/gov/org/grid/editgrid";
 
       let params = {
         gridId: this.modifyGridFrom.griId,
@@ -2434,68 +2684,91 @@ export default {
         mobile: this.modifyGridFrom.mobile,
         code: this.modifyGridFrom.code,
         gridType: this.modifyGridFrom.gridType,
-        sort:this.modifyGridFrom.gridSort
-      }
+        sort: this.modifyGridFrom.gridSort,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.$message.success("修改成功")
-        this.modifyGridPop = false
-        this.getAgencyList()
-        this.getDepartmentList()
-        this.getGridList()
-        this.agencyPeo()
+        this.$message.success("修改成功");
+        this.modifyGridPop = false;
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.agencyPeo();
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
     /** 地图初始化 */
-    initMap (_that) {
-
-      var position = document.getElementById("position");
+    createMap() {
+      let { latitude, longitude } = this;
+      if (
+        latitude === null ||
+        latitude === "" ||
+        longitude === null ||
+        longitude === ""
+      ) {
+        let { latitude: latitude2, longitude: longitude2 } =
+          this.$store.state.user;
+        if (!latitude2 || latitude2 == "" || latitude2 == "0") {
+          latitude = 39.9088810666821;
+          longitude = 116.39743841556731;
+        } else {
+          latitude = latitude2;
+          longitude = longitude2;
+        }
+      }
+      var center = new window.TMap.LatLng(latitude, longitude); //设置中心点坐标
 
-      var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
       //初始化地图
-      var map = new window.TMap.Map("container", {
-        center: center
+      var map = new window.TMap.Map("con", {
+        center: center,
+        zoom: 13, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
       });
 
-      //绑定点击事件
-      map.on("click", function (evt) {
-        _that.lat = evt.latLng.getLat().toFixed(6);
-        _that.lng = evt.latLng.getLng().toFixed(6);
-        position.innerHTML = _that.lat + "," + _that.lng;
-      })
-    },
-    createMap (_t) {
-      document.getElementById("con").innerHTML = ''
-      document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
-      var position = document.getElementById("pos");
-
-      if (this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === "") {
-        var center = new window.TMap.LatLng(36.116796, 120.339959);
-      } else {
-        var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
-      }
+      // 新建一个地点搜索类
+      let markers = new window.TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
 
-      //初始化地图
-      var map = new window.TMap.Map("con", {
-        center: center
+      map.on("panend", (e) => {
+        handleMoveCenter(e);
       });
 
-      //绑定点击事件
-      map.on("click", function (evt) {
-        _t.latitude = evt.latLng.getLat().toFixed(6);
-        _t.longitude = evt.latLng.getLng().toFixed(6);
-        position.innerHTML = _t.latitude + "," + _t.longitude;
-      })
+      setMarker(latitude, longitude);
 
-    }
+      function setMarker(lat, lng) {
+        console.log("setMarker", lat, lng);
+        markers.setGeometries([]);
 
-  }
-}
+        markers.add([
+          {
+            id: "4",
+            styleId: "marker",
+            position: new window.TMap.LatLng(lat, lng),
+            properties: {
+              title: "marker4",
+            },
+          },
+        ]);
+      }
+
+      function handleMoveCenter(e) {
+        //修改地图中心点
+        const center = map.getCenter();
+        const lat = center.getLat();
+        const lng = center.getLng();
+
+        setMarker(lat, lng);
+      }
+    },
+  },
+};
 </script>
 
 <style scoped>
@@ -2519,4 +2792,4 @@ export default {
 .el-tag + .el-tag {
   margin-left: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/communityParty/elegant/detail.vue b/src/views/modules/communityParty/elegant/detail.vue
index bcddf5b3d..9586d16c1 100644
--- a/src/views/modules/communityParty/elegant/detail.vue
+++ b/src/views/modules/communityParty/elegant/detail.vue
@@ -43,7 +43,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -73,6 +77,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
 
     async initForm (row) {
 
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 292ca37ac..0a26f120f 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -290,7 +290,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"></detail-form>
+      <detail-form ref="ref_form_detail"
+                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/heart/heartDetail.vue b/src/views/modules/communityParty/heart/heartDetail.vue
index 6832a618c..b9b2869bf 100644
--- a/src/views/modules/communityParty/heart/heartDetail.vue
+++ b/src/views/modules/communityParty/heart/heartDetail.vue
@@ -171,7 +171,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -435,8 +439,8 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index e1c0432d7..7b5dff515 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -243,7 +243,8 @@
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
-      <heart-detail ref="ref_form_detail"></heart-detail>
+      <heart-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></heart-detail>
     </el-dialog>
 
     <!-- 活动取消原因 -->
diff --git a/src/views/modules/communityParty/members/detailForm.vue b/src/views/modules/communityParty/members/detailForm.vue
index bcf6a3fc3..e0648dbb1 100644
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@@ -1,109 +1,116 @@
 <template>
-  <div class="dialog-h-content scroll-h pd0">
-    <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
-
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-row-2">
-        <div class="info-prop">
-          <span class="info-title-2">所属党组织：</span>
-          <span>{{ info.orgName }}</span>
+  <div>
+    <div class="dialog-h-content scroll-h pd0">
+      <div class="div-tip">本模块主要为添加非本社区居住党员，本社区居住党员建议到居民信息页面添加</div>
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">所属党组织：</span>
+            <span>{{ info.orgName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">党员中心户：</span>
+            <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
+          </div>
         </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">党员中心户：</span>
-          <span>{{ info.isDyzxh==='1'?'是':'否' }}</span>
-        </div>
-      </div>
-
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">姓名：</span>
-          <span>{{ info.name}}</span>
-        </div>
+          <div class="info-prop">
+            <span class="info-title-2">姓名：</span>
+            <span>{{ info.name}}</span>
+          </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">免学习：</span>
-          <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          <div class="info-prop">
+            <span class="info-title-2">免学习：</span>
+            <span>{{info.isMxx==='1'?'是':'否'}}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">手机号：</span>
-          <span>{{ info.mobile?info.mobile:'--'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">职务：</span>
-          <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ info.mobile?info.mobile:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">职务：</span>
+            <span>{{info.partyZwShow?info.partyZwShow:'--' }}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">身份证：</span>
-          <span>{{ info.idCard?info.idCard:'--' }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">文化程度：</span>
-          <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">身份证：</span>
+            <span>{{ info.idCard?info.idCard:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">文化程度：</span>
+            <span>{{ info.cultureName?info.cultureName:'--' }}</span>
+          </div>
         </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">地址：</span>
-          <span>{{ info.address?info.address:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">地址：</span>
+            <span>{{ info.address?info.address:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">入党时间：</span>
+            <span>{{ info.rdsj?info.rdsj:'--' }}</span>
+          </div>
         </div>
-        <div class="info-prop">
-          <span class="info-title-2">入党时间：</span>
-          <span>{{ info.rdsj?info.rdsj:'--' }}</span>
-        </div>
-      </div>
 
-      <div class="m-row-2">
+        <div class="m-row-2">
 
-        <div class="info-prop">
-          <span class="info-title-2">流动党员：</span>
-          <span>{{ info.isLd==='1'?'是':'否'}}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-2">流动党员号：</span>
-          <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员：</span>
+            <span>{{ info.isLd==='1'?'是':'否'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">流动党员号：</span>
+            <span>{{ info.ldzh?info.ldzh:'--' }}</span>
+
+          </div>
 
         </div>
 
-      </div>
+        <div class="m-row-2">
 
-      <div class="m-row-2">
+          <div class="info-prop">
+            <span class="info-title-2">备注：</span>
+            <span>{{ info.remark? info.remark:'--'  }}</span>
+          </div>
 
-        <div class="info-prop">
-          <span class="info-title-2">备注：</span>
-          <span>{{ info.remark? info.remark:'--'  }}</span>
         </div>
-
       </div>
-    </div>
 
-    <div class="pdl40">
-      <el-tabs v-model="activesName">
-        <el-tab-pane label="量化积分"
-                     name="first">
-          <pointsDetail :partyId="partymenberid" />
-        </el-tab-pane>
-        <el-tab-pane label="缴费记录"
-                     name="second">
-          <record :partyId="partymenberid"
-                  :disabled="disabled" />
-        </el-tab-pane>
-      </el-tabs>
+      <div class="pdl40">
+        <el-tabs v-model="activesName">
+          <el-tab-pane label="量化积分"
+                       name="first">
+            <pointsDetail :partyId="partymenberid" />
+          </el-tab-pane>
+          <el-tab-pane label="缴费记录"
+                       name="second">
+            <record :partyId="partymenberid"
+                    :disabled="disabled" />
+          </el-tab-pane>
+        </el-tabs>
+
+      </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -187,7 +194,11 @@ export default {
     // this.$refs['ruleForm'].resetFields()
   },
   methods: {
+    handleCancle () {
 
+      this.$emit('diaDetailClose')
+
+    },
     async saveRecord (form) {
       const params = {
         ...form,
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index ea47281fc..f5a710ed3 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -335,7 +335,8 @@
       <detail-form v-if="detailShow"
                    :info="detailInfo"
                    :partyList="optionsG"
-                   :disabled="disabled" />
+                   :disabled="disabled"
+                   @diaDetailClose="handlerCancle" />
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index fa88d16a6..fb2782f0b 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -265,7 +265,8 @@
                @closed="detailShow = false">
       <detail-activity ref="ref_add_form"
                        :formType="formType"
-                       :icPartyActId="icPartyActId"></detail-activity>
+                       :icPartyActId="icPartyActId"
+                       @diaDetailClose="detailShow = false"></detail-activity>
     </el-dialog>
     <el-dialog v-if="showSchedule"
                :visible.sync="showSchedule"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
index 00130bd1d..5b422701c 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
@@ -50,7 +50,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">附件：</span>
-            <file-list v-if="formData.attachmentList.length>0"
+            <file-list v-if="formData.attachmentList&&formData.attachmentList.length>0"
                        :fileList="formData.attachmentList"></file-list>
             <span v-else>--</span>
 
@@ -60,7 +60,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -275,8 +279,8 @@ export default {
 
     },
     handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 9a12e535c..e9785bebb 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -245,7 +245,7 @@
       <activitys-detail ref="ref_detail"
                         :serviceList="serviceList"
                         :gridList="gridList"
-                        @diaClose="diaClose"></activitys-detail>
+                        @diaDetailClose="detailClosed"></activitys-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
index af98c885f..744bb1be6 100644
--- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue
@@ -58,11 +58,11 @@
 
     </div>
 
-    <!-- <div class="div-btn">
+    <div class="div-btn">
       <el-button size="small"
                  @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
 
   </div>
 </template>
@@ -94,7 +94,7 @@ export default {
 
     handleCancle () {
       this.diaDestroy()
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 04efa189a..afc0660cc 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -4,23 +4,24 @@
       <el-form :inline="true"
                :model="form"
                ref="ref_searchform"
-               :label-width="'100px'">
+               :label-width="'110px'">
         <div>
-          <el-form-item prop="mySelectOrg" label-width="130px" label="参加活动党组织">
-            <el-cascader
-                    class="list_item_width_1"
-                    v-model="joinOrgIds"
-                    size="small"
-                    :options="orgList"
-                    placeholder="请选择党组织"
-                    :props="{
+          <el-form-item prop="mySelectOrg"
+                        label-width="130px"
+                        label="参加活动党组织">
+            <el-cascader class="list_item_width_1"
+                         v-model="joinOrgIds"
+                         size="small"
+                         :options="orgList"
+                         placeholder="请选择党组织"
+                         :props="{
                       checkStrictly: true,
                       label: 'partyOrgName',
                       value: 'id',
                       children: 'children'
                     }"
-                    @change="handleChangeOrg"
-                    clearable/>
+                         @change="handleChangeOrg"
+                         clearable />
           </el-form-item>
           <el-form-item label="活动开始时间"
                         prop="serviceTimeArea">
@@ -47,10 +48,10 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-      <el-button style="margin-left:10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
       </div>
       <el-table class="table"
                 :data="tableData"
@@ -74,43 +75,37 @@
         <el-table-column prop="dydhNum"
                          header-align="center"
                          align="center"
-                         label="支部党员大会(次)"
-                         >
+                         label="支部党员大会(次)">
         </el-table-column>
         <el-table-column prop="wyhNum"
                          header-align="center"
                          align="center"
                          label="支部委员会(次)"
-                         show-overflow-tooltip
-                         >
+                         show-overflow-tooltip>
         </el-table-column>
         <el-table-column prop="dxzhNum"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
-                         label="党小组会(次)"
-                         >
+                         label="党小组会(次)">
         </el-table-column>
         <el-table-column prop="dkNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="党课(次)"
-                         >
+                         label="党课(次)">
         </el-table-column>
         <el-table-column prop="ztdrNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="主题党日(次)"
-                         >
+                         label="主题党日(次)">
         </el-table-column>
         <el-table-column prop="wmfwNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="为民服务活动(次)"
-                         >
+                         label="为民服务活动(次)">
         </el-table-column>
       </el-table>
     </div>
@@ -168,25 +163,25 @@ export default {
         this.form.joinOrgId = ''
       }
     },
-    getOrgList() {
+    getOrgList () {
       return this.$http
-          .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
-            params: { agencyId: localStorage.getItem('agencyId') }
-          })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            }else {
-              this.orgList = this.deepArrTOnull(res.data)
-            }
-          }).catch(() => {return this.$message.error("网络错误");})
+        .get('/resi/partymember/icPartyOrg/getSearchTreelist', {
+          params: { agencyId: localStorage.getItem('agencyId') }
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.orgList = this.deepArrTOnull(res.data)
+          }
+        }).catch(() => { return this.$message.error("网络错误"); })
     },
-    deepArrTOnull(arr) {
+    deepArrTOnull (arr) {
       let a = []
       a = arr.map(item => {
         return {
           ...item,
-          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
         }
       })
       return a
@@ -196,17 +191,17 @@ export default {
       if (Array.isArray(this.serviceTimeArea) && this.serviceTimeArea.length > 0) {
         this.form.startTime = this.serviceTimeArea[0];
         this.form.endTime = this.serviceTimeArea[1];
-      }else {
+      } else {
         this.form.startTime = '';
         this.form.endTime = '';
       }
 
-      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined){
+      if (this.form.joinOrgId === '' || this.form.joinOrgId === null || this.form.joinOrgId === undefined) {
         let a = this.orgList[0]
         this.form.joinOrgId = a.id;
         this.joinOrgIds = this.form.joinOrgId
-      }else {
-        if (Array.isArray(this.joinOrgIds)){
+      } else {
+        if (Array.isArray(this.joinOrgIds)) {
           this.form.joinOrgId = this.joinOrgIds[this.joinOrgIds.length - 1];
         }
       }
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index 40665e62b..be802b46c 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -100,15 +100,11 @@
 
     </div>
 
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
 
     <el-dialog v-if="showPersonList"
                :visible.sync="showPersonList"
@@ -318,7 +314,7 @@ export default {
 
     handleCancle () {
       this.resetData()
-      this.$emit('handleClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 490acfb20..7ff0282b0 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -278,7 +278,8 @@
                    :serviceRecordId="serviceRecordId"
                    :serviceOrgName="serviceOrgName"
                    :satisfyArray="satisfyArray"
-                   :statusArray="statusArray">
+                   :statusArray="statusArray"
+                   @diaDetailClose="diaDetailClose">
       </detail-form>
     </el-dialog>
     <el-dialog v-if="showPersonList"
diff --git a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
index 861ea418e..5686967ac 100644
--- a/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/cpts/detail.vue
@@ -42,7 +42,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -145,7 +149,7 @@ export default {
 
 
     handleCancle () {
-      this.$emit("close");
+      this.$emit("diaDetailClose");
     },
   },
 };
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index 2f5820a8f..a55231b0e 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -187,7 +187,8 @@
                class="dialog-h"
                @closed="handleClose">
       <detail-form ref="ref_form_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="handleClose"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
index 8b00db98a..2b9322af5 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/detail.vue
@@ -53,17 +53,11 @@
 
     </div>
 
-    <!-- <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'watch'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
-    </div> -->
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -112,6 +106,17 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
     async initForm () {
 
       this.startLoading()
@@ -258,9 +263,7 @@ export default {
     },
 
 
-    handleCancle () {
-      this.$emit("close");
-    },
+
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index 6294dd3e4..93e340ddc 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -193,7 +193,8 @@
                class="dialog-h"
                @closed="diaDetailClose">
       <detail-form ref="ref_detail"
-                   :formId="formId"></detail-form>
+                   :formId="formId"
+                   @diaDetailClose="diaDetailClose"></detail-form>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index 62200acdc..cc51d946f 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -86,7 +86,11 @@
 
       </div>
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -123,6 +127,11 @@ export default {
   },
 
   methods: {
+    handleCancle () {
+
+      this.$emit('diaDetailClose')
+
+    },
     initForm (row) {
       this.dataForm = JSON.parse(JSON.stringify(row))
       console.log(' this.dataForm', this.dataForm)
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 9487c8665..349dd7bf8 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -507,7 +507,8 @@
                class="dialog-h"
                :close-on-click-modal="false"
                :before-close="detailFormCancle">
-      <detail ref="ref_form_detail"></detail>
+      <detail ref="ref_form_detail"
+              @diaDetailClose="detailFormCancle"></detail>
     </el-dialog>
   </div>
 </template>
@@ -959,7 +960,7 @@ export default {
     },
     async handleLook (row, type) {
       this.detailShow = true
-      console.log('row',row)
+      console.log('row', row)
       this.$nextTick(() => {
         this.$refs.ref_form_detail.initForm(row)
       })
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 6b2d90f6d..936672819 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -253,7 +253,7 @@
                       :gridList="gridList"
                       :resultList="resultList"
                       :placeTypeList="placeTypeList"
-                      @dialogCancle="addFormCancle"></inspect-detail>
+                      @diaDetailClose="diaDetailClose"></inspect-detail>
     </el-dialog>
 
     <!-- 复查记录弹出框 -->
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
index a6fa53fff..ff7e19445 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectDetail.vue
@@ -1,61 +1,59 @@
 <template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-4">场所区域：</span>
+            <span>{{ formData.gridName||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所类型：</span>
+            <span>{{ formData.placeOrgName||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">场所名称：</span>
+            <span>{{ formData.ninePlaceName||'--'}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">分队名称：</span>
+            <span>{{ formData.placePatrolTeamName||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">检查人员：</span>
+            <span>{{ formData.inspectorsNames||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次巡查时间：</span>
+            <span>{{ formData.firstTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">隐患明细：</span>
+            <span>{{ formData.detailed||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">首次检查结论：</span>
+            <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">拟复查时间：</span>
+            <span>{{ formData.reviewTime||'--'  }}</span>
+          </div>
 
-  <div class="dialog-h-content scroll-h">
-    <div v-if="initLoading"
-         class="m-row">
-      <div class="m-info">
-        <div class="info-prop">
-          <span class="info-title-4">场所区域：</span>
-          <span>{{ formData.gridName||'--'  }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所类型：</span>
-          <span>{{ formData.placeOrgName||'--' }}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">场所名称：</span>
-          <span>{{ formData.ninePlaceName||'--'}}</span>
-        </div>
-
-        <div class="info-prop">
-          <span class="info-title-4">分队名称：</span>
-          <span>{{ formData.placePatrolTeamName||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">检查人员：</span>
-          <span>{{ formData.inspectorsNames||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次巡查时间：</span>
-          <span>{{ formData.firstTime||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">隐患明细：</span>
-          <span>{{ formData.detailed||'--'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">首次检查结论：</span>
-          <span>{{ formData.firstResult==='0'?'合格':'不合格'  }}</span>
-        </div>
-        <div class="info-prop">
-          <span class="info-title-4">拟复查时间：</span>
-          <span>{{ formData.reviewTime||'--'  }}</span>
         </div>
 
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -138,7 +136,7 @@ export default {
     handleCancle () {
 
       this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 36c6af69f..f97837131 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -208,7 +208,7 @@
                      :agencyId="agencyId"
                      :scaleList="scaleList"
                      :placeTypeList="placeTypeList"
-                     @dialogCancle="addFormCancle"></places-detail>
+                     @diaDetailClose="diaDetailClose"></places-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
index dbac5af92..2c0a3e1e8 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesDetail.vue
@@ -40,15 +40,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -142,8 +138,8 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 37791495d..ce4691412 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -196,7 +196,7 @@
       <team-detail ref="ref_detail"
                    :gridList="gridList"
                    :placeTypeList="placeTypeList"
-                   @dialogCancle="addFormCancle"></team-detail>
+                   @diaDetailClose="diaDetailClose"></team-detail>
     </el-dialog>
 
   </div>
@@ -344,7 +344,7 @@ export default {
       // this.formTitle = '详情'
       this.detailShow = true
       this.$nextTick(() => {
-        this.$refs.ref_detail.initForm( row.teamId, this.agencyId)
+        this.$refs.ref_detail.initForm(row.teamId, this.agencyId)
       })
     },
 
diff --git a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
index 3ddad9351..3082c700e 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
@@ -51,15 +51,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 v-if="formType != 'detail'"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div> -->
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
   </div>
 </template>
 
@@ -256,8 +252,7 @@ export default {
 
     handleCancle () {
 
-      this.resetData()
-      this.$emit('dialogCancle')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 51b59c910..9584d9954 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -258,7 +258,7 @@
                class="dialog-h"
                @closed="diaClose">
       <work-log-detail ref="ref_detail"
-                       @diaClose="diaClose"></work-log-detail>
+                       @diaDetailClose="diaClose"></work-log-detail>
     </el-dialog>
 
   </div>
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index 568510f7c..28e63cdc2 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -50,7 +50,11 @@
       </div>
 
     </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
 
+    </div>
   </div>
 </template>
 
@@ -74,7 +78,7 @@ export default {
   methods: {
     handleCancle () {
 
-      this.$emit('diaClose')
+      this.$emit('diaDetailClose')
 
     },
 
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index af71bc574..a472ca5a9 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -286,11 +286,36 @@
         </el-form-item>
         <br/>
 
-        <el-form-item label="合同附件" prop="fileList" label-width="140px">
+        <el-form-item label="合同照片" prop="fileList" label-width="140px">
           <template>
             <upload-image :defaultFileList="dataForm.fileList" :limit="6" @change="onChangeFileList"></upload-image>
           </template>
         </el-form-item>
+
+        <el-form-item label="合同附件" label-width="140px">
+          <template>
+            <el-upload
+              class="upload-demo"
+              multiple
+              :action="uploadUrl"
+              :data="{ customerId: customerId }"
+              :limit="limit"
+              :headers="$getElUploadHeaders()"
+              :on-success="(res, file) => handleFlieSuccess(res, file)"
+              :on-error="(res, file) => handleFlieError(res, file)"
+              :on-remove="(res) => handleFlieRemove(res)"
+              :on-exceed="(res) => handleFlieExceed(res)"
+              :before-upload="(file) => beforeFlieUpload(file)"
+              :on-preview="handlePreview"
+              :file-list="dataForm.docList">
+              <el-button size="small" type="primary">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传合同文件</div>
+            </el-upload>
+          </template>
+        </el-form-item>
+
+
+
       </el-form>
     <template slot="footer">
         <div class="resi-btns">
@@ -355,7 +380,8 @@ export default {
           idCardImgList: [],
           unit: ''
         }],
-        fileList: []
+        fileList: [],
+        docList: []
       },
       zzmmOptions: [
         { name: '党员', value: '党员' },
@@ -391,7 +417,10 @@ export default {
         buildingOptions: [],
         unitOptions: [],
         houseOptions: [],
-        agencyOptions: []
+        agencyOptions: [],
+        uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
+        customerId: localStorage.getItem("customerId"),
+        limit: 3
     }
   },
   computed: {
@@ -537,6 +566,7 @@ export default {
           unit: ''
         }],
         fileList: [],
+        docList: [],
         agencyImgList: []
       }
     },
@@ -866,6 +896,43 @@ export default {
         this.editModeGetList()
       }).catch(() => {})
     },
+    handleFlieSuccess(res, file) {
+        if (res.code === 0 && res.msg === "success") {
+            let ob = {
+              fileType: '0',
+              fileUrl: file.response.data.url,
+              name: file.response.data.fileName
+            }
+            this.dataForm.docList.push(ob)
+        } else {
+            this.$message.error(res.msg)
+        }
+    },
+    handleFlieError(res, file) {
+        console.log(res)
+    },
+    handleFlieRemove(res) {
+      // console.log(JSON.stringify(res))
+        const delFile = res.fileUrl
+        this.dataForm.docList.forEach((item, key) => {
+            if (delFile == item.fileUrl) {
+              this.dataForm.docList.splice(key, 1)
+            }
+        })
+    },
+    handleFlieExceed(res) {
+        this.$message({
+          type: "warning",
+          message: `文件数量最多不超过${this.limit}个`,
+        })
+    },
+    beforeFlieUpload(file) {
+        console.log(file)
+    },
+    handlePreview(file) {
+      window.open(file.fileUrl)
+      // console.log(JSON.stringify(file));
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -932,7 +999,9 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-
+    ::v-deep .el-upload-list__item.is-success.focusing .el-icon-close-tip {
+      display: none !important;
+    }
     .div_btn {
         display: flex;
         justify-content: flex-end;
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 4bf8f7084..c56ac16ae 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -117,13 +117,17 @@
         </el-form-item>
         <br/>
 
-        <el-form-item label="合同附件" prop="fileList">
+        <el-form-item label="合同照片" prop="fileList">
             <template>
                 <label v-for="(item,index) in dataForm.fileList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
                 </label>
             </template>
         </el-form-item>
+
+        <el-form-item label="合同附件">
+            <label v-for="(item,index) in dataForm.docList" :key="index" @click="downFile(item.fileUrl)" class="file-l">{{ item.name }}</label>
+        </el-form-item>
         <el-form-item label="审核原因" prop="reason" v-if="dataForm.flag === '1' && dataForm.state === '2'">
             <el-input v-model="dataForm.reason" placeholder="审核原因" disabled></el-input>
         </el-form-item>
@@ -184,7 +188,8 @@ export default {
           lesseeHouseAddress: '',
         signDate: '',
         startDate: '',
-        endDate: ''
+        endDate: '',
+        docList: [],
       },
         dataListLoading: false,
         dialogVisible: false,
@@ -346,6 +351,9 @@ export default {
               })
           }).catch(() => {})
       },
+    downFile(fileUrl) {
+        window.open(fileUrl)
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -376,6 +384,11 @@ export default {
         margin-top: 20px;
         text-align: center;
     }
+    .file-l{
+      margin-right: 10px;
+      color: #3ebef7;
+      cursor: pointer;
+    }
 </style>
 <style lang="scss">
 .rent {
diff --git a/src/views/modules/plugins/rent/upload-image.vue b/src/views/modules/plugins/rent/upload-image.vue
index 262e5bc65..5791c78ae 100644
--- a/src/views/modules/plugins/rent/upload-image.vue
+++ b/src/views/modules/plugins/rent/upload-image.vue
@@ -9,7 +9,8 @@
             :on-error="(res, file) => handleImgError(res, file)"
             :on-remove="(res) => handleImgRemove(res)"
             :on-exceed="(res) => handleImgExceed(res)"
-            :before-upload="(file) => beforeImgUpload(file)">
+            :before-upload="(file) => beforeImgUpload(file)"
+            accept="image/jpg,image/jpeg,image/png">
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
                 <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index 6220087e6..acc1443a2 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -48,11 +48,11 @@
 
         </div>
       </div>
-      <!-- <div class="div-btn">
+      <div class="div-btn">
         <el-button size="small"
                    @click="handleCancle">关 闭</el-button>
 
-      </div> -->
+      </div>
     </div>
 
   </div>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
index d486aa828..e1a66f803 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@@ -51,11 +51,11 @@
       </div>
 
     </div>
-    <!-- <div class="div_btn">
+    <div class="div-btn">
       <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
+                 @click="handleCancle">关 闭</el-button>
 
-    </div> -->
+    </div>
   </div>
 </template>
 
diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index 8a1c73255..0998cee12 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -220,7 +220,8 @@
             </el-option>
           </el-select>
       </el-form-item>
-      <el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">
+      <el-form-item label="原因" label-width="150px">
+          <!--<el-form-item v-if="dataForm.isVaccination === '0'" label="原因" label-width="150px">-->
           <el-select class="item_width_2"
                      v-model.trim="dataForm.reason"
                      placeholder="请选择"
@@ -337,6 +338,14 @@
       return !this.dataForm.unitId
     },
     dataRule () {
+        var checkPhone = (rule, value, callback) => {
+            let moblie = /^1(3|4|5|6|7|8|9)\d{9}$/; let tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/
+            if (!moblie.test(this.dataForm.mobile) && !tel.test(this.dataForm.mobile)) {
+                return callback(new Error('请输入正确的手机号或座机号！'))
+            } else {
+                callback()
+            }
+        }
       return {
         customerId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -384,7 +393,8 @@
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+            { validator: checkPhone, trigger: 'blur' }
         ],
         idCard: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -728,16 +738,6 @@
       setTimeout(() => {
         this.btnDisable = false;
       }, 10000);
-      //验证手机号码
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/;
-      if (regPhone.test(this.dataForm.mobile) === false) {
-        this.btnDisable = false
-        this.$message({
-          type: 'warning',
-          message: '请输入正确的手机号码'
-        })
-        return false;
-      }
       if(this.dataForm.isVaccination === '1'){
           if(this.dataForm.firstVacTime === ''){
               this.$message({
diff --git a/src/views/modules/visual/command/cpts/map.vue b/src/views/modules/visual/command/cpts/map.vue
index 2653ee140..e49ce08f1 100644
--- a/src/views/modules/visual/command/cpts/map.vue
+++ b/src/views/modules/visual/command/cpts/map.vue
@@ -444,8 +444,8 @@ export default {
         .size(12)
         .style({
           offsets: [0, 8], // 文本相对锚点的偏移量 [水平, 垂直]
-          // rotation: 60,
-          layerType: "fillImage",
+          rotation: 0,
+          // layerType: "fillImage",
         });
       scene.addLayer(posLayer);
 
@@ -516,6 +516,7 @@ export default {
 
     iniMapDot(scene) {
       const { darkStyle, lightStyle, dotIcoList, dotData } = this;
+      console.log("--------------------------图标", dotIcoList);
       Object.keys(dotIcoList).forEach((k) => {
         scene.addImage(k, dotIcoList[k]);
       });
@@ -531,18 +532,20 @@ export default {
           strokeOpacity: 0.1,
           stroke: "#000",
         });
-      scene.addLayer(dotBgLayer);
 
       dotLayer = new PointLayer({
-        zIndex: 21,
+        zIndex: 20,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k)
-        .size(10)
         .style({
           offsets: [0, 0],
+          rotation: 0,
           layerType: "fillImage",
-        });
+        })
+        .size(10);
+
+      scene.addLayer(dotBgLayer);
       scene.addLayer(dotLayer);
 
       dotBgLayer.on("click", (e) => {
@@ -567,15 +570,16 @@ export default {
       });
 
       dotLayer2 = new PointLayer({
-        zIndex: 31,
+        zIndex: 30,
       })
         .source(dotData)
         .shape("categoryKey", (k) => k + "2")
-        .size(30)
         .style({
           offsets: [0, 0],
+          rotation: 0,
           layerType: "fillImage",
-        });
+        })
+        .size(30);
       scene.addLayer(dotLayer2);
 
       dotLayer2.on("click", (e) => {
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index d135daabf..4971f977d 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -334,7 +334,7 @@ export default {
 
         yjdw: require("@/assets/img/shuju/command/ico/yjdw.png"),
         sr_gy: require("@/assets/img/shuju/command/ico/sr_gy.png"),
-        sr_gc: require("@/assets/img/shuju/command/ico/sr_gc.png"),
+        sr_gc: require("@/assets/img/shuju/grid/sr_gc.png"),
         whdw: require("@/assets/img/shuju/command/ico/whdw.png"),
         sr_ggld: require("@/assets/img/shuju/command/ico/sr_ggld.png"),
         lwh: require("@/assets/img/shuju/command/ico/lwh.png"),
@@ -424,7 +424,7 @@ export default {
         IS_DB: require("@/assets/img/shuju/command/ico3/IS_DB.png"),
         IS_MB: require("@/assets/img/shuju/command/ico3/IS_MB.png"),
         anzhibangjiao: require("@/assets/img/shuju/command/ico3/anzhibangjiao.png"),
-        IS_KC: require("@/assets/img/shuju/command/ico3/IS_KC.png"),
+        IS_KC: require("@/assets/img/shuju/grid/IS_KC.png"),
         IS_XFRY: require("@/assets/img/shuju/command/ico3/IS_XFRY.png"),
         IS_SD: require("@/assets/img/shuju/command/ico3/IS_SD.png"),
         IS_SN: require("@/assets/img/shuju/command/ico3/IS_SN.png"),
diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue
index acd84557f..f5e804c77 100644
--- a/src/views/modules/visual/cpts/map/index.vue
+++ b/src/views/modules/visual/cpts/map/index.vue
@@ -408,7 +408,7 @@ export default {
         .style({
           offsets: [0, 8], // 文本相对锚点的偏移量 [水平, 垂直]
           // rotation: 60,
-          layerType: "fillImage",
+          // layerType: "fillImage",
         });
       scene.addLayer(posLayer);