From dba0556a3b060d70c58df623e2359ff008cdb724 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 24 Oct 2024 16:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=BB=84=E7=BB=87=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=A3=80=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 5366 ++++++++---------
 .../modules/customer/customize/roleList.vue   |  615 +-
 src/views/modules/customer/role.vue           |  669 +-
 src/views/modules/home/index.vue              | 1478 ++---
 .../modules/productConfig/workRoleAuth.vue    |  869 ++-
 src/views/modules/workSys/role/role.vue       |  501 +-
 6 files changed, 4462 insertions(+), 5036 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 2e207375b..0d1ed3b6b 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,465 +1,282 @@
 <template>
-  <div class="app-container">
-    <el-row>
-      <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>
-        </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">
-        <template slot="header">
-          <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>
-        </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>
-        </template>
-        <template slot-scope="scope">
-          <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 prop="sort"
-                       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>
-        </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">
-        <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>
-        </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>
-        </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>
-        </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">
-        <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>
-        </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>
-        </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>
-        </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">
-        <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>
-        </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"
+    <div class="app-container">
+        <el-row>
+            <el-col :span="16" style="margin-left: 10px; margin-top: 20px; 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>
+
+                </el-breadcrumb>
+            </el-col>
+            <el-col :span="6" style="margin-left: 0px; margin-top: 10px; margin-bottom: 20px">
+                <el-breadcrumb separator-class="el-icon-arrow-right">
+                    <el-breadcrumb-item>
+                        <el-form :inline="true" ref="ref_searchform" :label-width="'110px'" style="margin-top:10px">
+                            <el-input size="small" placeholder="请输入姓名或手机号码" v-model.trim="searchValue">
+                                <el-button slot="append" icon="el-icon-search" @click="searchStaff()"></el-button>
+                            </el-input>
+                        </el-form>
+                    </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">
+                <template slot="header">
+                    <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>
+                </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>
+                </template>
+                <template slot-scope="scope">
+                    <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 prop="sort" 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>
+                </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">
+                <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>
+                </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>
+                </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>
+                </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">
+                <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>
+                </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>
+                </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>
+                </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">
+                <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>
+                </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-dropdown @command="handleCommand">
-          <el-button type="primary" >
-                新增 <i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="newAdd" >新添加</el-dropdown-item>
-                <el-dropdown-item command="fromOrg">从组织添加</el-dropdown-item>
-          </el-dropdown-menu>
-    </el-dropdown>
-        </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>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 新增下级机关单位/基层科室 -->
-    <el-dialog title="新增部门"
-               :visible.sync="dialogVisible"
-               width="850"
-               :before-close="handleClose" destroy-on-close>
-      <el-form label-width="120px"
-               :rules="rules">
-        <el-form-item label="部门名称"
-                      prop="addDepartmentName">
-          <el-input v-model.trim="insertForm.departmentName"
-                    placeholder="请输入部门名称"></el-input>
-        </el-form-item>
-        <el-form-item label="组织编码"
-                      prop="code">
-          <el-input v-model.trim="insertForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="联系人"
-                      prop="contacts">
-          <el-input v-model.trim="insertForm.contacts"
-                    placeholder="请输入联系人姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="mobile">
-          <el-input v-model.trim="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>
-      </div>
-    </el-dialog>
-
-    <!-- 新增网格 -->
-    <div v-if="dialogVisibleGrid">
-      <el-dialog title="新增网格"
-                 :visible.sync="dialogVisibleGrid"
-                 width="850"
-                 :before-close="cancelGrid" destroy-on-close>
-        <el-form label-width="120px"
-                    ref="addGridForm"
-                    :model="GridForm"
-                 :rules="rules">
-          <el-form-item label="网格名称"
-                        prop="gridName">
-            <el-input v-model.trim="GridForm.gridName"
-                      placeholder="请输入部门名称"></el-input>
-          </el-form-item>
-          <el-form-item label="网格编码"
-                        prop="GridCode">
-            <el-input v-model.trim="GridForm.code"
-                      placeholder="请输入网格编码"></el-input>
-          </el-form-item>
-
-          <!-- 网格类型，下拉框 -->
-          <el-form-item label="网格类型"
-                        prop="typeTag">
-            <el-select v-model.trim="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="sort">
-            <el-input-number v-model="GridForm.sort" :min="1" :max="50" label="排序"></el-input-number>
-          </el-form-item>
-
-          <el-form-item label="联系人"
-                        prop="GridContacts">
-            <el-input v-model.trim="GridForm.contacts"
-                      placeholder="请输入联系人姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="GridMobile">
-            <el-input v-model.trim="GridForm.mobile"
-                      placeholder="请输入联系电话"></el-input>
-          </el-form-item>
-
-          <!-- 组织位置 -->
-          <el-form-item
-          label="坐标"
-          prop="longitude"
-          label-width="120px"
-          style="display: block"
-        >
-          <div style="width: 500px">
-            <el-select
-              v-model.trim="searchValue"
-              filterable
-              style="width: 500px"
-              remote
-              :reserve-keyword="true"
-              placeholder="请输入关键词"
-              :remote-method="remoteMethod"
-              :loading="loading"
-            >
-              <el-option
-                v-for="(item, index) in searchOptions"
-                @click.native="handleClickKey(index)"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <div id="wangge" class="div_map"></div>
-          </div>
-        </el-form-item>
-        </el-form>
-
-        <div slot="footer">
-          <el-button @click="cancelGrid">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitGrid">确 定</el-button>
+                    <el-dropdown @command="handleCommand">
+                        <el-button type="primary">
+                            新增 <i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item command="newAdd">新添加</el-dropdown-item>
+                            <el-dropdown-item command="fromOrg">从组织添加</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                </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>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 新增下级机关单位/基层科室 -->
+        <el-dialog title="新增部门" :visible.sync="dialogVisible" width="850" :before-close="handleClose" destroy-on-close>
+            <el-form label-width="120px" :rules="rules">
+                <el-form-item label="部门名称" prop="addDepartmentName">
+                    <el-input v-model.trim="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
+                </el-form-item>
+                <el-form-item label="组织编码" prop="code">
+                    <el-input v-model.trim="insertForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="联系人" prop="contacts">
+                    <el-input v-model.trim="insertForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobile">
+                    <el-input v-model.trim="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>
+            </div>
+        </el-dialog>
+
+        <!-- 新增网格 -->
+        <div v-if="dialogVisibleGrid">
+            <el-dialog title="新增网格" :visible.sync="dialogVisibleGrid" width="850" :before-close="cancelGrid"
+                destroy-on-close>
+                <el-form label-width="120px" ref="addGridForm" :model="GridForm" :rules="rules">
+                    <el-form-item label="网格名称" prop="gridName">
+                        <el-input v-model.trim="GridForm.gridName" placeholder="请输入部门名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="网格编码" prop="GridCode">
+                        <el-input v-model.trim="GridForm.code" placeholder="请输入网格编码"></el-input>
+                    </el-form-item>
+
+                    <!-- 网格类型，下拉框 -->
+                    <el-form-item label="网格类型" prop="typeTag">
+                        <el-select v-model.trim="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="sort">
+                        <el-input-number v-model="GridForm.sort" :min="1" :max="50" label="排序"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="联系人" prop="GridContacts">
+                        <el-input v-model.trim="GridForm.contacts" placeholder="请输入联系人姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="GridMobile">
+                        <el-input v-model.trim="GridForm.mobile" placeholder="请输入联系电话"></el-input>
+                    </el-form-item>
+
+                    <!-- 组织位置 -->
+                    <el-form-item label="坐标" prop="longitude" label-width="120px" style="display: block">
+                        <div style="width: 500px">
+                            <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                                :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :key="item.value" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <div id="wangge" class="div_map"></div>
+                        </div>
+                    </el-form-item>
+                </el-form>
+
+                <div slot="footer">
+                    <el-button @click="cancelGrid">取 消</el-button>
+                    <el-button type="primary" @click="submitGrid">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
 
-    <!-- 新增人员 -->
-    <div v-if="dialogVisiblePeo">
-      <el-dialog title="新增人员"
-                 :visible.sync="dialogVisiblePeo"
-                 width="850"
-                 :before-close="handleClose" destroy-on-close>
-        <el-form :model="peoForm"
-                 label-width="120px"
-                 ref="addPeoForm"
-                 :rules="rulesPeo">
-          <el-form-item label="姓名"
-                        prop="name">
-            <el-input v-model.trim="peoForm.name"
-                      placeholder="请输入姓名"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="mobile">
-            <el-input v-model.trim="peoForm.mobile"
-                      placeholder="请输入联系电话"></el-input>
-          </el-form-item>
-          <el-form-item label="证件号"
-                        prop="idCard">
-            <el-input v-model.trim="peoForm.idCard"
-                      placeholder="请输入证件号"></el-input>
-          </el-form-item>
-          <!-- 性别下拉框 -->
-          <el-form-item label="性别"
-                        prop="gender">
-            <el-select v-model.trim="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.trim="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="职责"
+        <!-- 新增人员 -->
+        <div v-if="dialogVisiblePeo">
+            <el-dialog title="新增人员" :visible.sync="dialogVisiblePeo" width="850" :before-close="handleClose"
+                destroy-on-close>
+                <el-form :model="peoForm" label-width="120px" ref="addPeoForm" :rules="rulesPeo">
+                    <el-form-item label="姓名" prop="name">
+                        <el-input v-model.trim="peoForm.name" placeholder="请输入姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话" prop="mobile">
+                        <el-input v-model.trim="peoForm.mobile" placeholder="请输入联系电话"></el-input>
+                    </el-form-item>
+                    <el-form-item label="证件号" prop="idCard">
+                        <el-input v-model.trim="peoForm.idCard" placeholder="请输入证件号"></el-input>
+                    </el-form-item>
+                    <!-- 性别下拉框 -->
+                    <el-form-item label="性别" prop="gender">
+                        <el-select v-model.trim="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.trim="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.trim="peoForm.duty"
                        multiple
@@ -473,119 +290,69 @@
             </el-select>
           </el-form-item> -->
 
-          <el-form-item label="角色"
-                        prop="newRoles">
-            <el-select v-model.trim="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-item label="管辖范围"
-                        prop="manageScopes">
-            <el-cascader class="u-item-width-normal"
-                       size="small"
-                       ref="myCascader"
-                       v-model.trim="peoForm.manageScopes"
-                       :options="orgOptions"
-                       :props="orgOptionProps"
-                       :show-all-levels="true"                     
-                       clearable></el-cascader>
-          </el-form-item>
-        </el-form>
-        <div slot="footer">
-          <el-button @click="cancelPeo">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitPeo">确 定</el-button>
+                    <el-form-item label="角色" prop="newRoles">
+                        <el-select v-model.trim="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-item label="管辖范围" prop="manageScopes">
+                        <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                            v-model.trim="peoForm.manageScopes" :options="orgOptions" :props="orgOptionProps"
+                            :show-all-levels="true" clearable></el-cascader>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="cancelPeo">取 消</el-button>
+                    <el-button type="primary" @click="submitPeo">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
-    <div v-if="dialogVisiblePeoAgency">
-      <el-dialog title="新增人员ccccc"
-                 :visible.sync="dialogVisiblePeoAgency"
-                 width="850"
-                >
-        <el-form :model="peoFormAgency"
-                 label-width="120px"
-                 ref="addPeoAgencyForm"
-                 :rules="rulesAgencyPeo">
-          <el-form-item label="工作人员" prop="selectedList">
-            <el-select v-model.trim="peoFormAgency.selectedList"
-                       multiple
-                      placeholder="请选择"
-                       >
-                       <el-option v-for="item in agencyStaffTableListData"
-                        :key="item.staffId"
-                        :value="item.staffId"
-                        :label="item.name"
-                       >
-
-                       </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div slot="footer">
-          <el-button @click="cancelPeoAgency">取 消</el-button>
-          <el-button type="primary"
-                     @click="submitPeoAgency">确 定</el-button>
+        <div v-if="dialogVisiblePeoAgency">
+            <el-dialog title="新增人员ccccc" :visible.sync="dialogVisiblePeoAgency" width="850">
+                <el-form :model="peoFormAgency" label-width="120px" ref="addPeoAgencyForm" :rules="rulesAgencyPeo">
+                    <el-form-item label="工作人员" prop="selectedList">
+                        <el-select v-model.trim="peoFormAgency.selectedList" multiple placeholder="请选择">
+                            <el-option v-for="item in agencyStaffTableListData" :key="item.staffId"
+                                :value="item.staffId" :label="item.name">
+
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="cancelPeoAgency">取 消</el-button>
+                    <el-button type="primary" @click="submitPeoAgency">确 定</el-button>
+                </div>
+            </el-dialog>
         </div>
-      </el-dialog>
-    </div>
-    <!-- 人员修改 -->
-    <el-dialog v-if="modifyPeo"
-               title="人员修改"
-               :visible.sync="modifyPeo"
-               width="850"
-               :before-close="handleClose" destroy-on-close>
-      <el-form :model="peoForm"
-               label-width="120px"
-               ref="editPeoForm"
-               :rules="rulesPeo">
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model.trim="peoForm.name"
-                    placeholder="请输入姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话"
-                      prop="mobile">
-          <el-input v-model.trim="peoForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item label="证件号"
-                      prop="mobile">
-          <el-input v-model.trim="peoForm.idCard"
-                    placeholder="请输入证件号"></el-input>
-        </el-form-item>
-        <el-form-item label="性别"
-                      prop="gender">
-          <el-select v-model.trim="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.trim="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="职责"
+        <!-- 人员修改 -->
+        <el-dialog v-if="modifyPeo" title="人员修改" :visible.sync="modifyPeo" width="850" :before-close="handleClose"
+            destroy-on-close>
+            <el-form :model="peoForm" label-width="120px" ref="editPeoForm" :rules="rulesPeo">
+                <el-form-item label="姓名" prop="name">
+                    <el-input v-model.trim="peoForm.name" placeholder="请输入姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话" prop="mobile">
+                    <el-input v-model.trim="peoForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item label="证件号" prop="mobile">
+                    <el-input v-model.trim="peoForm.idCard" placeholder="请输入证件号"></el-input>
+                </el-form-item>
+                <el-form-item label="性别" prop="gender">
+                    <el-select v-model.trim="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.trim="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.trim="peoForm.duty"
                      multiple
@@ -598,493 +365,310 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="角色"
-                      prop="newRoles">
-          <el-select v-model.trim="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-item label="管辖范围"
-                        prop="manageScopes">
-            <el-cascader class="u-item-width-normal"
-                       size="small"
-                       ref="myCascader"
-                       v-model.trim="peoForm.manageScopes"
-                       :options="orgOptions"
-                       :props="orgOptionProps"
-                       :show-all-levels="true"
-                       clearable></el-cascader>
-          </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelXiugai">取 消</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">
-      <span>禁用后该用户将无法登录系统，是否继续？</span>
-      <div slot="footer">
-        <el-button @click="cancelDisable">取 消</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" destroy-on-close>
-      <el-form label-width="120px">
-        <el-form-item label="姓名">
-          <el-input v-model.trim="peoForm.name"
-                    placeholder="姓名"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model.trim="peoForm.mobile"
-                    placeholder="联系电话"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="证件号">
-          <el-input v-model.trim="peoForm.idCard"
-                    placeholder="--"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="组织/部门">
-          <el-input v-model.trim="peoForm.zuzhi"
-                    placeholder="组织/部门"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <el-form-item label="激活时间">
-          <el-input v-model.trim="peoForm.activeTime"
-                    placeholder="激活时间"
-                    :disabled="true"></el-input>
-        </el-form-item>
-        <!-- <el-form-item label="职位">
+                <el-form-item label="角色" prop="newRoles">
+                    <el-select v-model.trim="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-item label="管辖范围" prop="manageScopes">
+                    <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                        v-model.trim="peoForm.manageScopes" :options="orgOptions" :props="orgOptionProps"
+                        :show-all-levels="true" clearable></el-cascader>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelXiugai">取 消</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">
+            <span>禁用后该用户将无法登录系统，是否继续？</span>
+            <div slot="footer">
+                <el-button @click="cancelDisable">取 消</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"
+            destroy-on-close>
+            <el-form label-width="120px">
+                <el-form-item label="姓名">
+                    <el-input v-model.trim="peoForm.name" placeholder="姓名" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model.trim="peoForm.mobile" placeholder="联系电话" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="证件号">
+                    <el-input v-model.trim="peoForm.idCard" placeholder="--" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="组织/部门">
+                    <el-input v-model.trim="peoForm.zuzhi" placeholder="组织/部门" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="激活时间">
+                    <el-input v-model.trim="peoForm.activeTime" placeholder="激活时间" :disabled="true"></el-input>
+                </el-form-item>
+                <!-- <el-form-item label="职位">
           <el-input v-model.trim="peoForm.duty"
                     placeholder="职位"
                     :disabled="true"></el-input>
         </el-form-item> -->
