diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 987130e57..cb242203c 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,468 +1,353 @@
 <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="
+          <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
-            >
+                     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="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-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="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-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>
 
           <!-- 组织位置 -->
@@ -473,345 +358,310 @@
 
         <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="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-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
-      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-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
-      v-if="Disable"
-      title="确认禁用"
-      :visible.sync="Disable"
-      width="850"
-      :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
-      v-if="details"
-      title="人员详情"
-      :visible.sync="details"
-      width="850"
-      :before-close="handleClosePeoView"
-    >
+    <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
-      v-if="transferPeo"
-      title="人员调动"
-      :visible.sync="transferPeo"
-      width="850"
-      :before-close="handleClose"
-    >
-      <el-form label-width="120px" :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, multiple: false }"
-            v-model="selectValue"
-            :options="options"
-            style="width: 100%"
-            @change="handleChangeTransferCascader"
-          >
+          <el-cascader clearable
+                       :props="{ checkStrictly: true, multiple: false }"
+                       v-model="selectValue"
+                       :options="options"
+                       style="width: 100%"
+                       @change="handleChangeTransferCascader">
             <template slot-scope="{ data }">
               <span>{{ data.label }}</span>
-              <span
-                v-if="data.type != 'agency'"
-                style="color: #aaa; font-size: 12px"
-                >（{{ data.typeName }}）
+              <span v-if="data.type != 'agency'"
+                    style="color: #aaa; font-size: 12px">（{{ data.typeName }}）
               </span>
             </template>
           </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
-      v-if="createAgencyDialogFlag"
-      title="新增组织"
-      :visible.sync="createAgencyDialogFlag"
-      width="850"
-      :before-close="handleClose"
-    >
+    <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 label="坐标">
           <div id="con"></div>
@@ -819,43 +669,34 @@
       </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
-      v-if="modifyCityOrgPop"
-      title="修改组织"
-      :visible.sync="modifyCityOrgPop"
-      width="850"
-      :before-close="handleClose"
-    >
+    <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 label="坐标">
           <div id="con"></div>
@@ -863,62 +704,47 @@
       </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
-      v-if="streetOrCommunity"
-      title="修改组织"
-      :visible.sync="streetOrCommunity"
-      width="850"
-      :before-close="handleClose"
-    >
+    <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 label="坐标">
           <div id="con"></div>
@@ -926,113 +752,88 @@
       </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
-      v-if="OrgUnitPop"
-      title="修改部门"
-      :visible.sync="OrgUnitPop"
-      width="850"
-      :before-close="handleClose"
-    >
+    <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
-      v-if="modifyGridPop"
-      title="修改网格"
-      :visible.sync="modifyGridPop"
-      width="850"
-      :before-close="handleClose"
-    >
+    <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>
 
         <!-- 组织位置,地图 -->
@@ -1042,7 +843,8 @@
       </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>