-        <el-form-item label="角色"
-                      prop="szsqRoles">
-          <el-select v-model.trim="peoForm.szsqRoles"
-                     multiple
-                     placeholder="请选择"  :disabled="true">
-            <el-option v-for="item in szsqRoles"
-                       :key="item"
-                       :label="item"
-                       :value="item">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否禁用">
-          <el-input v-model.trim="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>
-      </div>
-    </el-dialog>
-
-    <!-- 人员调动 -->
-    <el-dialog v-if="transferPeo"
-               title="人员调动"
-               :visible.sync="transferPeo"
-               width="850"
-               :before-close="handleClose" destroy-on-close>
-      <el-form label-width="120px"
-               :model="agencyForm">
-        <el-form-item label="姓名">
-          <el-input v-model.trim="transferForm.name"
-                    placeholder="姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="调动至">
-          <el-cascader clearable
-                       :props="{ checkStrictly: true, multiple: false }"
-                       v-model.trim="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>
-            </template>
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="调动原因">
-          <el-input type="textarea"
-                    :rows="2"
-                    placeholder="请输入内容"
-                    maxlength="500"
-                    show-word-limit
-                    v-model.trim="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>
-      </div>
-    </el-dialog>
-
-    <!-- 新增组织 -->
-    <el-dialog v-if="createAgencyDialogFlag"
-               title="新增组织"
-               :visible.sync="createAgencyDialogFlag"
-               width="850"
-               :before-close="handleClose" destroy-on-close>
-      <el-form label-width="120px" :model="agencyForm" ref="agencyForm" :rules="rulesAddAgency">
-        <el-form-item label="组织名称" prop="agencyName">
-          <el-input v-model.trim="agencyForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <!-- 组织区划 -->
-        <el-form-item label="组织区划" prop="areaCode">
-          <el-select v-model.trim="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.trim="agencyForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model.trim="agencyForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model.trim="agencyForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item
-          label="坐标"
-          prop="longitude"
-          label-width="120px"
-          style="display: block"
-        >
-          <div style="width: 500px">
-            <el-select
-              v-model.trim="searchValue"
-              filterable
-              style="width: 500px"
-              remote
-              :reserve-keyword="true"
-              placeholder="请输入关键词"
-              :remote-method="remoteMethod"
-              :loading="loading"
-            >
-              <el-option
-                v-for="(item, index) in searchOptions"
-                @click.native="handleClickKey(index)"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <div id="jiedao" class="div_map"></div>
-          </div>
-        </el-form-item>
-        <el-form-item label="机构简介">
-            <el-input class="u-edit-width-normal"
-                        type="textarea"
-                        maxlength="500"
-                        show-word-limit
-                        :rows="3"
-                        placeholder="请输入简介，不超过500字"
-                        v-model.trim="agencyForm.description"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="canceladdNewAgency">取 消</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" destroy-on-close>
-      <el-form label-width="120px">
-        <el-form-item label="组织名称">
-          <el-input v-model.trim="OrgDetailsForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model.trim="OrgDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model.trim="OrgDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model.trim="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item
-          label="坐标"
-          prop="longitude"
-          label-width="120px"
-          style="display: block"
-        >
-          <div style="width: 500px">
-            <el-select
-              v-model.trim="searchValue"
-              filterable
-              style="width: 500px"
-              remote
-              :reserve-keyword="true"
-              placeholder="请输入关键词"
-              :remote-method="remoteMethod"
-              :loading="loading"
-            >
-              <el-option
-                v-for="(item, index) in searchOptions"
-                @click.native="handleClickKey(index)"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <div id="shiqu" class="div_map"></div>
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelModifyCityOrgPop">取 消</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" destroy-on-close>
-      <el-form label-width="120px">
-        <el-form-item label="组织名称">
-          <el-input v-model.trim="OrgDetailsForm.agencyName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <!-- 组织区划 -->
-        <el-form-item label="组织区划">
-          <el-select v-model.trim="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.trim="OrgDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model.trim="OrgDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model.trim="OrgDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-        <el-form-item
-          label="坐标"
-          prop="longitude"
-          label-width="120px"
-          style="display: block"
-        >
-          <div style="width: 500px">
-            <el-select
-              v-model.trim="searchValue"
-              filterable
-              style="width: 500px"
-              remote
-              :reserve-keyword="true"
-              placeholder="请输入关键词"
-              :remote-method="remoteMethod"
-              :loading="loading"
-            >
-              <el-option
-                v-for="(item, index) in searchOptions"
-                @click.native="handleClickKey(index)"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <div id="jiedao" class="div_map"></div>
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelstreetOrCommunity">取 消</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" destroy-on-close>
-      <el-form label-width="120px">
-        <el-form-item label="部门名称">
-          <el-input v-model.trim="OrgUnitDetailsForm.departmentName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model.trim="OrgUnitDetailsForm.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input v-model.trim="OrgUnitDetailsForm.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model.trim="OrgUnitDetailsForm.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-      </el-form>
-      <!-- <div>*部分负责人联系电话可用于接收工作短信通知，请如实填写。</div> -->
-      <div slot="footer">
-        <el-button @click="cancelOrgUnitPop">取 消</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" destroy-on-close>
-      <el-form label-width="120px">
-        <el-form-item label="网格名称">
-          <el-input v-model.trim="modifyGridFrom.gridName"
-                    placeholder="请输入组织名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="组织编码">
-          <el-input v-model.trim="modifyGridFrom.code"
-                    placeholder="请输入组织编码"></el-input>
-        </el-form-item>
-
-        <!-- 网格类型下拉框 -->
-        <el-form-item label="网格类型"
-                      prop="typeTag">
-          <el-select v-model.trim="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.trim="modifyGridFrom.gridSort"
-                           :min="1"
-                           label="排序"></el-input-number>
-        </el-form-item>
-
-        <el-form-item label="负责人">
-          <el-input v-model.trim="modifyGridFrom.contacts"
-                    placeholder="请输入负责人名字"></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model.trim="modifyGridFrom.mobile"
-                    placeholder="请输入联系电话"></el-input>
-        </el-form-item>
-
-        <!-- 组织位置,地图 -->
-        <el-form-item
-          label="坐标"
-          prop="longitude"
-          label-width="120px"
-          style="display: block"
-        >
-          <div style="width: 500px">
-            <el-select
-              v-model.trim="searchValue"
-              filterable
-              style="width: 500px"
-              remote
-              :reserve-keyword="true"
-              placeholder="请输入关键词"
-              :remote-method="remoteMethod"
-              :loading="loading"
-            >
-              <el-option
-                v-for="(item, index) in searchOptions"
-                @click.native="handleClickKey(index)"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <div id="wangge" class="div_map"></div>
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="cancelModifyGridPop">取 消</el-button>
-        <el-button type="primary"
-                   @click="submitModifyGrid">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
+                <el-form-item label="角色" prop="szsqRoles">
+                    <el-select v-model.trim="peoForm.szsqRoles" multiple placeholder="请选择" :disabled="true">
+                        <el-option v-for="item in szsqRoles" :key="item" :label="item" :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="是否禁用">
+                    <el-input v-model.trim="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>
+            </div>
+        </el-dialog>
+
+        <!-- 人员调动 -->
+        <el-dialog v-if="transferPeo" title="人员调动" :visible.sync="transferPeo" width="850" :before-close="handleClose"
+            destroy-on-close>
+            <el-form label-width="120px" :model="agencyForm">
+                <el-form-item label="姓名">
+                    <el-input v-model.trim="transferForm.name" placeholder="姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="调动至">
+                    <el-cascader clearable :props="{ checkStrictly: true, multiple: false }" v-model.trim="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>
+                        </template>
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="调动原因">
+                    <el-input type="textarea" :rows="2" placeholder="请输入内容" maxlength="500" show-word-limit
+                        v-model.trim="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>
+            </div>
+        </el-dialog>
+
+        <!-- 新增组织 -->
+        <el-dialog v-if="createAgencyDialogFlag" title="新增组织" :visible.sync="createAgencyDialogFlag" width="850"
+            :before-close="handleClose" destroy-on-close>
+            <el-form label-width="120px" :model="agencyForm" ref="agencyForm" :rules="rulesAddAgency">
+                <el-form-item label="组织名称" prop="agencyName">
+                    <el-input v-model.trim="agencyForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <!-- 组织区划 -->
+                <el-form-item label="组织区划" prop="areaCode">
+                    <el-select v-model.trim="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.trim="agencyForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model.trim="agencyForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model.trim="agencyForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item label="坐标" prop="longitude" label-width="120px" style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                            :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <div id="jiedao" class="div_map"></div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="机构简介">
+                    <el-input class="u-edit-width-normal" type="textarea" maxlength="500" show-word-limit :rows="3"
+                        placeholder="请输入简介，不超过500字" v-model.trim="agencyForm.description"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="canceladdNewAgency">取 消</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" destroy-on-close>
+            <el-form label-width="120px">
+                <el-form-item label="组织名称">
+                    <el-input v-model.trim="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model.trim="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model.trim="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model.trim="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item label="坐标" prop="longitude" label-width="120px" style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                            :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <div id="shiqu" class="div_map"></div>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelModifyCityOrgPop">取 消</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" destroy-on-close>
+            <el-form label-width="120px">
+                <el-form-item label="组织名称">
+                    <el-input v-model.trim="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model.trim="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.trim="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model.trim="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model.trim="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+                <el-form-item label="坐标" prop="longitude" label-width="120px" style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                            :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <div id="jiedao" class="div_map"></div>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelstreetOrCommunity">取 消</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"
+            destroy-on-close>
+            <el-form label-width="120px">
+                <el-form-item label="部门名称">
+                    <el-input v-model.trim="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model.trim="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+                <el-form-item label="负责人">
+                    <el-input v-model.trim="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model.trim="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+            </el-form>
+            <!-- <div>*部分负责人联系电话可用于接收工作短信通知，请如实填写。</div> -->
+            <div slot="footer">
+                <el-button @click="cancelOrgUnitPop">取 消</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" destroy-on-close>
+            <el-form label-width="120px">
+                <el-form-item label="网格名称">
+                    <el-input v-model.trim="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input>
+                </el-form-item>
+
+                <el-form-item label="组织编码">
+                    <el-input v-model.trim="modifyGridFrom.code" placeholder="请输入组织编码"></el-input>
+                </el-form-item>
+
+                <!-- 网格类型下拉框 -->
+                <el-form-item label="网格类型" prop="typeTag">
+                    <el-select v-model.trim="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.trim="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number>
+                </el-form-item>
+
+                <el-form-item label="负责人">
+                    <el-input v-model.trim="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-input v-model.trim="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input>
+                </el-form-item>
+
+                <!-- 组织位置,地图 -->
+                <el-form-item label="坐标" prop="longitude" label-width="120px" style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                            :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                            :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                        <div id="wangge" class="div_map"></div>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelModifyGridPop">取 消</el-button>
+                <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -1092,1897 +676,1909 @@ import { requestPost, requestGet } from "@/js/dai/request";
 import daiMap from "@/utils/dai-map";
 var map
 export default {
-  data () {
-    return {
-      // 新增组织弹窗
-      createAgencyDialogFlag: false,
-      // 修改市区级组织弹窗
-      modifyCityOrgPop: false,
-      // 修改街道/社区级组织弹窗
-      streetOrCommunity: false,
-      // 修改下级机关单位弹窗
-      OrgUnitPop: false,
-      // 修改网格弹窗
-      modifyGridPop: false,
-      // 组织列表展示标识
-      agencyTableFlag: true,
-      // 组织工作人员列表展示标识
-      currentAgencyStaffTableFlag: true,
-      // 组织列表数据
-      agencyTableListData: [],
-      // 组织工作人员列表数据
-      agencyStaffTableListData: [],
-
-      // 部门列表（机关、科室列表）列表展示标识
-      departmentTableFlag: true,
-      // 部门人员列表展示标识
-      departmentStaffTableFlag: false,
-      // 部门列表数据
-      departmentTableListData: [],
-      // 部门工作人员列表数据
-      departmentStaffTableListData: [],
-
-      // 网格列表展示标识
-      gridTableFlag: true,
-      // 网格人员列表展示标识
-      gridStaffTableFlag: false,
-      // 网格列表数据
-      gridTableListData: [],
-      // 网格工作人员列表数据
-      gridStaffTableListData: [],
-
-      // 用户所属组织ID
-      userAgencyId: localStorage.getItem("agencyId"),
-      // 修改时操作的用户staffId
-      userStaffId: "",
-      // 当前被操作的组织的ID
-      currentAgencyId: localStorage.getItem("agencyId"),
-      // 当前被操作的部门的ID
-      currentDepartmentId: "14f572e724eecf7668b655505d789cab",
-      // 当前被操作的网格的ID
-      currentGridOrgId: "63d5ff92ea981b1c58e4914ac894c610",
-
-      // 当前被操作的组织的级别
-      currentAgencyLevel: localStorage.getItem("level"),
-      currentAreaCode: "",
-      currentAreaCodeSwitch: "",
-      parentAreaCode: "",
-      parentAgencyId: localStorage.getItem("agencyId"),
-      parentAgencyLevel: localStorage.getItem("level"),
-
-      // 经纬度坐标
-      lat: "",
-      lng: "",
-      latitude: "",
-      longitude: "",
-      Navigation: "",
-      searchValue:"",
-      searchOptions:[],
-      resultList:[],
-      // 查询参数
-      queryParams: {
-        deptName: undefined,
-        status: undefined,
-      },
-      // 状态列表
-      dictList: [],
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 遮罩层
-      loading: true,
-      // 表格树数据
-      deptList: [],
-
-      // 弹窗开关
-      dialogVisible: false,
-      dialogVisibleGrid: false,
-      dialogVisiblePeo: false,
-      Disable: false,
-      details: false,
-      transferPeo: false,
-      // 社区添加表单项
-      insertForm: {
-        departmentName: "",
-        code: "",
-        contacts: "",
-        mobile: "",
-        agencyId: "",
-        departmentDuty: "",
-      },
-      // 网格添加表单项
-      GridForm: {
-        gridName: "",
-        code: "",
-        contacts: "",
-        mobile: "",
-        agencyId: "",
-        manageDistrict: "",
-        gridType: "",
-        location: "", //坐标位置
-        longitude: "", //经度
-        latitude: "", //纬度
-        centerAddress: "",
-        sort: 1,
-      },
-      // 新增组织
-      agencyForm: {
-        parentAgencyId: "",
-        agencyName: "",
-        level: "",
-        areaCodeSwitch: "",
-        areaCode: "",
-        areaName: "",
-        contacts: "",
-        mobile: "",
-        code: "",
-        description:"",
-      },
-      // 树
-      tree: [],
-      // 新增人员表单项
-      peoForm: {
-        name: "",
-        mobile: "",
-        idCard: "",
-        gender: "",
-        post: "",
-        orgType: "",
-        activeTime: "",
-        zuzhi: "",
-        disableFlag: "",
-        newRoles: [],
-        manageScopes:[]
-      },
-      // 人员调动
-      transferForm: {
-        name: "",
-        remarks: "",
-        transferTo: "",
-        staffId: "",
-        orgId: "",
-        orgType: "",
-      },
-      // 人员禁用
-      DisableForm: {
-        staffId: "",
-        agencyId: "",
-        customerId: "",
-      },
-      // 组织详细信息
-      OrgDetailsForm: {
-        level: "",
-        agencyName: "",
-        code: "",
-        contacts: "",
-        mobile: "",
-        centerAddress: "",
-        areaCode: "",
-        agencyId: "",
-        areaName: "",
-      },
-      // 下级机关单位
-      OrgUnitDetailsForm: {
-        code: "",
-        contacts: "",
-        departmentId: "",
-        departmentName: "",
-        mobile: "",
-      },
-      // 网格修改表单
-      modifyGridFrom: {
-        gridName: "",
-        code: "",
-        gridTypeName: "",
-        contacts: "",
-        mobile: "",
-        latitude: "",
-        longitude: "",
-        agencyId: "",
-        gridType: "",
-        manageDistrict: "",
-        griId: "",
-        // 排序
-        gridSort: 0,
-      },
-      judgeOrgInfoLevel: [],
-      keyWords: "",
-      typeList: [],
-      // 性别字典
-      genderList: [
-        { value: 1, label: "男" },
-        { value: 2, label: "女" },
-        { value: 0, label: "未知" },
-      ],
-      // 专兼职字典
-      postList: [
-        { value: "fulltime", label: "专职" },
-        { value: "parttime", label: "兼职" },
-      ],
-      // 修改操作是否展示
-      modifyPeo: false,
-
-      roleList: [],
-
-      // 级联数据
-      options: [],
-      selectValue: [],
-      // 顶部 面包屑
-      breadcrumbArr: [],
-      // 面包屑 当前所属机构ID
-      currentBreadcrumbKey: "",
-      // 组织区划数据
-      zonings: [],
-      // 校验
-      rules: {
-        departmentName: [
-          { required: true, message: "社区名称必填", trigger: "blur" },
-        ],
-        gridName: [
-          { required: true, message: "网格名称必填", trigger: "blur" },
-        ],
-        addDepartmentName: [
-          { required: true, message: "部门名称必填", trigger: "blur" },
-        ],
-      },
-
-      rulesPeo: {
-        name: [{ required: true, message: "姓名必填", trigger: "blur" }],
-        mobile: [{ required: true, message: "联系电话必填", trigger: "blur" }],
-        idCard: [{ required: true, message: "证件号必填", trigger: "blur" }],
-        gender: [{ required: true, message: "性别必填", trigger: "blur" }],
-        post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
-        newRoles: [{ required: true, message: "角色必填", trigger: "blur" }],
-      },
-      rulesAddAgency:{
-        areaCode: [{ required: true, message: "组织区划必填", trigger: "blur" }]
-      },
-      selDeptType: "",
-
-      // 组织树
-      orgOptions: [],
-      orgOptionProps :{
-      multiple: true,
-      emitPath: true, 
-      value: 'agencyId',
-      label: 'agencyName',
-      children: 'subAgencyList',
-      checkStrictly: true
-      // lazyLoad: (node, resolve) => {
-      //               this.loadOptions(node, resolve)
-      //           },
-    
-    },
-    dialogVisiblePeoAgency:false,//通过组织添加
-    peoFormAgency:{
-      gridId:"",
-      selectedList:[]
-    },
-    rulesAgencyPeo:{
-      selectedList:[{required:true,message:"请选择人员",trigger:"blur"}]
-    },
-    tableKey:""
-    };
-  },
-  created () {
-    this.getAgencyList();
-    this.getDepartmentList();
-    this.getGridList();
-    this.getAgencyStaffListData();
-    this.getRoleList();
-    this.getOrgTreeList()
-    // this.getNavigation()
-    // 更新顶部面包屑
-    this.assembleBreadcrumbArr(localStorage.getItem("agencyId"), "agency");
-  },
-
-  watch: {
-    dialogVisibleGrid (val) {
-      if (val) {
-        setTimeout(() => {
-          this.initMap('wangge');
-        }, 1000);
-      }
-    },
-    createAgencyDialogFlag (val) {
-      if (val) {
-        setTimeout(() => {
-          this.initMap('jiedao');
-        }, 1000);
-      }
-    },
-    modifyCityOrgPop (val) {
-      if (val) {
-        setTimeout(() => {
-          this.initMap('shiqu');
-        }, 1000);
-      }
-    },
-    streetOrCommunity (val) {
-      if (val) {
-        setTimeout(() => {
-          this.initMap('jiedao');
-        }, 1000);
-      }
-    },
-    modifyGridPop (val) {
-      if (val) {
-        setTimeout(() => {
-          this.initMap('wangge');
-        }, 1000);
-      }
-    },
-  },
-  mounted () {
-  },
-  methods: {
-    getOrgTreeList () {
-      this.$http
-        .post('/gov/org/customeragency/agencygridtree', {})
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取组织树成功', res.data)
-            this.orgOptions = []
-            this.orgOptions.push(res.data)
-            console.log(this.orgOptions,"sdkfhkjdfs");
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    // async loadOptions(node, resolve) {
-    //   let data1 =node.data;
-    //   if (data1.level == 'district') {
-    //       resolve(this.orgOptions);
-
-    //   } else {
-    //         if(data1.level !== "building"){            
-    //           const url = "/actual/base/communityBuilding/tree/nextTreeNode";
-		// 	        let params = {
-    //           level:data1.level,
-    //           id:data1.id
-    //          };
-		// 	        const { data, code, msg } =await requestGet(url, params);
-    //           data1.children=data
-    //           resolve(data);
-    //       }else{
-    //         return resolve()
-    //       }
-
-    //   }
-    // },
-    // 点击后获取id
-    handleChangeTransferCascader (e) {
-      function findItem (valueArr, coll) {
-        let copyArr = [...valueArr];
-        let firstValue = copyArr.shift();
-        let item = coll.find((a) => a.value == firstValue);
-        if (copyArr.length > 0) {
-          return findItem(copyArr, item.children);
-        } else {
-          return item;
-        }
-      }
-      let item = findItem(e, this.options);
-      this.transferForm.orgId = item.value;
-      this.transferForm.orgType = item.type;
-    },
-    /** 查询系统工作人员角色（职责） */
-    async getRoleList () {
-      this.tableLoading = true;
-
-      const url = "/gov/access/govrole/roleListOfCustomer";
-
-      let params = {};
-
-      const { data, code, msg } = await requestGet(url, params);
-
-      if (code === 0) {
-        this.roleList = data;
-      } else {
-        this.$message.error(msg);
-      }
-      this.tableLoading = false;
-    },
-    /** 查询组织列表 */
-    async getAgencyList () {
-      const url = "/gov/org/agency/agencylist";
-      let params = {
-        agencyId: this.currentAgencyId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.agencyTableListData = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    /** 查询社区列表 */
-    async getDepartmentList () {
-      const url = "/gov/org/department/departmentlist";
-
-      let params = {
-        agencyId: this.currentAgencyId,
-      };
-
-      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 = "社会自组织";
-          } else {
-            element.departmentTypeShow = "";
-          }
-        });
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    /** 查询网格列表 */
-    async getGridList () {
-      const url = "/gov/org/grid/allgrids";
-
-      let params = {
-        agencyId: this.currentAgencyId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.gridTableListData = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 查询网格人员列表
-    async getGridStaffListData () {
-      const url = "/data/aggregator/org/stafflist";
-
-      let params = {
-        orgId: this.currentGridOrgId,
-        orgType: "grid",
-        pageNo: 1,
-        pageSize: 100,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.gridStaffTableListData = data.staffList;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 查询组织工作人员
-    async getAgencyStaffListData () {
-      const url = "/data/aggregator/org/stafflist";
-
-      let params = {
-        orgId: this.currentAgencyId,
-        orgType: "agency",
-        pageNo: 1,
-        pageSize: 100,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.agencyStaffTableListData = data.staffList;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 查询部门人员
-    async getDepartmentStaffListData () {
-      const url = "/data/aggregator/org/stafflist";
-
-      let params = {
-        orgId: this.currentDepartmentId,
-        orgType: "dept",
-        pageNo: 1,
-        pageSize: 100,
-      };
+    data() {
+        return {
+            // 新增组织弹窗
+            createAgencyDialogFlag: false,
+            // 修改市区级组织弹窗
+            modifyCityOrgPop: false,
+            // 修改街道/社区级组织弹窗
+            streetOrCommunity: false,
+            // 修改下级机关单位弹窗
+            OrgUnitPop: false,
+            // 修改网格弹窗
+            modifyGridPop: false,
+            // 组织列表展示标识
+            agencyTableFlag: true,
+            // 组织工作人员列表展示标识
+            currentAgencyStaffTableFlag: true,
+            // 组织列表数据
+            agencyTableListData: [],
+            // 组织工作人员列表数据
+            agencyStaffTableListData: [],
+
+            // 部门列表（机关、科室列表）列表展示标识
+            departmentTableFlag: true,
+            // 部门人员列表展示标识
+            departmentStaffTableFlag: false,
+            // 部门列表数据
+            departmentTableListData: [],
+            // 部门工作人员列表数据
+            departmentStaffTableListData: [],
+
+            // 网格列表展示标识
+            gridTableFlag: true,
+            // 网格人员列表展示标识
+            gridStaffTableFlag: false,
+            // 网格列表数据
+            gridTableListData: [],
+            // 网格工作人员列表数据
+            gridStaffTableListData: [],
+
+            // 用户所属组织ID
+            userAgencyId: localStorage.getItem("agencyId"),
+            // 修改时操作的用户staffId
+            userStaffId: "",
+            // 当前被操作的组织的ID
+            currentAgencyId: localStorage.getItem("agencyId"),
+            // 当前被操作的部门的ID
+            currentDepartmentId: "14f572e724eecf7668b655505d789cab",
+            // 当前被操作的网格的ID
+            currentGridOrgId: "63d5ff92ea981b1c58e4914ac894c610",
+
+            // 当前被操作的组织的级别
+            currentAgencyLevel: localStorage.getItem("level"),
+            currentAreaCode: "",
+            currentAreaCodeSwitch: "",
+            parentAreaCode: "",
+            parentAgencyId: localStorage.getItem("agencyId"),
+            parentAgencyLevel: localStorage.getItem("level"),
+
+            // 经纬度坐标
+            lat: "",
+            lng: "",
+            latitude: "",
+            longitude: "",
+            Navigation: "",
+            searchValue: "",
+            searchOptions: [],
+            resultList: [],
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined,
+            },
+            // 状态列表
+            dictList: [],
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 遮罩层
+            loading: true,
+            // 表格树数据
+            deptList: [],
+
+            // 弹窗开关
+            dialogVisible: false,
+            dialogVisibleGrid: false,
+            dialogVisiblePeo: false,
+            Disable: false,
+            details: false,
+            transferPeo: false,
+            // 社区添加表单项
+            insertForm: {
+                departmentName: "",
+                code: "",
+                contacts: "",
+                mobile: "",
+                agencyId: "",
+                departmentDuty: "",
+            },
+            // 网格添加表单项
+            GridForm: {
+                gridName: "",
+                code: "",
+                contacts: "",
+                mobile: "",
+                agencyId: "",
+                manageDistrict: "",
+                gridType: "",
+                location: "", //坐标位置
+                longitude: "", //经度
+                latitude: "", //纬度
+                centerAddress: "",
+                sort: 1,
+            },
+            // 新增组织
+            agencyForm: {
+                parentAgencyId: "",
+                agencyName: "",
+                level: "",
+                areaCodeSwitch: "",
+                areaCode: "",
+                areaName: "",
+                contacts: "",
+                mobile: "",
+                code: "",
+                description: "",
+            },
+            // 树
+            tree: [],
+            // 新增人员表单项
+            peoForm: {
+                name: "",
+                mobile: "",
+                idCard: "",
+                gender: "",
+                post: "",
+                orgType: "",
+                activeTime: "",
+                zuzhi: "",
+                disableFlag: "",
+                newRoles: [],
+                manageScopes: []
+            },
+            // 人员调动
+            transferForm: {
+                name: "",
+                remarks: "",
+                transferTo: "",
+                staffId: "",
+                orgId: "",
+                orgType: "",
+            },
+            // 人员禁用
+            DisableForm: {
+                staffId: "",
+                agencyId: "",
+                customerId: "",
+            },
+            // 组织详细信息
+            OrgDetailsForm: {
+                level: "",
+                agencyName: "",
+                code: "",
+                contacts: "",
+                mobile: "",
+                centerAddress: "",
+                areaCode: "",
+                agencyId: "",
+                areaName: "",
+            },
+            // 下级机关单位
+            OrgUnitDetailsForm: {
+                code: "",
+                contacts: "",
+                departmentId: "",
+                departmentName: "",
+                mobile: "",
+            },
+            // 网格修改表单
+            modifyGridFrom: {
+                gridName: "",
+                code: "",
+                gridTypeName: "",
+                contacts: "",
+                mobile: "",
+                latitude: "",
+                longitude: "",
+                agencyId: "",
+                gridType: "",
+                manageDistrict: "",
+                griId: "",
+                // 排序
+                gridSort: 0,
+            },
+            judgeOrgInfoLevel: [],
+            keyWords: "",
+            typeList: [],
+            // 性别字典
+            genderList: [
+                { value: 1, label: "男" },
+                { value: 2, label: "女" },
+                { value: 0, label: "未知" },
+            ],
+            // 专兼职字典
+            postList: [
+                { value: "fulltime", label: "专职" },
+                { value: "parttime", label: "兼职" },
+            ],
+            // 修改操作是否展示
+            modifyPeo: false,
+
+            roleList: [],
+
+            // 级联数据
+            options: [],
+            selectValue: [],
+            // 顶部 面包屑
+            breadcrumbArr: [],
+            // 面包屑 当前所属机构ID
+            currentBreadcrumbKey: "",
+            // 组织区划数据
+            zonings: [],
+            // 校验
+            rules: {
+                departmentName: [
+                    { required: true, message: "社区名称必填", trigger: "blur" },
+                ],
+                gridName: [
+                    { required: true, message: "网格名称必填", trigger: "blur" },
+                ],
+                addDepartmentName: [
+                    { required: true, message: "部门名称必填", trigger: "blur" },
+                ],
+            },
 
-      const { data, code, msg } = await requestPost(url, params);
+            rulesPeo: {
+                name: [{ required: true, message: "姓名必填", trigger: "blur" }],
+                mobile: [{ required: true, message: "联系电话必填", trigger: "blur" }],
+                idCard: [{ required: true, message: "证件号必填", trigger: "blur" }],
+                gender: [{ required: true, message: "性别必填", trigger: "blur" }],
+                post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
+                newRoles: [{ required: true, message: "角色必填", trigger: "blur" }],
+            },
+            rulesAddAgency: {
+                areaCode: [{ required: true, message: "组织区划必填", trigger: "blur" }]
+            },
+            selDeptType: "",
+
+            // 组织树
+            orgOptions: [],
+            orgOptionProps: {
+                multiple: true,
+                emitPath: true,
+                value: 'agencyId',
+                label: 'agencyName',
+                children: 'subAgencyList',
+                checkStrictly: true
+                // lazyLoad: (node, resolve) => {
+                //               this.loadOptions(node, resolve)
+                //           },
 
-      if (code === 0) {
-        this.departmentStaffTableListData = data.staffList;
-      } else {
-        this.$message.error(msg);
-      }
+            },
+            dialogVisiblePeoAgency: false,//通过组织添加
+            peoFormAgency: {
+                gridId: "",
+                selectedList: []
+            },
+            rulesAgencyPeo: {
+                selectedList: [{ required: true, message: "请选择人员", trigger: "blur" }]
+            },
+            tableKey: ""
+        };
     },
-    // 添加组织
-    async submit () {
-      const url = "/gov/org/department/adddepartment";
-
-      let params = {
-        agencyId: this.insertForm.agencyId,
-        departmentName: this.insertForm.departmentName,
-        departmentDuty: this.insertForm.departmentDuty,
-        contacts: this.insertForm.contacts,
-        mobile: this.insertForm.mobile,
-        code: this.insertForm.code,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("添加成功");
-        this.dialogVisible = false;
-        this.insertForm = [];
+    created() {
         this.getAgencyList();
         this.getDepartmentList();
         this.getGridList();
         this.getAgencyStaffListData();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 添加网格
-    async submitGrid () {
-        this.$refs.addGridForm.validate(async (result) => {
-            if (result === true) {
-                const url = "/gov/org/grid/addgrid";
-
-                let params = {
-                    agencyId: this.GridForm.agencyId,
-                    gridName: this.GridForm.gridName,
-                    contacts: this.GridForm.contacts,
-                    mobile: this.GridForm.mobile,
-                    code: this.GridForm.code,
-                    sort: this.GridForm.sort,
-                    manageDistrict: this.GridForm.manageDistrict,
-                    gridType: this.GridForm.gridType,
-                    latitude: this.lat,
-                    longitude: this.lng,
-                };
-
-                const { data, code, msg } = await requestPost(url, params);
-
-                if (code === 0) {
-                    this.$message.success("添加成功");
-                    this.dialogVisibleGrid = false;
-                    this.GridFormRest();
-                    this.getAgencyList();
-                    this.getDepartmentList();
-                    this.getGridList();
-                    this.getAgencyStaffListData();
+        this.getRoleList();
+        this.getOrgTreeList()
+        // this.getNavigation()
+        // 更新顶部面包屑
+        this.assembleBreadcrumbArr(localStorage.getItem("agencyId"), "agency");
+    },
+
+    watch: {
+        dialogVisibleGrid(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.initMap('wangge');
+                }, 1000);
+            }
+        },
+        createAgencyDialogFlag(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.initMap('jiedao');
+                }, 1000);
+            }
+        },
+        modifyCityOrgPop(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.initMap('shiqu');
+                }, 1000);
+            }
+        },
+        streetOrCommunity(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.initMap('jiedao');
+                }, 1000);
+            }
+        },
+        modifyGridPop(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.initMap('wangge');
+                }, 1000);
+            }
+        },
+    },
+    mounted() {
+    },
+    methods: {
+        getOrgTreeList() {
+            this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取组织树成功', res.data)
+                        this.orgOptions = []
+                        this.orgOptions.push(res.data)
+                        console.log(this.orgOptions, "sdkfhkjdfs");
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+        searchStaff() {
+            if(null != this.searchValue && this.searchValue != ''){
+                this.getGridStaffListData();
+            }
+        },
+        // async loadOptions(node, resolve) {
+        //   let data1 =node.data;
+        //   if (data1.level == 'district') {
+        //       resolve(this.orgOptions);
+
+        //   } else {
+        //         if(data1.level !== "building"){            
+        //           const url = "/actual/base/communityBuilding/tree/nextTreeNode";
+        // 	        let params = {
+        //           level:data1.level,
+        //           id:data1.id
+        //          };
+        // 	        const { data, code, msg } =await requestGet(url, params);
+        //           data1.children=data
+        //           resolve(data);
+        //       }else{
+        //         return resolve()
+        //       }
+
+        //   }
+        // },
+        // 点击后获取id
+        handleChangeTransferCascader(e) {
+            function findItem(valueArr, coll) {
+                let copyArr = [...valueArr];
+                let firstValue = copyArr.shift();
+                let item = coll.find((a) => a.value == firstValue);
+                if (copyArr.length > 0) {
+                    return findItem(copyArr, item.children);
                 } else {
-                    this.$message.error(msg);
+                    return item;
                 }
             }
-        })
-    },
+            let item = findItem(e, this.options);
+            this.transferForm.orgId = item.value;
+            this.transferForm.orgType = item.type;
+        },
+        /** 查询系统工作人员角色（职责） */
+        async getRoleList() {
+            this.tableLoading = true;
 
-    async submitPeo () {
-      this.$refs["addPeoForm"].validate((valid, err) => {
-        if (valid) {
-          this.submitPeoDo();
-        } else {
-          app.util.validateRule(err);
-          return console.log("error submit!!", valid, err);
-        }
-      });
-    },
+            const url = "/gov/access/govrole/roleListOfCustomer";
 
-    // 添加人员
-    async submitPeoDo () {
-      if(this.peoForm.manageScopes){
-      const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
-      // 用于存储提取结果的 Set 对象
-      const result = new Set();
-      // 调用递归函数提取 level 与 agencyId 组合成的字符串
-      this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
-      var manageScopeArray = Array.from(result);
-      }
-      const url = "/gov/org/staff/addstaffv2";
-      const {
-        peoForm: { orgType },
-      } = this;
-      let params = {
-        orgType: this.peoForm.orgType,
-        name: this.peoForm.name,
-        mobile: this.peoForm.mobile,
-        idCard: this.peoForm.idCard,
-        gender: this.peoForm.gender,
-        workType: this.peoForm.post,
-        newRoles: this.peoForm.newRoles,
-        orgId:
-          orgType == "agency"
-            ? this.currentAgencyId
-            : orgType == "dept"
-              ? this.currentDepartmentId
-              : this.currentGridOrgId,
-        manageScopes:manageScopeArray      
-      };
-      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();
-        } else {
-          this.getAgencyStaffListData();
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
+            let params = {};
 
-    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 updatePeoDo () {
-      const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
-      // 用于存储提取结果的 Set 对象
-      const result = new Set();
-      // 调用递归函数提取 level 与 agencyId 组合成的字符串
-      this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
-      // 将 Set 对象转换为数组
-
-      const manageScopeArray = Array.from(result);
-      const url = "/gov/org/staff/editstaff";
-      let params = {
-        staffId: this.userStaffId,
-        name: this.peoForm.name,
-        mobile: this.peoForm.mobile,
-        // gender: this.peoForm.gender === '男' ? 1 : 0,
-        gender: this.peoForm.gender,
-        workType: this.peoForm.post,
-        newRoles: this.peoForm.newRoles,
-        agencyId: this.currentAgencyId,
-        idCard: this.peoForm.idCard,
-        manageScopes:manageScopeArray
-      };
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("修改成功");
-        this.modifyPeo = false;
+            const { data, code, msg } = await requestGet(url, params);
 
-        this.getAgencyList();
-        this.getDepartmentList();
-        this.getGridList();
-        this.getAgencyStaffListData();
-        this.getDepartmentStaffListData();
-        this.getGridStaffListData();
-        this.insertFormRest();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串
-    extractLevelAndAgencyId(obj, agencyIds, result) {
-        if (obj && typeof obj === 'object') {
-            if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) {
-                result.add(`${obj.level}:${obj.agencyId}`);
+            if (code === 0) {
+                this.roleList = data;
+            } else {
+                this.$message.error(msg);
+            }
+            this.tableLoading = false;
+        },
+        /** 查询组织列表 */
+        async getAgencyList() {
+            const url = "/gov/org/agency/agencylist";
+            let params = {
+                agencyId: this.currentAgencyId,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.agencyTableListData = data;
+            } else {
+                this.$message.error(msg);
             }
-            if (Array.isArray(obj.subAgencyList)) {
-                obj.subAgencyList.forEach(subObj => {
-                  this.extractLevelAndAgencyId(subObj, agencyIds, result);
+        },
+        /** 查询社区列表 */
+        async getDepartmentList() {
+            const url = "/gov/org/department/departmentlist";
+
+            let params = {
+                agencyId: this.currentAgencyId,
+            };
+
+            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 = "社会自组织";
+                    } else {
+                        element.departmentTypeShow = "";
+                    }
                 });
+            } else {
+                this.$message.error(msg);
             }
-        }
-    },
+        },
+        /** 查询网格列表 */
+        async getGridList() {
+            const url = "/gov/org/grid/allgrids";
 
-    // 字典
-    async getDictionaries () {
-      const url = "/sys/dict/data/dictlist";
+            let params = {
+                agencyId: this.currentAgencyId,
+            };
 
-      let params = {
-        dictType: "grid_type",
-      };
+            const { data, code, msg } = await requestPost(url, params);
 
-      const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridTableListData = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        // 查询网格人员列表
+        async getGridStaffListData() {
+            const url = "/data/aggregator/org/stafflist";
+
+            let params = {
+                orgId: this.currentGridOrgId,
+                orgType: "grid",
+                searchName:this.searchValue,
+                pageNo: 1,
+                pageSize: 100,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.gridStaffTableListData = data.staffList;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 查询组织工作人员
+        async getAgencyStaffListData() {
+            const url = "/data/aggregator/org/stafflist";
+
+            let params = {
+                orgId: this.currentAgencyId,
+                orgType: "agency",
+                searchName: this.searchValue,
+                pageNo: 1,
+                pageSize: 100,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.agencyStaffTableListData = data.staffList;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        // 查询部门人员
+        async getDepartmentStaffListData() {
+            const url = "/data/aggregator/org/stafflist";
+
+            let params = {
+                orgId: this.currentDepartmentId,
+                orgType: "dept",
+                searchName: this.searchValue,
+                pageNo: 1,
+                pageSize: 100,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.departmentStaffTableListData = data.staffList;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 添加组织
+        async submit() {
+            const url = "/gov/org/department/adddepartment";
+
+            let params = {
+                agencyId: this.insertForm.agencyId,
+                departmentName: this.insertForm.departmentName,
+                departmentDuty: this.insertForm.departmentDuty,
+                contacts: this.insertForm.contacts,
+                mobile: this.insertForm.mobile,
+                code: this.insertForm.code,
+            };
+
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 添加网格
+        async submitGrid() {
+            this.$refs.addGridForm.validate(async (result) => {
+                if (result === true) {
+                    const url = "/gov/org/grid/addgrid";
+
+                    let params = {
+                        agencyId: this.GridForm.agencyId,
+                        gridName: this.GridForm.gridName,
+                        contacts: this.GridForm.contacts,
+                        mobile: this.GridForm.mobile,
+                        code: this.GridForm.code,
+                        sort: this.GridForm.sort,
+                        manageDistrict: this.GridForm.manageDistrict,
+                        gridType: this.GridForm.gridType,
+                        latitude: this.lat,
+                        longitude: this.lng,
+                    };
+
+                    const { data, code, msg } = await requestPost(url, params);
+
+                    if (code === 0) {
+                        this.$message.success("添加成功");
+                        this.dialogVisibleGrid = false;
+                        this.GridFormRest();
+                        this.getAgencyList();
+                        this.getDepartmentList();
+                        this.getGridList();
+                        this.getAgencyStaffListData();
+                    } else {
+                        this.$message.error(msg);
+                    }
+                }
+            })
+        },
 
-      if (code === 0) {
-        this.typeList = data;
-      } else {
-        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 submitPeoDo() {
+            if (this.peoForm.manageScopes) {
+                const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
+                // 用于存储提取结果的 Set 对象
+                const result = new Set();
+                // 调用递归函数提取 level 与 agencyId 组合成的字符串
+                this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
+                var manageScopeArray = Array.from(result);
+            }
+            const url = "/gov/org/staff/addstaffv2";
+            const {
+                peoForm: { orgType },
+            } = this;
+            let params = {
+                orgType: this.peoForm.orgType,
+                name: this.peoForm.name,
+                mobile: this.peoForm.mobile,
+                idCard: this.peoForm.idCard,
+                gender: this.peoForm.gender,
+                workType: this.peoForm.post,
+                newRoles: this.peoForm.newRoles,
+                orgId:
+                    orgType == "agency"
+                        ? this.currentAgencyId
+                        : orgType == "dept"
+                            ? this.currentDepartmentId
+                            : this.currentGridOrgId,
+                manageScopes: manageScopeArray
+            };
+            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();
+                } else {
+                    this.getAgencyStaffListData();
+                }
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    /** 搜索按钮操作 */
-    handleQuery () {
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery () {
-      this.queryParams.deptName = undefined;
-      this.queryParams.status = undefined;
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd (row) {
-      this.dialogVisible = true;
-    },
-    // 社区弹框关闭函数
-    handleClose (done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          this.insertFormRest();
-          done();
-        })
-        .catch((_) => { });
-    },
-    // 人员查看叉号关闭
-    handleClosePeoView (done) {
-      this.insertFormRest();
-      done();
-    },
-    // 社区新增弹框重置函数
-    insertFormRest () {
-      this.insertForm.name = "";
-      this.insertForm.contacts = "";
-      this.insertForm.code = "";
-      this.insertForm.mobile = "";
-      this.insertForm.idCard = "";
-      this.insertForm.departmentName = "";
-
-      this.peoForm = {
-        name: "",
-        mobile: "",
-        gender: "",
-        idCard: "",
-        post: "",
-        orgType: "",
-        activeTime: "",
-        zuzhi: "",
-        disableFlag: "",
-        newRoles: [],
-      };
-      this.peoFormAgency = {
-        selectedList:[]
-      }
-    },
-    // 网格新增弹框重置函数
-    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 = "");
-        (this.GridForm.sort = 1)
-    },
-    /** 人员清空 */
-    peoFormRest () {
-      (this.peoForm.name = ""),
-        (this.peoForm.mobile = ""),
-        (this.peoForm.idCard = ""),
-        (this.peoForm.gender = ""),
-        (this.peoForm.post = ""),
-      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] = [];
-    },
-    // 新增组织
-    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.description = ""),
-        (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 = "");
-    },
-    // 修改下级机关单位
-    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 = "");
-    },
-    // 社区新增弹框取消按钮
-    cancel () {
-      this.dialogVisible = false;
-      this.insertFormRest();
-    },
-    // 网格新增弹框取消按钮
-    cancelGrid () {
-      this.dialogVisibleGrid = false;
-      this.GridFormRest();
-    },
-    /** 取消按钮 */
-    cancelPeo () {
-      this.dialogVisiblePeo = false;
-      this.peoFormRest();
-    },
-    // 修改取消
-    cancelXiugai () {
-      this.modifyPeo = false;
-      this.peoFormRest();
-    },
-    // 查看弹窗
-    cancelDetails () {
-      this.details = false;
-      this.peoFormRest();
-    },
-    /** 人员调动取消按钮 */
-    cancelTransfer () {
-      this.transferRest();
-      this.transferPeo = false;
-    },
-    // 新增组织取消按钮
-    canceladdNewAgency () {
-      this.addNewAgencyRest();
-      this.createAgencyDialogFlag = false;
-    },
-    // 修改市级组织取消按钮
-    cancelModifyCityOrgPop () {
-      this.cancelModifyCityOrgPopRest();
-      this.modifyCityOrgPop = false;
-    },
-    // 修改街道/社区级取消按钮
-    cancelstreetOrCommunity () {
-      this.cancelModifyCityOrgPopRest();
-      this.streetOrCommunity = false;
-    },
-    // 取消修改下级机关单位按钮
-    cancelOrgUnitPop () {
-      this.OrgUnitPop = false;
-      this.OrgUnitDetailsRest();
-    },
-    // 取消修改网格按钮
-    cancelModifyGridPop () {
-      this.modifyGridPop = false;
-      this.ModifyGridPopRest();
-    },
-    // 进入网格，查询网格所属人员
-    entryGrid (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) {
-      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");
-    },
+        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 updatePeoDo() {
+            const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
+            // 用于存储提取结果的 Set 对象
+            const result = new Set();
+            // 调用递归函数提取 level 与 agencyId 组合成的字符串
+            this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
+            // 将 Set 对象转换为数组
+
+            const manageScopeArray = Array.from(result);
+            const url = "/gov/org/staff/editstaff";
+            let params = {
+                staffId: this.userStaffId,
+                name: this.peoForm.name,
+                mobile: this.peoForm.mobile,
+                // gender: this.peoForm.gender === '男' ? 1 : 0,
+                gender: this.peoForm.gender,
+                workType: this.peoForm.post,
+                newRoles: this.peoForm.newRoles,
+                agencyId: this.currentAgencyId,
+                idCard: this.peoForm.idCard,
+                manageScopes: manageScopeArray
+            };
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    // 进入组织，重新渲染
-    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;
-    },
-    // 新增网格
-    addGrid (row) {
-      this.GridForm.agencyId = this.currentAgencyId;
-      this.getDictionaries();
-      this.dialogVisibleGrid = true;
-    },
+        // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串
+        extractLevelAndAgencyId(obj, agencyIds, result) {
+            if (obj && typeof obj === 'object') {
+                if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) {
+                    result.add(`${obj.level}:${obj.agencyId}`);
+                }
+                if (Array.isArray(obj.subAgencyList)) {
+                    obj.subAgencyList.forEach(subObj => {
+                        this.extractLevelAndAgencyId(subObj, agencyIds, result);
+                    });
+                }
+            }
+        },
 
-    // 新增人员
-    addPeo (row) {
-      this.dialogVisiblePeo = true;
-      this.peoForm.orgType = "agency";
-    },
+        // 字典
+        async getDictionaries() {
+            const url = "/sys/dict/data/dictlist";
 
-    // 新增社区人员
-    addCommunityPeo () {
-      this.dialogVisiblePeo = true;
-      this.peoForm.orgType = "dept";
-    },
+            let params = {
+                dictType: "grid_type",
+            };
 
-    // 新增网格人员
-   async addGridPeo (command) {
-    if (command === 'newAdd') {
-      this.dialogVisiblePeo = true;
-      this.peoForm.orgType = "grid";
-    } else if (command === 'fromOrg') {
-      await this.getAgencyStaffListData()
-      this.dialogVisiblePeoAgency = true;
-    }
-    },
-    // 修改网格人员
-    async xiuGridPeo (row) {
-      this.modifyPeo = true;
-      this.peoForm.orgType = "grid";
-
-      this.userStaffId = row.staffId;
-
-      const url = "/gov/org/staff/editstaffinit";
-      let params = {
-        staffId: row.staffId,
-        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.gender = data.gender === 1 ? '男' : '女'
-        this.peoForm.gender = data.gender;
-        this.peoForm.post = data.workType;
-        this.peoForm.idCard = data.idCard;
-        // 已有的权限（角色）
-        let existedRoleArr = [];
-        data.newRoleList.forEach(function (sysRole) {
-          if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId);
-          }
-        });
-        this.peoForm.newRoles = existedRoleArr;
-        this.peoForm.manageScopes = data.manageScopes
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 修改人员
-    async xiuPeo (row) {
-      console.log(row);
-      this.modifyPeo = true;
-      this.peoForm.orgType = "agency";
-      this.userStaffId = row.staffId;
-      const url = "/gov/org/staff/editstaffinit";
-      let params = {
-        staffId: row.staffId,
-        agencyId: this.currentAgencyId,
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        console.log("修改人员", data);
-
-        this.peoForm.name = data.name;
-        this.peoForm.mobile = data.mobile;
-        this.peoForm.post = data.workType;
-        this.peoForm.gender = data.gender;
-        this.peoForm.idCard = data.idCard;
-        this.peoForm.agencyName=data.agencyName;
-        // 已有的权限（角色）
-        let existedRoleArr = [];
-        data.newRoleList.forEach(function (sysRole) {
-          if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId);
-          }
-        });
-        this.peoForm.newRoles = existedRoleArr;
-        var paths = this.findParentPath(this.orgOptions[0], data.manageScopes);
-        this.peoForm.manageScopes = paths;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    findParentPath(data,agencyIds) {
-      console.log(data,agencyIds,"dskck");
-      let paths = [];
-      function findPathRecursive(agencyId, node, path) {;
-          if (node.agencyId === agencyId) {
-              path.push(agencyId);
-              paths.push(path.slice()); // Make a copy of the path array before pushing
-              return true;
-          }
-          if (node.subAgencyList) {
-              for (let i = 0; i < node.subAgencyList.length; i++) {
-                  if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) {
-                      return true;
-                  }
-              }
-          }
-
-          return false;
-      }
-      agencyIds.forEach(agencyId => {
-          findPathRecursive(agencyId, data, []);
-      });
-      console.log(paths,"paths");
-      return paths;
-    },
-    // 修改社区人员
-    async xiuCommunityPeo (row) {
-      this.modifyPeo = true;
-      this.peoForm.orgType = "dept";
-
-      this.userStaffId = row.staffId;
-
-      const url = "/gov/org/staff/editstaffinit";
-
-      let params = {
-        staffId: row.staffId,
-        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.gender = data.gender === 1 ? '男' : '女'
-        this.peoForm.gender = data.gender;
-        this.peoForm.post = data.workType;
-        this.peoForm.idCard = data.idCard;
-        // 已有的权限（角色）
-        let existedRoleArr = [];
-        data.newRoleList.forEach(function (sysRole) {
-          if (sysRole.selected === true) {
-            existedRoleArr.push(sysRole.roleId);
-          }
-        });
-        this.peoForm.newRoles = existedRoleArr;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 取消禁用按钮
-    cancelDisable () {
-      this.Disable = false;
-    },
-    // 人员禁用
-    DisablePeo (row) {
-      this.DisableForm.staffId = row.staffId;
-      this.Disable = true;
-    },
-    // 确定禁用
-    async submitDisable () {
-      const url = "/epmetuser/customerstaff/disabledstaff";
+            const { data, code, msg } = await requestPost(url, params);
 
-      let params = {
-        staffId: this.DisableForm.staffId,
-        agencyId: this.DisableForm.agencyId,
-        customerId: this.DisableForm.customerId,
-      };
+            if (code === 0) {
+                this.typeList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.deptName = undefined;
+            this.queryParams.status = undefined;
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd(row) {
+            this.dialogVisible = true;
+        },
+        // 社区弹框关闭函数
+        handleClose(done) {
+            this.$confirm("确认关闭？")
+                .then((_) => {
+                    this.insertFormRest();
+                    done();
+                })
+                .catch((_) => { });
+        },
+        // 人员查看叉号关闭
+        handleClosePeoView(done) {
+            this.insertFormRest();
+            done();
+        },
+        // 社区新增弹框重置函数
+        insertFormRest() {
+            this.insertForm.name = "";
+            this.insertForm.contacts = "";
+            this.insertForm.code = "";
+            this.insertForm.mobile = "";
+            this.insertForm.idCard = "";
+            this.insertForm.departmentName = "";
+
+            this.peoForm = {
+                name: "",
+                mobile: "",
+                gender: "",
+                idCard: "",
+                post: "",
+                orgType: "",
+                activeTime: "",
+                zuzhi: "",
+                disableFlag: "",
+                newRoles: [],
+            };
+            this.peoFormAgency = {
+                selectedList: []
+            }
+        },
+        // 网格新增弹框重置函数
+        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 = "");
+            (this.GridForm.sort = 1)
+        },
+        /** 人员清空 */
+        peoFormRest() {
+            (this.peoForm.name = ""),
+                (this.peoForm.mobile = ""),
+                (this.peoForm.idCard = ""),
+                (this.peoForm.gender = ""),
+                (this.peoForm.post = ""),
+                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] = [];
+        },
+        // 新增组织
+        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.description = ""),
+                (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 = "");
+        },
+        // 修改下级机关单位
+        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 = "");
+        },
+        // 社区新增弹框取消按钮
+        cancel() {
+            this.dialogVisible = false;
+            this.insertFormRest();
+        },
+        // 网格新增弹框取消按钮
+        cancelGrid() {
+            this.dialogVisibleGrid = false;
+            this.GridFormRest();
+        },
+        /** 取消按钮 */
+        cancelPeo() {
+            this.dialogVisiblePeo = false;
+            this.peoFormRest();
+        },
+        // 修改取消
+        cancelXiugai() {
+            this.modifyPeo = false;
+            this.peoFormRest();
+        },
+        // 查看弹窗
+        cancelDetails() {
+            this.details = false;
+            this.peoFormRest();
+        },
+        /** 人员调动取消按钮 */
+        cancelTransfer() {
+            this.transferRest();
+            this.transferPeo = false;
+        },
+        // 新增组织取消按钮
+        canceladdNewAgency() {
+            this.addNewAgencyRest();
+            this.createAgencyDialogFlag = false;
+        },
+        // 修改市级组织取消按钮
+        cancelModifyCityOrgPop() {
+            this.cancelModifyCityOrgPopRest();
+            this.modifyCityOrgPop = false;
+        },
+        // 修改街道/社区级取消按钮
+        cancelstreetOrCommunity() {
+            this.cancelModifyCityOrgPopRest();
+            this.streetOrCommunity = false;
+        },
+        // 取消修改下级机关单位按钮
+        cancelOrgUnitPop() {
+            this.OrgUnitPop = false;
+            this.OrgUnitDetailsRest();
+        },
+        // 取消修改网格按钮
+        cancelModifyGridPop() {
+            this.modifyGridPop = false;
+            this.ModifyGridPopRest();
+        },
+        // 进入网格，查询网格所属人员
+        entryGrid(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) {
+            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");
+        },
+        // 新增组织
+        addCommunity(row) {
+            this.insertForm.agencyId = this.currentAgencyId;
+            this.dialogVisible = true;
+        },
+        // 新增网格
+        addGrid(row) {
+            this.GridForm.agencyId = this.currentAgencyId;
+            this.getDictionaries();
+            this.dialogVisibleGrid = true;
+        },
+
+        // 新增人员
+        addPeo(row) {
+            this.dialogVisiblePeo = true;
+            this.peoForm.orgType = "agency";
+        },
+
+        // 新增社区人员
+        addCommunityPeo() {
+            this.dialogVisiblePeo = true;
+            this.peoForm.orgType = "dept";
+        },
+
+        // 新增网格人员
+        async addGridPeo(command) {
+            if (command === 'newAdd') {
+                this.dialogVisiblePeo = true;
+                this.peoForm.orgType = "grid";
+            } else if (command === 'fromOrg') {
+                await this.getAgencyStaffListData()
+                this.dialogVisiblePeoAgency = true;
+            }
+        },
+        // 修改网格人员
+        async xiuGridPeo(row) {
+            this.modifyPeo = true;
+            this.peoForm.orgType = "grid";
+
+            this.userStaffId = row.staffId;
+
+            const url = "/gov/org/staff/editstaffinit";
+            let params = {
+                staffId: row.staffId,
+                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.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.gender = data.gender;
+                this.peoForm.post = data.workType;
+                this.peoForm.idCard = data.idCard;
+                // 已有的权限（角色）
+                let existedRoleArr = [];
+                data.newRoleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId);
+                    }
+                });
+                this.peoForm.newRoles = existedRoleArr;
+                this.peoForm.manageScopes = data.manageScopes
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改人员
+        async xiuPeo(row) {
+            console.log(row);
+            this.modifyPeo = true;
+            this.peoForm.orgType = "agency";
+            this.userStaffId = row.staffId;
+            const url = "/gov/org/staff/editstaffinit";
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId,
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                console.log("修改人员", data);
+
+                this.peoForm.name = data.name;
+                this.peoForm.mobile = data.mobile;
+                this.peoForm.post = data.workType;
+                this.peoForm.gender = data.gender;
+                this.peoForm.idCard = data.idCard;
+                this.peoForm.agencyName = data.agencyName;
+                // 已有的权限（角色）
+                let existedRoleArr = [];
+                data.newRoleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId);
+                    }
+                });
+                this.peoForm.newRoles = existedRoleArr;
+                var paths = this.findParentPath(this.orgOptions[0], data.manageScopes);
+                this.peoForm.manageScopes = paths;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        findParentPath(data, agencyIds) {
+            console.log(data, agencyIds, "dskck");
+            let paths = [];
+            function findPathRecursive(agencyId, node, path) {
+                ;
+                if (node.agencyId === agencyId) {
+                    path.push(agencyId);
+                    paths.push(path.slice()); // Make a copy of the path array before pushing
+                    return true;
+                }
+                if (node.subAgencyList) {
+                    for (let i = 0; i < node.subAgencyList.length; i++) {
+                        if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) {
+                            return true;
+                        }
+                    }
+                }
 
-      const { data, code, msg } = await requestPost(url, params);
+                return false;
+            }
+            agencyIds.forEach(agencyId => {
+                findPathRecursive(agencyId, data, []);
+            });
+            console.log(paths, "paths");
+            return paths;
+        },
+        // 修改社区人员
+        async xiuCommunityPeo(row) {
+            this.modifyPeo = true;
+            this.peoForm.orgType = "dept";
+
+            this.userStaffId = row.staffId;
+
+            const url = "/gov/org/staff/editstaffinit";
+
+            let params = {
+                staffId: row.staffId,
+                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.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.gender = data.gender;
+                this.peoForm.post = data.workType;
+                this.peoForm.idCard = data.idCard;
+                // 已有的权限（角色）
+                let existedRoleArr = [];
+                data.newRoleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId);
+                    }
+                });
+                this.peoForm.newRoles = existedRoleArr;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 取消禁用按钮
+        cancelDisable() {
+            this.Disable = false;
+        },
+        // 人员禁用
+        DisablePeo(row) {
+            this.DisableForm.staffId = row.staffId;
+            this.Disable = true;
+        },
+        // 确定禁用
+        async submitDisable() {
+            const url = "/epmetuser/customerstaff/disabledstaff";
+
+            let params = {
+                staffId: this.DisableForm.staffId,
+                agencyId: this.DisableForm.agencyId,
+                customerId: this.DisableForm.customerId,
+            };
+
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 查看按钮
+        async lookAngency(row) {
+            const url = "/data/aggregator/org/staffdetailv2";
+
+            let params = {
+                staffId: row.staffId,
+            };
+
+            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.idCard = data.idCard;
+                this.peoForm.zuzhi = data.orgName;
+                let existedRoleArr = [];
+                this.peoForm.szsqRoles = data.szsqRoles;
+                this.peoForm.newRoles = existedRoleArr;
+                if (data.enableFlag === "enable") {
+                    this.peoForm.disableFlag = "已启用";
+                } else {
+                    this.peoForm.disableFlag = "已禁用";
+                }
+            }
+            this.details = true;
+        },
+
+        // 人员调动
+        async transfer(row) {
+            this.transferForm.name = row.name;
+            this.transferForm.staffId = row.staffId;
+
+            this.transferPeo = true;
+            const url = "/gov/org/customeragency/orgtree";
+
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                function computeOption(opt) {
+                    return {
+                        label: opt.agencyName,
+                        value: opt.agencyId,
+                        type: "agency",
+                        children: [
+                            ...(opt.departmentList || []).map((item) => ({
+                                label: item.deptName,
+                                value: item.deptId,
+                                type: "dept",
+                                typeName: "部门",
+                            })),
+                            ...(opt.gridList || []).map((item) => ({
+                                label: item.gridName,
+                                value: item.gridId,
+                                type: "grid",
+                                typeName: "网格",
+                            })),
+                            ...(opt.subAgencyList || []).map((item) => computeOption(item)),
+                        ],
+                    };
+                }
+                if (data) {
+                    this.options = [computeOption(data)];
+                }
+            } else {
+                this.$message.error("树查询失败", msg);
+            }
+        },
+        // 人员调动确定
+        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,
+            };
+
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-      if (code === 0) {
-        this.$message.success("禁用成功");
-        this.Disable = false;
-        this.getAgencyList();
-        this.getDepartmentList();
-        this.getGridList();
-        this.getAgencyStaffListData();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 查看按钮
-    async lookAngency (row) {
-      const url = "/data/aggregator/org/staffdetailv2";
-
-      let params = {
-        staffId: row.staffId,
-      };
-
-      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.idCard = data.idCard;
-        this.peoForm.zuzhi = data.orgName;
-        let existedRoleArr = [];
-        this.peoForm.szsqRoles = data.szsqRoles;
-        this.peoForm.newRoles = existedRoleArr;
-        if (data.enableFlag === "enable") {
-          this.peoForm.disableFlag = "已启用";
-        } else {
-          this.peoForm.disableFlag = "已禁用";
-        }
-      }
-      this.details = true;
-    },
+        // 获取导航
+        // async getNavigation(){
 
-    // 人员调动
-    async transfer (row) {
-      this.transferForm.name = row.name;
-      this.transferForm.staffId = row.staffId;
-
-      this.transferPeo = true;
-      const url = "/gov/org/customeragency/orgtree";
-
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        function computeOption (opt) {
-          return {
-            label: opt.agencyName,
-            value: opt.agencyId,
-            type: "agency",
-            children: [
-              ...(opt.departmentList || []).map((item) => ({
-                label: item.deptName,
-                value: item.deptId,
-                type: "dept",
-                typeName: "部门",
-              })),
-              ...(opt.gridList || []).map((item) => ({
-                label: item.gridName,
-                value: item.gridId,
-                type: "grid",
-                typeName: "网格",
-              })),
-              ...(opt.subAgencyList || []).map((item) => computeOption(item)),
-            ],
-          };
-        }
-        if (data) {
-          this.options = [computeOption(data)];
-        }
-      } else {
-        this.$message.error("树查询失败", msg);
-      }
-    },
-    // 人员调动确定
-    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,
-      };
-
-      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();
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        //     const url = "/gov/org/customeragency/orgtree"
 
-    // 获取导航
-    // async getNavigation(){
+        //     let params = {
 
-    //     const url = "/gov/org/customeragency/orgtree"
+        //     }
 
-    //     let params = {
+        //     const { data, code, msg } = await requestPost(url,params)
 
-    //     }
+        //     if(code === 0){
+        //         this.Navigation = data.agencyName
+        //     }
+        // 组装顶部面包屑数组
+        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);
+                if (code === 0) {
+                    // 社区级为最低级组织，不展示下级组织列表
+                    this.currentAgencyLevel = data.level;
+                    this.currentAreaCode = data.areaCode;
+                    this.currentAreaCodeSwitch = data.areaCodeSwitch;
+                    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;
+                    }
+                    if (data.level === "community") {
+                        this.agencyTableFlag = false;
+                    } else {
+                        this.agencyTableFlag = true;
+                    }
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [
+                            { id: data.agencyId, name: data.agencyName, type: orgType },
+                        ];
+                    } else {
+                        let hasBreadcrumbArr = false;
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true;
+                            }
+                        });
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {
+                                id: data.agencyId,
+                                name: data.agencyName,
+                                type: orgType,
+                            };
+                            this.breadcrumbArr.push(breadcrumb);
+                        }
+                    }
+                } else {
+                    this.$message.error(msg);
+                }
+            } else if (orgType === "department") {
+                const url = "/gov/org/department/departmentdetail";
+                let params = {
+                    departmentId: id,
+                };
+                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,
+                            },
+                        ];
+                    } else {
+                        let hasBreadcrumbArr = false;
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true;
+                            }
+                        });
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {
+                                id: data.departmentId,
+                                name: data.departmentName,
+                                type: orgType,
+                            };
+                            this.breadcrumbArr.push(breadcrumb);
+                        }
+                    }
+                } else {
+                    this.$message.error(msg);
+                }
+            } else if (orgType === "grid") {
+                const url = "/gov/org/grid/griddetail";
+                let params = {
+                    gridId: id,
+                };
+                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 },
+                        ];
+                    } else {
+                        let hasBreadcrumbArr = false;
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true;
+                            }
+                        });
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {
+                                id: data.grid,
+                                name: data.gridName,
+                                type: orgType,
+                            };
+                            this.breadcrumbArr.push(breadcrumb);
+                        }
+                    }
+                } else {
+                    this.$message.error(msg);
+                }
+            }
+        },
 