@@ -1050,9 +852,10 @@
 
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
+import daiMap from "@/utils/dai-map";
 
 export default {
-  data() {
+  data () {
     return {
       // 新增组织弹窗
       createAgencyDialogFlag: false,
@@ -1297,7 +1100,7 @@ export default {
       selDeptType: "",
     };
   },
-  created() {
+  created () {
     this.getAgencyList();
     this.getDepartmentList();
     this.getGridList();
@@ -1310,35 +1113,35 @@ export default {
   },
 
   watch: {
-    dialogVisibleGrid(val) {
+    dialogVisibleGrid (val) {
       if (val) {
         setTimeout(() => {
           this.createMap();
         }, 1000);
       }
     },
-    createAgencyDialogFlag(val) {
+    createAgencyDialogFlag (val) {
       if (val) {
         setTimeout(() => {
           this.createMap();
         }, 1000);
       }
     },
-    modifyCityOrgPop(val) {
+    modifyCityOrgPop (val) {
       if (val) {
         setTimeout(() => {
           this.createMap();
         }, 1000);
       }
     },
-    streetOrCommunity(val) {
+    streetOrCommunity (val) {
       if (val) {
         setTimeout(() => {
           this.createMap();
         }, 1000);
       }
     },
-    modifyGridPop(val) {
+    modifyGridPop (val) {
       if (val) {
         setTimeout(() => {
           this.createMap();
@@ -1346,14 +1149,14 @@ export default {
       }
     },
   },
-  mounted() {
+  mounted () {
     // this.initMap()
   },
   methods: {
     // 点击后获取id
-    handleChangeTransferCascader(e) {
+    handleChangeTransferCascader (e) {
       console.log("*********************");
-      function findItem(valueArr, coll) {
+      function findItem (valueArr, coll) {
         console.log("--------------------");
         console.log(valueArr);
         let copyArr = [...valueArr];
@@ -1371,7 +1174,7 @@ export default {
       this.transferForm.orgType = item.type;
     },
     /** 查询系统工作人员角色（职责） */
-    async getDutyList() {
+    async getDutyList () {
       const url = "/gov/org/staff/rolelist";
       let params = {
         agencyId: this.currentAgencyId,
@@ -1384,7 +1187,7 @@ export default {
       }
     },
     /** 查询系统工作人员角色（职责） */
-    async getRoleList() {
+    async getRoleList () {
       this.tableLoading = true;
 
       const url = "/gov/access/govrole/list";
@@ -1401,7 +1204,7 @@ export default {
       this.tableLoading = false;
     },
     /** 查询组织列表 */
-    async getAgencyList() {
+    async getAgencyList () {
       const url = "/gov/org/agency/agencylist";
       let params = {
         agencyId: this.currentAgencyId,
@@ -1416,7 +1219,7 @@ export default {
       }
     },
     /** 查询社区列表 */
-    async getDepartmentList() {
+    async getDepartmentList () {
       const url = "/gov/org/department/departmentlist";
 
       let params = {
@@ -1444,7 +1247,7 @@ export default {
       }
     },
     /** 查询网格列表 */
-    async getGridList() {
+    async getGridList () {
       const url = "/gov/org/grid/allgrids";
 
       let params = {
@@ -1461,7 +1264,7 @@ export default {
     },
 
     // 查询网格人员列表
-    async getGridStaffListData() {
+    async getGridStaffListData () {
       const url = "/data/aggregator/org/stafflist";
 
       let params = {
@@ -1480,7 +1283,7 @@ export default {
       }
     },
     // 查询组织工作人员
-    async getAgencyStaffListData() {
+    async getAgencyStaffListData () {
       const url = "/data/aggregator/org/stafflist";
 
       let params = {
@@ -1500,7 +1303,7 @@ export default {
     },
 
     // 查询部门人员
-    async getDepartmentStaffListData() {
+    async getDepartmentStaffListData () {
       const url = "/data/aggregator/org/stafflist";
 
       let params = {
@@ -1519,7 +1322,7 @@ export default {
       }
     },
     // 添加组织
-    async submit() {
+    async submit () {
       const url = "/gov/org/department/adddepartment";
 
       let params = {
@@ -1546,7 +1349,7 @@ export default {
       }
     },
     // 添加网格
-    async submitGrid() {
+    async submitGrid () {
       const url = "/gov/org/grid/addgrid";
 
       let params = {
@@ -1576,7 +1379,7 @@ export default {
       }
     },
 
-    async submitPeo() {
+    async submitPeo () {
       this.$refs["addPeoForm"].validate((valid, err) => {
         if (valid) {
           this.submitPeoDo();
@@ -1588,7 +1391,7 @@ export default {
     },
 
     // 添加人员
-    async submitPeoDo() {
+    async submitPeoDo () {
       const url = "/gov/org/staff/addstaffv2";
       const {
         peoForm: { orgType },
@@ -1605,8 +1408,8 @@ export default {
           orgType == "agency"
             ? this.currentAgencyId
             : orgType == "dept"
-            ? this.currentDepartmentId
-            : this.currentGridOrgId,
+              ? this.currentDepartmentId
+              : this.currentGridOrgId,
       };
 
       const { data, code, msg } = await requestPost(url, params);
@@ -1632,7 +1435,7 @@ export default {
       }
     },
 
-    async updatePeo() {
+    async updatePeo () {
       this.$refs["editPeoForm"].validate((valid, err) => {
         if (valid) {
           this.updatePeoDo();
@@ -1643,7 +1446,7 @@ export default {
       });
     },
     // 人员修改
-    async updatePeoDo() {
+    async updatePeoDo () {
       const url = "/gov/org/staff/editstaff";
 
       let params = {
@@ -1677,7 +1480,7 @@ export default {
     },
 
     // 字典
-    async getDictionaries() {
+    async getDictionaries () {
       const url = "/sys/dict/data/dictlist";
 
       let params = {
@@ -1694,35 +1497,35 @@ export default {
     },
 
     /** 搜索按钮操作 */
-    handleQuery() {
+    handleQuery () {
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() {
+    resetQuery () {
       this.queryParams.deptName = undefined;
       this.queryParams.status = undefined;
       this.handleQuery();
     },
     /** 新增按钮操作 */
-    handleAdd(row) {
+    handleAdd (row) {
       this.dialogVisible = true;
     },
     // 社区弹框关闭函数
-    handleClose(done) {
+    handleClose (done) {
       this.$confirm("确认关闭？")
         .then((_) => {
           this.insertFormRest();
           done();
         })
-        .catch((_) => {});
+        .catch((_) => { });
     },
     // 人员查看叉号关闭
-    handleClosePeoView(done) {
+    handleClosePeoView (done) {
       this.insertFormRest();
       done();
     },
     // 社区新增弹框重置函数
-    insertFormRest() {
+    insertFormRest () {
       this.insertForm.name = "";
       this.insertForm.contacts = "";
       this.insertForm.code = "";
@@ -1743,7 +1546,7 @@ export default {
       };
     },
     // 网格新增弹框重置函数
-    GridFormRest() {
+    GridFormRest () {
       (this.GridForm.gridName = ""),
         (this.GridForm.code = ""),
         (this.GridForm.centerAddress = ""),
@@ -1757,7 +1560,7 @@ export default {
         (this.GridForm.latitude = "");
     },
     /** 人员清空 */
-    peoFormRest() {
+    peoFormRest () {
       (this.peoForm.name = ""),
         (this.peoForm.mobile = ""),
         (this.peoForm.gender = ""),
@@ -1766,7 +1569,7 @@ export default {
       this.peoForm.newRoles = [];
     },
     // 人员调动
-    transferRest() {
+    transferRest () {
       (this.transferForm.name = ""),
         (this.transferForm.remarks = ""),
         (this.transferForm.transferTo = "");
@@ -1777,7 +1580,7 @@ export default {
       this.options[0] = [];
     },
     // 新增组织
-    addNewAgencyRest() {
+    addNewAgencyRest () {
       (this.agencyForm.parentAgencyId = ""),
         (this.agencyForm.agencyName = ""),
         (this.agencyForm.level = ""),
@@ -1791,7 +1594,7 @@ export default {
         (this.longitude = "");
     },
     // 修改市级组织
-    cancelModifyCityOrgPopRest() {
+    cancelModifyCityOrgPopRest () {
       (this.OrgDetailsForm.level = ""),
         (this.OrgDetailsForm.agencyName = ""),
         (this.OrgDetailsForm.code = ""),
@@ -1803,7 +1606,7 @@ export default {
       (this.latitude = ""), (this.longitude = "");
     },
     // 修改下级机关单位
-    OrgUnitDetailsRest() {
+    OrgUnitDetailsRest () {
       (this.OrgUnitDetailsForm.code = ""),
         (this.OrgUnitDetailsForm.contacts = ""),
         (this.OrgUnitDetailsForm.departmentId = ""),
@@ -1811,7 +1614,7 @@ export default {
         (this.OrgUnitDetailsForm.mobile = "");
     },
     // 修改网格清空
-    ModifyGridPopRest() {
+    ModifyGridPopRest () {
       (this.modifyGridFrom.gridName = ""),
         (this.modifyGridFrom.code = ""),
         (this.modifyGridFrom.gridTypeName = ""),
@@ -1825,61 +1628,61 @@ export default {
         (this.modifyGridFrom.griId = "");
     },
     // 社区新增弹框取消按钮
-    cancel() {
+    cancel () {
       this.dialogVisible = false;
       this.insertFormRest();
     },
     // 网格新增弹框取消按钮
-    cancelGrid() {
+    cancelGrid () {
       this.dialogVisibleGrid = false;
       this.GridFormRest();
     },
     /** 取消按钮 */
-    cancelPeo() {
+    cancelPeo () {
       this.dialogVisiblePeo = false;
       this.peoFormRest();
     },
     // 修改取消
-    cancelXiugai() {
+    cancelXiugai () {
       this.modifyPeo = false;
       this.peoFormRest();
     },
     // 查看弹窗
-    cancelDetails() {
+    cancelDetails () {
       this.details = false;
     },
     /** 人员调动取消按钮 */
-    cancelTransfer() {
+    cancelTransfer () {
       this.transferRest();
       this.transferPeo = false;
     },
     // 新增组织取消按钮
-    canceladdNewAgency() {
+    canceladdNewAgency () {
       this.addNewAgencyRest();
       this.createAgencyDialogFlag = false;
     },
     // 修改市级组织取消按钮
-    cancelModifyCityOrgPop() {
+    cancelModifyCityOrgPop () {
       this.cancelModifyCityOrgPopRest();
       this.modifyCityOrgPop = false;
     },
     // 修改街道/社区级取消按钮
-    cancelstreetOrCommunity() {
+    cancelstreetOrCommunity () {
       this.cancelModifyCityOrgPopRest();
       this.streetOrCommunity = false;
     },
     // 取消修改下级机关单位按钮
-    cancelOrgUnitPop() {
+    cancelOrgUnitPop () {
       this.OrgUnitPop = false;
       this.OrgUnitDetailsRest();
     },
     // 取消修改网格按钮
-    cancelModifyGridPop() {
+    cancelModifyGridPop () {
       this.modifyGridPop = false;
       this.ModifyGridPopRest();
     },
     // 进入网格，查询网格所属人员
-    entryGrid(gridId) {
+    entryGrid (gridId) {
       console.log(gridId);
       this.gridStaffTableListData = [];
       this.departmentStaffTableListData = [];
@@ -1895,7 +1698,7 @@ export default {
       this.assembleBreadcrumbArr(gridId, "grid");
     },
     // 进入部门，查询部门所属人员
-    entryDepartment(row) {
+    entryDepartment (row) {
       console.log(row);
       this.gridStaffTableListData = [];
       this.departmentStaffTableListData = [];
@@ -1914,7 +1717,7 @@ export default {
     },
 
     // 进入组织，重新渲染
-    entryAgency(agencyId) {
+    entryAgency (agencyId) {
       this.currentAgencyId = agencyId;
 
       this.agencyTableListData = [];
@@ -1931,36 +1734,36 @@ export default {
       this.assembleBreadcrumbArr(agencyId, "agency");
     },
     // 新增组织
-    addCommunity(row) {
+    addCommunity (row) {
       this.insertForm.agencyId = this.currentAgencyId;
       this.dialogVisible = true;
     },
     // 新增网格
-    addGrid(row) {
+    addGrid (row) {
       this.GridForm.agencyId = this.currentAgencyId;
       this.getDictionaries();
       this.dialogVisibleGrid = true;
     },
 
     // 新增人员
-    addPeo(row) {
+    addPeo (row) {
       this.dialogVisiblePeo = true;
       this.peoForm.orgType = "agency";
     },
 
     // 新增社区人员
-    addCommunityPeo() {
+    addCommunityPeo () {
       this.dialogVisiblePeo = true;
       this.peoForm.orgType = "dept";
     },
 
     // 新增网格人员
-    addGridPeo() {
+    addGridPeo () {
       this.dialogVisiblePeo = true;
       this.peoForm.orgType = "grid";
     },
     // 修改网格人员
-    async xiuGridPeo(row) {
+    async xiuGridPeo (row) {
       this.modifyPeo = true;
       this.peoForm.orgType = "grid";
 
@@ -1999,7 +1802,7 @@ export default {
       }
     },
     // 修改人员
-    async xiuPeo(row) {
+    async xiuPeo (row) {
       this.modifyPeo = true;
       this.peoForm.orgType = "agency";
 
@@ -2041,7 +1844,7 @@ export default {
       }
     },
     // 修改社区人员
-    async xiuCommunityPeo(row) {
+    async xiuCommunityPeo (row) {
       this.modifyPeo = true;
       this.peoForm.orgType = "dept";
 
@@ -2083,16 +1886,16 @@ export default {
       }
     },
     // 取消禁用按钮
-    cancelDisable() {
+    cancelDisable () {
       this.Disable = false;
     },
     // 人员禁用
-    DisablePeo(row) {
+    DisablePeo (row) {
       this.DisableForm.staffId = row.staffId;
       this.Disable = true;
     },
     // 确定禁用
-    async submitDisable() {
+    async submitDisable () {
       const url = "/epmetuser/customerstaff/disabledstaff";
 
       let params = {
@@ -2115,7 +1918,7 @@ export default {
       }
     },
     // 查看按钮
-    async lookAngency(row) {
+    async lookAngency (row) {
       const url = "/data/aggregator/org/staffdetailv2";
 
       let params = {
@@ -2141,7 +1944,7 @@ export default {
     },
 
     // 人员调动
-    async transfer(row) {
+    async transfer (row) {
       this.transferForm.name = row.name;
       this.transferForm.staffId = row.staffId;
 
@@ -2153,7 +1956,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        function computeOption(opt) {
+        function computeOption (opt) {
           return {
             label: opt.agencyName,
             value: opt.agencyId,
@@ -2184,7 +1987,7 @@ export default {
       }
     },
     // 人员调动确定
-    async submitTransfer() {
+    async submitTransfer () {
       const url = "/gov/org/staff/stafftransferv2";
 
       let params = {
@@ -2227,7 +2030,7 @@ export default {
     //         this.Navigation = data.agencyName
     //     }
     // 组装顶部面包屑数组
-    async assembleBreadcrumbArr(id, orgType) {
+    async assembleBreadcrumbArr (id, orgType) {
       this.currentBreadcrumbKey = id;
       if (orgType === "agency") {
         const url = "/gov/org/agency/agencydetail";
@@ -2343,7 +2146,7 @@ export default {
       }
     },
 
-    async refreshThisPage(index) {
+    async refreshThisPage (index) {
       // 点击最后一级不触发响应
       if (index === this.breadcrumbArr.length - 1) {
         return;
@@ -2415,7 +2218,7 @@ export default {
       } */
     },
     // 获取组织区划信息
-    async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
+    async getZoning (areaCode, parentAgencyId, parentAgencyLevel) {
       const url = "/data/aggregator/org/nextlevelareacodelist";
 
       let params = {
@@ -2433,7 +2236,7 @@ export default {
       }
     },
 
-    handelZoing(val) {
+    handelZoing (val) {
       this.zonings.forEach((item) => {
         if (item.areaCode == val) {
           this.agencyForm.level = item.level;
@@ -2442,7 +2245,7 @@ export default {
         }
       });
     },
-    handelStreeOrCommunityZoing(val) {
+    handelStreeOrCommunityZoing (val) {
       this.zonings.forEach((item) => {
         if (item.areaCode == val) {
           this.OrgDetailsForm.level = item.level;
@@ -2452,7 +2255,7 @@ export default {
       });
     },
 
-    addAgency() {
+    addAgency () {
       this.createAgencyDialogFlag = true;
       this.addNewAgencyRest();
       this.getZoning(
@@ -2462,7 +2265,7 @@ export default {
       );
     },
     // 新增组织确定按钮
-    async submitaddNewAgency() {
+    async submitaddNewAgency () {
       const url = "/gov/org/agency/addagency-v2";
 
       let params = {
@@ -2494,7 +2297,7 @@ export default {
     },
 
     // 修改面包屑
-    modifyOrgInfo() {
+    modifyOrgInfo () {
       this.judgeOrgInfoLevel =
         this.breadcrumbArr[this.breadcrumbArr.length - 1];
       if (this.judgeOrgInfoLevel.type === "agency") {
@@ -2526,7 +2329,7 @@ export default {
     },
 
     // 根据id获取组织机构详细信息
-    async getOrgDetailsById() {
+    async getOrgDetailsById () {
       const url = "/gov/org/agency/agencydetail";
 
       let params = {
@@ -2562,7 +2365,7 @@ export default {
     },
 
     // 根据id获取下级机关单位详情
-    async getOrgUnitDetailsById() {
+    async getOrgUnitDetailsById () {
       const url = "/gov/org/department/departmentdetail";
 
       let params = {
@@ -2583,7 +2386,7 @@ export default {
     },
 
     // 根据id获取网格详情
-    async getGridDetailsById() {
+    async getGridDetailsById () {
       const url = "/gov/org/grid/griddetail";
 
       let params = {
@@ -2609,7 +2412,7 @@ export default {
     },
 
     // 市级/街道/社区级组织修改确定按钮
-    async sunmitModifyCityOrgPop() {
+    async sunmitModifyCityOrgPop () {
       const url = "/gov/org/agency/editagency";
 
       let params = {
@@ -2637,7 +2440,7 @@ export default {
       }
     },
     // 修改下级机关单位确定按钮
-    async sunmitOrgUnitForm() {
+    async sunmitOrgUnitForm () {
       const url = "/gov/org/department/editdepartment";
 
       let params = {
@@ -2662,7 +2465,7 @@ export default {
       }
     },
     // 修改网格确定按钮
-    async submitModifyGrid() {
+    async submitModifyGrid () {
       const url = "/gov/org/grid/editgrid";
 
       let params = {
@@ -2691,7 +2494,7 @@ export default {
     },
 
     /** 地图初始化 */
-    createMap() {
+    createMap () {
       let { latitude, longitude } = this;
       if (
         latitude === null ||
@@ -2709,51 +2512,81 @@ export default {
           longitude = longitude2;
         }
       }
-      var center = new window.TMap.LatLng(latitude, longitude); //设置中心点坐标
-
-      //初始化地图
-      var map = new window.TMap.Map("con", {
-        center: center,
-        zoom: 13, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45, // 设置地图旋转角度
+      // var center = new window.TMap.LatLng(latitude, longitude); //设置中心点坐标
+      var map = new daiMap(
+        document.getElementById("con"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
+      // //初始化地图
+      // var map = new window.TMap.Map("con", {
+      //   center: center,
+      //   zoom: 13, // 设置地图缩放级别
+      //   pitch: 43.5, // 设置俯仰角
+      //   rotation: 45, // 设置地图旋转角度
+      // });
+
+      // // 新建一个地点搜索类
+      // let markers = new window.TMap.MultiMarker({
+      //   map: map,
+      //   geometries: [],
+      // });
+
+      // map.on("panend", (e) => {
+      //   handleMoveCenter(e);
+      // });
+
+      // 监听地图平移结束
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
       });
 
-      // 新建一个地点搜索类
-      let markers = new window.TMap.MultiMarker({
-        map: map,
-        geometries: [],
-      });
+      // map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
 
-      map.on("panend", (e) => {
-        handleMoveCenter(e);
-      });
+      // setMarker(latitude, 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 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 { lat, lng } = map.getCenter();
+        // const lat = lat;
+        // const lng = lng;
+        map.setMarker(lat, lng);
+
+        // let { msg, data } = await map.getAddress(lat, lng);
+        // if (msg == "success") {
+        //   this.formData.address = data.address
+        //   this.searchValue = data.address
+        //   this.searchOptions = []
+
+        // }
 
-      function handleMoveCenter(e) {
         //修改地图中心点
-        const center = map.getCenter();
-        const lat = center.getLat();
-        const lng = center.getLng();
+        // const center = map.getCenter();
+        // const lat = center.getLat();
+        // const lng = center.getLng();
 
-        setMarker(lat, lng);
+        // setMarker(lat, lng);
       }
     },
   },