-    //     const { data, code, msg } = await requestPost(url,params)
+        async refreshThisPage(index) {
+            // 点击最后一级不触发响应
+            if (index === this.breadcrumbArr.length - 1) {
+                return;
+            }
 
-    //     if(code === 0){
-    //         this.Navigation = data.agencyName
-    //     }
-    // 组装顶部面包屑数组
-    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);
-        if (code === 0) {
-          // 社区级为最低级组织，不展示下级组织列表
-          this.currentAgencyLevel = data.level;
-          this.currentAreaCode = data.areaCode;
-          this.currentAreaCodeSwitch = data.areaCodeSwitch;
-          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;
-          }
-          if (data.level === "community") {
-            this.agencyTableFlag = false;
-          } else {
-            this.agencyTableFlag = true;
-          }
-          if (this.breadcrumbArr.length === 0) {
-            this.breadcrumbArr = [
-              { id: data.agencyId, name: data.agencyName, type: orgType },
-            ];
-          } else {
-            let hasBreadcrumbArr = false;
-            this.breadcrumbArr.forEach(function (bc) {
-              if (bc.id === id) {
-                hasBreadcrumbArr = true;
-              }
-            });
-            if (hasBreadcrumbArr === false) {
-              let breadcrumb = {
-                id: data.agencyId,
-                name: data.agencyName,
-                type: orgType,
-              };
-              this.breadcrumbArr.push(breadcrumb);
+            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();
             }
-          }
-        } else {
-          this.$message.error(msg);
-        }
-      } else if (orgType === "department") {
-        const url = "/gov/org/department/departmentdetail";
-        let params = {
-          departmentId: id,
-        };
-        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,
-              },
-            ];
-          } else {
-            let hasBreadcrumbArr = false;
-            this.breadcrumbArr.forEach(function (bc) {
-              if (bc.id === id) {
-                hasBreadcrumbArr = true;
-              }
-            });
-            if (hasBreadcrumbArr === false) {
-              let breadcrumb = {
-                id: data.departmentId,
-                name: data.departmentName,
-                type: orgType,
-              };
-              this.breadcrumbArr.push(breadcrumb);
+            // 当点击最后一级不触发响应
+            // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
+            // 若需要点击最后一级触发刷新，可释放以下代码
+            /* else if (orgType === 'department') {
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData = []
+                this.gridStaffTableListData = []
+      
+                this.currentDepartmentId = orgId
+      
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = true
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = false
+      
+                this.getDepartmentStaffListData()
+                this.assembleBreadcrumbArr(orgId, 'department')
+            } else if (orgType === 'grid') {
+                this.agencyStaffTableListData = []
+                this.departmentStaffTableListData =[]
+                this.gridStaffTableListData = []
+      
+                this.currentGridOrgId = orgId
+      
+                this.agencyTableFlag = false
+                this.currentAgencyStaffTableFlag = false
+                this.departmentTableFlag = false
+                this.departmentStaffTableFlag = false
+                this.gridTableFlag = false
+                this.gridStaffTableFlag = true
+                this.getGridStaffListData()
+                this.assembleBreadcrumbArr(orgId, 'grid')
+            } */
+        },
+        // 获取组织区划信息
+        async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
+            const url = "/data/aggregator/org/nextlevelareacodelist";
+
+            let params = {
+                areaCode: areaCode,
+                level: parentAgencyLevel,
+                parentAgencyId: parentAgencyId,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.zonings = data;
+            } else {
+                this.$message.error(msg);
             }
-          }
-        } else {
-          this.$message.error(msg);
-        }
-      } else if (orgType === "grid") {
-        const url = "/gov/org/grid/griddetail";
-        let params = {
-          gridId: id,
-        };
-        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 },
-            ];
-          } else {
-            let hasBreadcrumbArr = false;
-            this.breadcrumbArr.forEach(function (bc) {
-              if (bc.id === id) {
-                hasBreadcrumbArr = true;
-              }
+        },
+
+        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;
+                }
             });
-            if (hasBreadcrumbArr === false) {
-              let breadcrumb = {
-                id: data.grid,
-                name: data.gridName,
-                type: orgType,
-              };
-              this.breadcrumbArr.push(breadcrumb);
-            }
-          }
-        } else {
-          this.$message.error(msg);
-        }
-      }
-    },
-
-    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();
-      }
-      // 当点击最后一级不触发响应
-      // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
-      // 若需要点击最后一级触发刷新，可释放以下代码
-      /* else if (orgType === 'department') {
-          this.agencyStaffTableListData = []
-          this.departmentStaffTableListData = []
-          this.gridStaffTableListData = []
-
-          this.currentDepartmentId = orgId
-
-          this.agencyTableFlag = false
-          this.currentAgencyStaffTableFlag = false
-          this.departmentTableFlag = false
-          this.departmentStaffTableFlag = true
-          this.gridTableFlag = false
-          this.gridStaffTableFlag = false
-
-          this.getDepartmentStaffListData()
-          this.assembleBreadcrumbArr(orgId, 'department')
-      } else if (orgType === 'grid') {
-          this.agencyStaffTableListData = []
-          this.departmentStaffTableListData =[]
-          this.gridStaffTableListData = []
-
-          this.currentGridOrgId = orgId
-
-          this.agencyTableFlag = false
-          this.currentAgencyStaffTableFlag = false
-          this.departmentTableFlag = false
-          this.departmentStaffTableFlag = false
-          this.gridTableFlag = false
-          this.gridStaffTableFlag = true
-          this.getGridStaffListData()
-          this.assembleBreadcrumbArr(orgId, 'grid')
-      } */
-    },
-    // 获取组织区划信息
-    async getZoning (areaCode, parentAgencyId, parentAgencyLevel) {
-      const url = "/data/aggregator/org/nextlevelareacodelist";
-
-      let params = {
-        areaCode: areaCode,
-        level: parentAgencyLevel,
-        parentAgencyId: parentAgencyId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.zonings = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    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;
-        }
-      });
-    },
-    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;
-        }
-      });
-    },
-
-    addAgency () {
-      this.createAgencyDialogFlag = true;
-      this.addNewAgencyRest();
-      this.getZoning(
-        this.currentAreaCode,
-        this.currentAgencyId,
-        this.currentAgencyLevel
-      );
-    },
-    // 新增组织确定按钮
-    async submitaddNewAgency () {
-      this.$refs['agencyForm'].validate(async (valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-          const url = "/gov/org/agency/addagency-v2";
-
-        let params = {
-          parentAgencyId: this.currentAgencyId,
-          agencyName: this.agencyForm.agencyName,
-          level: this.agencyForm.level,
-          areaCodeSwitch: this.currentAreaCodeSwitch,
-          areaCode: this.agencyForm.areaCode,
-          areaName: this.agencyForm.areaName,
-          contacts: this.agencyForm.contacts,
-          mobile: this.agencyForm.mobile,
-          description: this.agencyForm.description,
-          code: this.agencyForm.code,
-          latitude: this.latitude,
-          longitude: this.longitude,
-        };
-
-        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();
-        } else {
-          this.$message.error(msg);
-        }
+        },
+        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;
                 }
+            });
+        },
 
-              })
-    
-    },
-
-    // 修改面包屑
-    modifyOrgInfo () {
-      this.judgeOrgInfoLevel =
-        this.breadcrumbArr[this.breadcrumbArr.length - 1];
-        this.searchValue = ''
-      if (this.judgeOrgInfoLevel.type === "agency") {
-        this.getOrgDetailsById();
-        setTimeout(() => {
-          if (this.OrgDetailsForm.level === "district") {
-            /** 修改市区级弹窗 */
-            this.modifyCityOrgPop = true;
-          } else {
-            /** 街道级和社区级弹窗 */
+        addAgency() {
+            this.createAgencyDialogFlag = true;
+            this.addNewAgencyRest();
             this.getZoning(
-              this.parentAreaCode,
-              this.parentAgencyId,
-              this.parentAgencyLevel
+                this.currentAreaCode,
+                this.currentAgencyId,
+                this.currentAgencyLevel
             );
-            this.streetOrCommunity = true;
-          }
-        }, 1000);
-      } else if (this.judgeOrgInfoLevel.type === "department") {
-        /** 下级机关单位修改 */
-        this.OrgUnitPop = true;
-        this.getOrgUnitDetailsById();
-      } else {
-        /** 网格修改 */
-        this.getDictionaries();
-        this.modifyGridPop = true;
-        this.getGridDetailsById();
-      }
-    },
-
-    // 根据id获取组织机构详细信息
-    async getOrgDetailsById () {
-      const url = "/gov/org/agency/agencydetail";
-
-      let params = {
-        agencyId: this.judgeOrgInfoLevel.id,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        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.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);
-      }
-    },
-
-    // 根据id获取下级机关单位详情
-    async getOrgUnitDetailsById () {
-      const url = "/gov/org/department/departmentdetail";
-
-      let params = {
-        departmentId: this.judgeOrgInfoLevel.id,
-      };
-
-      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;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 根据id获取网格详情
-    async getGridDetailsById () {
-      const url = "/gov/org/grid/griddetail";
-      let params = {
-        gridId: this.judgeOrgInfoLevel.id,
-      };
-
-      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.latitude = data.latitude;
-        this.longitude = data.longitude;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    // 市级/街道/社区级组织修改确定按钮
-    async sunmitModifyCityOrgPop () {
-      const url = "/gov/org/agency/editagency";
-
-      let params = {
-        agencyId: this.OrgDetailsForm.agencyId,
-        agencyName: this.OrgDetailsForm.agencyName,
-        contacts: this.OrgDetailsForm.contacts,
-        mobile: this.OrgDetailsForm.mobile,
-        code: this.OrgDetailsForm.code,
-        areaCode: this.OrgDetailsForm.areaCode,
-        latitude: this.latitude,
-        longitude: this.longitude,
-      };
-
-      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();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 修改下级机关单位确定按钮
-    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,
-      };
-
-      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();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 修改网格确定按钮
-    async submitModifyGrid () {
-      const url = "/gov/org/grid/editgrid";
-
-      let params = {
-        gridId: this.modifyGridFrom.griId,
-        gridName: this.modifyGridFrom.gridName,
-        manageDistrict: this.modifyGridFrom.manageDistrict,
-        contacts: this.modifyGridFrom.contacts,
-        mobile: this.modifyGridFrom.mobile,
-        code: this.modifyGridFrom.code,
-        gridType: this.modifyGridFrom.gridType,
-        sort: this.modifyGridFrom.gridSort,
-        latitude:this.latitude,
-        longitude:this.longitude
-      };
-
-      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();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-     initMap(id) {
-      let { latitude, longitude } = this;
-      let storeLatitude = this.$store.state.user.latitude
-      let storeLongitude = this.$store.state.user.longitude
-      let lat = latitude || storeLatitude
-      let lng = longitude || storeLongitude
-     this.$nextTick(()=>{
-      map = new daiMap(
-        document.getElementById(id),
-        { lat,lng },
-        {
-          zoom: 17.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
-      // 监听地图平移结束
-    /*  map.on("dragend", (e) => {
-        this.handleMoveCenter(e);
-      });*/
-       map.on("click", (e) => {
-         this.handleMoveCenter(e);
-       });
-      map.setCenter(lat, lng);
-      map.setMarker(lat, lng);
-     })
-    },
+        },
+        // 新增组织确定按钮
+        async submitaddNewAgency() {
+            this.$refs['agencyForm'].validate(async (valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else {
+                    const url = "/gov/org/agency/addagency-v2";
+
+                    let params = {
+                        parentAgencyId: this.currentAgencyId,
+                        agencyName: this.agencyForm.agencyName,
+                        level: this.agencyForm.level,
+                        areaCodeSwitch: this.currentAreaCodeSwitch,
+                        areaCode: this.agencyForm.areaCode,
+                        areaName: this.agencyForm.areaName,
+                        contacts: this.agencyForm.contacts,
+                        mobile: this.agencyForm.mobile,
+                        description: this.agencyForm.description,
+                        code: this.agencyForm.code,
+                        latitude: this.latitude,
+                        longitude: this.longitude,
+                    };
+
+                    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();
+                    } else {
+                        this.$message.error(msg);
+                    }
+                }
 
-    async handleMoveCenter(e) {
-      //修改地图中心点
-      // const { lat, lng } = map.getCenter();
-      const { lat, lng } = e.latLng;
-      this.latitude = lat;
-      this.longitude = lng;
-      map.setMarker(lat, lng);
-
-      let { msg, data } = await map.getAddress(lat, lng);
-      if (msg == "success") {
-        this.address = data.address;
-        this.searchValue = data.address;
-        this.searchOptions = [];
-      }
-    },
+            })
+
+        },
+
+        // 修改面包屑
+        modifyOrgInfo() {
+            this.judgeOrgInfoLevel =
+                this.breadcrumbArr[this.breadcrumbArr.length - 1];
+            this.searchValue = ''
+            if (this.judgeOrgInfoLevel.type === "agency") {
+                this.getOrgDetailsById();
+                setTimeout(() => {
+                    if (this.OrgDetailsForm.level === "district") {
+                        /** 修改市区级弹窗 */
+                        this.modifyCityOrgPop = true;
+                    } else {
+                        /** 街道级和社区级弹窗 */
+                        this.getZoning(
+                            this.parentAreaCode,
+                            this.parentAgencyId,
+                            this.parentAgencyLevel
+                        );
+                        this.streetOrCommunity = true;
+                    }
+                }, 1000);
+            } else if (this.judgeOrgInfoLevel.type === "department") {
+                /** 下级机关单位修改 */
+                this.OrgUnitPop = true;
+                this.getOrgUnitDetailsById();
+            } else {
+                /** 网格修改 */
+                this.getDictionaries();
+                this.modifyGridPop = true;
+                this.getGridDetailsById();
+            }
+        },
+
+        // 根据id获取组织机构详细信息
+        async getOrgDetailsById() {
+            const url = "/gov/org/agency/agencydetail";
+
+            let params = {
+                agencyId: this.judgeOrgInfoLevel.id,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                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;
+                }
 
-    async remoteMethod(query) {
-      if (query !== "") {
-        this.loading = true;
-
-        const { msg, data } = await map.searchNearby(query);
-        this.loading = false;
-        this.resultList = [];
-        if (msg == "success" && data.resultList && data.resultList.length > 0) {
-          if (data.resultList && data.resultList.length > 0) {
-            this.resultList = data.resultList;
-            this.searchOptions = this.resultList.map((item) => {
-              return {
-                value: `${item.id}`,
-                label: `${item.address + item.title}`,
-              };
+                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);
+            }
+        },
+
+        // 根据id获取下级机关单位详情
+        async getOrgUnitDetailsById() {
+            const url = "/gov/org/department/departmentdetail";
+
+            let params = {
+                departmentId: this.judgeOrgInfoLevel.id,
+            };
+
+            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;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        // 根据id获取网格详情
+        async getGridDetailsById() {
+            const url = "/gov/org/grid/griddetail";
+            let params = {
+                gridId: this.judgeOrgInfoLevel.id,
+            };
+
+            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.latitude = data.latitude;
+                this.longitude = data.longitude;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop() {
+            const url = "/gov/org/agency/editagency";
+
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                areaCode: this.OrgDetailsForm.areaCode,
+                latitude: this.latitude,
+                longitude: this.longitude,
+            };
+
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改下级机关单位确定按钮
+        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,
+            };
+
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改网格确定按钮
+        async submitModifyGrid() {
+            const url = "/gov/org/grid/editgrid";
+
+            let params = {
+                gridId: this.modifyGridFrom.griId,
+                gridName: this.modifyGridFrom.gridName,
+                manageDistrict: this.modifyGridFrom.manageDistrict,
+                contacts: this.modifyGridFrom.contacts,
+                mobile: this.modifyGridFrom.mobile,
+                code: this.modifyGridFrom.code,
+                gridType: this.modifyGridFrom.gridType,
+                sort: this.modifyGridFrom.gridSort,
+                latitude: this.latitude,
+                longitude: this.longitude
+            };
+
+            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();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(id) {
+            let { latitude, longitude } = this;
+            let storeLatitude = this.$store.state.user.latitude
+            let storeLongitude = this.$store.state.user.longitude
+            let lat = latitude || storeLatitude
+            let lng = longitude || storeLongitude
+            this.$nextTick(() => {
+                map = new daiMap(
+                    document.getElementById(id),
+                    { lat, lng },
+                    {
+                        zoom: 17.2, // 设置地图缩放级别
+                        pitch: 43.5, // 设置俯仰角
+                        rotation: 45, // 设置地图旋转角度
+                    }
+                );
+                // 监听地图平移结束
+                /*  map.on("dragend", (e) => {
+                    this.handleMoveCenter(e);
+                  });*/
+                map.on("click", (e) => {
+                    this.handleMoveCenter(e);
+                });
+                map.setCenter(lat, lng);
+                map.setMarker(lat, lng);
+            })
+        },
+
+        async handleMoveCenter(e) {
+            //修改地图中心点
+            // const { lat, lng } = map.getCenter();
+            const { lat, lng } = e.latLng;
+            this.latitude = lat;
+            this.longitude = lng;
+            map.setMarker(lat, lng);
+
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == "success") {
+                this.address = data.address;
+                this.searchValue = data.address;
+                this.searchOptions = [];
+            }
+        },
+
+        async remoteMethod(query) {
+            if (query !== "") {
+                this.loading = true;
+
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = [];
+                if (msg == "success" && data.resultList && data.resultList.length > 0) {
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList;
+                        this.searchOptions = this.resultList.map((item) => {
+                            return {
+                                value: `${item.id}`,
+                                label: `${item.address + item.title}`,
+                            };
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: "0",
+                            label: "未检索到结果",
+                        },
+                    ];
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
+
+        handleClickKey(index) {
+            let selPosition = this.resultList[index];
+            let lonlat = selPosition.lonlat.split(" ");
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.latitude = lonlat[1];
+            this.longitude = lonlat[0];
+            // this.formData.address = selPosition.address + selPosition.name;
+        },
+
+        handleCommand(command) {
+            this.addGridPeo(command);
+        },
+        cancelPeoAgency() {
+            this.dialogVisiblePeoAgency = false
+            this.peoFormAgency.selectedList = []; // 清空选择的工作人员
+        },
+        submitPeoAgency() {
+            this.$refs["addPeoAgencyForm"].validate((valid, err) => {
+                if (valid) {
+                    this.submitPeoAgencyDo();
+                } else {
+                    app.util.validateRule(err);
+                    return console.log("error submit!!", valid, err);
+                }
             });
-          }
-        } else {
-          this.searchOptions = [
-            {
-              value: "0",
-              label: "未检索到结果",
-            },
-          ];
-        }
-      } else {
-        this.searchOptions = [];
-      }
-    },
-
-    handleClickKey(index) {
-      let selPosition = this.resultList[index];
-      let lonlat = selPosition.lonlat.split(" ");
-      map.setCenter(lonlat[1], lonlat[0]);
-      map.setMarker(lonlat[1], lonlat[0]);
-      this.latitude = lonlat[1];
-      this.longitude = lonlat[0];
-      // this.formData.address = selPosition.address + selPosition.name;
+        },
+        async submitPeoAgencyDo() {
+            let url = "/gov/org/grid/addgridstaffs"
+            this.peoFormAgency.gridId = this.currentGridOrgId
+            const { data, code, msg } = await requestPost(url, this.peoFormAgency)
+            if (code == 0) {
+                this.$message.success('添加成功')
+                this.dialogVisiblePeoAgency = false
+                this.getGridStaffListData();
+                this.peoFormAgency.selectedList = []
+            } else {
+                this.$message.err(msg)
+            }
+        },
     },
-
-  handleCommand(command) {
-      this.addGridPeo(command);
-  },
-  cancelPeoAgency(){
-    this.dialogVisiblePeoAgency = false
-    this.peoFormAgency.selectedList = []; // 清空选择的工作人员
-  },
-  submitPeoAgency(){
-    this.$refs["addPeoAgencyForm"].validate((valid, err) => {
-        if (valid) {
-          this.submitPeoAgencyDo();
-        } else {
-          app.util.validateRule(err);
-          return console.log("error submit!!", valid, err);
-        }
-      });
-  },
-  async submitPeoAgencyDo(){
-    let url = "/gov/org/grid/addgridstaffs"
-    this.peoFormAgency.gridId = this.currentGridOrgId
-    const {data,code,msg} = await requestPost(url,this.peoFormAgency)
-    if(code == 0){
-      this.$message.success('添加成功')
-      this.dialogVisiblePeoAgency = false
-      this.getGridStaffListData();
-      this.peoFormAgency.selectedList = []
-    } else{
-      this.$message.err(msg)
-    }
-  },
-  },
 };
 </script>
 
 <style scoped>
 #container {
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 }
+
 #info {
-  left: 20px;
-  top: 20px;
-  font-size: 14px;
-  background: #fff;
-  width: 270px;
-  padding: 10px;
-  border-radius: 3px;
+    left: 20px;
+    top: 20px;
+    font-size: 14px;
+    background: #fff;
+    width: 270px;
+    padding: 10px;
+    border-radius: 3px;
 }
+
 #con {
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 }
-.el-tag + .el-tag {
-  margin-left: 10px;
+
+.el-tag+.el-tag {
+    margin-left: 10px;
 }
 </style>
diff --git a/src/views/modules/customer/customize/roleList.vue b/src/views/modules/customer/customize/roleList.vue
index aa5827290..99a3217ba 100644
--- a/src/views/modules/customer/customize/roleList.vue
+++ b/src/views/modules/customer/customize/roleList.vue
@@ -1,98 +1,64 @@
 <template>
-  <div class="role-container">
-    <el-card class="flex1">
-      <div class="now-name">
-        当前客户: {{customerName}}
-        <el-button type="primary"
-                   size="small"
-                   @click="handleSaveSort">保存顺序</el-button>
-      </div>
-      <el-table ref="roleTable"
-                v-loading="loading1"
-                :data="roleList"
-                row-key="roleId"
-                border
-                style="width: 100%">
-        <el-table-column type="index"
-                         width="50"></el-table-column>
-        <!-- <el-table-column prop="roleId" label="角色ID"></el-table-column> -->
-        <el-table-column prop="roleName"
-                         label="角色名称"
-                         width="160">
-          <template slot-scope="scope">
-            <el-input v-if="scope.row.isEdit"
-                      v-model.trim="scope.row.roleName"
-                      clearable>
-            </el-input>
-            <span v-else>{{scope.row.constName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="!funcShow"
-                         prop="roleKey"
-                         label="角色Key"></el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="primary"
-                       size="mini"
-                       @click="toOperationConfig(scope.row.roleId, scope.row.roleName)">功能权限</el-button>
-            <span v-if="scope.row.isEdit"
-                  style="display: inline-block; margin-left: 10px;">
-              <el-button type="primary"
-                         size="small"
-                         @click="handleSaveChange(scope.row)">保存</el-button>
-              <el-button size="small"
-                         @click="scope.row.isEdit=false">取消</el-button>
-            </span>
-            <el-button v-else
-                       type="primary"
-                       size="mini"
-                       @click="handleChangeName(scope.row)">修改名称</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card v-show="funcShow"
-             style="flex: 1; margin: 0 10px;">
-      <div class="now-name">当前角色: {{roleName}}</div>
-      <el-table v-loading="loading2"
-                max-height="580"
-                ref="opeTable"
-                :data="opeList"
-                border
-                style="width: 100%"
+    <div class="role-container">
+        <el-card class="flex1">
+            <div class="now-name">
+                当前客户: {{ customerName }}
+                <el-button type="primary" size="small" @click="handleSaveSort">保存顺序</el-button>
+            </div>
+            <el-table ref="roleTable" v-loading="loading1" :data="roleList" row-key="roleId" border style="width: 100%">
+                <el-table-column type="index" width="50"></el-table-column>
+                <!-- <el-table-column prop="roleId" label="角色ID"></el-table-column> -->
+                <el-table-column prop="roleName" label="角色名称" width="160">
+                    <template slot-scope="scope">
+                        <el-input v-if="scope.row.isEdit" v-model.trim="scope.row.roleName" clearable>
+                        </el-input>
+                        <span v-else>{{ scope.row.constName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column v-if="!funcShow" prop="roleKey" label="角色Key"></el-table-column>
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="primary" size="mini"
+                            @click="toOperationConfig(scope.row.roleId, scope.row.roleName)">功能权限</el-button>
+                        <span v-if="scope.row.isEdit" style="display: inline-block; margin-left: 10px;">
+                            <el-button type="primary" size="small" @click="handleSaveChange(scope.row)">保存</el-button>
+                            <el-button size="small" @click="scope.row.isEdit = false">取消</el-button>
+                        </span>
+                        <el-button v-else type="primary" size="mini"
+                            @click="handleChangeName(scope.row)">修改名称</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <el-card v-show="funcShow" style="flex: 1; margin: 0 10px;">
+            <div class="now-name">当前角色: {{ roleName }}</div>
+            <el-table v-loading="loading2" max-height="580" ref="opeTable" :data="opeList" border style="width: 100%"
                 @select="handleSelectionChange">
-        <el-table-column type="selection"
-                         width="55"></el-table-column>
-        <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
-        <el-table-column prop="operationName"
-                         label="操作名称"></el-table-column>
-        <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="primary"
-                       size="small"
-                       @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">权限配置</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card v-show="roleShow"
-             style="width: 250px;">
-      <div class="now-name">当前功能: {{funcName}}</div>
-      <div>
-        <el-row :gutter="12">
-          <el-col v-loading="loading3">
-            <el-card shadow="hover">
-              <el-checkbox-group class="t"
-                                 v-model.trim="checkedScopes"
-                                 @change="roleChange">
-                <el-checkbox v-for="scope in scopeOptions"
-                             :label="scope.scopeKey"
-                             :key="scope.scopeKey">{{scope.scopeName}}</el-checkbox>
-              </el-checkbox-group>
-            </el-card>
-          </el-col>
-          <!-- <el-col :span="8">
+                <el-table-column type="selection" width="55"></el-table-column>
+                <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
+                <el-table-column prop="operationName" label="操作名称"></el-table-column>
+                <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="primary" size="small"
+                            @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">权限配置</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <el-card v-show="roleShow" style="width: 250px;">
+            <div class="now-name">当前功能: {{ funcName }}</div>
+            <div>
+                <el-row :gutter="12">
+                    <el-col v-loading="loading3">
+                        <el-card shadow="hover">
+                            <el-checkbox-group class="t" v-model.trim="checkedScopes" @change="roleChange">
+                                <el-checkbox v-for="scope in scopeOptions" :label="scope.scopeKey"
+                                    :key="scope.scopeKey">{{ scope.scopeName }}</el-checkbox>
+                            </el-checkbox-group>
+                        </el-card>
+                    </el-col>
+                    <!-- <el-col :span="8">
           <el-card shadow="hover">
             <el-checkbox-group class="t" v-model.trim="checkedSettings">
               <el-checkbox
@@ -104,261 +70,264 @@
             </el-checkbox-group>
           </el-card>
         </el-col> -->
-        </el-row>
-      </div>
-    </el-card>
-  </div>
+                </el-row>
+            </div>
+        </el-card>
+    </div>
 </template>
 <script>
 import Sortable from 'sortablejs'
 export default {
-  name: 'RoleList',
-  props: {
-    customerId: {
-      type: String,
-      default: ''
-    },
-    customerName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      funcShow: false,
-      roleShow: false,
-      roleName: '',
-      funcName: '',
-      roleList: [],
-      opeList: [],
-      roleKey: '',
-      operationKey: '',
-      scopeOptions: [],
-      settingOptions: [],
-      checkedScopes: [],
-      checkedSettings: [],
-      roleId: ''
-    }
-  },
-  created () {
-    this.listRolesByCustomerId(this.customerId)
-  },
-  mounted () {
-    this.dragRoleSort()
-  },
-  beforeDestroy () {
-    let _data = this.$data
-    for (let n in _data) {
-      if (typeof _data[n] === 'boolean') _data[n] = false
-      if (typeof _data[n] === 'string') _data[n] = ''
-      if (typeof _data[n] === 'object') _data[n] = []
-    }
-  },
-  methods: {
-    listRolesByCustomerId (customerId) {
-      this.loading1 = true
-      this.$http
-        .post('/epmetuser/govstaffrole/rolesbycustomer/' + customerId)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0) {
-            this.roleList = res.data.map(item => {
-              return {
-                ...item,
-                constName: item.roleName,
-                isEdit: false
-              }
-            })
-          }
-          setTimeout(() => {
-            this.loading1 = false
-          }, 500)
-        })
-    },
-    listOperations4AccessConfig (roleId) {
-      this.roleId = roleId
-      this.loading2 = true
-      this.$http.post('/gov/access/config/roleopes/' + roleId).then((resp) => {
-        this.opeList = resp.data.data
-        this.$nextTick(function() {
-          this.defaultCheck() // 每次更新了数据，触发这个函数即可。
-        })
-        setTimeout(() => {
-          this.loading2 = false
-        }, 500)
-      })
-    },
-    listSettingOptions (operationKey) {
-      let params = {
-        roleId: this.roleId,
-        operationKey: operationKey
-      }
-      console.log('checkedScopes', this.checkedScopes)
-      this.checkedScopes = []
-      this.loading3 = true
-      this.$http
-        .post('/gov/access/config/configoptions', params)
-        .then(resp => {
-          console.log('scopeOptions', resp.data)
-          this.scopeOptions = resp.data.data.scopeOptions
-          resp.data.data.scopeOptions.forEach(item => {
-            if (item.assigned) this.checkedScopes.push(item.scopeKey)
-          })
-          console.log('checkedScopes222', this.checkedScopes)
-          this.settingOptions = resp.data.data.settingOptions
-          setTimeout(() => {
-            this.loading3 = false
-          }, 500)
-        })
-    },
-    defaultCheck () {
-      for (var index in this.opeList) {
-        let role = this.opeList[index]
-        if (role.assigned) {
-          this.$refs.opeTable.toggleRowSelection(role, true)
-        }
-      }
-    },
-    toOperationConfig (roleId, roleName) {
-      this.roleName = roleName
-      this.funcShow = true
-      this.opeList = []
-      this.listOperations4AccessConfig(roleId)
-    },
-    toScopeConfig (operationKey, operationName) {
-      this.roleShow = true
-      this.operationKey = operationKey
-      this.funcName = operationName
-      this.checkedScopes = []
-      this.listSettingOptions(operationKey)
-    },
-    saveOperations4Role (val) {
-      let param = {
-        roleId: this.roleId,
-        opes: val,
-        customerId: this.customerId
-      }
-      this.$http.post('/gov/access/config/saveroleopes', param).then(
-        resp => {
-          this.$message({
-            message: '操作成功',
-            type: 'success'
-          })
-          this.listOperations4AccessConfig(this.roleId)
+    name: 'RoleList',
+    props: {
+        customerId: {
+            type: String,
+            default: ''
+        },
+        customerName: {
+            type: String,
+            default: ''
         }
-      )
     },
-    saveSettings (val) {
-      let param = {
-        roleId: this.roleId,
-        operationKey: this.operationKey,
-        scopeKeys: val,
-        settingKeys: this.checkedSettings,
-        customerId: this.customerId
-      }
-      this.$http.post('/gov/access/config/saveconfig', param).then(
-        resp => {
-          this.$message({
-            type: 'success',
-            message: '保存成功'
-          })
-          this.listSettingOptions(this.operationKey)
+    data() {
+        return {
+            loading1: false,
+            loading2: false,
+            loading3: false,
+            funcShow: false,
+            roleShow: false,
+            roleName: '',
+            funcName: '',
+            roleList: [],
+            opeList: [],
+            roleKey: '',
+            operationKey: '',
+            scopeOptions: [],
+            settingOptions: [],
+            checkedScopes: [],
+            checkedSettings: [],
+            roleId: ''
         }
-      )
     },
-    roleChange (val) {
-      this.saveSettings(val)
+    created() {
+        this.listRolesByCustomerId(this.customerId)
     },
-    handleSelectionChange (val) {
-      this.saveOperations4Role(val)
+    mounted() {
+        this.dragRoleSort()
     },
-    handleChangeName (row) {
-      row.isEdit = true
+    beforeDestroy() {
+        let _data = this.$data
+        for (let n in _data) {
+            if (typeof _data[n] === 'boolean') _data[n] = false
+            if (typeof _data[n] === 'string') _data[n] = ''
+            if (typeof _data[n] === 'object') _data[n] = []
+        }
     },
-    handleSaveChange (row) {
-      let data = {
-        roleId: row.roleId,
-        roleName: row.roleName
-      }
-      this.$http
-        .post('/epmetuser/govstaffrole/update-role', data)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0 && res.msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
+    methods: {
+        listRolesByCustomerId(customerId) {
+            this.loading1 = true
+            this.$http
+                .post('/epmetuser/govstaffrole/rolesbycustomer/' + customerId)
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0) {
+                        this.roleList = res.data.map(item => {
+                            return {
+                                ...item,
+                                constName: item.roleName,
+                                isEdit: false
+                            }
+                        })
+                    }
+                    setTimeout(() => {
+                        this.loading1 = false
+                    }, 500)
+                })
+        },
+        listOperations4AccessConfig(roleId) {
+            this.roleId = roleId
+            this.loading2 = true
+            this.$http.post('/gov/access/config/roleopes/' + roleId).then((resp) => {
+                this.opeList = resp.data.data
+                this.$nextTick(function () {
+                    this.defaultCheck() // 每次更新了数据，触发这个函数即可。
+                })
+                setTimeout(() => {
+                    this.loading2 = false
+                }, 500)
             })
-            this.listRolesByCustomerId(this.customerId)
-          } else {
-            this.$message({
-              type: 'error',
-              message: res.msg
+        },
+        listSettingOptions(operationKey) {
+            let params = {
+                roleId: this.roleId,
+                operationKey: operationKey
+            }
+            console.log('checkedScopes', this.checkedScopes)
+            this.checkedScopes = []
+            this.loading3 = true
+            this.$http
+                .post('/gov/access/config/configoptions', params)
+                .then(resp => {
+                    console.log('scopeOptions', resp.data)
+                    this.scopeOptions = resp.data.data.scopeOptions
+                    resp.data.data.scopeOptions.forEach(item => {
+                        if (item.assigned) this.checkedScopes.push(item.scopeKey)
+                    })
+                    console.log('checkedScopes222', this.checkedScopes)
+                    this.settingOptions = resp.data.data.settingOptions
+                    setTimeout(() => {
+                        this.loading3 = false
+                    }, 500)
+                })
+        },
+        defaultCheck() {
+            for (var index in this.opeList) {
+                let role = this.opeList[index]
+                if (role.assigned) {
+                    this.$refs.opeTable.toggleRowSelection(role, true)
+                }
+            }
+        },
+        toOperationConfig(roleId, roleName) {
+            this.roleName = roleName
+            this.funcShow = true
+            this.opeList = []
+            this.listOperations4AccessConfig(roleId)
+        },
+        toScopeConfig(operationKey, operationName) {
+            this.roleShow = true
+            this.operationKey = operationKey
+            this.funcName = operationName
+            this.checkedScopes = []
+            this.listSettingOptions(operationKey)
+        },
+        saveOperations4Role(val) {
+            let param = {
+                roleId: this.roleId,
+                opes: val,
+                customerId: this.customerId
+            }
+            this.$http.post('/gov/access/config/saveroleopes', param).then(
+                resp => {
+                    this.$message({
+                        message: '操作成功',
+                        type: 'success'
+                    })
+                    this.listOperations4AccessConfig(this.roleId)
+                }
+            )
+        },
+        saveSettings(val) {
+            let param = {
+                roleId: this.roleId,
+                operationKey: this.operationKey,
+                scopeKeys: val,
+                settingKeys: this.checkedSettings,
+                customerId: this.customerId
+            }
+            this.$http.post('/gov/access/config/saveconfig', param).then(
+                resp => {
+                    this.$message({
+                        type: 'success',
+                        message: '保存成功'
+                    })
+                    this.listSettingOptions(this.operationKey)
+                }
+            )
+        },
+        roleChange(val) {
+            this.saveSettings(val)
+        },
+        handleSelectionChange(val) {
+            this.saveOperations4Role(val)
+        },
+        handleChangeName(row) {
+            row.isEdit = true
+        },
+        handleSaveChange(row) {
+            let data = {
+                roleId: row.roleId,
+                roleName: row.roleName
+            }
+            this.$http
+                .post('/epmetuser/govstaffrole/update-role', data)
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0 && res.msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listRolesByCustomerId(this.customerId)
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg
+                        })
+                    }
+                })
+        },
+        dragRoleSort() {
+            const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+            this.sortTable = Sortable.create(el, {
+                group: 'dragTable',
+                ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+                // setData: function(dataTransfer, dragEl) {
+                //   dataTransfer.setData("Text", dragEl.textContent);
+                // },
+                delay: 0,
+                onChange: evt => {
+                    // console.log(evt)
+                },
+                onEnd: evt => {
+                    const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
+                    this.roleList.splice(evt.newIndex, 0, targetRow)
+                }
             })
-          }
-        })
-    },
-    dragRoleSort () {
-      const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
-      this.sortTable = Sortable.create(el, {
-        group: 'dragTable',
-        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
-        // setData: function(dataTransfer, dragEl) {
-        //   dataTransfer.setData("Text", dragEl.textContent);
-        // },
-        delay: 0,
-        onChange: evt => {
-          // console.log(evt)
         },
-        onEnd: evt => {
-          const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
-          this.roleList.splice(evt.newIndex, 0, targetRow)
+        handleSaveSort() {
+            let data = {
+                roleIdList: this.roleList.map(item => {
+                    return item.roleId
+                })
+            }
+            this.$http
+                .post('/epmetuser/govstaffrole/save-sortorder', data)
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0 && res.msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listRolesByCustomerId(this.customerId)
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg
+                        })
+                    }
+                })
         }
-      })
-    },
-    handleSaveSort () {
-      let data = {
-        roleIdList: this.roleList.map(item => {
-          return item.roleId
-        })
-      }
-      this.$http
-        .post('/epmetuser/govstaffrole/save-sortorder', data)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0 && res.msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
-            })
-            this.listRolesByCustomerId(this.customerId)
-          } else {
-            this.$message({
-              type: 'error',
-              message: res.msg
-            })
-          }
-        })
     }
-  }
 }
 </script>
 <style>
 .role-container {
-  display: flex;
+    display: flex;
 }
+
 .flex1 {
-  flex: 1;
+    flex: 1;
 }
+
 .now-name {
-  /* display: flex;
+    /* display: flex;
   justify-content: space-between; */
-  margin-bottom: 10px;
+    margin-bottom: 10px;
 }
-.aui-wrapper .el-card + .el-card {
-  margin-top: 0;
+
+.aui-wrapper .el-card+.el-card {
+    margin-top: 0;
 }
 </style>
diff --git a/src/views/modules/customer/role.vue b/src/views/modules/customer/role.vue
index 92bf18963..fcac69f99 100644
--- a/src/views/modules/customer/role.vue
+++ b/src/views/modules/customer/role.vue
@@ -1,391 +1,362 @@
 <template>
-  <div class="role-container">
-    <el-card class="flex1">
-      <!-- <div class="now-name">
+    <div class="role-container">
+        <el-card class="flex1">
+            <!-- <div class="now-name">
         当前客户: {{customerName}}
          <el-button type="primary" size="small" @click="handleSaveSort">保存顺序</el-button>
       </div> -->
-      <el-table ref="roleTable"
-                v-loading="loading1"
-                :data="roleList"
-                row-key="roleKey"
-                border
+            <el-table ref="roleTable" v-loading="loading1" :data="roleList" row-key="roleKey" border
                 style="width: 100%">
-        <el-table-column type="index"
-                         width="50"></el-table-column>
-        <!-- <el-table-column prop="roleId" label="角色ID"></el-table-column> -->
-        <el-table-column prop="roleName"
-                         label="角色名称"
-                         width="160">
-          <template slot-scope="scope">
-            <el-input v-if="scope.row.isEdit"
-                      v-model.trim="scope.row.roleName"
-                      clearable>
-            </el-input>
-            <span v-else>{{scope.row.constName}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="!funcShow"
-                         prop="roleKey"
-                         label="角色Key"></el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="primary"
-                       size="mini"
-                       @click="toOperationConfig(scope.row.roleKey, scope.row.roleName)">功能权限</el-button>
-            <!-- <span v-if="scope.row.isEdit" style="display: inline-block; margin-left: 10px;">
+                <el-table-column type="index" width="50"></el-table-column>
+                <!-- <el-table-column prop="roleId" label="角色ID"></el-table-column> -->
+                <el-table-column prop="roleName" label="角色名称" width="160">
+                    <template slot-scope="scope">
+                        <el-input v-if="scope.row.isEdit" v-model.trim="scope.row.roleName" clearable>
+                        </el-input>
+                        <span v-else>{{ scope.row.constName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column v-if="!funcShow" prop="roleKey" label="角色Key"></el-table-column>
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-button type="primary" size="mini"
+                            @click="toOperationConfig(scope.row.roleKey, scope.row.roleName)">功能权限</el-button>
+                        <!-- <span v-if="scope.row.isEdit" style="display: inline-block; margin-left: 10px;">
               <el-button type="primary" size="small" @click="handleSaveChange(scope.row)">保存</el-button>
               <el-button  size="small" @click="scope.row.isEdit=false">取消</el-button>
             </span>
             <el-button v-else type="primary" size="mini" @click="handleChangeName(scope.row)">修改名称</el-button> -->
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-dialog :visible.sync="funcShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="70%"
-               top="30px"
-               title="功能列表"
-               @closed="handleDialogClosed">
-      <div class="role-flex"
-           v-if="funcShow">
-        <el-card class="flex1">
-          <div class="now-name">当前角色: {{roleName}}</div>
-          <div class="now-name">
-            <el-button type="primary"
-                       size="small"
-                       @click="saveOperations4Role">保存功能</el-button>
-          </div>
-          <el-table v-loading="loading2"
-                    height="580"
-                    ref="opeTable"
-                    :data="opeList"
-                    border
-                    @select="handleSelectionChange">
-            <el-table-column type="selection"
-                             width="55"></el-table-column>
-            <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
-            <el-table-column prop="operationName"
-                             label="操作名称"></el-table-column>
-            <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
-            <el-table-column label="操作">
-              <template slot-scope="scope">
-                <el-button type="primary"
-                           size="small"
-                           @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">范围配置</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+                    </template>
+                </el-table-column>
+            </el-table>
         </el-card>
-        <el-card v-show="roleShow"
-                 style="width: 250px; margin-left: 10px;">
-          <div class="now-name">当前功能: {{funcName}}</div>
-          <div class="now-name">
-            <el-button type="primary"
-                       size="small"
-                       @click="saveSettings">保存范围</el-button>
-          </div>
-          <div>
-            <el-row :gutter="12">
-              <el-col v-loading="loading3">
-                <el-card shadow="hover">
-                  <el-checkbox-group class="t"
-                                     v-model.trim="checkedScopes"
-                                     @change="roleChange">
-                    <el-checkbox v-for="scope in scopeOptions"
-                                 :label="scope.scopeKey"
-                                 :key="scope.scopeKey">{{scope.scopeName}}</el-checkbox>
-                  </el-checkbox-group>
+        <el-dialog :visible.sync="funcShow" :close-on-click-modal="false" :close-on-press-escape="false" width="70%"
+            top="30px" title="功能列表" @closed="handleDialogClosed">
+            <div class="role-flex" v-if="funcShow">
+                <el-card class="flex1">
+                    <div class="now-name">当前角色: {{ roleName }}</div>
+                    <div class="now-name">
+                        <el-button type="primary" size="small" @click="saveOperations4Role">保存功能</el-button>
+                    </div>
+                    <el-table v-loading="loading2" height="580" ref="opeTable" :data="opeList" border
+                        @select="handleSelectionChange">
+                        <el-table-column type="selection" width="55"></el-table-column>
+                        <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
+                        <el-table-column prop="operationName" label="操作名称"></el-table-column>
+                        <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
+                        <el-table-column label="操作">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="small"
+                                    @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">范围配置</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
                 </el-card>
-              </el-col>
-            </el-row>
-          </div>
-        </el-card>
-      </div>
-    </el-dialog>
-  </div>
+                <el-card v-show="roleShow" style="width: 250px; margin-left: 10px;">
+                    <div class="now-name">当前功能: {{ funcName }}</div>
+                    <div class="now-name">
+                        <el-button type="primary" size="small" @click="saveSettings">保存范围</el-button>
+                    </div>
+                    <div>
+                        <el-row :gutter="12">
+                            <el-col v-loading="loading3">
+                                <el-card shadow="hover">
+                                    <el-checkbox-group class="t" v-model.trim="checkedScopes" @change="roleChange">
+                                        <el-checkbox v-for="scope in scopeOptions" :label="scope.scopeKey"
+                                            :key="scope.scopeKey">{{ scope.scopeName }}</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-card>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-card>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 <script>
 import Sortable from 'sortablejs'
 export default {
-  name: 'RoleList',
-  props: {
-    customerId: {
-      type: String,
-      default: ''
-    },
-    customerName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      funcShow: false,
-      roleShow: false,
-      roleName: '',
-      funcName: '',
-      roleList: [],
-      opeList: [],
-      roleKey: '',
-      operationKey: '',
-      scopeOptions: [],
-      settingOptions: [],
-      checkedScopes: [],
-      checkedSettings: [],
-      operateSection: [], // 功能选择列表
-      scopeSection: [] // 范围选择列表
-    }
-  },
-  created () {
-    this.listRolesByCustomerId()
-  },
-  mounted () {
-    this.dragRoleSort()
-  },
-  beforeDestroy () {
-    let _data = this.$data
-    for (let n in _data) {
-      if (typeof _data[n] === 'boolean') _data[n] = false
-      if (typeof _data[n] === 'string') _data[n] = ''
-      if (typeof _data[n] === 'object') _data[n] = []
-    }
-  },
-  methods: {
-    handleDialogClosed () {
-      this.roleName = ''
-      this.roleKey = ''
-      this.funcName = ''
-      this.operateSection = []
-      this.scopeSection = []
-      this.funcShow = false
-      this.roleShow = false
-    },
-    listRolesByCustomerId (customerId) {
-      this.loading1 = true
-      this.$http
-        .post('/epmetuser/govstaffrole/roletemplates')
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0) {
-            this.roleList = res.data.map(item => {
-              return {
-                ...item,
-                constName: item.roleName,
-                isEdit: false
-              }
-            })
-          }
-          setTimeout(() => {
-            this.loading1 = false
-          }, 500)
-        })
-    },
-    listOperations4AccessConfig (roleKey) {
-      this.roleKey = roleKey
-      this.loading2 = true
-      this.$http.post('/gov/access/config/roledefaultops/' + roleKey).then((resp) => {
-        this.opeList = resp.data.data
-        this.$nextTick(function() {
-          this.defaultCheck() // 每次更新了数据，触发这个函数即可。
-        })
-        setTimeout(() => {
-          this.loading2 = false
-        }, 500)
-      })
-    },
-    listSettingOptions (operationKey) {
-      let params = {
-        roleKey: this.roleKey,
-        operationKey: operationKey
-      }
-      console.log('checkedScopes', this.checkedScopes)
-      this.loading3 = true
-      this.checkedScopes = []
-      this.$http
-        .post('/gov/access/config/opedefaultscopes/list', params)
-        .then(resp => {
-          console.log('scopeOptions', resp.data)
-          this.scopeOptions = resp.data.data
-          resp.data.data.forEach(item => {
-            if (item.assigned) this.checkedScopes.push(item.scopeKey)
-          })
-          console.log('checkedScopes222', this.checkedScopes)
-          this.settingOptions = resp.data.data
-          setTimeout(() => {
-            this.loading3 = false
-          }, 500)
-        })
-    },
-    defaultCheck () {
-      for (var index in this.opeList) {
-        let role = this.opeList[index]
-        if (role.assigned) {
-          this.$refs.opeTable.toggleRowSelection(role, true)
-        }
-      }
-    },
-    toOperationConfig (roleKey, roleName) {
-      this.roleName = roleName
-      this.funcShow = true
-      this.opeList = []
-      this.listOperations4AccessConfig(roleKey)
-    },
-    toScopeConfig (operationKey, operationName) {
-      this.roleShow = true
-      this.operationKey = operationKey
-      this.funcName = operationName
-      this.checkedScopes = []
-      this.listSettingOptions(operationKey)
-    },
-    saveOperations4Role () {
-      let param = {
-        roleKey: this.roleKey,
-        operationKeys: this.operateSection.map(item => item.operationKey)
-      }
-      this.$http.post('/gov/access/config/roledefaultopes/save', param).then(
-        resp => {
-          const { code, msg } = resp.data
-          if (code === 0 && msg === 'success') {
-            this.$message({
-              message: '操作成功',
-              type: 'success'
-            })
-            this.listOperations4AccessConfig(this.roleKey)
-          } else {
-            this.$message({
-              message: msg,
-              type: 'error'
-            })
-          }
+    name: 'RoleList',
+    props: {
+        customerId: {
+            type: String,
+            default: ''
+        },
+        customerName: {
+            type: String,
+            default: ''
         }
-      )
     },
-    saveSettings () {
-      let param = {
-        roleKey: this.roleKey,
-        operationKey: this.operationKey,
-        scopeKeys: this.scopeSection
-      }
-      this.$http.post('/gov/access/config/opedefaultscopes/save', param).then(
-        resp => {
-          const { code, msg } = resp.data
-          if (code === 0 && msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
-            })
-            this.listSettingOptions(this.operationKey)
-          } else {
-            this.$message({
-              message: msg,
-              type: 'error'
-            })
-          }
+    data() {
+        return {
+            loading1: false,
+            loading2: false,
+            loading3: false,
+            funcShow: false,
+            roleShow: false,
+            roleName: '',
+            funcName: '',
+            roleList: [],
+            opeList: [],
+            roleKey: '',
+            operationKey: '',
+            scopeOptions: [],
+            settingOptions: [],
+            checkedScopes: [],
+            checkedSettings: [],
+            operateSection: [], // 功能选择列表
+            scopeSection: [] // 范围选择列表
         }
-      )
     },
-    roleChange (val) {
-      this.scopeSection = val
-      // this.saveSettings(val)
+    created() {
+        this.listRolesByCustomerId()
     },
-    handleSelectionChange (val) {
-      this.operateSection = val
-      // this.saveOperations4Role(val)
+    mounted() {
+        this.dragRoleSort()
     },
-    handleChangeName (row) {
-      row.isEdit = true
+    beforeDestroy() {
+        let _data = this.$data
+        for (let n in _data) {
+            if (typeof _data[n] === 'boolean') _data[n] = false
+            if (typeof _data[n] === 'string') _data[n] = ''
+            if (typeof _data[n] === 'object') _data[n] = []
+        }
     },
-    handleSaveChange (row) {
-      let data = {
-        roleKey: row.roleKey,
-        roleName: row.roleName
-      }
-      this.$http
-        .post('/epmetuser/govstaffrole/update-role', data)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0 && res.msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
+    methods: {
+        handleDialogClosed() {
+            this.roleName = ''
+            this.roleKey = ''
+            this.funcName = ''
+            this.operateSection = []
+            this.scopeSection = []
+            this.funcShow = false
+            this.roleShow = false
+        },
+        listRolesByCustomerId(customerId) {
+            this.loading1 = true
+            this.$http
+                .post('/epmetuser/govstaffrole/roletemplates')
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0) {
+                        this.roleList = res.data.map(item => {
+                            return {
+                                ...item,
+                                constName: item.roleName,
+                                isEdit: false
+                            }
+                        })
+                    }
+                    setTimeout(() => {
+                        this.loading1 = false
+                    }, 500)
+                })
+        },
+        listOperations4AccessConfig(roleKey) {
+            this.roleKey = roleKey
+            this.loading2 = true
+            this.$http.post('/gov/access/config/roledefaultops/' + roleKey).then((resp) => {
+                this.opeList = resp.data.data
+                this.$nextTick(function () {
+                    this.defaultCheck() // 每次更新了数据，触发这个函数即可。
+                })
+                setTimeout(() => {
+                    this.loading2 = false
+                }, 500)
             })
-            this.listRolesByCustomerId(this.customerId)
-          } else {
-            this.$message({
-              type: 'error',
-              message: res.msg
+        },
+        listSettingOptions(operationKey) {
+            let params = {
+                roleKey: this.roleKey,
+                operationKey: operationKey
+            }
+            console.log('checkedScopes', this.checkedScopes)
+            this.loading3 = true
+            this.checkedScopes = []
+            this.$http
+                .post('/gov/access/config/opedefaultscopes/list', params)
+                .then(resp => {
+                    console.log('scopeOptions', resp.data)
+                    this.scopeOptions = resp.data.data
+                    resp.data.data.forEach(item => {
+                        if (item.assigned) this.checkedScopes.push(item.scopeKey)
+                    })
+                    console.log('checkedScopes222', this.checkedScopes)
+                    this.settingOptions = resp.data.data
+                    setTimeout(() => {
+                        this.loading3 = false
+                    }, 500)
+                })
+        },
+        defaultCheck() {
+            for (var index in this.opeList) {
+                let role = this.opeList[index]
+                if (role.assigned) {
+                    this.$refs.opeTable.toggleRowSelection(role, true)
+                }
+            }
+        },
+        toOperationConfig(roleKey, roleName) {
+            this.roleName = roleName
+            this.funcShow = true
+            this.opeList = []
+            this.listOperations4AccessConfig(roleKey)
+        },
+        toScopeConfig(operationKey, operationName) {
+            this.roleShow = true
+            this.operationKey = operationKey
+            this.funcName = operationName
+            this.checkedScopes = []
+            this.listSettingOptions(operationKey)
+        },
+        saveOperations4Role() {
+            let param = {
+                roleKey: this.roleKey,
+                operationKeys: this.operateSection.map(item => item.operationKey)
+            }
+            this.$http.post('/gov/access/config/roledefaultopes/save', param).then(
+                resp => {
+                    const { code, msg } = resp.data
+                    if (code === 0 && msg === 'success') {
+                        this.$message({
+                            message: '操作成功',
+                            type: 'success'
+                        })
+                        this.listOperations4AccessConfig(this.roleKey)
+                    } else {
+                        this.$message({
+                            message: msg,
+                            type: 'error'
+                        })
+                    }
+                }
+            )
+        },
+        saveSettings() {
+            let param = {
+                roleKey: this.roleKey,
+                operationKey: this.operationKey,
+                scopeKeys: this.scopeSection
+            }
+            this.$http.post('/gov/access/config/opedefaultscopes/save', param).then(
+                resp => {
+                    const { code, msg } = resp.data
+                    if (code === 0 && msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listSettingOptions(this.operationKey)
+                    } else {
+                        this.$message({
+                            message: msg,
+                            type: 'error'
+                        })
+                    }
+                }
+            )
+        },
+        roleChange(val) {
+            this.scopeSection = val
+            // this.saveSettings(val)
+        },
+        handleSelectionChange(val) {
+            this.operateSection = val
+            // this.saveOperations4Role(val)
+        },
+        handleChangeName(row) {
+            row.isEdit = true
+        },
+        handleSaveChange(row) {
+            let data = {
+                roleKey: row.roleKey,
+                roleName: row.roleName
+            }
+            this.$http
+                .post('/epmetuser/govstaffrole/update-role', data)
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0 && res.msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listRolesByCustomerId(this.customerId)
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg
+                        })
+                    }
+                })
+        },
+        dragRoleSort() {
+            const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+            this.sortTable = Sortable.create(el, {
+                group: 'dragTable',
+                ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+                // setData: function(dataTransfer, dragEl) {
+                //   dataTransfer.setData("Text", dragEl.textContent);
+                // },
+                delay: 0,
+                onChange: evt => {
+                    // console.log(evt)
+                },
+                onEnd: evt => {
+                    const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
+                    this.roleList.splice(evt.newIndex, 0, targetRow)
+                }
             })
-          }
-        })
-    },
-    dragRoleSort () {
-      const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
-      this.sortTable = Sortable.create(el, {
-        group: 'dragTable',
-        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
-        // setData: function(dataTransfer, dragEl) {
-        //   dataTransfer.setData("Text", dragEl.textContent);
-        // },
-        delay: 0,
-        onChange: evt => {
-          // console.log(evt)
         },
-        onEnd: evt => {
-          const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
-          this.roleList.splice(evt.newIndex, 0, targetRow)
+        handleSaveSort() {
+            let data = {
+                roleIdList: this.roleList.map(item => {
+                    return item.roleKey
+                })
+            }
+            this.$http
+                .post('/epmetuser/govstaffrole/save-sortorder', data)
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0 && res.msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listRolesByCustomerId(this.customerId)
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg
+                        })
+                    }
+                })
         }
-      })
-    },
-    handleSaveSort () {
-      let data = {
-        roleIdList: this.roleList.map(item => {
-          return item.roleKey
-        })
-      }
-      this.$http
-        .post('/epmetuser/govstaffrole/save-sortorder', data)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0 && res.msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
-            })
-            this.listRolesByCustomerId(this.customerId)
-          } else {
-            this.$message({
-              type: 'error',
-              message: res.msg
-            })
-          }
-        })
     }
-  }
 }
 </script>
 <style>
 .role-container,
 .role-flex {
-  display: flex;
+    display: flex;
 }
+
 .flex1 {
-  flex: 1;
+    flex: 1;
 }
+
 .now-name {
-  /* display: flex;
+    /* display: flex;
   justify-content: space-between; */
-  margin-bottom: 10px;
+    margin-bottom: 10px;
 }
-.aui-wrapper .el-card + .el-card {
-  margin-top: 0;
+
+.aui-wrapper .el-card+.el-card {
+    margin-top: 0;
 }
+
 .role-container .el-dialog__body {
-  padding: 0 20px 20px;
+    padding: 0 20px 20px;
 }
 </style>
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index d0b652438..10c402dca 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -1,194 +1,212 @@
 <template>
-  <div>
-    <div class="g-row">
-      <div class="g-row-left">
-        <div class="m-box m-search">
-          <div class="wrap">
-            <!-- <div class="title">
+    <div>
+        <div class="g-row">
+            <div class="g-row-left">
+                <div class="m-box m-search">
+                    <div class="wrap">
+                        <!-- <div class="title">
               <span>社区查询</span>
             </div> -->
-            <div class="tabs">
-              <div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">查居民</div>
-              <div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">查房屋</div>
-            </div>
-
-            <div class="search">
-              <div class="search-input">
-                <div class="input">
-                  <input type="text" :placeholder="typePlaceholder[searchData.type]" v-model.trim="searchData.searchKey"
-                    @keyup.enter="handleClickSearchBtn" />
+                        <div class="tabs">
+                            <div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">查居民
+                            </div>
+                            <div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">查房屋
+                            </div>
+                        </div>
+
+                        <div class="search">
+                            <div class="search-input">
+                                <div class="input">
+                                    <input type="text" :placeholder="typePlaceholder[searchData.type]"
+                                        v-model.trim="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
+
+                                    <div class="close-btn" v-if="searchData.searchKey != ''"
+                                        @click="searchData.searchKey = ''">
+                                        <img src="@/assets/img/shequ/close.png" />
+                                    </div>
+                                </div>
+                                <div class="btn" @click="handleClickSearchBtn">查询</div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="mewq">
+                        <div class="boxss">
+                            <div style="margin-top: 10px;" @click="handelClickToResi">
+                                <span style="color: #2683DB; font-size: 25px;">
+                                    {{ pandectData.totalResidents }}
+                                </span>
+
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">居民总数</span>
+                            </div>
+                        </div>
+                        <div class="boxss">
+                            <div style="margin-top: 10px;"
+                                @click="handelClickToResi({ residentCategory: 'permanentFlag' })">
+                                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.permanentResiCount
+                                    }}</span>
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">常住人口</span>
+                            </div>
+                        </div>
+                        <div class="boxss">
+                            <div style="margin-top: 10px;"
+                                @click="handelClickToResi({ residentCategory: 'FLOATING_FLAG' })">
+                                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.floatingResiCount
+                                    }}</span>
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">流动人口</span>
+                            </div>
+                        </div>
+                        <div class="boxss">
+                            <div style="margin-top: 10px;" @click="jumpToHouse('zongshu')">
+                                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.homeCount }}</span>
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">房屋总数</span>
+                            </div>
+                        </div>
+                        <div class="boxss" @click="jumpToHouse('zizhuM')">
+                            <div style="margin-top: 10px;">
+                                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.selfStay }}</span>
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">自住房屋</span>
+                            </div>
+                        </div>
+                        <div class="boxss" @click="jumpToHouse('chuzuM')">
+                            <div style="margin-top: 10px;">
+                                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.rentOut }}</span>
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">出租房屋</span>
+                            </div>
+                        </div>
+                        <div class="boxss" @click="jumpToHouse('xianzhiM')">
+                            <div style="margin-top: 10px;">
+                                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.vacantHouse }}</span>
+                                <br>
+                                <span style="color: #858585; font-size: 12px;">闲置房屋</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="m-pan">
+                    <div class="m-box flex_box m-pan">
+                        <div class="header">
+                            <div class="newqsa"><span>居民分类信息不完整数量统计</span></div>
+                            <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
+                        </div>
+                        <div class="cnt">
+                            <!-- 树状图 -->
+                            <div class="echart" id="myBarchart" style="width: 100%; height: 100%;"></div>
+                            <!-- 树状图end -->
+                        </div>
+                    </div>
+                </div>
 
-                  <div class="close-btn" v-if="searchData.searchKey != ''" @click="searchData.searchKey = ''">
-                    <img src="@/assets/img/shequ/close.png" />
-                  </div>
+                <div class="m-box m-tb">
+                    <div class="header">
+                        <div class="newqsa"><span>不满意事项(月度)趋势分析</span></div>
+                        <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
+                    </div>
+                    <!-- <div class="more">更多></div> -->
+                    <div class="cnt">
+                        <div id="my_chart" style="width: 100%; height: 170px;"></div>
+                    </div>
                 </div>
-                <div class="btn" @click="handleClickSearchBtn">查询</div>
-              </div>
-            </div>
-          </div>
-
-          <div class="mewq">
-            <div class="boxss">
-              <div style="margin-top: 10px;" @click="handelClickToResi">
-                <span style="color: #2683DB; font-size: 25px;">
-                  {{ pandectData.totalResidents }}
-                </span>
-
-                <br>
-                <span style="color: #858585; font-size: 12px;">居民总数</span>
-              </div>
-            </div>
-            <div class="boxss">
-              <div style="margin-top: 10px;"  @click="handelClickToResi({residentCategory:'permanentFlag'})">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.permanentResiCount }}</span>
-                <br>
-                <span style="color: #858585; font-size: 12px;">常住人口</span>
-              </div>
-            </div>
-            <div class="boxss">
-              <div style="margin-top: 10px;"  @click="handelClickToResi({residentCategory:'FLOATING_FLAG'})">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.floatingResiCount }}</span>
-                <br>
-                <span style="color: #858585; font-size: 12px;">流动人口</span>
-              </div>
-            </div>
-            <div class="boxss">
-              <div style="margin-top: 10px;" @click="jumpToHouse('zongshu')">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.homeCount }}</span>
-                <br>
-                <span style="color: #858585; font-size: 12px;">房屋总数</span>
-              </div>
-            </div>
-            <div class="boxss" @click="jumpToHouse('zizhuM')">
-              <div style="margin-top: 10px;">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.selfStay }}</span>
-                <br>
-                <span style="color: #858585; font-size: 12px;">自住房屋</span>
-              </div>
-            </div>
-            <div class="boxss" @click="jumpToHouse('chuzuM')">
-              <div style="margin-top: 10px;">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.rentOut }}</span>
-                <br>
-                <span style="color: #858585; font-size: 12px;">出租房屋</span>
-              </div>
-            </div>
-            <div class="boxss" @click="jumpToHouse('xianzhiM')">
-              <div style="margin-top: 10px;">
-                <span style="color: #2683DB; font-size: 25px;">{{ pandectData.vacantHouse }}</span>
-                <br>
-                <span style="color: #858585; font-size: 12px;">闲置房屋</span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="m-pan">
-          <div class="m-box flex_box m-pan">
-            <div class="header">
-              <div class="newqsa"><span>居民分类信息不完整数量统计</span></div>
-              <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
-            </div>
-            <div class="cnt">
-              <!-- 树状图 -->
-              <div class="echart" id="myBarchart" style="width: 100%; height: 100%;"></div>
-              <!-- 树状图end -->
-            </div>
-          </div>
-        </div>
 
-        <div class="m-box m-tb">
-            <div class="header">
-              <div class="newqsa"><span>不满意事项(月度)趋势分析</span></div>
-              <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
             </div>
-          <!-- <div class="more">更多></div> -->
-          <div class="cnt">
-            <div id="my_chart" style="width: 100%; height: 170px;"></div>
-          </div>
-        </div>
-
-      </div>
-      <div class="g-row-right" style="margin-right: 20px;">
-        <div class="m-box m-tx">
-          <div class="header">
-            <div class="newqsa"><span>消息提醒</span></div>
-            <!-- <img src="@/assets/images/index/title-icon-zntx.png" /> -->
-          </div>
-          <div class="more" @click="toNoticePage">更多></div>
-          <div class="cnt" v-if="noticeData.length > 0" style="margin-top: 0px;">
-            <div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
-              v-for="(item, index) in noticeData">
-              <div class="item_right">
-                <div class="item-date">
-                  {{ item.createdTime }}
+            <div class="g-row-right" style="margin-right: 20px;">
+                <div class="m-box m-tx">
+                    <div class="header">
+                        <div class="newqsa"><span>消息提醒</span></div>
+                        <!-- <img src="@/assets/images/index/title-icon-zntx.png" /> -->
+                    </div>
+                    <div class="more" @click="toNoticePage">更多></div>
+                    <div class="cnt" v-if="noticeData.length > 0" style="margin-top: 0px;">
+                        <div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
+                            v-for="(item, index) in noticeData">
+                            <div class="item_right">
+                                <div class="item-date">
+                                    {{ item.createdTime }}
+                                </div>
+                                <div class="item-title"
+                                    style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 450px;">
+                                    <img v-if="item.msgType == 'resident_category'" class="thumbnail_1"
+                                        style="width: 17px;" referrerpolicy="no-referrer"
+                                        src="~@/assets/images/shuju/renfang/index/zhiding.png" />{{
+                                    item.content }}
+                                </div>
+                            </div>
+                            <div class="item_left">
+                                <i class="i-tag" v-if="item.readFlag == 1">已读</i>
+                                <i class="i-tag" v-else>未读</i>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="cnt" v-else>
+                        <div class="empty">
+                            <img src="~@/assets/images/shuju/renfang/index/empty.png" />
+                            <span>暂无提醒～</span>
+                        </div>
+                    </div>
                 </div>
-                <div class="item-title"
-                  style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 450px;">
-                  <img v-if="item.msgType == 'resident_category'" class="thumbnail_1" style="width: 17px;"
-                    referrerpolicy="no-referrer" src="~@/assets/images/shuju/renfang/index/zhiding.png" />{{
-                item.content }}
+
+                <div class="m-box m-tx" style="position: relative;">
+                    <div class="header" style="display: flex;align-items: center;justify-content: space-between;">
+                        <div class="newqsa"><span>居民信息更新情况</span> <span
+                                style="color: #cccccc;">（数据截止到{{ yesterdayDate }}）</span></div>
+                        <div class="update-settings" @click="jumpToJuMin()" v-show="showAll"><img
+                                referrerpolicy="no-referrer"
+                                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置
+                        </div>
+                    </div>
+                    <div
+                        style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box">
+                        <el-table :data="tableList" border :cell-style="columnbackgroundStyle" class="m-table-item">
+                            <el-table-column label="居民类别" align="center" width="105">
+                                <template slot-scope="scope">
+                                    <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="总人数" width="105" align="center">
+                                <template slot-scope="scope">
+                                    <span style="color:#006fd6;cursor: pointer;"
+                                        @click="handelClickToResi(scope.row)">{{ scope.row.total }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                    <span style="color:#ff1200;cursor: pointer;"
+                                        @click="handelCLickJump(scope.row, 'cateNonIntegrity')">{{ scope.row.nonIntegratedNum }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
+                                <template slot-scope="scope">
+                                    <span style="color:#989898;">{{ scope.row.userName }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="更新周期" align="center" width="105">
+                                <template slot-scope="scope">
+                                    <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
+                                        == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' :
+                                        scope.row.updatePeriod
+                                        == 'week' ? '每周' : '' : '' }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="更新人数" align="center" width="105">
+                                <template slot-scope="scope">
+                                    <span style="color:#006fd6;cursor: pointer;"
+                                        @click="handelCLickJump(scope.row, 'updateResiList')">{{ scope.row.updateResiNum }}</span><span
+                                        style="color:#989898;">({{ scope.row.updatePeriodName ? scope.row.updatePeriodName : '--' }})</span>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
                 </div>
-              </div>
-              <div class="item_left">
-                <i class="i-tag" v-if="item.readFlag == 1">已读</i>
-                <i class="i-tag" v-else>未读</i>
-              </div>
-            </div>
-          </div>
-          <div class="cnt" v-else>
-            <div class="empty">
-              <img src="~@/assets/images/shuju/renfang/index/empty.png" />
-              <span>暂无提醒～</span>
             </div>
-          </div>
-        </div>
-
-        <div class="m-box m-tx" style="position: relative;">
-          <div class="header" style="display: flex;align-items: center;justify-content: space-between;"> <div class="newqsa"><span >居民信息更新情况</span> <span style="color: #cccccc;">（数据截止到{{yesterdayDate}}）</span></div> <div class="update-settings"  @click="jumpToJuMin()" v-show="showAll"><img referrerpolicy="no-referrer"
-                src="https://lanhu.oss-cn-beijing.aliyuncs.com/pskhmf0717eflwg54wn73s6spnsg6u48r0f69e94b-2bc8-4156-8330-902087b72e0b" />更新设置</div>
-          </div>
-          <div style="width: 100%;margin-top:26px;overflow-y: scroll; height:calc(100% - 79px);padding-bottom:15px; box-sizing: border-box" >
-            <el-table :data="tableList" 
-            border :cell-style="columnbackgroundStyle" class="m-table-item">
-            <el-table-column label="居民类别" align="center" width="105">
-              <template slot-scope="scope">
-                <span style="color:#989898">{{ scope.row.residentCategoryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="总人数" width="105" align="center">
-              <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;" @click="handelClickToResi(scope.row)">{{scope.row.total}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分类信息不完整数" align="center" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                  <span style="color:#ff1200;cursor: pointer;"  @click="handelCLickJump(scope.row,'cateNonIntegrity')">{{scope.row.nonIntegratedNum}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="更新负责人" :show-overflow-tooltip="true" align="center" v-if="showAll">
-              <template slot-scope="scope">
-                  <span style="color:#989898;">{{scope.row.userName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="更新周期" align="center" width="105">
-              <template slot-scope="scope">
-                <span style="color:#989898;">{{ scope.row.updatePeriod ? scope.row.updatePeriod
-                == 'month' ? '每自然月' : scope.row.updatePeriod == 'halfMonth' ? '每半自然月' : scope.row.updatePeriod
-                  == 'week' ? '每周' : '' : '' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="更新人数" align="center" width="105">
-              <template slot-scope="scope">
-                  <span style="color:#006fd6;cursor: pointer;" @click="handelCLickJump(scope.row,'updateResiList')">{{scope.row.updateResiNum}}</span><span style="color:#989898;">({{scope.row.updatePeriodName?scope.row.updatePeriodName:'--'}})</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          </div>
         </div>
-      </div>
+        <fastcall ref="fastcall" />
     </div>
-    <fastcall ref="fastcall" />
-  </div>
 </template>
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -199,589 +217,589 @@ import fastcall from "@/views/modules/cpts/fastcall";
 import * as echarts from "echarts";
 
 export default {
-  components: { fastcall },
-
-  data() {
-    return {
-      yesterdayDate:null,
-      searchStatus: "ini", //ing over
-      searchData: {
-        type: "jumin",
-        searchKey: "",
-      },
-      showAll: false,
-
-      typePlaceholder: {
-        jumin: "请输入姓名或联系电话或证件号",
-        fangwu: "请输入小区名称或楼栋名称",
-        xuqiu: "请输入需求人或需求内容或服务组织",
-      },
-
-      resiCategory: {
-        loading: false,
-        total: "",
-        list: [],
-      },
-      tableList: [
-      ],
-      znycCategory: {
-        loading: false,
-        total: "",
-        list: [],
-      },
-
-      orgData: {
-        id: "",
-        level: "agency",
-      },
-
-      pandectData: {
-        communityName: "",
-        streetName: "",
-        gridCount: "",
-        resiCount: "",
-        homeCount: "",
-        floatingResiCount: "",
-        permanentResiCount: "",
-      },
-      noticeData: [],
-      activeName: "resi",
-      myChart: {},
-      myBarchart: {},
-      agencyLevel: '',
-      yData: [],
-      myChartStyle: { float: "left", width: "140%", height: "100%" },
-    }
-  },
-  computed: {},
-  watch: {
-    "searchData.searchKey": function (val) {
-      if (val == "") {
-        this.searchStatus = "ini";
-      }
-    },
-    $route: {
-      handler: function (newVal, oldVal) {
-        if (newVal.name == "home") {
-          this.getApiData();
-        }
-      },
-      deep: true,
-      immediate: true,
-    },
+    components: { fastcall },
+
+    data() {
+        return {
+            yesterdayDate: null,
+            searchStatus: "ini", //ing over
+            searchData: {
+                type: "jumin",
+                searchKey: "",
+            },
+            showAll: false,
 
-  },
-  created() {
-  },
-  mounted() {
-    // this.ehso();
-    //图形
-
-
-    this.getApiData();
-    this.$nextTick(() => {
-      this.initChart()
-      this.initEcharts();
-    })
-    this.getYesterdayDate()
-    // this.agencyLevel = localStorage.getItem("level", data.level);
-    console.log(
-      "dynamicMenuRoutes----------------------------",
-      this.$store.state.sidebarMenuList
-    );
-  },
-  methods: {
-    // 获取昨天时间
-    getYesterdayDate() {
-    const now = new Date();
-    now.setDate(now.getDate() - 1);
-    const year = now.getFullYear();
-    const month = (now.getMonth() + 1).toString().padStart(2, '0');
-    const day = now.getDate().toString().padStart(2, '0');
-    this.yesterdayDate = `${year}-${month}-${day}`;
-    },
-    formatNumber(number) {
-      if (typeof number === 'string') {
-        // 如果是字符串，去除非数字字符并转为数字类型
-        number = parseInt(number.replace(/\D/g, ''), 10);
-      }
-      return number.toLocaleString();
-    },
-    initChart() {
-      this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => {
-        this.myChart = echarts.init(document.getElementById("my_chart"));
-        // console.log("123123", data.series)
-        let series = data.series.map((item, index) => {
-          return {
-            ...item,
-            type: "line",
-            lineStyle: { // 添加lineStyle属性来指定折线样式
-              color: index === 0 ? '#F76828' : index === 1 ? '#EDB42D' : '#0056D6' // 根据索引指定不同的颜色
+            typePlaceholder: {
+                jumin: "请输入姓名或联系电话或证件号",
+                fangwu: "请输入小区名称或楼栋名称",
+                xuqiu: "请输入需求人或需求内容或服务组织",
             },
-            symbol: 'none',
-            itemStyle: {
-              color: index === 0 ? '#F76828' : index === 1 ? '#EDB42D' : '#0056D6' // 设置折点颜色
-            }
-          };
-        });
-        let option = {
-          tooltip: {
-            trigger: "axis",
-          },
-          legend: {
-            data: data.series.map((item) => item.name),
-            bottom: 0,
-            icon: "rect",
-            itemWidth: 20,
-            itemHeight: 5,
-            itemGap: 20,
-          },
-          grid: {
-            left: "3%",
-            right: "4%",
-            bottom: "13%",
-            top:'5',
-            containLabel: true,
-          },
-          toolbox: {
-            // feature: {
-            // 	saveAsImage: {}
-            // }
-          },
-          xAxis: {
-            type: "category",
-            boundaryGap: false,
-            // data: data.monthTimes.map((item) => this.$moment(item).format("M") + "月"),
-            data: data.monthTimes
-          },
-          yAxis: {
-            type: "value",
-          },
-          series,
-        };
-        this.myChart.setOption(option, true);
-        window.addEventListener("resize", this.handleWindowResize);
-      });
-      this.borderH();
-      const level = localStorage.getItem('level');
-      console.log('Stored level:', level);
-      if (level == 'community') {
-        this.showAll = true
-      }
-    },
 
-    columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 3 || columnIndex == 4 || columnIndex == 5) {
-        return 'background:#fffcf3;'
-      }
-    },
+            resiCategory: {
+                loading: false,
+                total: "",
+                list: [],
+            },
+            tableList: [
+            ],
+            znycCategory: {
+                loading: false,
+                total: "",
+                list: [],
+            },
 
-    borderH() {
-      this.$http.post("/actual/base/residentCategoryUpdateInfo/getUpdateAndintegrityList").then(({ data: { data } }) => {
-        this.tableList = data
-        this.tableList.forEach(item => {
-          if (typeof item.total === 'number') {
-            item.total = this.formatNumberWithCommas(item.total);
-          }
-          if (typeof item.nonIntegratedNum === 'number') {
-            item.nonIntegratedNum = this.formatNumberWithCommas(item.nonIntegratedNum);
-          }
-
-        });
-        console.log("请求成功:", data);
-      });
-    },
+            orgData: {
+                id: "",
+                level: "agency",
+            },
 
-    handleWindowResize() {
-      if (this.myChart) {
-        this.myChart.resize();
-        this.myBarchart.resize();
-      }
-    },
-    searchDataTab(str) {
-      this.searchData.type = str;
+            pandectData: {
+                communityName: "",
+                streetName: "",
+                gridCount: "",
+                resiCount: "",
+                homeCount: "",
+                floatingResiCount: "",
+                permanentResiCount: "",
+            },
+            noticeData: [],
+            activeName: "resi",
+            myChart: {},
+            myBarchart: {},
+            agencyLevel: '',
+            yData: [],
+            myChartStyle: { float: "left", width: "140%", height: "100%" },
+        }
     },
-    handleClickCategory(item) {
-      this.$router.push({
-        name: "base-resi",
-        params: {
-          category: item.code,
+    computed: {},
+    watch: {
+        "searchData.searchKey": function (val) {
+            if (val == "") {
+                this.searchStatus = "ini";
+            }
         },
-      });
-    },
-    async readClearOne(item) {
-      console.log("item", item);
-      const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
-      const { data, code, msg } = await requestPost(url);
-      if (code == 0) {
-        this.getNoticeData();
-      } else if (code >= 8000) {
-        this.$message.error(msg);
-      }
-    },
-    async readClearOne(item) {
-      const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
-      const { data, code, msg } = await requestPost(url);
-      if (code == 0) {
-        this.getNoticeData();
-      } else if (code >= 8000) {
-        this.$message.error(msg);
-      }
-    },
-    handleClickNotice(item) {
-      this.readClearOne(item);
-      if (item.msgType == "community_house") {
-        let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
-        this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
-        this.$router.push({ name: 'house-huaxiang' });
-        this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
-          if (item.name === "house-huaxiang") {
-            return { ...item, title: '房屋信息' };
-          }
-          return item;
-        });
-      } else if (item.msgType == "resident_base_info") {
-        let {
-          agencyId,
-          gridId,
-          gridName,
-          gender,
-          homeId,
-          homeName,
-          name,
-          targetId,
-          deptName
-        } = item;
-        this.$store.dispatch("saveData", {
-          agencyId,
-          gridId,
-          gridName,
-          gender,
-          homeId,
-          homeName,
-          name: '居民详情',
-          resiId: targetId,
-        });
-      }else if(item.msgType == "resident_category"){
-          this.$router.push({
-          name: "base-resi",
-          query: {
-            category: item.category || null,
-            type:"residentCategory"
-          },
-        });
-      } else if(item.msgType == "sys_version_upgrade_publish"){
-				let {  targetId } = item
-				this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
-				this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
-					if (item.name === "notice-version") {
-						return { ...item };
-					}
-					return item;
-				});
-			}
-      this.getNoticeData()
+        $route: {
+            handler: function (newVal, oldVal) {
+                if (newVal.name == "home") {
+                    this.getApiData();
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
+
     },
-   
-    toNoticePage() {
-      this.$router.push({
-        path: "/main/home-notice",
-      });
+    created() {
     },
-    jumpToJuMin() {
-      this.$router.push({
-        path: "/main/workSys-setResiUpdate-index",
-      });
+    mounted() {
+        // this.ehso();
+        //图形
+
+
+        this.getApiData();
+        this.$nextTick(() => {
+            this.initChart()
+            this.initEcharts();
+        })
+        this.getYesterdayDate()
+        // this.agencyLevel = localStorage.getItem("level", data.level);
+        console.log(
+            "dynamicMenuRoutes----------------------------",
+            this.$store.state.sidebarMenuList
+        );
     },
-    //
-    jumpToHouse(e) {
+    methods: {
+        // 获取昨天时间
+        getYesterdayDate() {
+            const now = new Date();
+            now.setDate(now.getDate() - 1);
+            const year = now.getFullYear();
+            const month = (now.getMonth() + 1).toString().padStart(2, '0');
+            const day = now.getDate().toString().padStart(2, '0');
+            this.yesterdayDate = `${year}-${month}-${day}`;
+        },
+        formatNumber(number) {
+            if (typeof number === 'string') {
+                // 如果是字符串，去除非数字字符并转为数字类型
+                number = parseInt(number.replace(/\D/g, ''), 10);
+            }
+            return number.toLocaleString();
+        },
+        initChart() {
+            this.$http.get("/governance/satisfactionOverview/notSatisfactionTrend").then(({ data: { data } }) => {
+                this.myChart = echarts.init(document.getElementById("my_chart"));
+                // console.log("123123", data.series)
+                let series = data.series.map((item, index) => {
+                    return {
+                        ...item,
+                        type: "line",
+                        lineStyle: { // 添加lineStyle属性来指定折线样式
+                            color: index === 0 ? '#F76828' : index === 1 ? '#EDB42D' : '#0056D6' // 根据索引指定不同的颜色
+                        },
+                        symbol: 'none',
+                        itemStyle: {
+                            color: index === 0 ? '#F76828' : index === 1 ? '#EDB42D' : '#0056D6' // 设置折点颜色
+                        }
+                    };
+                });
+                let option = {
+                    tooltip: {
+                        trigger: "axis",
+                    },
+                    legend: {
+                        data: data.series.map((item) => item.name),
+                        bottom: 0,
+                        icon: "rect",
+                        itemWidth: 20,
+                        itemHeight: 5,
+                        itemGap: 20,
+                    },
+                    grid: {
+                        left: "3%",
+                        right: "4%",
+                        bottom: "13%",
+                        top: '5',
+                        containLabel: true,
+                    },
+                    toolbox: {
+                        // feature: {
+                        // 	saveAsImage: {}
+                        // }
+                    },
+                    xAxis: {
+                        type: "category",
+                        boundaryGap: false,
+                        // data: data.monthTimes.map((item) => this.$moment(item).format("M") + "月"),
+                        data: data.monthTimes
+                    },
+                    yAxis: {
+                        type: "value",
+                    },
+                    series,
+                };
+                this.myChart.setOption(option, true);
+                window.addEventListener("resize", this.handleWindowResize);
+            });
+            this.borderH();
+            const level = localStorage.getItem('level');
+            console.log('Stored level:', level);
+            if (level == 'community') {
+                this.showAll = true
+            }
+        },
 
-      this.$router.push({
-        path: "/main/base-community-community",
-        query: {
-          param1: e,
-        }
-      });
-    },
+        columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
+            if (columnIndex == 3 || columnIndex == 4 || columnIndex == 5) {
+                return 'background:#fffcf3;'
+            }
+        },
 
-    toSearchPage(type, searchKey) {
-      this.$router.push({
-        path: "/main/shequ-chaxun",
-      });
-      localStorage.setItem("homeSearchType", type);
-      localStorage.setItem("homeSearchKey", searchKey);
-    },
+        borderH() {
+            this.$http.post("/actual/base/residentCategoryUpdateInfo/getUpdateAndintegrityList").then(({ data: { data } }) => {
+                this.tableList = data
+                this.tableList.forEach(item => {
+                    if (typeof item.total === 'number') {
+                        item.total = this.formatNumberWithCommas(item.total);
+                    }
+                    if (typeof item.nonIntegratedNum === 'number') {
+                        item.nonIntegratedNum = this.formatNumberWithCommas(item.nonIntegratedNum);
+                    }
+
+                });
+                console.log("请求成功:", data);
+            });
+        },
 
-    handleClickSearchBtn(str) {
-      const {
-        searchData: { type, searchKey },
-      } = this;
-      if (str) {
-        this.toSearchPage(type, searchKey);
-        return;
-      }
-      if (!searchKey) return this.$message.error("请输入搜索条件");
-      this.toSearchPage(type, searchKey);
-    },
+        handleWindowResize() {
+            if (this.myChart) {
+                this.myChart.resize();
+                this.myBarchart.resize();
+            }
+        },
+        searchDataTab(str) {
+            this.searchData.type = str;
+        },
+        handleClickCategory(item) {
+            this.$router.push({
+                name: "base-resi",
+                params: {
+                    category: item.code,
+                },
+            });
+        },
+        async readClearOne(item) {
+            console.log("item", item);
+            const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
+            const { data, code, msg } = await requestPost(url);
+            if (code == 0) {
+                this.getNoticeData();
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
+        async readClearOne(item) {
+            const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
+            const { data, code, msg } = await requestPost(url);
+            if (code == 0) {
+                this.getNoticeData();
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
+        handleClickNotice(item) {
+            this.readClearOne(item);
+            if (item.msgType == "community_house") {
+                let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
+                this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
+                this.$router.push({ name: 'house-huaxiang' });
+                this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+                    if (item.name === "house-huaxiang") {
+                        return { ...item, title: '房屋信息' };
+                    }
+                    return item;
+                });
+            } else if (item.msgType == "resident_base_info") {
+                let {
+                    agencyId,
+                    gridId,
+                    gridName,
+                    gender,
+                    homeId,
+                    homeName,
+                    name,
+                    targetId,
+                    deptName
+                } = item;
+                this.$store.dispatch("saveData", {
+                    agencyId,
+                    gridId,
+                    gridName,
+                    gender,
+                    homeId,
+                    homeName,
+                    name: '居民详情',
+                    resiId: targetId,
+                });
+            } else if (item.msgType == "resident_category") {
+                this.$router.push({
+                    name: "base-resi",
+                    query: {
+                        category: item.category || null,
+                        type: "residentCategory"
+                    },
+                });
+            } else if (item.msgType == "sys_version_upgrade_publish") {
+                let { targetId } = item
+                this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+                this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+                    if (item.name === "notice-version") {
+                        return { ...item };
+                    }
+                    return item;
+                });
+            }
+            this.getNoticeData()
+        },
 
-    async getApiData() {
-      await this.getOrgData();
-      this.getWarningList();
-      // this.getZnycList();
-      this.getPandectData();
-      this.getNoticeData();
-    },
+        toNoticePage() {
+            this.$router.push({
+                path: "/main/home-notice",
+            });
+        },
+        jumpToJuMin() {
+            this.$router.push({
+                path: "/main/workSys-setResiUpdate-index",
+            });
+        },
+        //
+        jumpToHouse(e) {
+
+            this.$router.push({
+                path: "/main/base-community-community",
+                query: {
+                    param1: e,
+                }
+            });
+        },
 
-    //加载组织数据
-    async getOrgData() {
-      const url = "/gov/org/agency/maporg";
-      let params = {
-        orgId: "",
-        level: "",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.orgData = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 格式化数字
-    formatNumberWithCommas(number) {
-      return new Intl.NumberFormat().format(number);
-    },
-    //加载组织数据
-    async getPandectData() {
-      const url = "/actual/base/residentHouseMerge/communityOverview";
-      let params = {
-        // orgId: "",
-        // level: "",
-      };
-
-      const { data, code, msg } = await requestGet(url, params);
-
-      if (code === 0) {
-        if (data) {
-          this.pandectData = data;
-          for (let key in this.pandectData) {
-            if (!isNaN(this.pandectData[key])) {
-              // 如果值可以转换为数字，则进行格式化
-              this.pandectData[key] = this.formatNumberWithCommas(parseFloat(this.pandectData[key]));
-            }
-          }
-        }
+        toSearchPage(type, searchKey) {
+            this.$router.push({
+                path: "/main/shequ-chaxun",
+            });
+            localStorage.setItem("homeSearchType", type);
+            localStorage.setItem("homeSearchKey", searchKey);
+        },
 
-      } else {
-        this.$message.error(msg);
-      }
-    },
+        handleClickSearchBtn(str) {
+            const {
+                searchData: { type, searchKey },
+            } = this;
+            if (str) {
+                this.toSearchPage(type, searchKey);
+                return;
+            }
+            if (!searchKey) return this.$message.error("请输入搜索条件");
+            this.toSearchPage(type, searchKey);
+        },
 
-    //加载组织数据
-    async getNoticeData() {
-      const url = "/message/intelligentMessage/list";
-      let params = {
-        last: "10",
-        readFlag: '0'
-      };
-      const { data, code, msg } = await requestGet(url, params);
-      if (code === 0) {
-        if (data) {
-          this.noticeData = data;
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    handelClickToResi(e){
-      this.$router.push({
-        name: "base-resi",
-        query: {
-          category: e.residentCategory || null,
+        async getApiData() {
+            await this.getOrgData();
+            this.getWarningList();
+            // this.getZnycList();
+            this.getPandectData();
+            this.getNoticeData();
         },
-      });
-    },
-    handelCLickJump(e,type){
-      if(type === 'updateResiList'){
-        this.$router.push({
-            path: "base-resi",
-            query: {
-              category: e.residentCategory,
-              type:'updateResi'
+
+        //加载组织数据
+        async getOrgData() {
+            const url = "/gov/org/agency/maporg";
+            let params = {
+                orgId: "",
+                level: "",
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.orgData = data;
+            } else {
+                this.$message.error(msg);
             }
-          });
-      }else{
-        this.$router.push({
-            path: "/main/base-nonIntResi",
-            query: {
-              resiCategory: e.residentCategory,
-              type:type
+        },
+        // 格式化数字
+        formatNumberWithCommas(number) {
+            return new Intl.NumberFormat().format(number);
+        },
+        //加载组织数据
+        async getPandectData() {
+            const url = "/actual/base/residentHouseMerge/communityOverview";
+            let params = {
+                // orgId: "",
+                // level: "",
+            };
+
+            const { data, code, msg } = await requestGet(url, params);
+
+            if (code === 0) {
+                if (data) {
+                    this.pandectData = data;
+                    for (let key in this.pandectData) {
+                        if (!isNaN(this.pandectData[key])) {
+                            // 如果值可以转换为数字，则进行格式化
+                            this.pandectData[key] = this.formatNumberWithCommas(parseFloat(this.pandectData[key]));
+                        }
+                    }
+                }
+
+            } else {
+                this.$message.error(msg);
             }
-          });
-      }
-     
-    },
+        },
 
-    //加载组织数据
-    async getWarningList() {
-      const url = "/actual/base/resiCategory/categoryCountList";
-      let params = {
-        // id: this.orgData.id,
-        // level: "agency",
-      };
-
-      this.resiCategory.loading = true;
-      const { data, code, msg } = await requestGet(url, params);
-      this.resiCategory.loading = false;
-
-      if (code === 0) {
-        if (data) {
-          this.resiCategory.count = data.resiCount;
-          this.resiCategory.list = data.categoryList.map((item) => {
-            return {
-              code: item.categoryName,
-              name: resiCategoryMap[item.categoryName] || "",
-              count: item.categoryCount,
-              per: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
-              const: "const",
-            };
-          });
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    //加载智能预测数据
-    async getZnycList() {
-      const url = "/actual/base/resiCategory/intelligentPredictioncategoryCountList";
-      // const url = "/actual/base/resiCategory/categoryCountList";
-      let params = {
-        // id: this.orgData.id,
-        // level: "agency",
-      };
-
-      this.znycCategory.loading = true;
-      const { data, code, msg } = await requestGet(url, params);
-      this.znycCategory.loading = false;
-
-      if (code === 0) {
-        if (data) {
-          this.znycCategory.count = data.resiCount;
-          this.znycCategory.list = data.categoryList.map((item) => {
-            return {
-              code: item.categoryName,
-              name: resiCategoryMap[item.categoryName] || "",
-              count: item.categoryCountNext,
-              // per: parseInt(
-              //   (100 * item.categoryCount) / data.resiCount
-              // ),
-              per: item.change_ratio,
-              const: "const",
+        //加载组织数据
+        async getNoticeData() {
+            const url = "/message/intelligentMessage/list";
+            let params = {
+                last: "10",
+                readFlag: '0'
             };
-          });
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    initEcharts() {
-      this.$http.get("/actual/base/residentIntegrity/resiCategoryStats/byOrg/query4Org").then(({ data: { data } }) => {
-        this.myBarchart = echarts.init(document.getElementById("myBarchart"));
-        let xData = data.categoryStatsDatas.map(item => item.resiCategoryName)
-        // let integratedNum = data.categoryStatsDatas.map(item => item.integratedNum)
-        // let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum)
-        let option = {
-          backgroundColor: '#fff',
-          color: ['#448cf6', '#f7ca60',],
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'shadow'
+            const { data, code, msg } = await requestGet(url, params);
+            if (code === 0) {
+                if (data) {
+                    this.noticeData = data;
+                }
+            } else {
+                this.$message.error(msg);
             }
-          },
-          legend: {
-            x: 'center',
-            bottom: '8%',
-            data: ['分类信息完整数', '分类信息不完整数'],
-            icon: "rect",
-            itemWidth: 20,
-            itemHeight: 5,
-            itemGap: 20,
-          },
-          grid: { //图表的位置
-            top: '3%',
-            left: '3%',
-            right: '4%',
-            bottom: '10%',
-            containLabel: true
-          },
-          yAxis: [{
-            type: 'value',
-            splitLine: {
-              show: true,
-              lineStyle: {
-                color: ['#f2f2f2']
-              }
-            },
-          }],
-          xAxis: [{
-            type: 'category',
-            data: xData,
-            axisLabel: {
-                rotate: 50  // 设置旋转角度为45度
+        },
+        handelClickToResi(e) {
+            this.$router.push({
+                name: "base-resi",
+                query: {
+                    category: e.residentCategory || null,
+                },
+            });
+        },
+        handelCLickJump(e, type) {
+            if (type === 'updateResiList') {
+                this.$router.push({
+                    path: "base-resi",
+                    query: {
+                        category: e.residentCategory,
+                        type: 'updateResi'
+                    }
+                });
+            } else {
+                this.$router.push({
+                    path: "/main/base-nonIntResi",
+                    query: {
+                        resiCategory: e.residentCategory,
+                        type: type
+                    }
+                });
             }
-          }],
-          series: [{
-            name: '分类信息完整数',
-            type: 'bar',
-            stack: '总量',
-            barWidth: '30px',
-            data: data.categoryStatsDatas.map((item, index) => ({
-              value: item.integratedNum,
-              extraProperty: item.resiCategory
-            })),
-          },
-          {
-            name: '分类信息不完整数',
-            type: 'bar',
-            stack: '总量',
-            barWidth: '30px',
-            data: data.categoryStatsDatas.map((item, index) => ({
-              value: item.nonIntegratedNum,
-              extraProperty: item.resiCategory
-            })),
-          }
-          ]
-        };
-        const resizeHandler = () => {
-            this.myBarchart.resize();
-        };
-        this.myBarchart.setOption(option);
-        window.addEventListener("resize", this.handleWindowResize);
-        window.addEventListener("resize", resizeHandler);
-        this.myBarchart.on("click", (e) => {
-          this.$router.push({
-            path: "/main/base-nonIntResi",
-            query: {
-              type:'cateNonIntegrity',
-              resiCategory: e.data.extraProperty,
+
+        },
+
+        //加载组织数据
+        async getWarningList() {
+            const url = "/actual/base/resiCategory/categoryCountList";
+            let params = {
+                // id: this.orgData.id,
+                // level: "agency",
+            };
+
+            this.resiCategory.loading = true;
+            const { data, code, msg } = await requestGet(url, params);
+            this.resiCategory.loading = false;
+
+            if (code === 0) {
+                if (data) {
+                    this.resiCategory.count = data.resiCount;
+                    this.resiCategory.list = data.categoryList.map((item) => {
+                        return {
+                            code: item.categoryName,
+                            name: resiCategoryMap[item.categoryName] || "",
+                            count: item.categoryCount,
+                            per: ((100 * item.categoryCount) / data.resiCount).toFixed(0),
+                            const: "const",
+                        };
+                    });
+                }
+            } else {
+                this.$message.error(msg);
             }
-          });
-          // 
+        },
+        //加载智能预测数据
+        async getZnycList() {
+            const url = "/actual/base/resiCategory/intelligentPredictioncategoryCountList";
+            // const url = "/actual/base/resiCategory/categoryCountList";
+            let params = {
+                // id: this.orgData.id,
+                // level: "agency",
+            };
 
-        });
-      });
-    },
+            this.znycCategory.loading = true;
+            const { data, code, msg } = await requestGet(url, params);
+            this.znycCategory.loading = false;
+
+            if (code === 0) {
+                if (data) {
+                    this.znycCategory.count = data.resiCount;
+                    this.znycCategory.list = data.categoryList.map((item) => {
+                        return {
+                            code: item.categoryName,
+                            name: resiCategoryMap[item.categoryName] || "",
+                            count: item.categoryCountNext,
+                            // per: parseInt(
+                            //   (100 * item.categoryCount) / data.resiCount
+                            // ),
+                            per: item.change_ratio,
+                            const: "const",
+                        };
+                    });
+                }
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        initEcharts() {
+            this.$http.get("/actual/base/residentIntegrity/resiCategoryStats/byOrg/query4Org").then(({ data: { data } }) => {
+                this.myBarchart = echarts.init(document.getElementById("myBarchart"));
+                let xData = data.categoryStatsDatas.map(item => item.resiCategoryName)
+                // let integratedNum = data.categoryStatsDatas.map(item => item.integratedNum)
+                // let nonIntegratedNum = data.categoryStatsDatas.map(item => item.nonIntegratedNum)
+                let option = {
+                    backgroundColor: '#fff',
+                    color: ['#448cf6', '#f7ca60',],
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'shadow'
+                        }
+                    },
+                    legend: {
+                        x: 'center',
+                        bottom: '8%',
+                        data: ['分类信息完整数', '分类信息不完整数'],
+                        icon: "rect",
+                        itemWidth: 20,
+                        itemHeight: 5,
+                        itemGap: 20,
+                    },
+                    grid: { //图表的位置
+                        top: '3%',
+                        left: '3%',
+                        right: '4%',
+                        bottom: '10%',
+                        containLabel: true
+                    },
+                    yAxis: [{
+                        type: 'value',
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: ['#f2f2f2']
+                            }
+                        },
+                    }],
+                    xAxis: [{
+                        type: 'category',
+                        data: xData,
+                        axisLabel: {
+                            rotate: 50  // 设置旋转角度为45度
+                        }
+                    }],
+                    series: [{
+                        name: '分类信息完整数',
+                        type: 'bar',
+                        stack: '总量',
+                        barWidth: '30px',
+                        data: data.categoryStatsDatas.map((item, index) => ({
+                            value: item.integratedNum,
+                            extraProperty: item.resiCategory
+                        })),
+                    },
+                    {
+                        name: '分类信息不完整数',
+                        type: 'bar',
+                        stack: '总量',
+                        barWidth: '30px',
+                        data: data.categoryStatsDatas.map((item, index) => ({
+                            value: item.nonIntegratedNum,
+                            extraProperty: item.resiCategory
+                        })),
+                    }
+                    ]
+                };
+                const resizeHandler = () => {
+                    this.myBarchart.resize();
+                };
+                this.myBarchart.setOption(option);
+                window.addEventListener("resize", this.handleWindowResize);
+                window.addEventListener("resize", resizeHandler);
+                this.myBarchart.on("click", (e) => {
+                    this.$router.push({
+                        path: "/main/base-nonIntResi",
+                        query: {
+                            type: 'cateNonIntegrity',
+                            resiCategory: e.data.extraProperty,
+                        }
+                    });
+                    // 
+
+                });
+            });
+        },
 
 
-  },
+    },
 };
 </script>
 
 <style lang="scss" src="@/assets/scss/modules/index.scss" scoped></style>
 <style lang="scss" scoped>
-.z-on{
-  margin-left: 0 !important;
+.z-on {
+    margin-left: 0 !important;
 }
 </style>
diff --git a/src/views/modules/productConfig/workRoleAuth.vue b/src/views/modules/productConfig/workRoleAuth.vue
index d2c92a84d..484450a82 100644
--- a/src/views/modules/productConfig/workRoleAuth.vue
+++ b/src/views/modules/productConfig/workRoleAuth.vue
@@ -1,506 +1,443 @@
 <template>
-  <div class="role-container">
-    <el-card class="flex1">
-      <el-tabs v-model.trim="activeName"
-               @tab-click="tabClick"
-               class="el-tabs">
-        <el-tab-pane label="工作端"
-                     name="work">
-          <div class="now-name">
-            上下拖动可改变角色顺序
-            <el-button type="primary"
-                       size="small"
-                       @click="handleSaveSort">保存顺序</el-button>
-          </div>
-          <el-table ref="roleTable"
-                    v-loading="loading1"
-                    :data="roleList"
-                    row-key="roleKey"
-                    border
-                    style="width: 100%">
-            <el-table-column type="index"
-                             header-align="left"
-                             align="left"
-                             width="50"></el-table-column>
-            <el-table-column prop="roleName"
-                             label="角色名称"
-                             header-align="left"
-                             align="left"
-                             width="180">
-              <template slot-scope="scope">
-                <el-input v-if="scope.row.isEdit"
-                          v-model.trim="scope.row.roleName"
-                          clearable>
-                </el-input>
-                <span v-else>{{scope.row.constName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="!funcShow"
-                             prop="roleKey"
-                             header-align="left"
-                             align="left"
-                             label="角色Key"
-                             width="150"></el-table-column>
-            <el-table-column prop="description"
-                             label="角色职责"
-                             header-align="left"
-                             align="left">
-              <template slot-scope="scope">
-                <p style="text-align:left;margin:3px 0"
-                   v-for="(item,index) in scope.row.descriptionList"
-                   :key="index">{{item}}</p>
-                <!-- <p>{{scope.row.description}}</p> -->
-              </template>
-            </el-table-column>
-            <el-table-column width="450"
-                             label="操作">
-              <template slot-scope="scope">
-                <el-button type="primary"
-                           size="mini"
-                           @click="handelChangeDuty(scope.row)">修改职责</el-button>
-                <el-button type="primary"
-                           size="mini"
-                           @click="toOperationConfig(scope.row.roleKey, scope.row.roleName)">功能权限</el-button>
-                <span v-if="scope.row.isEdit"
-                      style="display: inline-block; margin-left: 10px;">
-                  <el-button type="primary"
-                             size="small"
-                             @click="saveName(scope.row)">保存</el-button>
-                  <el-button size="small"
-                             @click="scope.row.isEdit=false">取消</el-button>
-                </span>
-                <el-button v-else
-                           type="primary"
-                           size="mini"
-                           @click="handleChangeName(scope.row)">修改名称</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="居民端"
-                     name="resi">
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-    <!-- 角色职责弹出框 -->
-    <el-dialog :visible.sync="dutyShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="角色职责"
-               width="30%"
-               @closed="handleDutyClosed">
-      <div class="div_duty"
-           v-if="dutyShow">
-        <el-input type="textarea"
-                  :rows="8"
-                  v-model.trim="description"></el-input>
-        <div class="div_btn">
-          <el-button type="primary"
-                     size="small"
-                     @click="updateRole()">保存</el-button>
-          <el-button size="small"
-                     @click="dutyShow=false">取消</el-button>
-        </div>
-      </div>
-    </el-dialog>
-    <!-- 功能配置弹出框 -->
-    <el-dialog :visible.sync="funcShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="70%"
-               top="30px"
-               title="功能列表"
-               @closed="handleDialogClosed">
-      <div class="role-flex"
-           v-if="funcShow">
+    <div class="role-container">
         <el-card class="flex1">
-          <div class="now-name">当前角色: {{roleName}}</div>
-          <div class="now-name">
-            <el-button type="primary"
-                       size="small"
-                       @click="saveOperations4Role">保存功能</el-button>
-          </div>
-          <el-table v-loading="loading2"
-                    height="580"
-                    ref="opeTable"
-                    :data="opeList"
-                    border
-                    @select="handleSelectionChange">
-            <el-table-column type="selection"
-                             width="55"></el-table-column>
-            <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
-            <el-table-column prop="operationName"
-                             label="操作名称"></el-table-column>
-            <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
-            <el-table-column label="操作">
-              <template slot-scope="scope">
-                <el-button type="primary"
-                           size="small"
-                           @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">范围配置</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+            <el-tabs v-model.trim="activeName" @tab-click="tabClick" class="el-tabs">
+                <el-tab-pane label="工作端" name="work">
+                    <div class="now-name">
+                        上下拖动可改变角色顺序
+                        <el-button type="primary" size="small" @click="handleSaveSort">保存顺序</el-button>
+                    </div>
+                    <el-table ref="roleTable" v-loading="loading1" :data="roleList" row-key="roleKey" border
+                        style="width: 100%">
+                        <el-table-column type="index" header-align="left" align="left" width="50"></el-table-column>
+                        <el-table-column prop="roleName" label="角色名称" header-align="left" align="left" width="180">
+                            <template slot-scope="scope">
+                                <el-input v-if="scope.row.isEdit" v-model.trim="scope.row.roleName" clearable>
+                                </el-input>
+                                <span v-else>{{ scope.row.constName }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column v-if="!funcShow" prop="roleKey" header-align="left" align="left" label="角色Key"
+                            width="150"></el-table-column>
+                        <el-table-column prop="description" label="角色职责" header-align="left" align="left">
+                            <template slot-scope="scope">
+                                <p style="text-align:left;margin:3px 0"
+                                    v-for="(item, index) in scope.row.descriptionList" :key="index">{{ item }}</p>
+                                <!-- <p>{{scope.row.description}}</p> -->
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="450" label="操作">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini"
+                                    @click="handelChangeDuty(scope.row)">修改职责</el-button>
+                                <el-button type="primary" size="mini"
+                                    @click="toOperationConfig(scope.row.roleKey, scope.row.roleName)">功能权限</el-button>
+                                <span v-if="scope.row.isEdit" style="display: inline-block; margin-left: 10px;">
+                                    <el-button type="primary" size="small" @click="saveName(scope.row)">保存</el-button>
+                                    <el-button size="small" @click="scope.row.isEdit = false">取消</el-button>
+                                </span>
+                                <el-button v-else type="primary" size="mini"
+                                    @click="handleChangeName(scope.row)">修改名称</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+                <el-tab-pane label="居民端" name="resi">
+                </el-tab-pane>
+            </el-tabs>
         </el-card>
-        <el-card v-show="roleShow"
-                 style="width: 250px; margin-left: 10px;">
-          <div class="now-name">当前功能: {{funcName}}</div>
-          <div class="now-name">
-            <el-button type="primary"
-                       size="small"
-                       @click="saveSettings">保存范围</el-button>
-            <el-button type="primary"
-                       size="small"
-                       @click="toAllClient">同步到所有客户</el-button>
-          </div>
-          <div>
-            <el-row :gutter="12">
-              <el-col v-loading="loading3">
-                <el-card shadow="hover">
-                  <el-checkbox-group class="t"
-                                     v-model.trim="checkedScopes"
-                                     @change="roleChange">
-                    <el-checkbox v-for="scope in scopeOptions"
-                                 :label="scope.scopeKey"
-                                 :key="scope.scopeKey">{{scope.scopeName}}</el-checkbox>
-                  </el-checkbox-group>
+        <!-- 角色职责弹出框 -->
+        <el-dialog :visible.sync="dutyShow" :close-on-click-modal="false" :close-on-press-escape="false" title="角色职责"
+            width="30%" @closed="handleDutyClosed">
+            <div class="div_duty" v-if="dutyShow">
+                <el-input type="textarea" :rows="8" v-model.trim="description"></el-input>
+                <div class="div_btn">
+                    <el-button type="primary" size="small" @click="updateRole()">保存</el-button>
+                    <el-button size="small" @click="dutyShow = false">取消</el-button>
+                </div>
+            </div>
+        </el-dialog>
+        <!-- 功能配置弹出框 -->
+        <el-dialog :visible.sync="funcShow" :close-on-click-modal="false" :close-on-press-escape="false" width="70%"
+            top="30px" title="功能列表" @closed="handleDialogClosed">
+            <div class="role-flex" v-if="funcShow">
+                <el-card class="flex1">
+                    <div class="now-name">当前角色: {{ roleName }}</div>
+                    <div class="now-name">
+                        <el-button type="primary" size="small" @click="saveOperations4Role">保存功能</el-button>
+                    </div>
+                    <el-table v-loading="loading2" height="580" ref="opeTable" :data="opeList" border
+                        @select="handleSelectionChange">
+                        <el-table-column type="selection" width="55"></el-table-column>
+                        <!-- <el-table-column prop="operationKey" label="操作Key"></el-table-column> -->
+                        <el-table-column prop="operationName" label="操作名称"></el-table-column>
+                        <!-- <el-table-column prop="brief" label="简介"></el-table-column> -->
+                        <el-table-column label="操作">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="small"
+                                    @click="toScopeConfig(scope.row.operationKey, scope.row.operationName)">范围配置</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
                 </el-card>
-              </el-col>
-            </el-row>
-          </div>
-        </el-card>
-      </div>
-    </el-dialog>
-  </div>
+                <el-card v-show="roleShow" style="width: 250px; margin-left: 10px;">
+                    <div class="now-name">当前功能: {{ funcName }}</div>
+                    <div class="now-name">
+                        <el-button type="primary" size="small" @click="saveSettings">保存范围</el-button>
+                        <el-button type="primary" size="small" @click="toAllClient">同步到所有客户</el-button>
+                    </div>
+                    <div>
+                        <el-row :gutter="12">
+                            <el-col v-loading="loading3">
+                                <el-card shadow="hover">
+                                    <el-checkbox-group class="t" v-model.trim="checkedScopes" @change="roleChange">
+                                        <el-checkbox v-for="scope in scopeOptions" :label="scope.scopeKey"
+                                            :key="scope.scopeKey">{{ scope.scopeName }}</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-card>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-card>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 <script>
 import Sortable from 'sortablejs'
 import { requestPost } from "@/js/dai/request";
 export default {
-  name: 'RoleList',
-  props: {
-    customerId: {
-      type: String,
-      default: ''
-    },
-    customerName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      activeName: "work",
-      loading1: false,
-      loading2: false,
-      loading3: false,
-      selRoleId: '',
-      //职责弹出框相关
-      dutyShow: false,
-      description: '',
-      roleName: '',
-      //功能权限弹出框相关
-      funcShow: false,
-      roleShow: false,
-      roleName: '',
-      funcName: '',
-      roleList: [],
-      opeList: [],
-      roleKey: '',
-      operationKey: '',
-      scopeOptions: [],
-      settingOptions: [],
-      checkedScopes: [],
-      checkedSettings: [],
-      operateSection: [], // 功能选择列表
-      scopeSection: [] // 范围选择列表
-    }
-  },
-  created () {
-    this.listRoles()
-  },
-  mounted () {
-    this.dragRoleSort()
-  },
-  beforeDestroy () {
-    let _data = this.$data
-    for (let n in _data) {
-      if (typeof _data[n] === 'boolean') _data[n] = false
-      if (typeof _data[n] === 'string') _data[n] = ''
-      if (typeof _data[n] === 'object') _data[n] = []
-    }
-  },
-  methods: {
-    tabClick () {
-    },
-    //获取角色列表
-    listRoles () {
-      this.loading1 = true
-      this.$http
-        .post('/epmetuser/govstaffrole/roletemplates')
-        .then(({ data: res }) => {
-          if (res.code === 0) {
-            this.roleList = res.data.map(item => {
-              return {
-                ...item,
-                constName: item.roleName,
-                isEdit: false,
-                descriptionList: item.description ? item.description.split("\n") : ""
-              }
-            })
-            console.log('roleList', this.roleList)
-          }
-          setTimeout(() => {
-            this.loading1 = false
-          }, 500)
-        })
-    },
-    //关闭角色职责弹出框
-    handleDutyClosed () {
-      this.selRoleId = ''
-      this.roleName = ''
-      this.description = ''
-      this.dutyShow = false
-    },
-    //显示角色职责弹出框
-    handelChangeDuty (row) {
-      this.selRoleId = row.id
-      this.description = row.description
-      this.roleName = row.roleName
-      this.dutyShow = true
-    },
-    handleChangeName (row) {
-      row.isEdit = true
+    name: 'RoleList',
+    props: {
+        customerId: {
+            type: String,
+            default: ''
+        },
+        customerName: {
+            type: String,
+            default: ''
+        }
     },
-    saveName (row) {
-      this.selRoleId = row.id
-      this.description = row.description
-      this.roleName = row.roleName
-      this.updateRole()
+    data() {
+        return {
+            activeName: "work",
+            loading1: false,
+            loading2: false,
+            loading3: false,
+            selRoleId: '',
+            //职责弹出框相关
+            dutyShow: false,
+            description: '',
+            roleName: '',
+            //功能权限弹出框相关
+            funcShow: false,
+            roleShow: false,
+            roleName: '',
+            funcName: '',
+            roleList: [],
+            opeList: [],
+            roleKey: '',
+            operationKey: '',
+            scopeOptions: [],
+            settingOptions: [],
+            checkedScopes: [],
+            checkedSettings: [],
+            operateSection: [], // 功能选择列表
+            scopeSection: [] // 范围选择列表
+        }
     },
-    //保存角色名称、职责
-    async updateRole () {
-      console.log(this.description)
-      const url = "/epmetuser/govstaffrole/updatedefaultrole"
-      const params = {
-        roleId: this.selRoleId,
-        roleName: this.roleName,
-        description: this.description
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.dutyShow = false
+    created() {
         this.listRoles()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    //同步权限到所有客户
-    async toAllClient () {
-      const url = "/gov/access/config/add-ope-and-scopes-4role/by-default-conf"
-      const params = {
-        roleKey: this.roleKey,
-        operationKey: this.operationKey,
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.$message.success('同步成功')
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    //关闭功能配置弹出框
-    handleDialogClosed () {
-      this.roleName = ''
-      this.roleKey = ''
-      this.funcName = ''
-      this.operateSection = []
-      this.scopeSection = []
-      this.funcShow = false
-      this.roleShow = false
-    },
-    //点击功能权限按钮
-    toOperationConfig (roleKey, roleName) {
-      this.roleName = roleName
-      this.funcShow = true
-      this.opeList = []
-      this.listOperations4AccessConfig(roleKey)
-    },
-    listOperations4AccessConfig (roleKey) {
-      this.roleKey = roleKey
-      this.loading2 = true
-      this.$http.post('/gov/access/config/roledefaultops/' + roleKey).then((resp) => {
-        this.opeList = resp.data.data
-        this.$nextTick(function() {
-          this.defaultCheck() // 每次更新了数据，触发这个函数即可。
-        })
-        setTimeout(() => {
-          this.loading2 = false
-        }, 500)
-      })
     },
-    listSettingOptions (operationKey) {
-      let params = {
-        roleKey: this.roleKey,
-        operationKey: operationKey
-      }
-      console.log('checkedScopes', this.checkedScopes)
-      this.loading3 = true
-      this.$http
-        .post('/gov/access/config/opedefaultscopes/list', params)
-        .then(resp => {
-          console.log('scopeOptions', resp.data)
-          this.scopeOptions = resp.data.data
-          resp.data.data.forEach(item => {
-            if (item.assigned) this.checkedScopes.push(item.scopeKey)
-          })
-          console.log('checkedScopes222', this.checkedScopes)
-          this.settingOptions = resp.data.data
-          setTimeout(() => {
-            this.loading3 = false
-          }, 500)
-        })
+    mounted() {
+        this.dragRoleSort()
     },
-    defaultCheck () {
-      for (var index in this.opeList) {
-        let role = this.opeList[index]
-        if (role.assigned) {
-          this.$refs.opeTable.toggleRowSelection(role, true)
+    beforeDestroy() {
+        let _data = this.$data
+        for (let n in _data) {
+            if (typeof _data[n] === 'boolean') _data[n] = false
+            if (typeof _data[n] === 'string') _data[n] = ''
+            if (typeof _data[n] === 'object') _data[n] = []
         }
-      }
     },
-    toScopeConfig (operationKey, operationName) {
-      this.roleShow = true
-      this.operationKey = operationKey
-      this.funcName = operationName
-      this.checkedScopes = []
-      this.listSettingOptions(operationKey)
-    },
-    saveOperations4Role () {
-      let param = {
-        roleKey: this.roleKey,
-        operationKeys: this.operateSection.map(item => item.operationKey)
-      }
-      this.$http.post('/gov/access/config/roledefaultopes/save', param).then(
-        resp => {
-          const { code, msg } = resp.data
-          if (code === 0 && msg === 'success') {
-            this.$message({
-              message: '操作成功',
-              type: 'success'
-            })
-            this.listOperations4AccessConfig(this.roleKey)
-          } else {
-            this.$message({
-              message: msg,
-              type: 'error'
-            })
-          }
-        }
-      )
-    },
-    saveSettings () {
-      let param = {
-        roleKey: this.roleKey,
-        operationKey: this.operationKey,
-        scopeKeys: this.scopeSection
-      }
-      this.$http.post('/gov/access/config/opedefaultscopes/save', param).then(
-        resp => {
-          const { code, msg } = resp.data
-          if (code === 0 && msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
+    methods: {
+        tabClick() {
+        },
+        //获取角色列表
+        listRoles() {
+            this.loading1 = true
+            this.$http
+                .post('/epmetuser/govstaffrole/roletemplates')
+                .then(({ data: res }) => {
+                    if (res.code === 0) {
+                        this.roleList = res.data.map(item => {
+                            return {
+                                ...item,
+                                constName: item.roleName,
+                                isEdit: false,
+                                descriptionList: item.description ? item.description.split("\n") : ""
+                            }
+                        })
+                        console.log('roleList', this.roleList)
+                    }
+                    setTimeout(() => {
+                        this.loading1 = false
+                    }, 500)
+                })
+        },
+        //关闭角色职责弹出框
+        handleDutyClosed() {
+            this.selRoleId = ''
+            this.roleName = ''
+            this.description = ''
+            this.dutyShow = false
+        },
+        //显示角色职责弹出框
+        handelChangeDuty(row) {
+            this.selRoleId = row.id
+            this.description = row.description
+            this.roleName = row.roleName
+            this.dutyShow = true
+        },
+        handleChangeName(row) {
+            row.isEdit = true
+        },
+        saveName(row) {
+            this.selRoleId = row.id
+            this.description = row.description
+            this.roleName = row.roleName
+            this.updateRole()
+        },
+        //保存角色名称、职责
+        async updateRole() {
+            console.log(this.description)
+            const url = "/epmetuser/govstaffrole/updatedefaultrole"
+            const params = {
+                roleId: this.selRoleId,
+                roleName: this.roleName,
+                description: this.description
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.dutyShow = false
+                this.listRoles()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        //同步权限到所有客户
+        async toAllClient() {
+            const url = "/gov/access/config/add-ope-and-scopes-4role/by-default-conf"
+            const params = {
+                roleKey: this.roleKey,
+                operationKey: this.operationKey,
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.$message.success('同步成功')
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        //关闭功能配置弹出框
+        handleDialogClosed() {
+            this.roleName = ''
+            this.roleKey = ''
+            this.funcName = ''
+            this.operateSection = []
+            this.scopeSection = []
+            this.funcShow = false
+            this.roleShow = false
+        },
+        //点击功能权限按钮
+        toOperationConfig(roleKey, roleName) {
+            this.roleName = roleName
+            this.funcShow = true
+            this.opeList = []
+            this.listOperations4AccessConfig(roleKey)
+        },
+        listOperations4AccessConfig(roleKey) {
+            this.roleKey = roleKey
+            this.loading2 = true
+            this.$http.post('/gov/access/config/roledefaultops/' + roleKey).then((resp) => {
+                this.opeList = resp.data.data
+                this.$nextTick(function () {
+                    this.defaultCheck() // 每次更新了数据，触发这个函数即可。
+                })
+                setTimeout(() => {
+                    this.loading2 = false
+                }, 500)
             })
-            this.listSettingOptions(this.operationKey)
-          } else {
-            this.$message({
-              message: msg,
-              type: 'error'
+        },
+        listSettingOptions(operationKey) {
+            let params = {
+                roleKey: this.roleKey,
+                operationKey: operationKey
+            }
+            console.log('checkedScopes', this.checkedScopes)
+            this.loading3 = true
+            this.$http
+                .post('/gov/access/config/opedefaultscopes/list', params)
+                .then(resp => {
+                    console.log('scopeOptions', resp.data)
+                    this.scopeOptions = resp.data.data
+                    resp.data.data.forEach(item => {
+                        if (item.assigned) this.checkedScopes.push(item.scopeKey)
+                    })
+                    console.log('checkedScopes222', this.checkedScopes)
+                    this.settingOptions = resp.data.data
+                    setTimeout(() => {
+                        this.loading3 = false
+                    }, 500)
+                })
+        },
+        defaultCheck() {
+            for (var index in this.opeList) {
+                let role = this.opeList[index]
+                if (role.assigned) {
+                    this.$refs.opeTable.toggleRowSelection(role, true)
+                }
+            }
+        },
+        toScopeConfig(operationKey, operationName) {
+            this.roleShow = true
+            this.operationKey = operationKey
+            this.funcName = operationName
+            this.checkedScopes = []
+            this.listSettingOptions(operationKey)
+        },
+        saveOperations4Role() {
+            let param = {
+                roleKey: this.roleKey,
+                operationKeys: this.operateSection.map(item => item.operationKey)
+            }
+            this.$http.post('/gov/access/config/roledefaultopes/save', param).then(
+                resp => {
+                    const { code, msg } = resp.data
+                    if (code === 0 && msg === 'success') {
+                        this.$message({
+                            message: '操作成功',
+                            type: 'success'
+                        })
+                        this.listOperations4AccessConfig(this.roleKey)
+                    } else {
+                        this.$message({
+                            message: msg,
+                            type: 'error'
+                        })
+                    }
+                }
+            )
+        },
+        saveSettings() {
+            let param = {
+                roleKey: this.roleKey,
+                operationKey: this.operationKey,
+                scopeKeys: this.scopeSection
+            }
+            this.$http.post('/gov/access/config/opedefaultscopes/save', param).then(
+                resp => {
+                    const { code, msg } = resp.data
+                    if (code === 0 && msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listSettingOptions(this.operationKey)
+                    } else {
+                        this.$message({
+                            message: msg,
+                            type: 'error'
+                        })
+                    }
+                }
+            )
+        },
+        roleChange(val) {
+            this.scopeSection = val
+            // this.saveSettings(val)
+        },
+        handleSelectionChange(val) {
+            this.operateSection = val
+            // this.saveOperations4Role(val)
+        },
+        dragRoleSort() {
+            const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
+            this.sortTable = Sortable.create(el, {
+                group: 'dragTable',
+                ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+                // setData: function(dataTransfer, dragEl) {
+                //   dataTransfer.setData("Text", dragEl.textContent);
+                // },
+                delay: 0,
+                onChange: evt => {
+                    // console.log(evt)
+                },
+                onEnd: evt => {
+                    const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
+                    this.roleList.splice(evt.newIndex, 0, targetRow)
+                }
             })
-          }
-        }
-      )
-    },
-    roleChange (val) {
-      this.scopeSection = val
-      // this.saveSettings(val)
-    },
-    handleSelectionChange (val) {
-      this.operateSection = val
-      // this.saveOperations4Role(val)
-    },
-    dragRoleSort () {
-      const el = this.$refs.roleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
-      this.sortTable = Sortable.create(el, {
-        group: 'dragTable',
-        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
-        // setData: function(dataTransfer, dragEl) {
-        //   dataTransfer.setData("Text", dragEl.textContent);
-        // },
-        delay: 0,
-        onChange: evt => {
-          // console.log(evt)
         },
-        onEnd: evt => {
-          const targetRow = this.roleList.splice(evt.oldIndex, 1)[0]
-          this.roleList.splice(evt.newIndex, 0, targetRow)
+        handleSaveSort() {
+            let data = {
+                roleIdList: this.roleList.map(item => {
+                    return item.id
+                })
+            }
+            this.$http
+                .post('/epmetuser/govstaffrole/savedefaultsort', data)
+                .then(({ data: res }) => {
+                    console.log('ressss', res)
+                    if (res.code === 0 && res.msg === 'success') {
+                        this.$message({
+                            type: 'success',
+                            message: '保存成功'
+                        })
+                        this.listRoles()
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.msg
+                        })
+                    }
+                })
         }
-      })
-    },
-    handleSaveSort () {
-      let data = {
-        roleIdList: this.roleList.map(item => {
-          return item.id
-        })
-      }
-      this.$http
-        .post('/epmetuser/govstaffrole/savedefaultsort', data)
-        .then(({ data: res }) => {
-          console.log('ressss', res)
-          if (res.code === 0 && res.msg === 'success') {
-            this.$message({
-              type: 'success',
-              message: '保存成功'
-            })
-            this.listRoles()
-          } else {
-            this.$message({
-              type: 'error',
-              message: res.msg
-            })
-          }
-        })
     }
-  }
 }
 </script>
 <style scoped>
 .role-container,
 .role-flex {
-  display: flex;
+    display: flex;
 }
+
 .flex1 {
-  flex: 1;
+    flex: 1;
 }
+
 .now-name {
-  /* display: flex;
+    /* display: flex;
   justify-content: space-between; */
-  margin-bottom: 10px;
+    margin-bottom: 10px;
 }
-.aui-wrapper .el-card + .el-card {
-  margin-top: 0;
+
+.aui-wrapper .el-card+.el-card {
+    margin-top: 0;
 }
+
 .role-container .el-dialog__body {
-  padding: 0 20px 20px;
+    padding: 0 20px 20px;
 }
+
 .div_duty {
-  height: 300px;
-  position: relative;
+    height: 300px;
+    position: relative;
 }
+
 .div_btn {
-  position: absolute;
-  bottom: 30px;
-  right: 15px;
+    position: absolute;
+    bottom: 30px;
+    right: 15px;
 }
 </style>
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index 191fa6eb8..e0d1f07a2 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -1,20 +1,13 @@
 <template>
-  <div class="g-main">
-    <div class="m-search">
-      <el-form :inline="true"
-               :model="formData"
-               ref="ref_searchform"
-               :label-width="'110px'">
-        <el-form-item label="角色名称"
-                      prop="name">
-          <el-input v-model.trim="formData.name"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入角色名称">
-          </el-input>
-        </el-form-item>
-        <!-- <el-form-item label="创建时间"
+    <div class="g-main">
+        <div class="m-search">
+            <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'110px'">
+                <el-form-item label="角色名称" prop="name">
+                    <el-input v-model.trim="formData.name" size="small" class="list_item_width_1" clearable
+                        placeholder="请输入角色名称">
+                    </el-input>
+                </el-form-item>
+                <!-- <el-form-item label="创建时间"
                       label-width="110px"
                       prop="createdTime">
           <el-date-picker v-model.trim="formData.createdTime"
@@ -26,116 +19,58 @@
                           placeholder="创建时间">
           </el-date-picker>
         </el-form-item> -->
-        <el-button style="margin-left:10px"
-                   size="small"
-                   class="diy-button--add"
-                   @click="handleSearch">查询</el-button>
-        <el-button style="margin-left:30px"
-                   size="small"
-                   class="diy-button--white"
-                   @click="resetSearch">重置</el-button>
-      </el-form>
+                <el-button style="margin-left:10px" size="small" class="diy-button--add"
+                    @click="handleSearch">查询</el-button>
+                <el-button style="margin-left:30px" size="small" class="diy-button--white"
+                    @click="resetSearch">重置</el-button>
+            </el-form>
+        </div>
+        <div class="m-table">
+            <div class="div_btn">
+                <el-button class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+            </div>
+            <el-table class="table" ref="ref_table" :data="tableData" border :height="tableHeight"
+                v-loading="tableLoading" style="width: 100%">
+                <el-table-column label="序号" header-align="center" align="center" type="index"
+                    width="50"></el-table-column>
+                <el-table-column prop="name" header-align="center" align="center" label="角色名称" min-width="100">
+                </el-table-column>
+                <el-table-column prop="defaultRole" header-align="center" align="center" label="默认角色" in-width="30">
+                    <template slot-scope="scope">
+                        {{ scope.row.defaultRole == '0' ? 'X' : '√' }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="levelName" header-align="center" align="center" label="级别" in-width="30">
+                </el-table-column>
+                <el-table-column prop="remark" header-align="center" align="center" label="备注" min-width="110">
+                </el-table-column>
+                <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" min-width="170">
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="140" header-align="center" align="center"
+                    class="operate">
+                    <template slot-scope="scope">
+                        <el-button v-if="true" type="text" class="div-table-button--detail" size="small"
+                            @click="handleDetail(scope.row)">查看</el-button>
+                        <el-button type="text" class="div-table-button--edit" size="small"
+                            @click="handleEdit(scope.row)">修改</el-button>
+                        <el-button v-if="scope.row.defaultRole !== '1'" type="text" class="div-table-button--delete "
+                            size="small" @click="handleDelete(scope.row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
+                    layout="sizes, prev, pager, next, total" :total="total">
+                </el-pagination>
+            </div>
+        </div>
+        <!-- 修改弹出框 -->
+        <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
+            :title="formTitle" width="850px" top="5vh" class="dialog-h" @closed="diaClose">
+            <role-form ref="ref_form" @dialogCancle="diaClose" @dialogOk="addFormOk"></role-form>
+        </el-dialog>
     </div>
-    <div class="m-table">
-      <div class="div_btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-      </div>
-      <el-table class="table"
-                ref="ref_table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                style="width: 100%">
-        <el-table-column label="序号"
-                         header-align="center"
-                         align="center"
-                         type="index"
-                         width="50"></el-table-column>
-        <el-table-column prop="name"
-                         header-align="center"
-                         align="center"
-                         label="角色名称"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="defaultRole"
-                         header-align="center"
-                         align="center"
-                         label="默认角色"
-                         in-width="30">
-                <template slot-scope="scope">
-                    {{ scope.row.defaultRole == '0' ? 'X' : '√' }}
-                </template>
-        </el-table-column>
-        <el-table-column prop="levelName"
-                         header-align="center"
-                         align="center"
-                         label="级别"
-                         in-width="30">
-        </el-table-column>
-        <el-table-column prop="remark"
-                         header-align="center"
-                         align="center"
-                         label="备注"
-                         min-width="110">
-        </el-table-column>
-        <el-table-column prop="createdTime"
-                         header-align="center"
-                         align="center"
-                         label="创建时间"
-                         min-width="170">
-        </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-            <el-button v-if="true"
-                       type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-            <el-button v-if="scope.row.defaultRole!=='1'"
-                       type="text"
-                       class="div-table-button--delete "
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-    </div>
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <role-form ref="ref_form"
-                 @dialogCancle="diaClose"
-                 @dialogOk="addFormOk"></role-form>
-    </el-dialog>
-  </div>
 </template>
 <script>
 import roleForm from './roleForm'
@@ -144,174 +79,174 @@ import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 let loading // 加载动画
 export default {
-  data () {
-    return {
-      loading: false,
-      total: 0,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
-      pageNo: 0,
-      tableLoading: false,
-      isResiUser: true,
-      agencyId: '',
-      timeRange: [],
-      formData: {
-        name: '',//名称
-        // createdTime: '',//时间
-      },
-      tableData: [],
-      //form相关
-      formShow: false,
-      formTitle: '新增',
-    }
-  },
-  components: {
-    roleForm
-  },
-  async created () {
-  },
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-    await this.loadTable()
-  },
-  activated () {
-    this.$refs['ref_table'].doLayout()
-  },
-  methods: {
-    async handleSearch () {
-      this.isResiUser = this.formData.orgType === 'current'
-      await this.loadTable()
-      this.$nextTick(() => {
-        this.$refs.ref_table.doLayout() // 解决表格错位
-      })
-    },
-    async loadTable () {
-      this.tableLoading = true
-      const url = "/gov/access/govrole/page"
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        ...this.formData
-      }
-      const { data, code, msg } = await requestGet(url, params)
-      if (code === 0) {
-        this.total = data.total
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-    handleTimeChange (time) {
-      if (time) {
-        this.formData.startTime = time[0]
-        this.formData.endTime = time[1]
-      } else {
-        this.formData.startTime = ''
-        this.formData.endTime = ''
-      }
-    },
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
+    data() {
+        return {
+            loading: false,
+            total: 0,
+            pageSize: window.localStorage.getItem('pageSize') || 20,
+            pageNo: 0,
+            tableLoading: false,
+            isResiUser: true,
+            agencyId: '',
+            timeRange: [],
+            formData: {
+                name: '',//名称
+                // createdTime: '',//时间
+            },
+            tableData: [],
+            //form相关
+            formShow: false,
+            formTitle: '新增',
+        }
     },
-    handleAdd () {
-      this.formTitle = '新增'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null)
-      })
+    components: {
+        roleForm
     },
-    handleEdit (row) {
-      this.formTitle = '修改'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id, row.defaultRole)
-      })
+    async created() {
     },
-    handleDetail (row) {
-      this.formTitle = '详情'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.id)
-      })
+    async mounted() {
+        const { user } = this.$store.state
+        this.agencyId = user.agencyId
+        await this.loadTable()
     },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
+    activated() {
+        this.$refs['ref_table'].doLayout()
     },
-    async handleDelete (row) {
-      let message = '确认删除?'
-      this.$confirm(message, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteRole(row)
-        })
-        .catch(err => {
-        });
+    methods: {
+        async handleSearch() {
+            this.isResiUser = this.formData.orgType === 'current'
+            await this.loadTable()
+            this.$nextTick(() => {
+                this.$refs.ref_table.doLayout() // 解决表格错位
+            })
+        },
+        async loadTable() {
+            this.tableLoading = true
+            const url = "/gov/access/govrole/page"
+            let params = {
+                pageSize: this.pageSize,
+                pageNo: this.pageNo,
+                ...this.formData
+            }
+            const { data, code, msg } = await requestGet(url, params)
+            if (code === 0) {
+                this.total = data.total
+                this.tableData = data.list
+            } else {
+                this.$message.error(msg)
+            }
+            this.tableLoading = false
+        },
+        handleTimeChange(time) {
+            if (time) {
+                this.formData.startTime = time[0]
+                this.formData.endTime = time[1]
+            } else {
+                this.formData.startTime = ''
+                this.formData.endTime = ''
+            }
+        },
+        diaClose() {
+            this.$refs.ref_form.resetData()
+            this.formShow = false
+        },
+        handleAdd() {
+            this.formTitle = '新增'
+            this.formShow = true
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm('add', null)
+            })
+        },
+        handleEdit(row) {
+            this.formTitle = '修改'
+            this.formShow = true
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm('edit', row.id, row.defaultRole)
+            })
+        },
+        handleDetail(row) {
+            this.formTitle = '详情'
+            this.formShow = true
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm('detail', row.id)
+            })
+        },
+        addFormOk() {
+            this.formShow = false
+            this.loadTable()
+        },
+        async handleDelete(row) {
+            let message = '确认删除?'
+            this.$confirm(message, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            })
+                .then(() => {
+                    this.deleteRole(row)
+                })
+                .catch(err => {
+                });
+        },
+        async deleteRole(row) {
+            const url = "/gov/access/govrole/del"
+            let params = [row.id]
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.$message({
+                    type: "success",
+                    message: "操作成功"
+                });
+                this.loadTable()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        //重置搜索条件
+        resetSearch() {
+            this.formData = {
+                name: '',//姓名	
+            }
+            this.pageNo = 0
+            this.loadTable()
+        },
+        handleSizeChange(val) {
+            this.pageSize = val
+            this.pageNo = 1
+            this.loadTable()
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val
+            this.loadTable()
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
     },
-    async deleteRole (row) {
-      const url = "/gov/access/govrole/del"
-      let params = [row.id]
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "操作成功"
-        });
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
+    computed: {
+        tableHeight() {
+            return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+        },
+        ...mapGetters(['clientHeight', 'iframeHeight'])
     },
-    //重置搜索条件
-    resetSearch () {
-      this.formData = {
-        name: '',//姓名	
-      }
-      this.pageNo = 0
-      this.loadTable()
+    watch: {
     },
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
+    props: {
     }
-  },
-  computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
-    },
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  watch: {
-  },
-  props: {
-  }
 }
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>