From 24cbdb7a2cc13befa04ae67f4ae727b6ef3ce7eb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 7 Jul 2022 15:55:42 +0800
Subject: [PATCH 01/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9D=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/main-shuju.scss          | 25 +++++--
 src/assets/scss/shuju-variables.scss     | 24 +++++++
 src/js/store/index.js                    | 89 +++++++++++++-----------
 src/views/components/fixed1920.vue       | 62 +++++++++++++++++
 src/views/main-shuju/main.vue            | 54 +++++++-------
 src/views/modules/visual/heart/index.vue | 84 ++++++++++++----------
 6 files changed, 231 insertions(+), 107 deletions(-)
 create mode 100644 src/assets/scss/shuju-variables.scss
 create mode 100644 src/views/components/fixed1920.vue

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 092ff796..bb1f2171 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -1,5 +1,8 @@
 @import "~@/element-ui/theme-variables.scss";
-@import "./variables.scss";
+@import "./shuju-variables.scss";
+@import "./c/config";
+@import "./c/function";
+@import "./modules/visual/c/common.scss";
 
 // $navbar--height: 60px;
 body {
@@ -19,6 +22,8 @@ body {
   background-image: url(../img/shuju/bg.jpg);
   background-size: cover;
   background-position: center 0;
+  height: 100%;
+  @include scrollBar;
 
   .el-card + .el-card {
     margin-top: 15px;
@@ -171,6 +176,10 @@ body {
   // box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05);
   background: linear-gradient(180deg, #00023f, #176dec);
   box-shadow: 0px 3px 16px 0px rgba(187, 187, 227, 0.35);
+  font-size: 18px;
+  .el-menu-item {
+    font-size: 18px;
+  }
 
   .navbar--colorful {
     .navbar__body {
@@ -229,17 +238,17 @@ body {
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 5px;
+    padding: 10px 20px;
     margin: 0;
     width: 100%;
     height: 100%;
-    font-size: 24px;
+    font-size: 28px;
+    font-weight: bold;
     text-transform: uppercase;
     white-space: nowrap;
     // overflow: hidden;
     transition: width 0.3s;
     font-family: FZZCHJW;
-    font-weight: normal;
     color: #ffffff;
     background: linear-gradient(0deg, #03c7ff 24.609375%, #ffffff 81.0791015625%);
     -webkit-background-clip: text;
@@ -288,6 +297,7 @@ body {
   .navbar__menu {
     background-color: transparent;
     border-bottom: 0 !important;
+
     a:focus,
     a:hover {
       text-decoration: none;
@@ -349,7 +359,7 @@ body {
         position: absolute;
         display: none;
         padding: 0 10px;
-        width: 120px;
+        width: 160px;
         left: -100px;
         right: -100px;
         margin: 0 auto;
@@ -360,6 +370,9 @@ body {
           border-top: 1px dashed rgba(#fff, 0.4);
           color: rgba(#fff, 0.7);
           transition: all ease 0.5s;
+          padding: 10px 0;
+          line-height: $navbar--height * 0.5;
+
           &.z-on {
             font-weight: bold;
           }
@@ -409,7 +422,7 @@ body {
       }
       .navbar__icon-menu {
         vertical-align: middle;
-        font-size: 16px;
+        font-size: 20px;
       }
       .el-dropdown {
         color: #fff;
diff --git a/src/assets/scss/shuju-variables.scss b/src/assets/scss/shuju-variables.scss
new file mode 100644
index 00000000..70ce5241
--- /dev/null
+++ b/src/assets/scss/shuju-variables.scss
@@ -0,0 +1,24 @@
+// Base
+$base--line-height: 1.15;
+
+// Navbar
+$navbar--height: 75px;
+
+// Sidebar
+$sidebar--width: 230px;
+$sidebar--width-fold: 100px;
+$sidebar--background-color-dark: #263238;
+$sidebar--text-color-dark: #8a979e;
+$sidebar--menu-item-height: 48px;
+
+// Content
+$content--padding: 10px;
+$content--background-color: #f1f4f5;
+$content--card-header-height: 60px;
+$content--tabs-header-height: 38px;
+// Content, 填充整屏高度(非tabs状态) = 整屏高度 - 导航条高度 - aui-content上下内边距高度
+$content--fill-height: calc(100vh - #{$navbar--height} - #{$content--padding * 2});
+// Content, 填充整屏高度(是tabs状态) = 整屏高度 - 导航条高度 - tabs组件header高度 - tabs组件content上下内边距高度
+$content--fill-height-tabs: calc(
+    100vh - #{$navbar--height} - #{$content--tabs-header-height} - #{$content--padding * 2}
+);
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 276c7f83..7ebb31e9 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -8,7 +8,7 @@ import { requestPost } from "@/js/dai/request";
 import { dateFormats } from "@/utils/index";
 
 Vue.use(Vuex);
-let interTimer = null
+let interTimer = null;
 export default new Vuex.Store({
   namespaced: true,
   state: {
@@ -42,6 +42,9 @@ export default new Vuex.Store({
     tipsList: [],
     tipsTime: [],
     inIframe: window.self !== window.top,
+    fixed1920: {
+      height: document.documentElement.clientHeight,
+    },
   },
   modules: {
     user,
@@ -56,69 +59,71 @@ export default new Vuex.Store({
       });
     },
     SET_TIPS_LIST(state, tipsList) {
-      let _list = state.tipsList
+      let _list = state.tipsList;
       // state.tipsList = _list.concat(tipsList)
-      state.tipsList = tipsList
+      state.tipsList = tipsList;
     },
     SET_TIPS_TIME(state, time) {
-      state.tipsTime = time
-    }
+      state.tipsTime = time;
+    },
   },
   actions: {
     clearInter() {
-      clearInterval(interTimer)
+      clearInterval(interTimer);
     },
     setInterval({ commit, dispatch, state }) {
       interTimer = setInterval(() => {
-        const _t = dateFormats('YYYY-mm-dd HH:MM', (new Date(new Date().toLocaleDateString()).getTime()))
-        const _tt = new Date(_t).getTime()
-        console.log('230000---', _t)
-        const t =  dateFormats('YYYY-mm-dd HH:MM', (new Date().getTime()))
-        const nt = new Date(t).getTime()
+        const _t = dateFormats(
+          "YYYY-mm-dd HH:MM",
+          new Date(new Date().toLocaleDateString()).getTime()
+        );
+        const _tt = new Date(_t).getTime();
+        console.log("230000---", _t);
+        const t = dateFormats("YYYY-mm-dd HH:MM", new Date().getTime());
+        const nt = new Date(t).getTime();
         // 判断当前时间是否为 00：00
         if (nt == _tt) {
-          dispatch('setTipsTime')
-          return
+          dispatch("setTipsTime");
+          return;
         }
-        let times = state.tipsTime
-        console.log('nt---000', nt)
+        let times = state.tipsTime;
+        console.log("nt---000", nt);
         state.tipsTime.forEach((item, index) => {
-          const _t = new Date(item).getTime()
+          const _t = new Date(item).getTime();
           if (_t == nt) {
-            clearInterval(interTimer)
-            dispatch('setTipsList', item)
-            times.splice(index, 1)
-            commit('SET_TIPS_TIME', times)
+            clearInterval(interTimer);
+            dispatch("setTipsList", item);
+            times.splice(index, 1);
+            commit("SET_TIPS_TIME", times);
           }
-        })
-      }, 60000) 
+        });
+      }, 60000);
     },
     setTipsList({ commit }, time) {
       return new Promise(async (resolve, reject) => {
-        const url = '/gov/project/memoAttr/memosToRemind'
+        const url = "/gov/project/memoAttr/memosToRemind";
         const params = {
-          remindTime: time || ''
-        }
-        const { data, code, msg } = await requestPost(url, params)
+          remindTime: time || "",
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
-          commit('SET_TIPS_LIST', data)
-          resolve()
-        } else reject(msg)
-      })
+          commit("SET_TIPS_LIST", data);
+          resolve();
+        } else reject(msg);
+      });
     },
     setTipsTime({ commit, dispatch }) {
       return new Promise(async (resolve, reject) => {
-        if (interTimer) clearInterval(interTimer)
-        const url = '/gov/project/memoAttr/memoTime'
-        
-        const { data, code, msg } = await requestPost(url)
+        if (interTimer) clearInterval(interTimer);
+        const url = "/gov/project/memoAttr/memoTime";
+
+        const { data, code, msg } = await requestPost(url);
         if (code === 0) {
-          
-          commit('SET_TIPS_TIME', data)
-          if (data.length > 0) dispatch('setInterval')
-          resolve()
-        } else reject(msg)
-      })
-    }
-  }
+          commit("SET_TIPS_TIME", data);
+          if (data.length > 0) dispatch("setInterval");
+          resolve();
+        } else reject(msg);
+      });
+    },
+  },
 });
diff --git a/src/views/components/fixed1920.vue b/src/views/components/fixed1920.vue
new file mode 100644
index 00000000..e98ab311
--- /dev/null
+++ b/src/views/components/fixed1920.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="g-app">
+    <div class="g-bd" :style="bdStyle">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      clientHeight: document.documentElement.clientHeight,
+      clientWidth: document.documentElement.clientWidth,
+    };
+  },
+
+  components: {},
+  computed: {
+    bdStyle() {
+      const { clientHeight, clientWidth } = this;
+      console.log("clientHeight", clientHeight);
+      const scale = clientWidth / 1920;
+      const height = clientHeight / scale;
+      const top = (clientHeight - height) / 2;
+      const left = (clientWidth - 1920) / 2;
+      this.$store.state.fixed1920.height = height;
+      return {
+        transform: `scale(${scale})`,
+        height: `${height}px`,
+        left: `${left}px`,
+        top: `${top}px`,
+      };
+    },
+  },
+  created() {},
+  mounted() {
+    window.addEventListener("resize", () => {
+      this.clientHeight = document.documentElement.clientHeight;
+      this.clientWidth = document.documentElement.clientWidth;
+    });
+  },
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.g-app {
+  position: absolute;
+  // width: 1920px;
+  width: 100%;
+  height: 100vh;
+  overflow: hidden;
+}
+
+.g-bd {
+  position: absolute;
+  width: 1920px;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+</style>
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index 4abb6808..6aa4e014 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,25 +1,28 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
-      'g-bd',
-      { 'z-sidebar--fold': $store.state.sidebarFold },
-      {
-        'z-sidebar--noside': true,
-      },
-    ]"
-  >
-    <template v-if="!loading">
-      <main-navbar ref="ref_navbar" />
-      <div class="g-cnt">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
-      </div>
-    </template>
-  </div>
+  <fixed1920>
+    <div
+      v-loading.fullscreen.lock="loading"
+      :element-loading-text="$t('loading')"
+      :class="[
+        'g-bd',
+        { 'z-sidebar--fold': $store.state.sidebarFold },
+        {
+          'z-sidebar--noside': true,
+        },
+      ]"
+    >
+      <template v-if="!loading">
+        <main-navbar ref="ref_navbar" />
+
+        <div class="g-cnt">
+          <main-content
+            v-if="!$store.state.contentIsNeedRefresh"
+            @changeCustomerName="changeCustomerName"
+          />
+        </div>
+      </template>
+    </div>
+  </fixed1920>
 </template>
 
 <script>
@@ -29,6 +32,7 @@ import debounce from "lodash/debounce";
 import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
+import fixed1920 from "@/views/components/fixed1920.vue";
 
 export default {
   provide() {
@@ -51,6 +55,7 @@ export default {
   components: {
     MainNavbar,
     MainContent,
+    fixed1920,
   },
 
   watch: {
@@ -145,7 +150,8 @@ export default {
   &::-webkit-scrollbar-corner,
     /* 滚动条角落 */
   &::-webkit-scrollbar-thumb,
-  &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+  &::-webkit-scrollbar-track {
+    /*滚动条的轨道*/
     border-radius: 4px;
   }
 
@@ -153,13 +159,13 @@ export default {
   &::-webkit-scrollbar-track {
     /* 滚动条轨道 */
 
-    background: rgba(12, 129, 254, .24);
+    background: rgba(12, 129, 254, 0.24);
     // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
   }
 
   &::-webkit-scrollbar-thumb {
     /* 滚动条手柄 */
-    background: linear-gradient(270deg, #1257c9, #0095FF);
+    background: linear-gradient(270deg, #1257c9, #0095ff);
   }
 }
 </style>
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index 9e7d4177..5c0ca936 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -2,12 +2,14 @@
   <div>
     <div class="m-sizer">
       <span>时间：</span>
-      <el-date-picker v-model="monthId"
-                      type="month"
-                      :clearable="false"
-                      prefix-icon="el-icon-caret-bottom"
-                      placeholder="选择日期"
-                      value-format="yyyyMM">
+      <el-date-picker
+        v-model="monthId"
+        type="month"
+        :clearable="false"
+        prefix-icon="el-icon-caret-bottom"
+        placeholder="选择日期"
+        value-format="yyyyMM"
+      >
       </el-date-picker>
     </div>
 
@@ -19,12 +21,14 @@
             <span>公益达人</span>
           </div>
 
-          <div class="tb">
-            <cpt-tb :highlight-top3="true"
-                    :col-list="tb3.colList"
-                    :loading="tb3.loading"
-                    :header="tb3.header"
-                    :list="tb3.list"></cpt-tb>
+          <div class="tb" :style="tbStyle">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb3.colList"
+              :loading="tb3.loading"
+              :header="tb3.header"
+              :list="tb3.list"
+            ></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -36,12 +40,14 @@
             <span>党员先锋</span>
           </div>
 
-          <div class="tb">
-            <cpt-tb :highlight-top3="true"
-                    :col-list="tb2.colList"
-                    :loading="tb2.loading"
-                    :header="tb2.header"
-                    :list="tb2.list"></cpt-tb>
+          <div class="tb" :style="tbStyle">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb2.colList"
+              :loading="tb2.loading"
+              :header="tb2.header"
+              :list="tb2.list"
+            ></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -53,12 +59,14 @@
             <span>动力网格</span>
           </div>
 
-          <div class="tb">
-            <cpt-tb :highlight-top3="true"
-                    :col-list="tb1.colList"
-                    :loading="tb1.loading"
-                    :header="tb1.header"
-                    :list="tb1.list"></cpt-tb>
+          <div class="tb" :style="tbStyle">
+            <cpt-tb
+              :highlight-top3="true"
+              :col-list="tb1.colList"
+              :loading="tb1.loading"
+              :header="tb1.header"
+              :list="tb1.list"
+            ></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -76,7 +84,7 @@ import dateFormat from "dai-js/tools/dateFormat";
 
 export default {
   name: "heart",
-  data () {
+  data() {
     return {
       agencyId: this.$store.state.user.agencyId,
       areaCode: "",
@@ -171,7 +179,13 @@ export default {
 
   props: {},
 
-  computed: {},
+  computed: {
+    tbStyle() {
+      return {
+        height: this.$store.state.fixed1920.height - 260 + "px",
+      };
+    },
+  },
 
   components: {
     cptCard,
@@ -179,33 +193,33 @@ export default {
   },
 
   watch: {
-    monthId () {
+    monthId() {
       this.getApiData();
     },
   },
 
-  async mounted () {
+  async mounted() {
     this.userId = this.uid;
     await nextTick(100);
     this.getApiData();
   },
 
   methods: {
-    handleSearch () { },
+    handleSearch() {},
 
-    async getApiData () {
+    async getApiData() {
       //await this.getAgencyInfo();
       this.getTb1();
       this.getTb2();
       this.getTb3();
     },
 
-    toUserInfo (uid) {
+    toUserInfo(uid) {
       this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
     },
 
     // 获取当前组织信息
-    async getAgencyInfo () {
+    async getAgencyInfo() {
       const { data, code, msg } = await requestPost(
         "/data/report/screen/agency/agencydetail-multic",
         {
@@ -219,7 +233,7 @@ export default {
     },
 
     //加载组织数据
-    async getTb1 () {
+    async getTb1() {
       const { agencyId, areaCode } = this;
 
       const url =
@@ -248,7 +262,7 @@ export default {
     },
 
     //加载组织数据
-    async getTb2 () {
+    async getTb2() {
       const { agencyId, areaCode } = this;
       const url = "/data/report/screen/user/partypointrank";
       let params = {
@@ -279,7 +293,7 @@ export default {
     },
 
     //加载组织数据
-    async getTb3 () {
+    async getTb3() {
       const { agencyId, areaCode } = this;
       const url = "/data/report/screen/user/userpointrank/withoutpartymember";
       let params = {

From c5b54f916d06fbf6a4c4941e8248cb51b6773a5c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 7 Jul 2022 16:54:47 +0800
Subject: [PATCH 02/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/main-shuju.scss       | 5 +++--
 src/views/main-shuju/main-content.vue | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index bb1f2171..5b90e6d0 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -10,8 +10,9 @@ body {
 
 .m-iframe {
   position: relative;
-  width: 100vw;
-  height: calc(100vh - 55px);
+  box-sizing: content-box;
+  width: calc(100% + 20px);
+  // height: calc(100vh - 55px);
   margin: -10px;
   z-index: 100;
 }
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index 4d6a73a3..6f3b1c52 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -18,6 +18,7 @@
           height="100%"
           frameborder="0"
           scrolling="yes"
+          :style="{ height: $store.state.fixed1920.height - 100 + 'px' }"
         />
       </template>
       <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">

From 8109ba26b407e0232fc1a4fd4d9216e514877937 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 8 Jul 2022 13:36:05 +0800
Subject: [PATCH 03/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=99=AE=E9=80=82?=
 =?UTF-8?q?=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/modules/visual/fenlei-box.png  | Bin 0 -> 9592 bytes
 src/assets/scss/main-shuju.scss               |   7 ++--
 .../scss/modules/visual/basicInfoMain.scss    |  38 ++++++++----------
 .../modules/visual/distributionAnalyze.scss   |   8 ++--
 .../scss/modules/visual/duoyuanfenxi.scss     |  10 ++---
 .../scss/modules/visual/fiveLayerMap.scss     |  21 +++++-----
 src/assets/scss/modules/visual/heart.scss     |   2 +-
 .../scss/modules/visual/houseStatic.scss      |   2 +-
 .../scss/modules/visual/personCategory.scss   |   4 +-
 .../scss/modules/visual/processAnalyze.scss   |  12 +++---
 src/assets/scss/modules/visual/resibuzz.scss  |  10 ++---
 .../modules/visual/shijianchulifenxi.scss     |  12 +++---
 .../modules/visual/shijianfenleifenxi.scss    |  12 +++---
 .../scss/modules/visual/typeAnalyze.scss      |  10 ++---
 src/assets/scss/modules/visual/warning.scss   |   2 +-
 src/views/main-shuju/main-content.vue         |   2 +-
 src/views/main-shuju/main.vue                 |   2 +-
 .../modules/visual/basicinfo/peopleList.vue   |   6 +--
 .../communityGovern/distributionAnalyze.vue   |   2 +-
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          |   2 +-
 .../visual/communityGovern/resibuzz.vue       |   2 +-
 .../shijianchuli/shijianchulifenxi.vue        |   2 +-
 .../shijianfenlei/shijianfenleifenxi.vue      |   2 +-
 .../visual/communityGovern/typeAnalyze.vue    |   2 +-
 .../visual/communityParty/community.vue       |   2 +-
 .../modules/visual/measure/volunteer.vue      |   1 -
 .../visual/plugin/power/organization.vue      |  19 +--------
 27 files changed, 86 insertions(+), 108 deletions(-)
 create mode 100644 src/assets/img/modules/visual/fenlei-box.png

diff --git a/src/assets/img/modules/visual/fenlei-box.png b/src/assets/img/modules/visual/fenlei-box.png
new file mode 100644
index 0000000000000000000000000000000000000000..531f8a811ce503ddf6f8e55d1aed715a6df3350d
GIT binary patch
literal 9592
zcmb_hcU)6x){cWC<0vv2MWkj-R79EqA#~6QAc8W0h)7ciAVpA-UV@?$x=0J%p*KMY
zy{eQTgeJX&h@poX2#^GlFWGT_qw9RT&i?kVH}~G0^PcmZ=REJpP4I75w77oc{}BKH
zaA{wJ8vp>`Ndo{J20!d$-9hS|sAMgBTn)4?0E)T<=K+9|(%SIzS3O6U@IGjSo%x3~
zLiK~K4PEKzcZmCt<8Utc9_aDY#{;Io#%V@%t1rGQdZBZ(Ww&Y8WT*pEP<Wu0zKDse
zMO^??2h%<*hnzk$(|YnX<ngn|j;Q#%X}F*6cW*oxQdnX14&ZaHq~$NaL)b3hd{w;^
z&5g|67B<FI+!}UM4UJ5cbz68~jk#SFyH^AsDQD3+vQ6UR7GgF9P}VzGL5evA&s~2)
z)vxz?Z-Boj=vuRxe_v?9PK<}<6ej5YtkDdox>Ut|L81X1p@fkT{fHez-kYZYsp~<;
zruDSd2P(=b{Gg_FQQ0^HnDdyKCjLfv(HP?8m>qDwJgU=7sU~&61)kaQbf{A)F8)SG
z%7ex{YropKSjC3QR&t*JIEi}QQN@xcN;36T@{IICtKU#Yd`^Fjg%Hq)w6m&6ZJ*Cy
zD{r--65w(8L0YvXe^iQ6-Na4YQbBolo|h_@%i*SCBa%z>0%|0mQlCX3$&qW_JP;#~
zkR?IeKbe~`64Hu8@Gik^cI|J5RQ0bCMy!t|)J3(0wAtE*?KNDZqhm3^mNsikqebP~
zE|1iB?q%8%twtoG>s(HmL^^F9wTOf6dFJLaXBg5}I=IinOfZwHVM3L86TZf}p%P9R
z=hrvq0p{qTV#<Oq@>Le~j^=7=y&eefGlDNhp7xh0b+WWpnT6~t4sCOH8%N@S{!4vL
zT)vlHwwVM674jTu>h>}YC~SUv0nSKmE2Z<36a@5lJ>gC%f@eEzvhsnT@UhJE*5)-A
zvK{<D#0%LWs9JEx8Rm14ZQGG}JUP^;n#2tzCnRJc8=T$e*VAMktFI7G#kRcNk+Hl!
zYpN%)P_JfW?)t_u!s6DNHn3$3l7394pf@?eUPFB$aZfN*=BMcI@>G)6M^GP)!5xFn
zNr#kG)3@s*_!5fHd>$bCK)&SLIN!3N0tYAKrvg(COyShgUW)Fl#?{6FeoWc<wlZ5g
z10T8UWz?fdt<)QqjzPLYQ4K)-9YR}a|MhM|Nd9b*rA3+D^?c~@K2)5WjI>d+lkuy5
zA%dZd^C4DUiIz)=zJ11Zi!)*c<QSL+VjA~x$vE`b2Q)QQQs63vlQGF*!Y|%`k6de)
z=0>Du7^CY?f{PYVv4v}1Cl8j|g58`7$8PmnbZH_HMdB;_fdd_yjnZ3G)HabTZj3QJ
zN1~o${9rLMe3VoiuOgZ5earE+OC+js@p@Mk#a_#B5E?;jb<UuGQoFiP*S#+}s%&ZY
zSGtcgGfQquDG6YfsgFmhwAGji(<87$XAopDXaCFQ%Zy!An;mcC&K4$6%CEO)5B51&
zr3&f1CWA~NTlw41OmVkjTt)`HPt=_O<HtwUW$ol{{9an>n70mvl?x-WcXkph-<irt
z1A$VesZaQ*S0;pjmbdSm#a#Q%CJB|(>HK2s;ecBbuVnYzu)<k7xD+{lGb5!Het8gD
z0abmp;PloTwwzIQ+CcH;09PeE)6d#@Ojgc5dJ>axo6n=3dNFUK*xi-m7<C%PbTD6J
zxB#O%CH?0EWdf0P_*Z+d`B~&TtYlXzb3DC)`E(%>t782i`gvDaE<+DqAzR}ybdLKw
zVb#{`BD|)+(qM1|Ndrs4ptfgLJrjcXNnYM?${-58g5JMyW4V2(^(DzRB6ePJwR$aT
zQzM3XywnM4t)ds4%g}*4*@v6rYtlBI<0jn<T;p;3IJ;(+Iufzfg@TsR;P>^w79U8*
zQ2~<I1vur=ts{d%l}TleqOybK_r_xJmoY{}`qHq(QPI{F_ZmBd@$j3PZQ}ZL#bG2S
zWM?O1ccrLstI>JBCe+!x`PWm8JA+6|-dYO~(B6IR01_s%J&Pot<rE|x!dX06d!bAe
zZTYaQR#@b-Q=nySySjr~bW1{^W2Hd2H7Pf&uHMj_s+U#oih>Kb@x8U?HOgRmI25y2
zKuD?2B4-$m>lY%8)ZE!DX$yf>46c7fEw&FX89V@i`bJ;n-0NPQukyvq#E){09vXBu
zM0)LF-oCd6=jXVKXH3W=46twB7GT@@lYU6Jm&Of`Q}OI+{Giw9W(VbER(E;SowJb{
z%dxt4QUY&$Xj8>!o)*fO1RhA(2{A<$ba~Xvfd??0s#^~e7Q{R}JvkycMW;vJ?(`wc
zx+>MObC-9r7Df*cY_HDMgR19o$`y4*T~~bd;ZP7TYKYsfAa`^8D4x>|6oC*mycQ;?
zV>Bz0Vl+F}{ca(P9!gW{7BcgAgXLC0w0F4pExj0~m;&<>O}EE6+i7B!YXSg4V`y||
z=Q4qe<IQq%AJZ*g;nNwiSQX8<0O~Y%CwfTDm@<9ZE17fcq{it1KM&kN##(DBtrZr@
z03Fh3IE!3!CHc;7A?#Pxqc&At?sjUxloy|gO4U**f#ev=&|FSePG@RCDUCL?%MZZX
z;HE@UHhSW6>g9C;eGL6(4--doChV`yg(lefkvaEG2N&y6H^soE(%=Cbx9+9s_wj1x
z{XUH<M$AEjR0-$mZH2&(Q&`Qb+;R4V1N)3Ew<iM+C6LM8jL7pPBxA@zOEm|q5y^jv
z>%(pSso7-Ln;nOlMsfSLSQf{C5zkvt4)@lLyE|g;P>WFFk-3~+<tqnFkGj-~>TFHG
z%8~M!%BIOa3y}xg&1bc)a>ou-B7N^JeQ)fd$O2G}?h|M=)EJt3v{G;zM-N#rwJ72J
z1$?wa#NyRCI@<2oep;5|Z-+L=Z%E?ZU895-TYOq2x^X)_(}5pjRzh<(;|C_vj+xP?
z8pqBeLc~;=K}HSh?I?#^9S@TxjIa7^(!K}G<s5O90ctp(h@kHUA)s@UV|-I3$W2bE
zf)2bMD)(qemJ1W%w);I&Mh+3u;p}Z;l*)hs2N)7`7hlV$&E@qbPC$eM4rjhmSR=ng
zhvaj#yl>z&8nWDGEIZCngMmOV%Ig&HK7c%J0j+kI7({mH?gX}&$+|B1go-)S-W55<
z=^Kej-AqZp^6tYPfR-iCI$e!AxoetgFf`4_dySg6A}YE2K;N7>wIx?<13CjZTRy|9
zO6j#)eW|B0<vM_~Uy+n-oNu|X4=@)laUhN6sjy8GfsjY?<tgSZHn94uZ2&+$wDNAB
z2>av)Ms;7E&T|oytflgT!F62nfSzbH6(?d{RKzJWYi1CeV`gMVOHk@$S?vZVa8!<?
zjR{mTxqx?;_Xj?}3%j_Z*RJemeW-kV5bz5E0AMWv&-VOt`H3~ku_F1jsI#1~uGkC9
z7I2*7p9|ZNb;Vu|#oym>k_H3RUC>dVyJ0*1OE;f+`^?Rk(Xb5J_VVrRQLZMJp6&(A
zJrRG-_g_UFAZxR(dq)`%APj~4Yy4-k+S|xw-bF>vkM99w-v}A7V1H*L?h8Erej<0x
zp6W{T1Jo^l{R2C}$!FS>=aT?{H@|eAoFG75?bCz*7u2tdVgoOCm&`(31Ozmk{VI>I
z>nLCK>>c^-Sr&5+Cd7O^(F6c&NFxsJ`Im~nesE^!N_H-U4+yx~{*n^%-yzIqf*?ox
zfT2m|MNz(=0WUxfGSUEbB#ULA)%sJepF;gQ;=j+lFF}&uJH3#11n3rfa6jPeK<V`*
z9(E8e|Jxu04;%QUvDo2#Mu6Q+U-!`Km@`^kHf$7b)(jNn;Ml!;^3P`ZOO~@U7r102
ziU0(pwjW@DxuIsyDpim1^r-2roJmf=>vN{_v7=!J0X>#~vo`~!7sNH-nQaF7hSDck
zesoI4CH3vzv0a&dyQ{OEtTs&WXxs;&HL*<p_qF@f?rb1}jQI3nUDw_{W69TVNi0R7
z6*xWN`gV2sQ1x3;eZ7IugwuWi+Mlw(WDDUpm4JnZyktyxpD6g`uipW5tN*?j=wj|q
zncYzb1Tem(ML#8tw#{(iPxzy=Z{ynfC+PfuIs3Luhj({b5FGqNcK=h?$Ul8qPj?g2
z584Xf3&=LRR3P$AY0F<a9z8wA#R2H)d#3&5763rIy>uCZiAj(6htS;p9~Ap6rM(wZ
z4rH~=*VJJ*OKNV64ZGNe&gI76+%2D|+gB*4Vk!UxynwMSSvT2o<8(=a)kut=|2RR|
zl=_nB?7k&v63&%gVQ*Xi%;xWOLjdu@`elgWV;CD|^Lp?0|JX?zCMv8L)GhI1tf(ef
zQK`GgPMnk0Sig)00J2k9iu;Wk`TCrgH5Ctz&x-j&;GF(nyt1|1rP(TCc&&?l&~JSy
zI-gYYYhXU%_vM*%x2Jt3VbqgVAIb3j2}krrnm7Qum8`uNZ+r*v*7*~5mf2^Cu=)CF
zKKQhIwu!?1qN4C006hY>Up@RYrq2#rc7%O}VTG4EL`W!cc292nYNN@TlB8IkKSlZF
zK5XMJU7>BK=SD_RY<j)?D|+4Cd8{ja?9Y?>%j8+!1Bf?>_+m`i4oi<Yj8gx>&~imc
z^xIJScYs|hRyd!4WGDZZ2>!##1qJU4x&LlPdX+7xV4Q<s9sHt|qhc)V{=uSu!RgPP
zKPv(&nE?BW&E+BcS3mus-WgDcp#T@)Me(1t`5LpY6B2y-Ok0x!Fz3k1@e@L?&bJ{<
z53+=#`<XV><rpBq|LGrd<k!4nS+Ii={N4uPbwf2F3&kdI4|gnk*l7I3j)<~P$|*V|
zpFZ>-o9a^#chB;#l*hbHlGp?A`^Hjy#!7bP5qnttP-M?6yrs$stkdT2Q2I-%$-jTj
za!Awrf(M^f<4dZtul}@GUm4(zDabL5OD}qUo;8V%-!INw2>9=(F?QuM_@ybUh&$(4
z1LKo_Q<@hprFBPGs-(xm;?SJhziTbpOF@PBZy!NfO!$nYY$X1YrT-3>&+I>A<tIXY
zBEdho@Hoa%#1P)k7InW{-`1D^LWV!<@!7tg#jULTPce~vnJWFi_@VG63qIRbzAHvQ
z=LireQ`;Tkqyrpy`0&;q`D+Zb%L(V_ezTi@)|yY+6jU(LFMOiA*;AWg;i(ZLg7iq<
z%ukC{BJ339Zc6c;46y#ij6B%vlM1>q+)vr&+HNx6%(M}XL*>Ch5@JN-AuXw&H2QK=
zx@*sdEZJ%CD<2v7DAb{bvh&}rL#vP=QQc|6fwj(&D#rDYe9o4G>L3nV8)EIxM+;^#
zlhi=`vx@GVUM^DmeJx3)W*g@PpXDk-(R3LkQ|LEtk=LhMhN|dENBs_E+~HMLyy7(}
z1}RnEB&<E(o;!)G*lhBl$r5->yXudVsWMipDaa5N7X}2%(UXC)-=~`@<ubQ!`+5qP
z#{=v9<+hf(YhW@LY}{O6ex}qw)k`ziF`=_V<onA?W~U@->kGZ3d;58`qA%n*Dhto^
zWj6_F`t47umhouLE8d=Nn{{t~SX?iuy7Oxz9}r68@EI+iZ63t>ij%2YE${KnpXn1j
z71zCQ_Gau==LTns-7GC7mWs1pIb4%V70nvxAPu(GRrhwAcC??`d;W%rg>`j74%Vrx
zcF-eZ_`1n8rMIn5aGD)>Cqb3xlTgW!Q+TaZwYp=8GcQDE+U1GHMPXLh3~PG=ok$be
z9d_U@t|gx|R#TkmW~Khp4*MZh>0?&`<Mh5Q3C}XX-1+7hlcQd7Et|8-3KgnUuc(%@
zW=|ux#Xy}w%-HCHq>?gsMOmpxO6}uB;Ni|`52stFq-3}tc1wz#W5u$XgI<kpB#Xq3
zd75%pW{mdXhP2@+vWNqIyKU+BOKYzskRT6cqn_@ao@D>&Q0wKw1J-v}X45BJ&->23
ze=`Ld!4#>9wPRdRz9a>GJbhr8K2zD6j^2Z&p+rN)uXs;#W5<bULe%$xQCUw0M$jl!
z`dUxg<<Yq8X|DOIZPfm?=h*G%d06=6#Gj-`7HH1P*W-?e8aPP$`1&G}4kq+NRf(-9
zg)VgIhQx3Du%R&oE_FIpIudQgj4ukWop5#QcT3DikL>oT37V#DJj&(WZ2h%T4XVmW
zu1|98w)33|L#wP4^_~25uWtFNY&J|wlz49WM+yTBf0kZCiQ1CosdlL#*IA37N9tj%
z9hFRknRn}jDgEZVSOcQ#P@Oiv^W!8h{YbNk@r$td66x9KJMtnj-XPJ1!P22+>jzZx
zoZ9ceZvM`UN=&&zV{J*@yN-y-J41HE+th?k;fu*~@+oprCl3F3|E(Xx3$d1MN)V8#
zMS_nu(B2JiX(563d8r}jk+raOVx}FFbdmCK7)h7;__RZ{z89vnKz6(mDnENz-$@CU
zPj3Wzu;brI2~vIp(Cu~7H9<sm$KD(5@IPbQ<!dnIVJTGXx1mEEzXLQmqTjq<znKph
zIO(gMP(Gut`72~!Q@0HsEpjY8^2{bY!~xB-uHT&3JL)BC+mvuEK0bZH%pWeKb8mLx
zsa$0BX)9yhRIN+B$t&6gv+-)94=av&XsOis^I`N`_ooO@`xQLO>KfL=S8V)n%Kbm0
zsI9cfF_R%4I0gNJuPn~6F!X(RMqV`oXgt30^mMnUk@(WC)uJCM4Nm#+UOzm6y6%o$
zPV>2pXmMI>B+h=!h~F8p&A(Hh<G0#B?7fTyt4;c(*Dy^>R+fxg9@cYvpV)(b^h~rv
z+*S`A8g0qIKt0IB^zF^G7NxY+#I_8Sa{Fm3JKQzae-j68MAD-p`0cyTAs_<dio55<
z<6H#0nv##n46JB1Z$*x5U$d6$3LI>GupMOpXLJpxHOj=vIGM%_AVZXWoZ$JUL&b_$
zxUY5R<U&H<tU4MI9g(0dUSn>Et>g?TExgA6D$zTmqjNpKJj`K(VX(eq0AI^ORlQu>
z^|yq(wXV_&_(@|2Urkca-TuC{oeZ&Zw@DEWyZzXrIT%=Ct-B3(OdeAs(jivN1&Y*e
zzf1FYhQG+ZEnnHq`dy)WA5LGkz&R6s&e<h9f(bQBM;mFD#9#GxDJ4unIkRDG8V0tH
zP$kczgJ4UrUGuWB86PGm<wMlo54T%!cjau|hbrW!<Ncww9;$L=6{gq(<FPTfop#9S
zkD0fc&4v@XhIO0avzA+K-iG3_E+OI}ZPr@2t1e+Ek;~})x4YjLI)!1b4Hv?3K32z>
z#7SD(F&m0fl-+D4W7SzwD)NX4q_%WYYhu_J=HX^8z<p#$^Qc!06tqs!$+%(%Ye<Dv
zgqvV@Uz+92UC%+Cc8)|z!JOBdQ459T>m!+Cl`A3=mN0>akR>bCun70&<Rc`HSvR5G
zXpiyP{oy0&C{h}^=K4;1LHhVT+hkh1nDsJFNQ>c7+eVCuXO7=*UZfXj12NUlf>GN&
zS%e6B<7U~hac0)(ij<={^*imu_gmc~PXM%f<1l(5(UxoNr>`i>kX;zwJ1yKh*tQ_-
zo0t+6+X9b+c2)+3ge<7Gk9DOlUD2FJXF3TC26Z*p{VsdBZ~SINXl5a$*H>{pt@#3@
z2-OCTJZxoq!m1`h;N6WJOvEwMhAwh4wtVg8JvT&@2A}Cupz9!-f-@Ch77|sTc62`-
zd;hTlwQXRnKp>#dGsDdnQQ^K_rGqx%V_m900e$#82*N;-%D7mqEy;#+GqXv>p$Q~O
ze;x6OwZ5qCJCS`BjD_LNVZ+F|70PnFvYPD`FSDy#{;Hc3n}!1J-Pyc5@5GivXi2<U
zZUkNk!QEkz@x)j-)__C4$j<6%ZR`vP>7Be&YOJAJ31Ow5<VlDo$SdEL70|@hK9zxv
zpt*)KXMcIAcC$R9vekeZ)FgqeXkE@Mnhp;|7bT>{UZnM1KSLO}&T!F+OCi)O(X5r;
z*WhpBvB=D-Q%6I%CATzjEpbr^=%SI_%{8gRhgvR*rf*xpeShbHM)J!vFQM!?O|ZD(
z#X#WN%T}8)h}F<OwZ3z=va@%0lYau5UTbv6pG5NLcql7@Lx(9c#SyGSpN87;U-4!{
zTX%SMhk4&}x$0AdlB&DiG*qgz9dFa{aX~1mi+25pk}!z!*8JXwO{9D}6Gh58pZU;O
z@Km~g8)gob8y5$Ti%5gjc4AOgV}tUO_G&<{d@I}T?q)i2brf~_W9n&Zoy9PTfi%r#
zLq%IDMY(5(VN=lLPESX19v2kqTv!;am1b>~h*32MxsldKp<p)}k%fh@sKFEzBs1U$
z=@715_RhdY!o@+HeabV4>6*an3c{yaelai;;tb)2ht%*u#cInEvCZcqD@_=6?qRz0
zZS)y%9GKj#(QGF`ERjBJSgFd7ZOYvAbMw37NyVuE*C-LFJX5tm<v~z%KM$HEqlJ)<
z4^h{z*Dv#cb|>1p>J&?>4L?5AtC!kGsNQ<D>&z?S6uP8`)XywCqGRc0>pM3O6JFey
zeA9{x${1cd5t$Cq>T!q=tP*QikwS4RQ)Ehf>okCLVkWwn;d=}!RI4uMYf?qQ@OJ>$
z8?C8x(Ny%yiGCDXySu@@@yE+Nq(h70N8G&iSn_Fl=qWlfVZj5ULlB7afUD=5cH})(
z3Qy$ZmXhr<*2i*M|GrJS^|-UuclSUOUVC8FJ6zmj<0e5FbZ+og&yR_U;6_=nvxz|D
zo9}@mCgC>a9HLxJd2Y{KWE>JL)2d<MhS3l-zJxJikkLKL4=T*#Np&NUQPUg&Ll#QQ
z2_O{}TRrC8BO=Kj+sHSDLI;@S((SfBg6k{hi9-`7VJvAkW!fP|u0@JtL#?pKce{E>
zUIA_7!(2^e&AK<j5_~LqkUsC!T1M{yHQ>80koSfeUauV%lu>1*HKd<!=EexCz!f!g
zTb<qK7w0*x#+P#_NGdGtZJnwWc`>x)8FPNLFM$M#R8(p3X-Xcg^&Q0scG~etq!qmv
zD*4T<o_0glv_L1lt;-&7>#68wCMPPF9&)-t2$<&R+nA$uu*=z8O?FUC1J`eDo154X
zsd?59vql-2)YTnY9MRMpT24%{54ugCCw7pY+lUrbd29985`g;4s)dbXfpn&v>ispO
zm;4=Wbx>x%|EbFmL^{eR9R&`V#Dv7D+3CaATUH0vWKIq4x;1WI@T8y{m*ZE|9EE;J
za#LNmJ!v;6H*7!Uy6%{<6~!vdxVzY8PiUPt<;m(`y2G7$)(8{V;4YQ7mhKsCad71Y
zvQ)rVwSOA>cv`n1(y4}UwR9sF(6drzzayL0q7A&)eb#YdKm;-r#g&$weA!pC<2E47
zM}tt#g{)Y19sSU<+WMpw&D))}8q$z~xsZgEB`m{4s(dcAEiNVx9OH$~|02S5XoknH
z@76Yc<YtXEjlee+c2Hf-&Sn%uZNuWDiWx)x^njv~AY0wA&_|n#8beO+W+qgBQMArb
zvMvqAh%AjfkL^?9_O3w4lt3kK3kSDdOp^DLZ#v0(dli9bYkrJ2@!5^84O%HUC;8(j
zv?uIQN)p<ps<s5zxtuzp0R5q+LND4wtlZA8RSVmMKbrk(GIV6_<!MltO%PHun-d5@
z0B9g-;-hTRFNDApw_#kXg3@D?@Nl{8BrlhRz~ImasIi6&1;_hS>FFYSSl^E5L<d8G
zGRq~*4~KRH8<RV`90YNGf{StsHz$tMqC&!&N_y24kN08%OeSwy2BeByCOtTcFNP-x
zO_iQ9j}wA>D*r5VaHQ$_3Iw=!cVu<zoPlt#<sm?}qP4*w5xd!>Akdc~u~s6$cVS<E
tmh@fW>Tpt%IpcTdGQ)PKZF?G1kUDF!a|q6Q`3nGOYg~aBUAXz^{{Ug7=(Yd=

literal 0
HcmV?d00001

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 5b90e6d0..51be5f9c 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -4,16 +4,15 @@
 @import "./c/function";
 @import "./modules/visual/c/common.scss";
 
-// $navbar--height: 60px;
-body {
+.g-main {
+  padding: 10px 20px 0;
 }
 
 .m-iframe {
   position: relative;
   box-sizing: content-box;
   width: calc(100% + 20px);
-  // height: calc(100vh - 55px);
-  margin: -10px;
+  margin: -10px -20px 0;
   z-index: 100;
 }
 
diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 819f2df3..e31559bb 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -3,7 +3,8 @@
 @import "./c/common";
 .div_top {
   margin-left: 10px;
-  height: 35px;
+  height: 40px;
+  line-height: 35px;
   .router_line {
     width: 212px;
     height: 1px;
@@ -12,8 +13,8 @@
     /* opacity: 0.09; */
   }
   .div_router {
-    margin-top: 5px;
     font-size: 16px;
+    font-weight: bold;
 
     .router_parents {
       color: #a0c3d9;
@@ -40,7 +41,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh - 15px);
+    height: calc(840px - 15px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -109,10 +110,9 @@
       box-sizing: border-box;
       width: 100%;
 
-      height: calc(88vh - 10px);
+      height: calc(840px - 10px);
       color: #fff;
-      background: url('../../../img/modules/visual/warning-box.png') no-repeat
-        center;
+      background: url("../../../img/modules/visual/fenlei-box.png") no-repeat center;
       background-size: 100% 100%;
       // padding: 45px 21px 35px 24px;
 
@@ -208,13 +208,12 @@
 
 .div_community_info {
   box-sizing: border-box;
-  flex: 0 0 calc(100vw - 620px);
-  // width: calc(100vw - 560px);
+  flex: 0 0 calc(1919px - 620px);
+  // width: calc(1919px - 560px);
 
-  height: calc(88vh - 10px);
+  height: calc(840px - 10px);
   color: #fff;
-  background: url('../../../img/modules/visual/warning-box.png') no-repeat
-    center;
+  background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
 
   .div_select {
@@ -253,11 +252,11 @@
     box-sizing: border-box;
 
     margin-top: 9px;
-    height: calc(88vh - 120px);
+    height: calc(840px - 120px);
   }
 
   .div_room {
-    // height: calc(88vh - 40px);
+    // height: calc(840px - 40px);
     // margin-top: 9px;
     display: flex;
     flex-wrap: wrap;
@@ -317,19 +316,18 @@
         justify-content: flex-start;
         // margin-left: 7px;
 
-        .div_icon_item{
-          .icon_img{
+        .div_icon_item {
+          .icon_img {
             margin-left: 5px;
             width: 21px;
             height: 20px;
           }
-          .icon_name{
+          .icon_name {
             text-align: center;
             display: flex;
             justify-content: center;
           }
         }
-       
       }
       .div_user:hover {
         cursor: pointer;
@@ -362,7 +360,7 @@
   }
 
   .div_room::after {
-    content: '';
+    content: "";
     flex: 1;
   }
 }
@@ -443,7 +441,7 @@
     width: 320px;
     height: 470px;
     color: #fff;
-    background: url('../../../img/modules/visual/box-2.png') no-repeat center;
+    background: url("../../../img/modules/visual/box-2.png") no-repeat center;
     background-size: 100% 100%;
     padding: 45px 20px 35px 20px;
 
@@ -578,7 +576,5 @@
         }
       }
     }
-
-
   }
 }
diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index e341f70f..60055cec 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -117,11 +117,11 @@
   flex-direction: row;
   // flex-wrap: wrap;
   justify-content: space-between;
-  height: calc(100vh - 190px);
+  height: calc(988px - 190px);
 
   .g-l {
     width: 40%;
-    height: calc(100vh - 200px);
+    height: calc(988px - 200px);
 
     .echart-line {
       margin-left: 30px;
@@ -149,11 +149,11 @@
 
   .g-r {
     width: 55%;
-    height: calc(100vh - 210px);
+    height: calc(988px - 210px);
 
     .r-map {
       position: relative;
-      height: calc(100vh - 210px - 50px);
+      height: calc(988px - 210px - 50px);
       width: 100%;
 
       .map {
diff --git a/src/assets/scss/modules/visual/duoyuanfenxi.scss b/src/assets/scss/modules/visual/duoyuanfenxi.scss
index 12032815..da5ae4d1 100644
--- a/src/assets/scss/modules/visual/duoyuanfenxi.scss
+++ b/src/assets/scss/modules/visual/duoyuanfenxi.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 385px;
@@ -21,7 +21,7 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(988px - 230px - 385px);
       margin-top: 40px;
     }
   }
@@ -29,8 +29,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss
index ed0ffedd..0d566ab6 100644
--- a/src/assets/scss/modules/visual/fiveLayerMap.scss
+++ b/src/assets/scss/modules/visual/fiveLayerMap.scss
@@ -3,7 +3,8 @@
 @import "./c/common";
 .div_top {
   margin-left: 10px;
-  height: 35px;
+  height: 40px;
+  line-height: 35px;
   .router_line {
     width: 212px;
     height: 1px;
@@ -12,8 +13,8 @@
     /* opacity: 0.09; */
   }
   .div_router {
-    margin-top: 5px;
     font-size: 16px;
+    font-weight: bold;
 
     .router_parents {
       color: #a0c3d9;
@@ -40,7 +41,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh - 15px);
+    height: calc(840px - 15px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -159,7 +160,7 @@
       box-sizing: border-box;
       width: 100%;
       margin-top:10px;
-      height: calc(88vh - 302px - 10px);
+      height: calc(840px - 302px - 10px);
       color: #fff;
       background: url('../../../img/modules/visual/warning-box.png') no-repeat
         center;
@@ -210,7 +211,7 @@
      
      
       .tb {
-        height: calc(88vh - 302px - 10px - 150px);
+        height: calc(840px - 302px - 10px - 150px);
         overflow-y: auto;
         @include scrollBar;
         margin-top:20px;
@@ -252,10 +253,10 @@
 
 .div_community_info {
   box-sizing: border-box;
-  flex: 0 0 calc(100vw - 620px);
-  // width: calc(100vw - 560px);
+  flex: 0 0 calc(1919px - 620px);
+  // width: calc(1919px - 560px);
 
-  height: calc(88vh - 10px);
+  height: calc(840px - 10px);
   color: #fff;
   background: url('../../../img/modules/visual/warning-box.png') no-repeat
     center;
@@ -297,11 +298,11 @@
     box-sizing: border-box;
 
     margin-top: 9px;
-    height: calc(88vh - 120px);
+    height: calc(840px - 120px);
   }
 
   .div_room {
-    // height: calc(88vh - 40px);
+    // height: calc(840px - 40px);
     // margin-top: 9px;
     display: flex;
     flex-wrap: wrap;
diff --git a/src/assets/scss/modules/visual/heart.scss b/src/assets/scss/modules/visual/heart.scss
index f0c964cb..5e31774f 100644
--- a/src/assets/scss/modules/visual/heart.scss
+++ b/src/assets/scss/modules/visual/heart.scss
@@ -64,7 +64,7 @@
         }
     }
     .tb {
-        height: calc(100vh - 230px);
+        height: calc(988px - 230px);
         overflow-y: auto;
         @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index fb6f31ae..5ae5c1e5 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -1,5 +1,5 @@
 .warning-box{
-  padding: 0 21px 20px 24px
+  padding: 0 ;
 }
 .no-data{
   margin-top:50px;
diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss
index a756b8c1..77d9988f 100644
--- a/src/assets/scss/modules/visual/personCategory.scss
+++ b/src/assets/scss/modules/visual/personCategory.scss
@@ -8,7 +8,7 @@
   color: #fff;
   // background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
-  padding: 15px 21px 15px 24px;
+  // padding: 15px 21px 15px 24px;
 
 
 
@@ -159,7 +159,7 @@
   &-bottom {
     box-sizing: border-box;
     width: 100%;
-    // height: calc(100vh - 535px);
+    // height: calc(988px - 535px);
     min-height: 300px;
     margin-top: 60px;
   }
diff --git a/src/assets/scss/modules/visual/processAnalyze.scss b/src/assets/scss/modules/visual/processAnalyze.scss
index ba44dbfa..1a4b3f3d 100644
--- a/src/assets/scss/modules/visual/processAnalyze.scss
+++ b/src/assets/scss/modules/visual/processAnalyze.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 385px;
@@ -24,7 +24,7 @@
       }
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(988px - 230px - 385px);
       margin-top: 20px;
     }
   }
@@ -32,8 +32,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
@@ -119,7 +119,7 @@
 .g-r {
   .r-map {
     position: relative;
-    height: calc(100vh - 180px - 20px - 70px);
+    height: calc(988px - 180px - 20px - 70px);
     width: 100%;
 
     .map {
diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss
index 6d43913e..049be180 100644
--- a/src/assets/scss/modules/visual/resibuzz.scss
+++ b/src/assets/scss/modules/visual/resibuzz.scss
@@ -9,19 +9,19 @@
   flex-direction: row;
   // flex-wrap: wrap;
   // justify-content: center;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 600px;
-    height: calc(100vh - 180px);
+    height: calc(988px - 180px);
   }
 
   .g-r {
     text-align: center;
     margin: 40px 0 0 19px;
-    width: calc(100vw - 60px - 600px);
-    // height: calc(100vh - 170px - 20px);
+    width: calc(1919px - 60px - 600px);
+    // height: calc(988px - 170px - 20px);
   }
 }
 
@@ -30,7 +30,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss
index ca099bed..79dfe912 100644
--- a/src/assets/scss/modules/visual/shijianchulifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 355px;
@@ -21,7 +21,7 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 200px - 365px);
+      height: calc(988px - 200px - 365px);
       margin-top: 0;
     }
   }
@@ -29,8 +29,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
@@ -74,7 +74,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/shijianfenleifenxi.scss b/src/assets/scss/modules/visual/shijianfenleifenxi.scss
index c4f19da3..6d0bcedc 100644
--- a/src/assets/scss/modules/visual/shijianfenleifenxi.scss
+++ b/src/assets/scss/modules/visual/shijianfenleifenxi.scss
@@ -6,12 +6,12 @@
 .g-cpt-resi {
   display: flex;
   flex-direction: row;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 700px;
-    height: calc(100vh - 230px);
+    height: calc(988px - 230px);
 
     .l_top {
       height: 385px;
@@ -21,7 +21,7 @@
     
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(988px - 230px - 385px);
       margin-top: 20px;
     }
   }
@@ -29,8 +29,8 @@
   .g-r {
     text-align: center;
     margin: 20px 10px 20px;
-    width: calc(100vw - 700px);
-    height: calc(100vh - 180px - 20px);
+    width: calc(1919px - 700px);
+    height: calc(988px - 180px - 20px);
   }
 }
 
@@ -80,7 +80,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/typeAnalyze.scss b/src/assets/scss/modules/visual/typeAnalyze.scss
index 0d1accf7..f1f31dff 100644
--- a/src/assets/scss/modules/visual/typeAnalyze.scss
+++ b/src/assets/scss/modules/visual/typeAnalyze.scss
@@ -8,19 +8,19 @@
   flex-direction: row;
   // flex-wrap: wrap;
   // justify-content: center;
-  height: calc(100vh - 180px);
+  height: calc(988px - 180px);
 
   .g-l {
     flex-shrink: 0;
     width: 600px;
-    height: calc(100vh - 180px);
+    height: calc(988px - 180px);
   }
 
   .g-r {
     text-align: center;
     margin: 40px 0 0 19px;
-    width: calc(100vw - 60px - 600px);
-    // height: calc(100vh - 140px - 20px);
+    width: calc(1919px - 60px - 600px);
+    // height: calc(988px - 140px - 20px);
   }
 }
 
@@ -29,7 +29,7 @@
     position: relative;
     height: 100%;
     .tb {
-      height: calc(100vh - 170px - 50px - 50px);
+      height: calc(988px - 170px - 50px - 50px);
       overflow-y: auto;
       @include scrollBar;
     }
diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss
index 265c3889..fddf565a 100644
--- a/src/assets/scss/modules/visual/warning.scss
+++ b/src/assets/scss/modules/visual/warning.scss
@@ -8,7 +8,7 @@
   color: #fff;
   // background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
-  padding: 45px 21px 35px 24px;
+  padding-top: 40px;
 
   &-top {
     display: flex;
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index 6f3b1c52..b9914005 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -1,5 +1,5 @@
 <template>
-  <main :class="['aui-content']">
+  <main class="g-main">
     <!-- tab展示内容 -->
     <template>
       <template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index 6aa4e014..d6d29c1b 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -138,7 +138,7 @@ export default {
 <style lang="scss" src="@/assets/scss/main-shuju.scss" scoped></style>
 <style lang="scss">
 .info-h {
-  height: calc(100vh - 320px);
+  height: calc(100% - 320px);
   // overflow: auto;
 }
 .info-scroll {
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index abad7f68..302b02cb 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -226,9 +226,9 @@ export default {
   }
 }
 .list_box {
-  width: 96%;
+  width: 100%;
   height: 780px;
-  margin: 20px auto;
+  margin: 0 auto;
 }
 .warning-table {
   height: 640px;
@@ -239,7 +239,7 @@ export default {
   text-align: right;
 }
 .g-bread {
-    padding: 10px 20px;
+    padding: 10px 10px 15px;
     ::v-deep .el-breadcrumb__item {
       font-size: 16px;
       .el-breadcrumb__inner {
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 5cc61996..f4b1669f 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <div class="card-title">
         <img src="@/assets/img/shuju/title-tip.png" />
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 1f646b05..d43c02d3 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>多元主体分析</span>
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 86b46c88..11f929fd 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>居民热议分析</span>
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index 301a60a9..c38f83ef 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>事件处理分析</span>
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index f3af070c..20ba99f1 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>事件分类分析</span>
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index b607c082..8d7885cc 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -1,5 +1,5 @@
 <template>
-  <cpt-card>
+  <cpt-card style="margin-top:40px">
     <div class="title">
       <img src="@/assets/img/shuju/title-tip.png" />
       <span>事件分类分析</span>
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 34cff4b2..c754228b 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -1078,7 +1078,7 @@ export default {
     flex: 1;
   }
   .card-wr:last-child {
-    margin-left: 20px;
+    // margin-left: 20px;
   }
   ::v-deep .table-body {
     overflow: auto;
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index a5db22cc..a0080b64 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -627,7 +627,6 @@ export default {
   .card-wr:last-child {
     margin-left: 20px;
   }
-  padding: 25px 21px 15px 24px;
 }
 .card-title {
   display: flex;
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 0fcc6130..9af2244e 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -1,15 +1,11 @@
 <template>
   <div class="warning-box">
     <cpt-card>
-      <!-- <div class="card-title">
+      <div class="card-title">
         <img class="title-icon" src="../../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           动力主轴
         </div>
-      </div> -->
-      <div class="title">
-        <img src="../../../../../assets/img/shuju/title-tip.png" />
-        <span>动力主轴</span>
         <div class="second-select cascader">
           <el-cascader  class="customer_cascader"
                         ref="myCascader"
@@ -20,19 +16,6 @@
                         @change="handleChangeAgencytree"
                         :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"/>
         </div>
-        <!-- <div class="second-select ">
-
-          <el-date-picker v-model="dateIdShow"
-                          type="date"
-                          :clearable="false"
-                          @change="handleChangeDate"
-                          :picker-options="pickerOptions"
-                          prefix-icon="el-icon-caret-bottom"
-                          placeholder="选择日期"
-                          value-format="yyyy-MM-dd">
-          </el-date-picker>
-
-        </div> -->
       </div>
       <div class="card-panel">
         <div class="card-left">

From 58e46d68a8692c25cf8bba0f69c134029b93f3d3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 8 Jul 2022 13:51:28 +0800
Subject: [PATCH 04/28] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue | 6 +++---
 src/views/modules/visual/communityParty/community.vue       | 4 ++--
 src/views/modules/visual/measure/volunteer.vue              | 6 +++---
 .../modules/visual/plugin/power/components/house-dialog.vue | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index d43c02d3..534ad5c0 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -739,14 +739,14 @@ export default {
   border-radius: 50%;
 }
 .card-wr-map {
-  // height: calc(100vh - 120px);
+  // height: calc(988px - 120px);
   text-align: center;
 
   .card-map {
     margin-top: 30px;
     width: 100%;
-    // height: calc(100vh - 285px);
-    height: calc(100vh - 335px);
+    // height: calc(988px - 285px);
+    height: calc(988px - 335px);
     padding-left: 20px;
     .map {
       width: 100%;
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index c754228b..8de9aabd 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -1305,10 +1305,10 @@ export default {
   }
 }
 .table-h {
-  height: calc(100vh - 630px);
+  height: calc(988px - 630px);
 }
 .calc-h {
-  height: calc(100vh - 240px);
+  height: calc(988px - 240px);
   padding-bottom: 20px;
 }
 .wd50 {
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index a0080b64..23740699 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -781,14 +781,14 @@ export default {
 }
 
 .card-wr-map {
-  // height: calc(100vh - 120px);
+  // height: calc(988px - 120px);
   text-align: center;
 
   .card-map {
     margin-top: 30px;
     width: 100%;
-    // height: calc(100vh - 285px);
-    height: calc(100vh - 335px);
+    // height: calc(988px - 285px);
+    height: calc(988px - 335px);
     padding-left: 20px;
     .map {
       width: 100%;
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
index 9cf8ef06..20370a67 100644
--- a/src/views/modules/visual/plugin/power/components/house-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -138,7 +138,7 @@ export default {
 }
 .dialog-bg {
   width: 100vw;
-  height: 100vh;
+  height: 988px;
   position: fixed;
   left: 0;
   top: 0;

From 51809af40927728aafcdacf3e45d659dff6c4c74 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 8 Jul 2022 14:05:42 +0800
Subject: [PATCH 05/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/main-shuju.scss                     | 4 ++--
 src/views/modules/visual/communityParty/elegant.vue | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 51be5f9c..58eee74e 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -5,14 +5,14 @@
 @import "./modules/visual/c/common.scss";
 
 .g-main {
-  padding: 10px 20px 0;
+  padding: 10px 20px 10px;
 }
 
 .m-iframe {
   position: relative;
   box-sizing: content-box;
   width: calc(100% + 20px);
-  margin: -10px -20px 0;
+  margin: -10px -20px -10px;
   z-index: 100;
 }
 
diff --git a/src/views/modules/visual/communityParty/elegant.vue b/src/views/modules/visual/communityParty/elegant.vue
index 01d721e8..5db0a55b 100644
--- a/src/views/modules/visual/communityParty/elegant.vue
+++ b/src/views/modules/visual/communityParty/elegant.vue
@@ -566,6 +566,7 @@ export default {
         display: block;
         width: 100%;
         height: 100%;
+        object-fit: cover;
       }
     }
     .item-user {

From 6c1c18aba57241aae740d744da0b09085d7f8ce1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 8 Jul 2022 15:13:39 +0800
Subject: [PATCH 06/28] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/main-shuju.scss      |  11 +--
 src/views/modules/visual/cpts/tb.vue | 127 +++++++++++++++------------
 2 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 58eee74e..a74a552f 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -176,9 +176,9 @@
   // box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05);
   background: linear-gradient(180deg, #00023f, #176dec);
   box-shadow: 0px 3px 16px 0px rgba(187, 187, 227, 0.35);
-  font-size: 18px;
+  font-size: 19px;
   .el-menu-item {
-    font-size: 18px;
+    font-size: 19px;
   }
 
   .navbar--colorful {
@@ -426,9 +426,10 @@
       }
       .el-dropdown {
         color: #fff;
+        font-size: 16px;
         .el-icon-arrow-down {
           width: auto;
-          font-size: 12px;
+          font-size: 16px;
           margin: 0 0 0 5px;
           transition: transform 0.3s;
         }
@@ -472,9 +473,9 @@
   .navbar__avatar {
     .el-dropdown-link {
       > img {
-        width: 36px;
+        width: 42px;
         height: auto;
-        margin-right: 5px;
+        margin-right: 7px;
         border-radius: 100%;
         vertical-align: middle;
       }
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 2920ee64..377ac635 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -1,75 +1,89 @@
 <template>
   <div class="m-table">
-    <table class="table"
-           border="0"
-           cellspacing="0"
-           cellpadding="0">
-      <col :align="item.align"
-           :width="item.width"
-           :key="'col' + index"
-           v-for="(item, index) in colList" />
+    <table class="table" border="0" cellspacing="0" cellpadding="0">
+      <col
+        :align="item.align"
+        :width="item.width"
+        :key="'col' + index"
+        v-for="(item, index) in colList"
+      />
 
       <thead>
         <tr class="table-header">
-          <th class="table-header-th"
-              v-for="item in header"
-              :key="item">
+          <th class="table-header-th" v-for="item in header" :key="item">
             {{ item }}
           </th>
         </tr>
       </thead>
       <tbody class="table-body">
-        <tr class="table-body-tr"
-            v-for="(value, index) in list"
-            :key="index"
-            @click="handleClickRow(index)">
-          <td class="td"
-              v-for="(item, indexs) in value"
-              :key="indexs">
-            <div v-if="typeof item === 'string' || typeof item === 'number'">
+        <tr
+          class="table-body-tr"
+          v-for="(value, index) in list"
+          :key="index"
+          @click="handleClickRow(index)"
+        >
+          <td class="td" v-for="(item, indexs) in value" :key="indexs">
+            <div
+              v-if="typeof item === 'string' || typeof item === 'number'"
+              :title="item"
+            >
               {{ item }}
             </div>
 
-            <div v-if="typeof item === 'object'&& item.type === 'img'">
+            <div v-if="typeof item === 'object' && item.type === 'img'">
               <!-- <span>{{  item.type+  item.src}}</span> -->
-              <img style="width:18px;height:18px"
-                   :src="item.src"
-                   alt="" />
-
+              <img style="width: 18px; height: 18px" :src="item.src" alt="" />
             </div>
-            <div v-if="typeof item === 'object' && item && item.type == 'index'">
-              <img v-if="highlightTop3 && index == 0"
-                   src="@/assets/img/shuju/top/1.png"
-                   alt="" />
-              <img v-else-if="highlightTop3 && index == 1"
-                   src="@/assets/img/shuju/top/2.png"
-                   alt="" />
-              <img v-else-if="highlightTop3 && index == 2"
-                   src="@/assets/img/shuju/top/3.png"
-                   alt="" />
+
+            <div
+              v-if="typeof item === 'object' && item && item.type == 'index'"
+            >
+              <img
+                v-if="highlightTop3 && index == 0"
+                src="@/assets/img/shuju/top/1.png"
+                alt=""
+              />
+              <img
+                v-else-if="highlightTop3 && index == 1"
+                src="@/assets/img/shuju/top/2.png"
+                alt=""
+              />
+              <img
+                v-else-if="highlightTop3 && index == 2"
+                src="@/assets/img/shuju/top/3.png"
+                alt=""
+              />
               <span v-else>{{ index + 1 }}</span>
             </div>
-            <a v-else-if="typeof item === 'object' && item  && item.type == 'operate'"
-               v-for="btn in item.list"
-               :key="'operate' + index + btn"
-               @click="handleClickBtn(index, btn)">{{ btn }}</a>
-            <a v-else-if="typeof item === 'object' && item && item.type == 'people'"
-               @click="handleClickPeople(item)">{{ item.name }}</a>
+
+            <a
+              v-else-if="
+                typeof item === 'object' && item && item.type == 'operate'
+              "
+              v-for="btn in item.list"
+              :key="'operate' + index + btn"
+              @click="handleClickBtn(index, btn)"
+              >{{ btn }}</a
+            >
+            <a
+              v-else-if="
+                typeof item === 'object' && item && item.type == 'people'
+              "
+              @click="handleClickPeople(item)"
+              >{{ item.name }}</a
+            >
           </td>
         </tr>
       </tbody>
     </table>
 
-    <div class="table-status"
-         v-if="loading">
+    <div class="table-status" v-if="loading">
       <screen-loading>加载中</screen-loading>
     </div>
 
-    <div class="table-status"
-         v-if="list.length == 0 && !loading">
+    <div class="table-status" v-if="list.length == 0 && !loading">
       <div class="no-data">
-        <img src="@/assets/img/modules/visual/noData.png"
-             class="no-data-img" />
+        <img src="@/assets/img/modules/visual/noData.png" class="no-data-img" />
       </div>
     </div>
   </div>
@@ -77,7 +91,6 @@
 
 <script>
 import ScreenLoading from "./loading";
-import Vue from "vue";
 
 export default {
   name: "table",
@@ -138,24 +151,24 @@ export default {
       default: false,
     },
   },
-  data () {
+  data() {
     return {};
   },
   watch: {},
 
-  mounted () { },
+  mounted() {},
 
-  created () { },
+  created() {},
 
   methods: {
     //点击某一行
-    handleClickRow (index) {
+    handleClickRow(index) {
       this.$emit("handleClickRow", index);
     },
-    handleClickBtn (index, type) {
+    handleClickBtn(index, type) {
       this.$emit("operate", index, type);
     },
-    handleClickPeople (item) {
+    handleClickPeople(item) {
       this.$router.push({
         path: `/main-shuju/visual-basicinfo-people/${item.uid}`,
       });
@@ -177,9 +190,10 @@ export default {
       width: 100%;
       height: 50px;
       background: rgba(8, 37, 134, 0.85);
-      font-size: 16px;
+      font-size: 17px;
       font-weight: 400;
       color: #ffffff;
+      line-height: 50px;
 
       &-th {
         text-align: center;
@@ -191,9 +205,10 @@ export default {
     &-body {
       box-sizing: border-box;
       width: 100%;
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #ffffff;
+      line-height: 40px;
 
       &-tr {
         box-sizing: border-box;
@@ -214,7 +229,7 @@ export default {
           }
 
           a {
-            font-size: 16px;
+            font-size: 18px;
             font-weight: 400;
             color: #e4dc00;
             position: relative;

From 68b17fcbcd626e783672a1d84479efb669ad51cb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 8 Jul 2022 16:00:03 +0800
Subject: [PATCH 07/28] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warning/components/screen-table/index.vue | 119 ++++++++++--------
 1 file changed, 69 insertions(+), 50 deletions(-)

diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index b0e0df0d..bc25aff0 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -1,45 +1,56 @@
 <template>
-  <div class="warning-table">
-    <div class="table">
-      <div class="table-header">
-        <div
-          class="table-header-th"
-          v-for="(item, index) in headerList"
-          :key="item.title"
-          :style="headerStyle[index]"
-        >
-          {{ item.title }}
+  <div>
+    <!-- <div class="warning-table">
+      <div class="table">
+        <div class="table-header">
+          <div
+            class="table-header-th"
+            v-for="(item, index) in headerList"
+            :key="item.title"
+            :style="headerStyle[index]"
+          >
+            {{ item.title }}
+          </div>
         </div>
-      </div>
-      <div class="table-body">
-        <div
-          class="table-body-tr"
-          v-for="(value, index) in tableData"
-          :key="index"
-        >
+        <div class="table-body">
           <div
-            class="td"
-            v-for="(item, indexs) in value"
-            :key="indexs"
-            :style="tableContentStyle[indexs]"
+            class="table-body-tr"
+            v-for="(value, index) in tableData"
+            :key="index"
           >
-            <div v-if="item.type && item.type == 'btn'">
-              <a @click="handleClickBtn(item)">{{ item.name }}</a>
+            <div
+              class="td"
+              v-for="(item, indexs) in value"
+              :key="indexs"
+              :style="tableContentStyle[indexs]"
+            >
+              <div v-if="item.type && item.type == 'btn'">
+                <a @click="handleClickBtn(item)">{{ item.name }}</a>
+              </div>
+              <span v-else>{{ item }}</span>
             </div>
-            <span v-else>{{ item }}</span>
           </div>
-        </div>
-        <screen-loading v-if="visibleLoading">加载中</screen-loading>
-        <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
-          <img
-            src="../../../../../../assets/img/modules/visual/noData.png"
-            alt=""
-            srcset=""
-            class="no-data-img"
-          />
+          <screen-loading v-if="visibleLoading">加载中</screen-loading>
+          <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
+            <img
+              src="../../../../../../assets/img/modules/visual/noData.png"
+              alt=""
+              srcset=""
+              class="no-data-img"
+            />
+          </div>
         </div>
       </div>
-    </div>
+    </div> -->
+
+    <cpt-tb
+      :highlight-top3="true"
+      :col-list="tableContentStyle"
+      :loading="visibleLoading"
+      :header="headerList.map((item) => item.title)"
+      :list="cptTbData"
+      @operate="handleOperate"
+    ></cpt-tb>
 
     <people-list
       v-if="showedPeopleList && buildingId"
@@ -53,14 +64,15 @@
 
 <script>
 import ScreenLoading from "../screen-loading/index";
-import Vue from "vue";
 import peopleList from "./people-list";
+import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
   name: "warning-table",
   components: {
     ScreenLoading,
     peopleList,
+    cptTb,
   },
   props: {
     headerList: {
@@ -133,22 +145,8 @@ export default {
       type: Boolean,
       default: true,
     },
-    // // 表格平均分的份数
-    // ava: {
-    //   type: Number,
-    //   default: 8
-    // },
-    // // 表头高度--默认占比10%
-    // headerHeightAva: {
-    //   type: String,
-    //   default: '10%'
-    // },
-    // // 表格主体平均分成的份数
-    // tableContentAva: {
-    //   type: Number,
-    //   default: 5
-    // },
   },
+
   data() {
     return {
       // 显示人员详情
@@ -158,6 +156,22 @@ export default {
       gridName: "",
     };
   },
+
+  computed: {
+    cptTbData() {
+      return this.tableData.map((item) => {
+        return item.map((subitem) => {
+          if (subitem.type && subitem.type == "btn") {
+            subitem.type = "operate";
+            subitem.list = [subitem.name];
+          }
+          console.log(subitem);
+          return subitem;
+        });
+      });
+    },
+  },
+
   watch: {},
 
   mounted() {},
@@ -165,6 +179,11 @@ export default {
   created() {},
 
   methods: {
+    handleOperate(index) {
+      let item = this.tableData[index];
+      this.handleClickBtn(item[item.length - 1]);
+    },
+
     handleClickBtn(item) {
       this.showedPeopleList = true;
       this.buildingId = item.buildingId;

From 606218d307092a9408b06908a20b10b16cf3d461 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 12 Jul 2022 11:04:27 +0800
Subject: [PATCH 08/28] 111

---
 .../workSys/role/role-add-or-update.vue       | 148 ++++++++++++++++++
 src/views/modules/workSys/role/role.vue       | 102 ++++++++++++
 2 files changed, 250 insertions(+)
 create mode 100644 src/views/modules/workSys/role/role-add-or-update.vue
 create mode 100644 src/views/modules/workSys/role/role.vue

diff --git a/src/views/modules/workSys/role/role-add-or-update.vue b/src/views/modules/workSys/role/role-add-or-update.vue
new file mode 100644
index 00000000..c645b634
--- /dev/null
+++ b/src/views/modules/workSys/role/role-add-or-update.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+      <el-form-item prop="name" :label="$t('role.name')">
+        <el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
+      </el-form-item>
+      <el-form-item prop="remark" :label="$t('role.remark')">
+        <el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
+      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item size="mini" :label="$t('role.menuList')">
+            <el-tree
+              :data="menuList"
+              :props="{ label: 'name', children: 'children' }"
+              node-key="id"
+              ref="menuListTree"
+              accordion
+              show-checkbox>
+            </el-tree>
+          </el-form-item>
+        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item size="mini" :label="$t('role.deptList')">-->
+<!--            <el-tree-->
+<!--              :data="deptList"-->
+<!--              :props="{ label: 'name', children: 'children' }"-->
+<!--              node-key="id"-->
+<!--              ref="deptListTree"-->
+<!--              accordion-->
+<!--              show-checkbox>-->
+<!--            </el-tree>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+      </el-row>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      menuList: [],
+      // deptList: [],
+      dataForm: {
+        id: '',
+        name: '',
+        menuIdList: [],
+        // deptIdList: [],
+        remark: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        this.$refs.menuListTree.setCheckedKeys([])
+        // this.$refs.deptListTree.setCheckedKeys([])
+        Promise.all([
+          this.getMenuList()
+          // this.getDeptList()
+        ]).then(() => {
+          if (this.dataForm.id) {
+            this.getInfo()
+          }
+        })
+      })
+    },
+    // 获取菜单列表
+    getMenuList () {
+      return this.$http.get('/oper/access/menu/select').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.menuList = res.data
+      }).catch(() => {})
+    },
+    // 获取部门列表
+    // getDeptList () {
+    //   return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.deptList = res.data
+    //   }).catch(() => {})
+    // },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/oper/access/operrole/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
+        // this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.dataForm.menuIdList = [
+          ...this.$refs.menuListTree.getCheckedKeys(),
+          ...this.$refs.menuListTree.getHalfCheckedKeys()
+        ]
+        // this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/access/operrole', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
new file mode 100644
index 00000000..a3a87e38
--- /dev/null
+++ b/src/views/modules/workSys/role/role.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-sys__role">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.name"
+                    :placeholder="$t('role.name')"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                @sort-change="dataListSortChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="name"
+                         :label="$t('role.name')"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="remark"
+                         :label="$t('role.remark')"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createDate"
+                         :label="$t('role.createDate')"
+                         sortable="custom"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './role-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/oper/access/operrole/page',
+        getDataListIsPage: true,
+        deleteURL: '/oper/access/operrole',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        name: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From ee8c394a24224ab3386ec205833e39e61b2fb419 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 12 Jul 2022 11:08:47 +0800
Subject: [PATCH 09/28] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/warning.scss | 3 +--
 src/views/modules/visual/cpts/tb.vue        | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss
index fddf565a..bfb32065 100644
--- a/src/assets/scss/modules/visual/warning.scss
+++ b/src/assets/scss/modules/visual/warning.scss
@@ -26,8 +26,7 @@
       border: 1px solid #1043c0;
       box-shadow: 0px 83px 150px 0px #002790;
       border-radius: 8px;
-      margin-right: 15px;
-      margin-bottom: 15px;
+      margin: 10px 12px;
 
       &-img {
         display: flex;
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 377ac635..a847ede2 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -190,7 +190,7 @@ export default {
       width: 100%;
       height: 50px;
       background: rgba(8, 37, 134, 0.85);
-      font-size: 17px;
+      font-size: 16px;
       font-weight: 400;
       color: #ffffff;
       line-height: 50px;
@@ -198,6 +198,7 @@ export default {
       &-th {
         text-align: center;
         border: none;
+        font-weight: normal;
         // width: calc(100% / 5);
       }
     }

From 03d44f70c88227ba16614c7b773bd7b9e61ca7bd Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 12 Jul 2022 15:47:58 +0800
Subject: [PATCH 10/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/basicInfoMain.scss    |  8 ++-
 .../scss/modules/visual/incident-info.scss    | 37 +++++++-------
 .../scss/modules/visual/issue-info.scss       | 31 +++++------
 .../scss/modules/visual/searchPerson.scss     | 19 ++++---
 src/assets/scss/shuju-card.scss               |  3 ++
 .../modules/visual/basicinfo/peopleSearch.vue |  3 +-
 src/views/modules/visual/cpts/card.vue        | 51 +++++++++++++++----
 7 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index e31559bb..f7e53229 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -270,15 +270,19 @@
       box-shadow: 0 0 10px inset #1a5afd;
     }
     .item {
-      background-color: #011168;
       margin-top: 12px;
-      width: 244px;
+      width: 242px;
       height: 190px;
       border: 1px solid #037ddc;
       border-radius: 8px;
       text-align: center;
       margin-left: 11px;
       position: relative;
+      background-color: rgba(#000, 0.3);
+
+      &:nth-child(5n + 1) {
+        margin-left: 0;
+      }
 
       // &:first-child {
       //   margin-left: 0;
diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss
index ed3aacad..c305a4c4 100644
--- a/src/assets/scss/modules/visual/incident-info.scss
+++ b/src/assets/scss/modules/visual/incident-info.scss
@@ -1,6 +1,6 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .m-pop {
   @include shield;
@@ -103,7 +103,18 @@
   .info-content {
     margin: 20px 0;
   }
- 
+
+  .info-pics {
+    display: flex;
+    margin: 20px 0;
+    img {
+      display: block;
+      width: 32%;
+      height: 90px;
+      margin-right: 9px;
+      object-fit: cover;
+    }
+  }
 
   .info-prop {
     position: relative;
@@ -123,7 +134,7 @@
     }
 
     &::before {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       top: 9px;
@@ -134,18 +145,6 @@
       border-radius: 3px;
       margin-right: 10px;
     }
-
-    .info-pics {
-      display: flex;
-      margin: 20px 0;
-      img {
-        display: block;
-        width: 32%;
-        height: 90px;
-        margin-right: 9px;
-        object-fit: cover;
-      }
-    }
   }
 }
 
@@ -265,7 +264,7 @@
     padding-right: 10px;
 
     &::before {
-      content: '';
+      content: "";
       position: absolute;
       z-index: 1;
       display: block;
@@ -290,7 +289,7 @@
       padding-top: 1px;
 
       &::before {
-        content: '';
+        content: "";
         display: block;
         position: absolute;
         top: -5px;
diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss
index e4672951..dc3fe2fd 100644
--- a/src/assets/scss/modules/visual/issue-info.scss
+++ b/src/assets/scss/modules/visual/issue-info.scss
@@ -1,6 +1,6 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .m-pop {
   @include shield;
@@ -68,6 +68,18 @@
     line-height: 30px;
   }
 
+  .info-pics {
+    display: flex;
+    margin: 10px 0;
+    img {
+      display: block;
+      width: 32%;
+      height: 90px;
+      margin-right: 9px;
+      object-fit: cover;
+    }
+  }
+
   .info-prop {
     position: relative;
     margin: 10px 0;
@@ -78,17 +90,6 @@
       flex: 0 0 1;
       font-size: 14px;
     }
-    .info-pics {
-      display: flex;
-      margin: 10px 0;
-      img {
-        display: block;
-        width: 32%;
-        height: 90px;
-        margin-right: 9px;
-        object-fit: cover;
-      }
-    }
     > span,
     > div {
       display: block;
@@ -96,7 +97,7 @@
     }
 
     &::before {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       top: 9px;
diff --git a/src/assets/scss/modules/visual/searchPerson.scss b/src/assets/scss/modules/visual/searchPerson.scss
index 6be528e1..fe9489fd 100644
--- a/src/assets/scss/modules/visual/searchPerson.scss
+++ b/src/assets/scss/modules/visual/searchPerson.scss
@@ -1,5 +1,5 @@
-.div_people_search{
-  min-height:100%;
+.div_people_search {
+  min-height: 100%;
   box-sizing: border-box;
 }
 
@@ -36,6 +36,7 @@
     font-weight: 400;
     color: #ffffff;
     line-height: 53px;
+    background: linear-gradient(90deg, #1a5afd, #26c4ff);
   }
   .btn:hover {
     cursor: pointer;
@@ -51,8 +52,7 @@
   // height: calc(88vh - 200px);
   height: 485px;
   color: #fff;
-  background: url('../../../img/modules/visual/warning-box.png') no-repeat
-    center;
+  background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
 }
 
@@ -123,16 +123,15 @@
       }
 
       &-tr:hover {
-        background: url('../../../img/modules/visual/hover-bac.png') no-repeat
-          center;
+        background: url("../../../img/modules/visual/hover-bac.png") no-repeat center;
         background-size: 100% 100%;
       }
     }
 
-    &-status{
-      margin-top:20px;
+    &-status {
+      margin-top: 20px;
 
-      .no-data{
+      .no-data {
         display: flex;
         justify-content: center;
       }
@@ -159,7 +158,7 @@
 }
 .pagination {
   box-sizing: border-box;
-  padding-right:180px;
+  padding-right: 180px;
   padding-bottom: 20px;
 
   margin-top: 40px;
diff --git a/src/assets/scss/shuju-card.scss b/src/assets/scss/shuju-card.scss
index 4af07fd8..04b4e1d4 100644
--- a/src/assets/scss/shuju-card.scss
+++ b/src/assets/scss/shuju-card.scss
@@ -1,5 +1,6 @@
 @import "c/config";
 @import "c/function";
+@import "./modules/visual/c/common";
 
 .m-card {
     position: relative;
@@ -69,5 +70,7 @@
         min-height: 200px;
         background-image: url(../img/shuju/card/bg.png);
         background-repeat: repeat;
+        overflow-y: auto;
+        @include scrollBar;
     }
 }
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index 8193f9f1..4ef10830 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -223,7 +223,8 @@ export default {
     border-radius: 8px 0 0 8px;
     height: 53px;
     background-color: #01106800;
-    border: 2px solid #0082fb;
+    border: 3px solid #0082fb;
+    border-right: 0;
     padding-left: 70px;
     font-size: 18px;
     font-family: PingFang SC;
diff --git a/src/views/modules/visual/cpts/card.vue b/src/views/modules/visual/cpts/card.vue
index 9dcb8971..4516d8b3 100644
--- a/src/views/modules/visual/cpts/card.vue
+++ b/src/views/modules/visual/cpts/card.vue
@@ -1,15 +1,27 @@
 <template>
   <div class="m-card">
     <div class="card-wrap">
-      <img src="@/assets/img/shuju/card/l-t.png" class="card-corner card-corner-1" />
-      <img src="@/assets/img/shuju/card/r-t.png" class="card-corner card-corner-2" />
-      <img src="@/assets/img/shuju/card/r-b.png" class="card-corner card-corner-3" />
-      <img src="@/assets/img/shuju/card/l-b.png" class="card-corner card-corner-4" />
+      <img
+        src="@/assets/img/shuju/card/l-t.png"
+        class="card-corner card-corner-1"
+      />
+      <img
+        src="@/assets/img/shuju/card/r-t.png"
+        class="card-corner card-corner-2"
+      />
+      <img
+        src="@/assets/img/shuju/card/r-b.png"
+        class="card-corner card-corner-3"
+      />
+      <img
+        src="@/assets/img/shuju/card/l-b.png"
+        class="card-corner card-corner-4"
+      />
       <div class="card-line card-line-t"></div>
       <div class="card-line card-line-l"></div>
       <div class="card-line card-line-r"></div>
       <div class="card-line card-line-b"></div>
-      <div class="card-cnt">
+      <div class="card-cnt" :style="tbStyle">
         <slot></slot>
       </div>
     </div>
@@ -19,17 +31,36 @@
 <script>
 export default {
   name: "shuju-card",
-  data() {
-    return {
 
-    };
-  },
   props: {
+    isFullScreen: {
+      type: Boolean,
+      default: false,
+    },
+    minFullScreen: {
+      type: Boolean,
+      default: false,
+    },
   },
 
-  methods: {
+  data() {
+    return {};
+  },
 
+  computed: {
+    tbStyle() {
+      let style = {};
+      if (this.isFullScreen) {
+        style.height = this.$store.state.fixed1920.height - 180 + "px";
+      }
+      if (this.minFullScreen) {
+        style.minHeight = this.$store.state.fixed1920.height - 180 + "px";
+      }
+      return style;
+    },
   },
+
+  methods: {},
 };
 </script>
 

From cab2822ba085f6cd11ee382e89a373f97d150e31 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 12 Jul 2022 17:09:49 +0800
Subject: [PATCH 11/28] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/distributionAnalyze.scss   | 13 +++----
 .../scss/modules/visual/fiveLayerMap.scss     | 36 +++++++++----------
 src/assets/scss/modules/visual/heart.scss     |  3 +-
 .../scss/modules/visual/houseStatic.scss      | 17 +++++----
 src/assets/scss/modules/visual/people.scss    | 15 +++++---
 src/assets/scss/modules/visual/search_1.scss  |  3 +-
 .../duoyuanfuwu/duoyuanfuwufenxi.vue          |  5 +--
 .../communityGovern/fivelayers/mapIndex.vue   | 36 +++++++++----------
 .../visual/communityParty/community.vue       |  7 ++--
 .../modules/visual/communityParty/elegant.vue |  7 ++--
 .../visual/communityParty/gridParty.vue       |  7 ++--
 .../modules/visual/communityParty/party.vue   |  7 ++--
 .../visual/communityParty/partyOld.vue        |  7 ++--
 src/views/modules/visual/measure/service.vue  | 12 ++++---
 .../modules/visual/measure/volunteer.vue      | 10 +++---
 .../plugin/power/components/house-dialog.vue  |  5 +--
 .../plugin/power/components/info-dialog.vue   |  5 +--
 .../visual/plugin/power/organization.vue      |  7 ++--
 18 files changed, 117 insertions(+), 85 deletions(-)

diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index 60055cec..fff1af83 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -1,9 +1,10 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .title {
-  padding: 10px;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   font-size: 22px;
   font-family: PingFang SC;
   font-weight: 800;
@@ -37,7 +38,7 @@
       color: #fff;
     }
     .second-title-label::after {
-      content: '';
+      content: "";
       position: absolute;
       top: 50%;
       left: 20px;
@@ -63,7 +64,7 @@
         }
 
         .el-icon-arrow-up:before {
-          content: '\e78f';
+          content: "\e78f";
         }
         // .el-select__caret:before {
         //   content: '\E790'
diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss
index 0d566ab6..34732393 100644
--- a/src/assets/scss/modules/visual/fiveLayerMap.scss
+++ b/src/assets/scss/modules/visual/fiveLayerMap.scss
@@ -38,10 +38,10 @@
 
   .div_map {
     box-sizing: border-box;
-    width: 100%;
+    width: 1920px - 630px - 20px;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(840px - 15px);
+    height: calc(810px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -50,7 +50,7 @@
   }
 
   .div_data {
-    flex: 0 0 610px;
+   width: 630px;
     margin-left: 12px;
 
     .div_tips{
@@ -58,9 +58,6 @@
       width: 100%;
       height: 302px;
       color: #fff;
-      background: url('../../../img/modules/visual/warning-box.png') no-repeat
-        center;
-      background-size: 100% 100%;
 
       .div_coverage{
         padding: 30px 10px 32px 10px;
@@ -90,9 +87,12 @@
       }
 
       .div_category {
+        @include scrollBar;
         box-sizing: border-box;
-        height:238px;
-        padding:0 10px 20px;  
+        height:178px;
+        padding:0 10px 0;  
+        overflow-y: auto;
+        overflow-x: hidden;
   
         .category_item {
          
@@ -160,17 +160,13 @@
       box-sizing: border-box;
       width: 100%;
       margin-top:10px;
-      height: calc(840px - 302px - 10px);
+      height: calc(810px - 302px - 10px);
       color: #fff;
-      background: url('../../../img/modules/visual/warning-box.png') no-repeat
-        center;
-      background-size: 100% 100%;
-      padding: 32px 21px 20px 20px;
 
       .div_search_list {
-        margin: 0 auto;
+        margin: 10px auto;
         text-align: center;
-        width: 559px;
+        width: 590px;
         height: 48px;
         background-color: #011168;
         border-radius: 4px;
@@ -211,14 +207,14 @@
      
      
       .tb {
-        height: calc(840px - 302px - 10px - 150px);
+        height: calc(810px - 302px - 10px - 150px);
         overflow-y: auto;
         @include scrollBar;
         margin-top:20px;
       }
   
       .m-pagination {
-        position: absolute;
+        // position: absolute;
         box-sizing: border-box;
         right: 5px;
         bottom: 5px;
@@ -256,7 +252,7 @@
   flex: 0 0 calc(1919px - 620px);
   // width: calc(1919px - 560px);
 
-  height: calc(840px - 10px);
+  height: calc(810px - 10px);
   color: #fff;
   background: url('../../../img/modules/visual/warning-box.png') no-repeat
     center;
@@ -298,11 +294,11 @@
     box-sizing: border-box;
 
     margin-top: 9px;
-    height: calc(840px - 120px);
+    height: calc(810px - 120px);
   }
 
   .div_room {
-    // height: calc(840px - 40px);
+    // height: calc(810px - 40px);
     // margin-top: 9px;
     display: flex;
     flex-wrap: wrap;
diff --git a/src/assets/scss/modules/visual/heart.scss b/src/assets/scss/modules/visual/heart.scss
index 5e31774f..536a22b3 100644
--- a/src/assets/scss/modules/visual/heart.scss
+++ b/src/assets/scss/modules/visual/heart.scss
@@ -47,7 +47,8 @@
 .m-tb {
     width: 33%;
     .title {
-        padding: 10px;
+        margin-bottom: 10px;
+        padding: 4px 2px;
         font-size: 22px;
         font-family: PingFang SC;
         font-weight: 800;
diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index 5ae5c1e5..f8910483 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -11,6 +11,9 @@
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
+
   .title-icon {
     display: block;
     width: 46px;
@@ -60,7 +63,7 @@
     }
   }
   .title-label {
-    font-size: 20px;
+    font-size: 22px;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
@@ -107,23 +110,25 @@
     flex-grow:0;
     flex-shrink:0;
     width:50%;
-  
     height: 100%;
+
     .div-chart{
       display: flex;
       width: 100%;
+      flex-wrap: wrap;
       .echart-wr{
+        position: relative;
         flex-shrink: 0;
         height: 420px;
         width: 70%;
       }
       .div-tip{
         flex-shrink: 0;
-        width: 30%;
+        width: 25%;
         display: flex;
         flex-direction: column;
         justify-content: center;
-        margin-left:20px;
+        margin-left:5%;
         margin-top: -23px;
 
         display: flex;
@@ -151,11 +156,11 @@
 
       .div-tip2{
         flex-shrink: 0;
-        width: 30%;
+        width: 25%;
         display: flex;
         flex-direction: column;
         justify-content: center;
-        margin-left:20px;
+        margin-left:5%;
         margin-top: -23px;
 
         display: flex;
diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index f9379e7f..747b9218 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -24,7 +24,8 @@
   position: relative;
 
   .title {
-    padding: 10px;
+    margin-bottom: 10px;
+    padding: 4px 2px;
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
@@ -187,7 +188,8 @@
     width: 1180px;
 
     .title {
-      padding: 10px;
+      margin-bottom: 10px;
+      padding: 4px 2px;
       font-size: 22px;
       font-family: PingFang SC;
       font-weight: 800;
@@ -294,7 +296,8 @@
   margin-top: 10px;
 
   .title {
-    padding: 10px;
+    margin-bottom: 10px;
+    padding: 4px 2px;
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
@@ -447,7 +450,8 @@
 
 .m-tb {
   .title {
-    padding: 10px;
+    margin-bottom: 10px;
+    padding: 4px 2px;
     font-size: 22px;
     font-family: PingFang SC;
     font-weight: 800;
@@ -479,7 +483,8 @@
     width: calc(50% - 3px);
 
     .title {
-      padding: 10px;
+      margin-bottom: 10px;
+      padding: 4px 2px;
       font-size: 22px;
       font-family: PingFang SC;
       font-weight: 800;
diff --git a/src/assets/scss/modules/visual/search_1.scss b/src/assets/scss/modules/visual/search_1.scss
index ffb46b67..b7606f26 100644
--- a/src/assets/scss/modules/visual/search_1.scss
+++ b/src/assets/scss/modules/visual/search_1.scss
@@ -3,7 +3,8 @@
 @import './c/common';
 
 .title {
-  padding: 10px;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   font-size: 22px;
   font-family: PingFang SC;
   font-weight: 800;
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 534ad5c0..3f98ac65 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -695,8 +695,9 @@ export default {
     box-sizing: border-box;
     margin-right: 3px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
 
     ::v-deep .el-input {
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 35664c13..a131e9c4 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -27,7 +27,7 @@
 
       <div class="div_data">
 
-        <div class="div_tips">
+        <cpt-card class="div_tips">
 
           <div class="div_coverage">
 
@@ -40,31 +40,27 @@
             </div>
           </div>
           <div class="div_category">
-            <el-scrollbar style="height:98%">
-
-              <div v-for="(item,index) in categoryListshow"
-                   :key="index"
-                   class="category_item">
-
-                <div v-for="(colItem,colIndex) in item"
-                     :key="colIndex"
-                     class="list_item"
-                     @click="handleClickCategory(index,colIndex)">
-                  <img :src="colItem.dataIcon"
-                       alt />
-                  <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
-
-                  </div>
+            <div v-for="(item,index) in categoryListshow"
+                  :key="index"
+                  class="category_item">
+
+              <div v-for="(colItem,colIndex) in item"
+                    :key="colIndex"
+                    class="list_item"
+                    @click="handleClickCategory(index,colIndex)">
+                <img :src="colItem.dataIcon"
+                      alt />
+                <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
 
                 </div>
 
               </div>
 
-            </el-scrollbar>
+            </div>
           </div>
-        </div>
+        </cpt-card>
 
-        <div class="div_info">
+        <cpt-card class="div_info">
           <div class="div_search_list">
             <el-input size="mini"
                       WarningColor='warning'
@@ -102,7 +98,7 @@
             </div>
           </div>
 
-        </div>
+        </cpt-card>
 
       </div>
     </div>
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 8de9aabd..9227f734 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -1113,6 +1113,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -1120,8 +1122,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/communityParty/elegant.vue b/src/views/modules/visual/communityParty/elegant.vue
index 5db0a55b..d4f4d0f7 100644
--- a/src/views/modules/visual/communityParty/elegant.vue
+++ b/src/views/modules/visual/communityParty/elegant.vue
@@ -358,6 +358,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -365,8 +367,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 4ea08dbe..a00b0687 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -605,6 +605,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -654,8 +656,9 @@ export default {
       
     }
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 53439191..d96ed7f6 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -843,6 +843,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -892,8 +894,9 @@ export default {
       
     }
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       
diff --git a/src/views/modules/visual/communityParty/partyOld.vue b/src/views/modules/visual/communityParty/partyOld.vue
index be0c958c..26668709 100644
--- a/src/views/modules/visual/communityParty/partyOld.vue
+++ b/src/views/modules/visual/communityParty/partyOld.vue
@@ -854,6 +854,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -903,8 +905,9 @@ export default {
       
     }
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 6126199b..13841e45 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -578,12 +578,15 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
+
   .title-icon {
     display: block;
-    width: 46px;
-    height: 34px;
+    // width: 46px;
+    // height: 34px;
     box-sizing: border-box;
-    margin-right: 6px;
+    margin-right: 5px;
   }
   ::v-deep .el-dropdown {
     font-size: 16px;
@@ -629,7 +632,8 @@ export default {
   }
 
   .title-label {
-    font-size: 20px;
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 23740699..186806dd 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -633,15 +633,17 @@ export default {
   align-items: center;
   cursor: pointer;
   margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
-    width: 36px;
-    height: 29px;
+    // width: 36px;
+    // height: 29px;
     box-sizing: border-box;
-    margin-right: 3px;
+    margin-right: 5px;
   }
   .title-label {
-    font-size: 20px;
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
 
     ::v-deep .el-input {
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
index 20370a67..fac6686c 100644
--- a/src/views/modules/visual/plugin/power/components/house-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -119,8 +119,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/plugin/power/components/info-dialog.vue b/src/views/modules/visual/plugin/power/components/info-dialog.vue
index eff5c941..e5d0003d 100644
--- a/src/views/modules/visual/plugin/power/components/info-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/info-dialog.vue
@@ -90,8 +90,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 9af2244e..7d35ec28 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -439,6 +439,8 @@ export default {
   display: flex;
   align-items: center;
   cursor: pointer;
+  margin-bottom: 10px;
+  padding: 4px 2px;
   .title-icon {
     display: block;
     width: 46px;
@@ -446,8 +448,9 @@ export default {
     box-sizing: border-box;
     margin-right: 6px;
   }
-  .title-label {
-    font-size: 20px;
+ .title-label {
+    font-size: 22px;
+    font-family: PingFang SC;
     font-weight: 800;
     ::v-deep .el-input {
       width: 180px;

From 548f813b93c5ad4b309c5d4d2d5757cb408ef08a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 12 Jul 2022 17:36:26 +0800
Subject: [PATCH 12/28] 11

---
 .../workSys/role/role-add-or-update.vue       | 148 -------
 src/views/modules/workSys/role/role.vue       | 401 +++++++++++++++---
 src/views/modules/workSys/role/roleForm.vue   | 369 ++++++++++++++++
 3 files changed, 706 insertions(+), 212 deletions(-)
 delete mode 100644 src/views/modules/workSys/role/role-add-or-update.vue
 create mode 100644 src/views/modules/workSys/role/roleForm.vue

diff --git a/src/views/modules/workSys/role/role-add-or-update.vue b/src/views/modules/workSys/role/role-add-or-update.vue
deleted file mode 100644
index c645b634..00000000
--- a/src/views/modules/workSys/role/role-add-or-update.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="name" :label="$t('role.name')">
-        <el-input v-model="dataForm.name" :placeholder="$t('role.name')"></el-input>
-      </el-form-item>
-      <el-form-item prop="remark" :label="$t('role.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('role.remark')"></el-input>
-      </el-form-item>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item size="mini" :label="$t('role.menuList')">
-            <el-tree
-              :data="menuList"
-              :props="{ label: 'name', children: 'children' }"
-              node-key="id"
-              ref="menuListTree"
-              accordion
-              show-checkbox>
-            </el-tree>
-          </el-form-item>
-        </el-col>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item size="mini" :label="$t('role.deptList')">-->
-<!--            <el-tree-->
-<!--              :data="deptList"-->
-<!--              :props="{ label: 'name', children: 'children' }"-->
-<!--              node-key="id"-->
-<!--              ref="deptListTree"-->
-<!--              accordion-->
-<!--              show-checkbox>-->
-<!--            </el-tree>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-      </el-row>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      menuList: [],
-      // deptList: [],
-      dataForm: {
-        id: '',
-        name: '',
-        menuIdList: [],
-        // deptIdList: [],
-        remark: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        this.$refs.menuListTree.setCheckedKeys([])
-        // this.$refs.deptListTree.setCheckedKeys([])
-        Promise.all([
-          this.getMenuList()
-          // this.getDeptList()
-        ]).then(() => {
-          if (this.dataForm.id) {
-            this.getInfo()
-          }
-        })
-      })
-    },
-    // 获取菜单列表
-    getMenuList () {
-      return this.$http.get('/oper/access/menu/select').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.menuList = res.data
-      }).catch(() => {})
-    },
-    // 获取部门列表
-    // getDeptList () {
-    //   return this.$http.get('/sys/dept/list').then(({ data: res }) => {
-    //     if (res.code !== 0) {
-    //       return this.$message.error(res.msg)
-    //     }
-    //     this.deptList = res.data
-    //   }).catch(() => {})
-    // },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/oper/access/operrole/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-        this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
-        // this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.dataForm.menuIdList = [
-          ...this.$refs.menuListTree.getCheckedKeys(),
-          ...this.$refs.menuListTree.getHalfCheckedKeys()
-        ]
-        // this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/access/operrole', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index a3a87e38..c70125bc 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -1,102 +1,375 @@
 <template>
-  <el-card shadow="never"
-           class="aui-card--fill">
-    <div class="mod-sys__role">
+  <div class="div_main">
+    <div class="div_search">
       <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.name"
-                    :placeholder="$t('role.name')"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+
+        <el-form-item label="角色名称"
+                      prop="name">
+          <el-input v-model="formData.name"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    placeholder="请输入角色名称">
+          </el-input>
+
         </el-form-item>
-        <el-form-item>
-          <el-button type="danger"
-                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        <el-form-item label="创建时间"
+                      label-width="110px"
+                      prop="createdTime">
+          <el-date-picker v-model="formData.createdTime"
+                          size="small"
+                          type="datetime"
+                          @change="handleTimeChange"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          placeholder="创建时间">
+          </el-date-picker>
+
         </el-form-item>
+
+        <el-button style="margin-left:30px"
+                   size="small"
+                   class="diy-button--search"
+                   @click="handleSearch">查询</el-button>
+        <el-button style="margin-left:10px"
+                   size="small"
+                   class="diy-button--reset"
+                   @click="resetSearch">重置</el-button>
+
       </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
+    </div>
+    <div class="div_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
-                @selection-change="dataListSelectionChangeHandle"
-                @sort-change="dataListSortChangeHandle"
-                style="width: 100%;">
-        <el-table-column type="selection"
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
                          header-align="center"
                          align="center"
+                         type="index"
                          width="50"></el-table-column>
+
         <el-table-column prop="name"
-                         :label="$t('role.name')"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         label="角色名称"
+                         min-width="100">
+        </el-table-column>
         <el-table-column prop="remark"
-                         :label="$t('role.remark')"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="createDate"
-                         :label="$t('role.createDate')"
-                         sortable="custom"
+                         align="center"
+                         label="备注"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="createdTime"
                          header-align="center"
                          align="center"
-                         width="180"></el-table-column>
-        <el-table-column :label="$t('handle')"
+                         label="创建时间"
+                         min-width="170">
+        </el-table-column>
+
+        <el-table-column label="操作"
                          fixed="right"
+                         width="140"
                          header-align="center"
                          align="center"
-                         width="150">
+                         class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+
+            <el-button v-if="true"
+                       type="text"
+                       class="div-table-button--edit"
                        size="small"
-                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="true"
+                       type="text"
+                       class="div-table-button--delete "
                        size="small"
-                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+                       @click="handleDelete(scope.row)">删除</el-button>
+
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
-                     :page-sizes="[10, 20, 50, 100]"
-                     :page-size="limit"
-                     :total="total"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     @size-change="pageSizeChangeHandle"
-                     @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible"
-                     ref="addOrUpdate"
-                     @refreshDataList="getDataList"></add-or-update>
+      <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-card>
+
+    <!-- 修改弹出框 -->
+    <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 mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './role-add-or-update'
+
+import roleForm from './roleForm'
+
+import { requestPost, requestGet } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/oper/access/operrole/page',
-        getDataListIsPage: true,
-        deleteURL: '/oper/access/operrole',
-        deleteIsBatch: true
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      isResiUser: true,
+
+      agencyId: '',
+
+      timeRange: [],
+      formData: {
+        name: '',//名称
+        createdTime: '',//时间
+
+
       },
-      dataForm: {
-        name: ''
-      }
+
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
     }
   },
   components: {
-    AddOrUpdate
+    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
+
+    },
+
+
+    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)
+      })
+    },
+
+    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/" + array
+
+
+      let params = {
+        ids: [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 = {
+        orgType: 'current',//当前组织:current 根组织：all		
+        name: '',//姓名	
+        mobile: '',//手机号	
+        idCard: '',//身份证号码	
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+      }
+      this.timeRange = []
+
+      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()
+      }
+    }
+  },
+  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 >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
new file mode 100644
index 00000000..289db50e
--- /dev/null
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='detail'"
+               class="form">
+
+        <el-form-item label="角色名称"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入角色名称"
+                    clearable
+                    v-model="formData.name">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 5, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入备注"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <el-form-item label="管理平台菜单"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-tree class="item_width_1"
+                   :data="menuList"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   ref="menuListTree"
+                   accordion
+                   show-checkbox>
+          </el-tree>
+        </el-form-item>
+        <el-form-item label="可视化平台菜单"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-tree class="item_width_1 item_border"
+                   :data="menuListShuju"
+                   :props="{ label: 'name', children: 'children' }"
+                   node-key="id"
+                   ref="menuListShujuTree"
+                   accordion
+                   show-checkbox>
+          </el-tree>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+
+
+      btnDisable: false,
+
+      roleId: '',
+      menuList: [],
+      menuListShuju: [],
+      formData: {
+        id: '',
+        name: '',
+        remark: '',//备注
+        menuIdList: [],
+        customerId: ''
+      },
+
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+    //获取菜单
+    await this.getMenuList()
+    await this.getMenuShujuList()
+  },
+
+  methods: {
+
+    async initForm (type, roleId) {
+      this.startLoading()
+      this.customerId = localStorage.getItem("customerId");
+      this.formData.customerId = this.customerId
+
+      this.$refs['ref_form'].resetFields();
+      this.$refs.menuListTree.setCheckedKeys([])
+      this.$refs.menuListShujuTree.setCheckedKeys([])
+
+      this.formType = type
+
+      if (roleId) {
+        this.roleId = roleId
+        this.formData.id = roleId
+        this.loadFormData()
+      }
+
+      this.endLoading()
+
+
+    },
+
+
+    async getMenuList () {
+      const url = "/gov/access/menu/nav"
+
+      let params = {}
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.menuList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getMenuShujuList () {
+      const url = "/gov/access/menu/nav"
+
+      let params = {
+        tableName: 'data_menu'
+      }
+
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+        this.menuListShuju = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+      const url = '/gov/access/govrole/' + this.roleId
+      let params = {
+
+      }
+      const { data, code, msg } = await requestGet(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        this.formData.menuIdList.forEach(item => {
+          this.$refs.menuListTree.setChecked(item, true)
+          this.$refs.menuListShujuTree.setChecked(item, true)
+        })
+        this.formData.customerId = this.customerId
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleComfirm () {
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+
+        } else {
+          this.addNat()
+        }
+
+      })
+    },
+
+    async addNat () {
+
+      // let menuList1 = [
+      //   ...this.$refs.menuListTree.getCheckedKeys(),
+      //   ...this.$refs.menuListTree.getHalfCheckedKeys(),
+      // ]
+      // let menuList2 = [
+      //   ...this.$refs.menuListShujuTree.getCheckedKeys(),
+      //   ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
+      // ]
+
+      //   console.log('menuList1', menuList1)
+      //   console.log('menuList2', menuList2)
+      // let menuAll=menuList1.concat(menuList2)
+      // console.log('menuAll',menuAll)
+      this.formData.menuIdList = []
+      this.formData.menuIdList = [
+        ...this.$refs.menuListTree.getCheckedKeys(),
+        ...this.$refs.menuListTree.getHalfCheckedKeys(),
+        ...this.$refs.menuListShujuTree.getCheckedKeys(),
+        ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
+      ]
+
+      console.log('menuAll', this.formData)
+
+      // return false
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/access/govrole/save'
+
+        this.formData.roleId = ''
+
+      } else {
+        url = '/gov/access/govrole/edit'
+
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+
+
+    resetData () {
+      this.roleId = ''
+      this.fileList = []
+      this.hideUploadEdit = false
+
+      this.formData = {
+        roleId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
+        name: '',
+        idCard: '',
+        mobile: '',
+        natTime: '',
+        natAddress: '',
+        natResult: '',
+        isSelChannel: false,
+        channel: [],
+        content: '',
+
+        fileName: '',//附件名	
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
+        attachmentUrl: '',//附件地址	
+
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_border {
+  border: 1px;
+  border-radius: 50%;
+}
+</style>
+
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
+

From 961c29a2b5f7689811b95df9daf23cc51ba09f1d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 12 Jul 2022 17:42:03 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E6=9C=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/basicInfoMain.scss      | 10 +++++-----
 src/assets/scss/modules/visual/fiveLayerMap.scss       |  6 ++----
 .../visual/basicinfo/houseStatic/houseStatic.vue       |  2 +-
 src/views/modules/visual/communityParty/elegant.vue    |  2 +-
 src/views/modules/visual/communityParty/party.vue      |  2 +-
 src/views/modules/visual/measure/service.vue           |  2 +-
 src/views/modules/visual/warning/index.vue             |  2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index f7e53229..0dced778 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -41,7 +41,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(840px - 15px);
+    height: calc(825px - 15px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -110,7 +110,7 @@
       box-sizing: border-box;
       width: 100%;
 
-      height: calc(840px - 10px);
+      height: calc(825px - 10px);
       color: #fff;
       background: url("../../../img/modules/visual/fenlei-box.png") no-repeat center;
       background-size: 100% 100%;
@@ -211,7 +211,7 @@
   flex: 0 0 calc(1919px - 620px);
   // width: calc(1919px - 560px);
 
-  height: calc(840px - 10px);
+  height: calc(825px - 10px);
   color: #fff;
   background: url("../../../img/modules/visual/warning-box.png") no-repeat center;
   background-size: 100% 100%;
@@ -252,11 +252,11 @@
     box-sizing: border-box;
 
     margin-top: 9px;
-    height: calc(840px - 120px);
+    height: calc(825px - 120px);
   }
 
   .div_room {
-    // height: calc(840px - 40px);
+    // height: calc(825px - 40px);
     // margin-top: 9px;
     display: flex;
     flex-wrap: wrap;
diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss
index 34732393..1b01dc8e 100644
--- a/src/assets/scss/modules/visual/fiveLayerMap.scss
+++ b/src/assets/scss/modules/visual/fiveLayerMap.scss
@@ -164,7 +164,7 @@
       color: #fff;
 
       .div_search_list {
-        margin: 10px auto;
+        margin: 6px auto;
         text-align: center;
         width: 590px;
         height: 48px;
@@ -207,7 +207,7 @@
      
      
       .tb {
-        height: calc(810px - 302px - 10px - 150px);
+        height: calc(810px - 302px - 20px - 150px);
         overflow-y: auto;
         @include scrollBar;
         margin-top:20px;
@@ -216,8 +216,6 @@
       .m-pagination {
         // position: absolute;
         box-sizing: border-box;
-        right: 5px;
-        bottom: 5px;
         width: 100%;
         height: 40px;
         display: flex;
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 893f8c5b..462110fa 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -12,7 +12,7 @@
         <span class="router_child">{{orgName}}</span>
       </div>
     </div>
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon"
              src="@/assets/img/shuju/title-tip.png" />
diff --git a/src/views/modules/visual/communityParty/elegant.vue b/src/views/modules/visual/communityParty/elegant.vue
index d4f4d0f7..bc45c547 100644
--- a/src/views/modules/visual/communityParty/elegant.vue
+++ b/src/views/modules/visual/communityParty/elegant.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card class="card-wr">
+    <cpt-card :min-full-screen="true" class="card-wr">
       <div class="card-title">
         <img class="title-icon"
              src="../../../../assets/img/shuju/title-tip.png" />
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index d96ed7f6..e1a4fc83 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 13841e45..150fc5f2 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="card-title">
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue
index 6be5ddbc..3ed6dc27 100644
--- a/src/views/modules/visual/warning/index.vue
+++ b/src/views/modules/visual/warning/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="warning-box">
-    <cpt-card>
+    <cpt-card :min-full-screen="true">
       <div class="warning-box-top">
         <div class="top-item" v-for="(item, index) in warningList" :key="index">
           <div class="top-item-img">

From be1b79b16a1dabf6e66d04ea9e6b3dd38a20e430 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 13 Jul 2022 14:00:34 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |    4 +-
 .../base/organization/organization.vue        | 4529 +++++++++--------
 src/views/modules/workSys/role/role.vue       |   26 +-
 src/views/modules/workSys/role/roleForm.vue   |   31 +-
 4 files changed, 2430 insertions(+), 2160 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index ad616091..a3c1e3f3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => {
   // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 
   http
-    .get("/gov/access/menu/nav?tableName=data_menu")
+    .get("gov/access/menu/navDigitalCommunity?tableName=data_menu")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => {
     });
 
   http
-    .get("/gov/access/menu/nav")
+    .get("gov/access/menu/navDigitalCommunity")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 8860180f..c61ba5f5 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,2236 +1,2477 @@
 <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="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.departmentId)"
-                    >进入</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <!-- 网格列表 -->
-        <el-table v-show="gridTableFlag"
-        height="250" 
-        :data="gridTableListData"
-        style="width: 100%">
-            <el-table-column prop="gridName" label="直属网格"></el-table-column>
-            <el-table-column prop="gridTypeName" label="网格类型"></el-table-column>
-            <el-table-column prop="contacts" label="联系人"></el-table-column>
-            <el-table-column prop="mobile" label="联系人电话"></el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot="header" slot-scope="scope">
-                    <el-button size="mini"
-                        type="primary"
-                        icon="el-icon-plus"
-                        @click="addGrid(scope.row)"
-                    >新增</el-button>
-                </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 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 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>
-                </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="30%"
-        :before-close="handleClose">
-            <el-form :rules="rules">
-                <el-form-item label="部门名称" prop="addDepartmentName">
-                    <el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input>
-                </el-form-item>
-                <el-form-item label="组织编码" prop="code">
-                    <el-input v-model="insertForm.code" placeholder="请输入组织编码"></el-input>
-                </el-form-item>
-                <el-form-item label="联系人" prop="contacts">
-                    <el-input  v-model="insertForm.contacts" placeholder="请输入联系人姓名"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话" prop="mobile">
-                    <el-input v-model="insertForm.mobile" placeholder="请输入联系电话"></el-input>
-                </el-form-item>
-            </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="60%"
-            :before-close="handleClose">
-                <el-form :rules="rules">
-                    <el-form-item label="网格名称" prop="gridName">
-                        <el-input v-model="GridForm.gridName" placeholder="请输入部门名称"></el-input>
-                    </el-form-item>
-                    <el-form-item label="网格编码" prop="GridCode">
-                        <el-input v-model="GridForm.code" placeholder="请输入网格编码"></el-input>
-                    </el-form-item>
-
-                    <!-- 网格类型，下拉框 -->
-                    <el-form-item label="网格类型" prop="typeTag">
-                        <el-select v-model="GridForm.gridType" clearable placeholder="网格类型">
-                            <el-option v-for="item in typeList" 
-                                :key="item.value" 
-                                :label="item.label" 
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item label="联系人" prop="GridContacts">
-                        <el-input  v-model="GridForm.contacts" placeholder="请输入联系人姓名"></el-input>
-                    </el-form-item>
-                    <el-form-item label="联系电话" prop="GridMobile">
-                        <el-input v-model="GridForm.mobile" placeholder="请输入联系电话"></el-input>
-                    </el-form-item>
-
-                    <!-- 组织位置 -->
-                    <el-form-item>
-                        <div id="container">当前点击坐标为：<span id="position"></span></div>
-                    </el-form-item>
-
-                </el-form>
-
-                <div slot="footer" >
-                    <el-button @click="cancelGrid">取 消</el-button>
-                    <el-button type="primary" @click="submitGrid">确 定</el-button>
-                </div>
-            </el-dialog>
+  <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="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.departmentId)">进入</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 网格列表 -->
+    <el-table v-show="gridTableFlag"
+              height="250"
+              :data="gridTableListData"
+              style="width: 100%">
+      <el-table-column prop="gridName"
+                       label="直属网格"></el-table-column>
+      <el-table-column prop="gridTypeName"
+                       label="网格类型"></el-table-column>
+      <el-table-column prop="contacts"
+                       label="联系人"></el-table-column>
+      <el-table-column prop="mobile"
+                       label="联系人电话"></el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       class-name="small-padding fixed-width">
+        <template slot="header"
+                  slot-scope="scope">
+          <el-button size="mini"
+                     type="primary"
+                     icon="el-icon-plus"
+                     @click="addGrid(scope.row)">新增</el-button>
+        </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 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 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>
+        </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="30%"
+               :before-close="handleClose">
+      <el-form :rules="rules">
+        <el-form-item label="部门名称"
+                      prop="addDepartmentName">
+          <el-input v-model="insertForm.departmentName"
+                    placeholder="请输入部门名称"></el-input>
+        </el-form-item>
+        <el-form-item label="组织编码"
+                      prop="code">
+          <el-input v-model="insertForm.code"
+                    placeholder="请输入组织编码"></el-input>
+        </el-form-item>
+        <el-form-item label="联系人"
+                      prop="contacts">
+          <el-input v-model="insertForm.contacts"
+                    placeholder="请输入联系人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      prop="mobile">
+          <el-input v-model="insertForm.mobile"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+      </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="60%"
+                 :before-close="handleClose">
+        <el-form :rules="rules">
+          <el-form-item label="网格名称"
+                        prop="gridName">
+            <el-input v-model="GridForm.gridName"
+                      placeholder="请输入部门名称"></el-input>
+          </el-form-item>
+          <el-form-item label="网格编码"
+                        prop="GridCode">
+            <el-input v-model="GridForm.code"
+                      placeholder="请输入网格编码"></el-input>
+          </el-form-item>
+
+          <!-- 网格类型，下拉框 -->
+          <el-form-item label="网格类型"
+                        prop="typeTag">
+            <el-select v-model="GridForm.gridType"
+                       clearable
+                       placeholder="网格类型">
+              <el-option v-for="item in typeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="联系人"
+                        prop="GridContacts">
+            <el-input v-model="GridForm.contacts"
+                      placeholder="请输入联系人姓名"></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="GridMobile">
+            <el-input v-model="GridForm.mobile"
+                      placeholder="请输入联系电话"></el-input>
+          </el-form-item>
+
+          <!-- 组织位置 -->
+          <el-form-item>
+            <div id="container">当前点击坐标为：<span id="position"></span></div>
+          </el-form-item>
+
+        </el-form>
+
+        <div slot="footer">
+          <el-button @click="cancelGrid">取 消</el-button>
+          <el-button type="primary"
+                     @click="submitGrid">确 定</el-button>
         </div>
+      </el-dialog>
+    </div>
 
-        <!-- 新增人员 -->
-        <div v-if="dialogVisiblePeo">
-            <el-dialog 
-            title="新增人员"
-            :visible.sync="dialogVisiblePeo"
-            width="30%"
-            :before-close="handleClose">
-                <el-form>
-                    <el-form-item label="姓名" prop="peoName">
-                        <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
-                    </el-form-item>
-                    <el-form-item label="手机号" prop="mobile">
-                        <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
-                    </el-form-item>
-                    <!-- 性别下拉框 -->
-                    <el-form-item label="性别" prop="gender">
-                        <el-select v-model="peoForm.gender" clearable placeholder="性别">
-                            <el-option v-for="item in genderList" 
-                                :key="item.value" 
-                                :label="item.label" 
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 专兼职下拉框 -->
-                    <el-form-item label="专兼职" prop="post">
-                        <el-select v-model="peoForm.post" clearable placeholder="专兼职">
-                            <el-option v-for="item in postList" 
-                                :key="item.value" 
-                                :label="item.label" 
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 职责下拉框 -->
-                    <el-form-item label="职责" prop="duty">
-                        <el-select v-model="peoForm.duty" multiple placeholder="请选择">
-                            <el-option
-                            v-for="item in dutyList"
-                            :key="item.roleId"
-                            :label="item.roleName"
-                            :value="item.roleId"
-                            :disabled="item.disabled">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-
-                </el-form>
-                <div slot="footer" >
-                    <el-button @click="cancelPeo">取 消</el-button>
-                    <el-button type="primary" @click="submitPeo">确 定</el-button>
-                </div>
-            </el-dialog>
+    <!-- 新增人员 -->
+    <div v-if="dialogVisiblePeo">
+      <el-dialog title="新增人员"
+                 :visible.sync="dialogVisiblePeo"
+                 width="30%"
+                 :before-close="handleClose">
+        <el-form>
+          <el-form-item label="姓名"
+                        prop="peoName">
+            <el-input v-model="peoForm.name"
+                      placeholder="请输入姓名"></el-input>
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="peoForm.mobile"
+                      placeholder="请输入手机号"></el-input>
+          </el-form-item>
+          <!-- 性别下拉框 -->
+          <el-form-item label="性别"
+                        prop="gender">
+            <el-select v-model="peoForm.gender"
+                       clearable
+                       placeholder="性别">
+              <el-option v-for="item in genderList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 专兼职下拉框 -->
+          <el-form-item label="专兼职"
+                        prop="post">
+            <el-select v-model="peoForm.post"
+                       clearable
+                       placeholder="专兼职">
+              <el-option v-for="item in postList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 职责下拉框 -->
+          <el-form-item label="职责"
+                        prop="duty">
+            <el-select v-model="peoForm.duty"
+                       multiple
+                       placeholder="请选择">
+              <el-option v-for="item in dutyList"
+                         :key="item.roleId"
+                         :label="item.roleName"
+                         :value="item.roleId"
+                         :disabled="item.disabled">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="角色"
+                        prop="newRoles">
+            <el-select v-model="peoForm.newRoles"
+                       multiple
+                       placeholder="请选择">
+              <el-option v-for="item in roleList"
+                         :key="item.id"
+                         :label="item.name"
+                         :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer">
+          <el-button @click="cancelPeo">取 消</el-button>
+          <el-button type="primary"
+                     @click="submitPeo">确 定</el-button>
         </div>
+      </el-dialog>
+    </div>
 
-        <!-- 人员修改 -->
-        <el-dialog 
-        title="人员修改"
-        :visible.sync="modifyPeo"
-        width="30%"
-        :before-close="handleClose">
-            <el-form >
-                <el-form-item label="姓名" prop="peoName">
-                    <el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input>
-                </el-form-item>
-                <el-form-item label="手机号" prop="mobile">
-                    <el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input>
-                </el-form-item>
-                <el-form-item label="性别" prop="gender">
-                    <el-select v-model="peoForm.gender" clearable placeholder="性别">
-                        <el-option v-for="item in genderList" 
-                            :key="item.value" 
-                            :label="item.label" 
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="专兼职" prop="post">
-                    <el-select v-model="peoForm.post" clearable placeholder="专兼职">
-                        <el-option v-for="item in postList" 
-                            :key="item.value" 
-                            :label="item.label" 
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="职责" prop="duty">
-                    <el-select v-model="peoForm.duty" multiple placeholder="请选择">
-                        <el-option
-                        v-for="item in dutyList"
-                        :key="item.roleId"
-                        :label="item.roleName"
-                        :value="item.roleId"
-                        :disabled="item.disabled">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="cancelXiugai">取 消</el-button>
-                <el-button type="primary" @click="updatePeo">确 定</el-button>
-            </div>
-        </el-dialog>
-
-        <!-- 禁用弹窗 -->
-        <el-dialog 
-        title="确认禁用"
-        :visible.sync="Disable"
-        width="30%"
-        :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
-        title="人员详情"
-        :visible.sync="details"
-        width="30%"
-        :before-close="handleClosePeoView">
-            <el-form>
-                <el-form-item label="姓名" >
-                    <el-input  v-model="peoForm.name" placeholder="姓名" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="手机号" >
-                    <el-input  v-model="peoForm.mobile" placeholder="手机号" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="组织/部门" >
-                    <el-input  v-model="peoForm.zuzhi" placeholder="组织/部门" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="激活时间" >
-                    <el-input  v-model="peoForm.activeTime" placeholder="激活时间" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="职位" >
-                    <el-input  v-model="peoForm.duty" placeholder="职位" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="是否禁用">
-                    <el-input v-model="peoForm.disableFlag" placeholder="是否禁用" :disabled="true"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" >
-                <el-button type="primary" style="margin-right:170px" @click="cancelDetails">关 闭</el-button>
-            </div>
-        </el-dialog>
-
-        <!-- 人员调动 -->
-        <el-dialog 
-        title="人员调动"
-        :visible.sync="transferPeo"
-        width="30%"
-        :before-close="handleClose">
-            <el-form :model="agencyForm">
-                <el-form-item label="姓名">
-                    <el-input v-model="transferForm.name" placeholder="姓名"></el-input>
-                </el-form-item>
-                <el-form-item label="调动至">
-                    <el-cascader 
-                        clearable
-                        :props="{ checkStrictly: true }"
-                        v-model="selectValue"
-                        :options="options"
-                        @change="handleChange">
-                    </el-cascader>
-                </el-form-item>
-                <el-form-item label="调动原因">
-                    <el-input
-                    type="textarea"
+    <!-- 人员修改 -->
+    <el-dialog title="人员修改"
+               :visible.sync="modifyPeo"
+               width="30%"
+               :before-close="handleClose">
+      <el-form>
+        <el-form-item label="姓名"
+                      prop="peoName">
+          <el-input v-model="peoForm.name"
+                    placeholder="请输入姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号"
+                      prop="mobile">
+          <el-input v-model="peoForm.mobile"
+                    placeholder="请输入手机号"></el-input>
+        </el-form-item>
+        <el-form-item label="性别"
+                      prop="gender">
+          <el-select v-model="peoForm.gender"
+                     clearable
+                     placeholder="性别">
+            <el-option v-for="item in genderList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="专兼职"
+                      prop="post">
+          <el-select v-model="peoForm.post"
+                     clearable
+                     placeholder="专兼职">
+            <el-option v-for="item in postList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="职责"
+                      prop="duty">
+          <el-select v-model="peoForm.duty"
+                     multiple
+                     placeholder="请选择">
+            <el-option v-for="item in dutyList"
+                       :key="item.roleId"
+                       :label="item.roleName"
+                       :value="item.roleId"
+                       :disabled="item.disabled">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="角色"
+                      prop="newRoles">
+          <el-select v-model="peoForm.newRoles"
+                     multiple
+                     placeholder="请选择">
+            <el-option v-for="item in roleList"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer">
+        <el-button @click="cancelXiugai">取 消</el-button>
+        <el-button type="primary"
+                   @click="updatePeo">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 禁用弹窗 -->
+    <el-dialog title="确认禁用"
+               :visible.sync="Disable"
+               width="30%"
+               :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 title="人员详情"
+               :visible.sync="details"
+               width="30%"
+               :before-close="handleClosePeoView">
+      <el-form>
+        <el-form-item label="姓名">
+          <el-input v-model="peoForm.name"
+                    placeholder="姓名"
+                    :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="peoForm.mobile"
+                    placeholder="手机号"
+                    :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="组织/部门">
+          <el-input v-model="peoForm.zuzhi"
+                    placeholder="组织/部门"
+                    :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="激活时间">
+          <el-input v-model="peoForm.activeTime"
+                    placeholder="激活时间"
+                    :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="职位">
+          <el-input v-model="peoForm.duty"
+                    placeholder="职位"
+                    :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="是否禁用">
+          <el-input v-model="peoForm.disableFlag"
+                    placeholder="是否禁用"
+                    :disabled="true"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary"
+                   style="margin-right:170px"
+                   @click="cancelDetails">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 人员调动 -->
+    <el-dialog title="人员调动"
+               :visible.sync="transferPeo"
+               width="30%"
+               :before-close="handleClose">
+      <el-form :model="agencyForm">
+        <el-form-item label="姓名">
+          <el-input v-model="transferForm.name"
+                    placeholder="姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="调动至">
+          <el-cascader clearable
+                       :props="{ checkStrictly: true }"
+                       v-model="selectValue"
+                       :options="options"
+                       @change="handleChange">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="调动原因">
+          <el-input type="textarea"
                     :rows="2"
                     placeholder="请输入内容"
                     maxlength="500"
                     show-word-limit
                     v-model="transferForm.remarks">
-                    </el-input>
-                </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
-        title="新增组织"
-        :visible.sync="createAgencyDialogFlag"
-        width="60%"
-        :before-close="handleClose">
-            <el-form>
-                <el-form-item label="组织名称">
-                    <el-input v-model="agencyForm.agencyName" placeholder="请输入组织名称"></el-input>
-                </el-form-item>
-
-                <!-- 组织区划 -->
-                <el-form-item label="组织区划">
-                    <el-select v-model="agencyForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
-                        <el-option 
-                        v-for="item in zonings"
-                        :key="item.areaCode"
-                        :label="item.areaName"
-                        :value="item.areaCode">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="组织编码">
-                    <el-input v-model="agencyForm.code" placeholder="请输入组织编码"></el-input>
-                </el-form-item>
-                <el-form-item label="负责人">
-                    <el-input v-model="agencyForm.contacts" placeholder="请输入负责人名字"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-input v-model="agencyForm.mobile" placeholder="请输入联系电话"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <div id="con"></div>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="canceladdNewAgency">取 消</el-button>
-                <el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
-            </div>
-        </el-dialog>
-
-
-        <!-- 修改市区级组织 -->
-        <el-dialog
-        title="修改组织"
-        :visible.sync="modifyCityOrgPop"
-        width="60%"
-        :before-close="handleClose">
-            <el-form>
-                <el-form-item label="组织名称">
-                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
-                </el-form-item>
-
-                <el-form-item label="组织编码">
-                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
-                </el-form-item>
-                <el-form-item label="负责人">
-                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <div id="con"></div>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
-                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
-            </div>
-        </el-dialog>
-
-
-        <!-- 修改街道/社区级组织 -->
-        <el-dialog
-        title="修改组织"
-        :visible.sync="streetOrCommunity"
-        width="60%"
-        :before-close="handleClose">
-            <el-form>
-                <el-form-item label="组织名称">
-                    <el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input>
-                </el-form-item>
-
-                 <!-- 组织区划 -->
-                <el-form-item label="组织区划">
-                    <el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
-                        <el-option 
-                        v-for="item in zonings"
-                        :key="item.areaCode"
-                        :label="item.areaName"
-                        :value="item.areaCode">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="组织编码">
-                    <el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input>
-                </el-form-item>
-                <el-form-item label="负责人">
-                    <el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <div id="con"></div>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="cancelstreetOrCommunity">取 消</el-button>
-                <el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
-            </div>
-        </el-dialog>
-
-
-        <!-- 修改下级机关单位 -->
-        <el-dialog
-        title="修改部门"
-        :visible.sync="OrgUnitPop"
-        width="60%"
-        :before-close="handleClose">
-            <el-form>
-                <el-form-item label="部门名称">
-                    <el-input v-model="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input>
-                </el-form-item>
-
-                <el-form-item label="组织编码">
-                    <el-input v-model="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input>
-                </el-form-item>
-                <el-form-item label="负责人">
-                    <el-input v-model="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="cancelOrgUnitPop">取 消</el-button>
-                <el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
-            </div>
-        </el-dialog>
-
-
-        <!-- 修改网格 -->
-        <el-dialog
-        title="修改网格"
-        :visible.sync="modifyGridPop"
-        width="60%"
-        :before-close="handleClose">
-            <el-form>
-                <el-form-item label="网格名称">
-                    <el-input v-model="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input>
-                </el-form-item>
-
-                <el-form-item label="组织编码">
-                    <el-input v-model="modifyGridFrom.code" placeholder="请输入组织编码"></el-input>
-                </el-form-item>
-
-                <!-- 网格类型下拉框 -->
-                <el-form-item label="网格类型" prop="typeTag">
-                        <el-select v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
-                            <el-option v-for="item in typeList" 
-                                :key="item.value" 
-                                :label="item.label" 
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-
-                <el-form-item label="负责人">
-                    <el-input v-model="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-input v-model="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input>
-                </el-form-item>
-
-                <!-- 组织位置,地图 -->
-                <el-form-item>
-                    <div id="con"></div>
-                </el-form-item>
-
-            </el-form>
-            <div slot="footer" >
-                <el-button @click="cancelModifyGridPop">取 消</el-button>
-                <el-button type="primary" @click="submitModifyGrid">确 定</el-button>
-            </div>
-        </el-dialog>
-
-    </div>
+          </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 title="新增组织"
+               :visible.sync="createAgencyDialogFlag"
+               width="60%"
+               :before-close="handleClose">
+      <el-form>
+        <el-form-item label="组织名称">
+          <el-input v-model="agencyForm.agencyName"
+                    placeholder="请输入组织名称"></el-input>
+        </el-form-item>
+
+        <!-- 组织区划 -->
+        <el-form-item label="组织区划">
+          <el-select v-model="agencyForm.areaCode"
+                     placeholder="请选择组织区划"
+                     @change="handelZoing">
+            <el-option v-for="item in zonings"
+                       :key="item.areaCode"
+                       :label="item.areaName"
+                       :value="item.areaCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="组织编码">
+          <el-input v-model="agencyForm.code"
+                    placeholder="请输入组织编码"></el-input>
+        </el-form-item>
+        <el-form-item label="负责人">
+          <el-input v-model="agencyForm.contacts"
+                    placeholder="请输入负责人名字"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="agencyForm.mobile"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <div id="con"></div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="canceladdNewAgency">取 消</el-button>
+        <el-button type="primary"
+                   @click="submitaddNewAgency">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 修改市区级组织 -->
+    <el-dialog title="修改组织"
+               :visible.sync="modifyCityOrgPop"
+               width="60%"
+               :before-close="handleClose">
+      <el-form>
+        <el-form-item label="组织名称">
+          <el-input v-model="OrgDetailsForm.agencyName"
+                    placeholder="请输入组织名称"></el-input>
+        </el-form-item>
+
+        <el-form-item label="组织编码">
+          <el-input v-model="OrgDetailsForm.code"
+                    placeholder="请输入组织编码"></el-input>
+        </el-form-item>
+        <el-form-item label="负责人">
+          <el-input v-model="OrgDetailsForm.contacts"
+                    placeholder="请输入负责人名字"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="OrgDetailsForm.mobile"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <div id="con"></div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
+        <el-button type="primary"
+                   @click="sunmitModifyCityOrgPop">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 修改街道/社区级组织 -->
+    <el-dialog title="修改组织"
+               :visible.sync="streetOrCommunity"
+               width="60%"
+               :before-close="handleClose">
+      <el-form>
+        <el-form-item label="组织名称">
+          <el-input v-model="OrgDetailsForm.agencyName"
+                    placeholder="请输入组织名称"></el-input>
+        </el-form-item>
+
+        <!-- 组织区划 -->
+        <el-form-item label="组织区划">
+          <el-select v-model="OrgDetailsForm.areaCode"
+                     placeholder="请选择组织区划"
+                     @change="handelStreeOrCommunityZoing">
+            <el-option v-for="item in zonings"
+                       :key="item.areaCode"
+                       :label="item.areaName"
+                       :value="item.areaCode">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="组织编码">
+          <el-input v-model="OrgDetailsForm.code"
+                    placeholder="请输入组织编码"></el-input>
+        </el-form-item>
+        <el-form-item label="负责人">
+          <el-input v-model="OrgDetailsForm.contacts"
+                    placeholder="请输入负责人名字"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="OrgDetailsForm.mobile"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <div id="con"></div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="cancelstreetOrCommunity">取 消</el-button>
+        <el-button type="primary"
+                   @click="sunmitModifyCityOrgPop">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 修改下级机关单位 -->
+    <el-dialog title="修改部门"
+               :visible.sync="OrgUnitPop"
+               width="60%"
+               :before-close="handleClose">
+      <el-form>
+        <el-form-item label="部门名称">
+          <el-input v-model="OrgUnitDetailsForm.departmentName"
+                    placeholder="请输入组织名称"></el-input>
+        </el-form-item>
+
+        <el-form-item label="组织编码">
+          <el-input v-model="OrgUnitDetailsForm.code"
+                    placeholder="请输入组织编码"></el-input>
+        </el-form-item>
+        <el-form-item label="负责人">
+          <el-input v-model="OrgUnitDetailsForm.contacts"
+                    placeholder="请输入负责人名字"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="OrgUnitDetailsForm.mobile"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="cancelOrgUnitPop">取 消</el-button>
+        <el-button type="primary"
+                   @click="sunmitOrgUnitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 修改网格 -->
+    <el-dialog title="修改网格"
+               :visible.sync="modifyGridPop"
+               width="60%"
+               :before-close="handleClose">
+      <el-form>
+        <el-form-item label="网格名称">
+          <el-input v-model="modifyGridFrom.gridName"
+                    placeholder="请输入组织名称"></el-input>
+        </el-form-item>
+
+        <el-form-item label="组织编码">
+          <el-input v-model="modifyGridFrom.code"
+                    placeholder="请输入组织编码"></el-input>
+        </el-form-item>
+
+        <!-- 网格类型下拉框 -->
+        <el-form-item label="网格类型"
+                      prop="typeTag">
+          <el-select v-model="modifyGridFrom.gridType"
+                     clearable
+                     placeholder="网格类型">
+            <el-option v-for="item in typeList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="负责人">
+          <el-input v-model="modifyGridFrom.contacts"
+                    placeholder="请输入负责人名字"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="modifyGridFrom.mobile"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+
+        <!-- 组织位置,地图 -->
+        <el-form-item>
+          <div id="con"></div>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer">
+        <el-button @click="cancelModifyGridPop">取 消</el-button>
+        <el-button type="primary"
+                   @click="submitModifyGrid">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
 
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 
 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: '',
-            parentAreaCode: '',
-            parentAgencyId: localStorage.getItem("agencyId"),
-            parentAgencyLevel: localStorage.getItem("level"),
-           
-            // 经纬度坐标
-            lat:'11',
-            lng:'11',
-            latitude:'11',
-            longitude:'11',
-            Navigation:'',
-            // 查询参数
-            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:'123'
-            },
-            // 网格添加表单项
-            GridForm:{
-                gridName:'',
-                code:'',
-                contacts:'',
-                mobile:'',
-                agencyId:'',
-                manageDistrict:'',
-                gridType:'',
-                location: '', //坐标位置
-                longitude: '11', //经度
-                latitude: '11' ,//纬度
-                centerAddress:''
-            },
-            // 新增组织
-            agencyForm:{
-                parentAgencyId:'',
-                agencyName:'',
-                level:'',
-                areaCodeSwitch:'',
-                areaCode:'',
-                areaName:'',
-                contacts:'',
-                mobile:'',
-                code:''
-            },
-            // 树
-            tree:[],
-            // 新增人员表单项
-            peoForm:{
-                name:'',
-                mobile:'',
-                gender:'',
-                post:'',
-                duty:[],
-                orgType:'',
-                activeTime:'',
-                zuzhi:'',
-                disableFlag:''
+  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: '',
+      parentAreaCode: '',
+      parentAgencyId: localStorage.getItem("agencyId"),
+      parentAgencyLevel: localStorage.getItem("level"),
+
+      // 经纬度坐标
+      lat: '11',
+      lng: '11',
+      latitude: '11',
+      longitude: '11',
+      Navigation: '',
+      // 查询参数
+      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: '123'
+      },
+      // 网格添加表单项
+      GridForm: {
+        gridName: '',
+        code: '',
+        contacts: '',
+        mobile: '',
+        agencyId: '',
+        manageDistrict: '',
+        gridType: '',
+        location: '', //坐标位置
+        longitude: '11', //经度
+        latitude: '11',//纬度
+        centerAddress: ''
+      },
+      // 新增组织
+      agencyForm: {
+        parentAgencyId: '',
+        agencyName: '',
+        level: '',
+        areaCodeSwitch: '',
+        areaCode: '',
+        areaName: '',
+        contacts: '',
+        mobile: '',
+        code: ''
+      },
+      // 树
+      tree: [],
+      // 新增人员表单项
+      peoForm: {
+        name: '',
+        mobile: '',
+        gender: '',
+        post: '',
+        duty: [],
+        orgType: '',
+        activeTime: '',
+        zuzhi: '',
+        disableFlag: '',
+        newRoles: []
+      },
+      // 人员调动
+      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: ''
+      },
+      judgeOrgInfoLevel: [],
+      keyWords: '',
+      typeList: [],
+      // 性别字典
+      genderList: [
+        { value: '1', label: '男' },
+        { value: '2', label: '女' },
+      ],
+      // 专兼职字典
+      postList: [
+        { value: 'fulltime', label: '专职' },
+        { value: 'parttime', label: '兼职' }
+      ],
+      // 职责字典
+      dutyList: [],
+      // 修改操作是否展示
+      modifyPeo: false,
+
+      roleList: [],
+
+      // 级联数据
+      options: [
+        {
+          value: '',
+          label: '',
+          children: [
+            {
+              value: '',
+              label: '',
+              children: []
             },
-            // 人员调动
-            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:''
-            },
-            judgeOrgInfoLevel:[],
-            keyWords: '',
-            typeList:[],
-            // 性别字典
-            genderList: [
-                {value: '1', label: '男'},
-                {value: '2', label: '女'},
-            ],
-            // 专兼职字典
-            postList:[
-                {value: 'fulltime' , label: '专职'},
-                {value: 'parttime' , label: '兼职'}
-            ],
-            // 职责字典
-            dutyList:[],
-            // 修改操作是否展示
-            modifyPeo:false,
-            
-            // 级联数据
-            options:[
-                {
-                    value:'',
-                    label:'',
-                    children:[
-                        {
-                            value:'',
-                            label:'',
-                            children:[]
-                        },
-                        {
-                            value:'',
-                            label:'',
-                            children:[]
-                        }
-                    ],
-                }
-            ],
-            selectValue: [],
-            // 顶部 面包屑
-            breadcrumbArr: [],
-            // 面包屑 当前所属机构ID
-            currentBreadcrumbKey: '',
-            // 组织区划数据
-            zonings:[],
-            // 校验
-            rules: {
-                departmentName:[
-                    { required: true, message: '社区名称必填', trigger: 'blur' }
-                ],
-                gridName:[
-                    { required: true, message: '网格名称必填', trigger: 'blur' }
-                ],
-                addDepartmentName:[
-                    { required: true, message: '部门名称必填', trigger: 'blur' }
-                ]
+            {
+              value: '',
+              label: '',
+              children: []
             }
+          ],
+        }
+      ],
+      selectValue: [],
+      // 顶部 面包屑
+      breadcrumbArr: [],
+      // 面包屑 当前所属机构ID
+      currentBreadcrumbKey: '',
+      // 组织区划数据
+      zonings: [],
+      // 校验
+      rules: {
+        departmentName: [
+          { required: true, message: '社区名称必填', trigger: 'blur' }
+        ],
+        gridName: [
+          { required: true, message: '网格名称必填', trigger: 'blur' }
+        ],
+        addDepartmentName: [
+          { required: true, message: '部门名称必填', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getAgencyList()
+    this.getDepartmentList()
+    this.getGridList()
+    this.getAgencyStaffListData()
+    this.getDutyList()
+    this.getRoleList()
+    // this.getNavigation()
+    // 更新顶部面包屑
+    this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
+  },
+
+  watch: {
+    dialogVisibleGrid (val) {
+      if (val) {
+        setTimeout(() => {
+          let _that = this
+          this.initMap(_that)
+        }, 1000);
+      }
+    },
+    createAgencyDialogFlag (val) {
+      if (val) {
+        setTimeout(() => {
+          let _t = this
+          this.createMap(_t)
+        }, 1000);
+      }
+    },
+    modifyCityOrgPop (val) {
+      if (val) {
+        setTimeout(() => {
+          let _t = this
+          this.createMap(_t)
+        }, 1000);
+      }
+    },
+    streetOrCommunity (val) {
+      if (val) {
+        setTimeout(() => {
+          let _t = this
+          this.createMap(_t)
+        }, 1000);
+      }
+    },
+    modifyGridPop (val) {
+      if (val) {
+        setTimeout(() => {
+          let _t = this
+          this.createMap(_t)
+        }, 1000);
+      }
+    }
+  },
+  mounted () {
+    // this.initMap()
+  },
+  methods: {
+    // 点击后获取id
+    handleChange (e) {
+      this.transferForm.orgId = e[1]
+      if (this.transferForm.orgId != null || '') {
+        if (this.transferForm.orgId === 0) {
+          if (e[2] == null || '') {
+            this.transferForm.orgType = 'dept'
+            this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
+          } else {
+            this.transferForm.orgId = e[2]
+            this.transferForm.orgType = 'dept'
+          }
+        } else {
+          if (e[2] == null || '') {
+            this.transferForm.orgType = 'grid'
+            this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
+          } else {
+            this.transferForm.orgId = e[2]
+            this.transferForm.orgType = 'grid'
+          }
+
         }
+      } else {
+        this.transferForm.orgId = e[0]
+        this.transferForm.orgType = 'agency'
+      }
+    },
+    /** 查询系统工作人员角色（职责） */
+    async getDutyList () {
+      const url = "/gov/org/staff/rolelist"
+      let params = {
+        agencyId: this.currentAgencyId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.dutyList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    /** 查询系统工作人员角色（职责） */
+    async getRoleList () {
+      this.tableLoading = true
+
+      const url = "/gov/access/govrole/list"
+
+      let params = {
+
+      }
+
+      const { data, code, msg } = await requestGet(url, params)
+
+      if (code === 0) {
+
+        this.roleList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
     },
-    created(){
+    /** 查询组织列表 */
+    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
+      } 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
+      }
+
+      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()
-        this.getRoleList()
-        // this.getNavigation()
-        // 更新顶部面包屑
-        this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency')
-    },
-    
-    watch: {
-        dialogVisibleGrid(val) {
-            if (val) {
-                setTimeout(() => {
-                    let _that = this
-                    this.initMap(_that)
-                }, 1000);
-            }
-        },
-        createAgencyDialogFlag(val) {
-            if (val) {
-                setTimeout(() => {
-                    let _t = this
-                    this.createMap(_t)
-                }, 1000);
-            }
-        },
-        modifyCityOrgPop(val){
-            if (val) {
-                setTimeout(() => {
-                    let _t = this
-                    this.createMap(_t)
-                }, 1000);
-            }
-        },
-        streetOrCommunity(val){
-            if (val) {
-                setTimeout(() => {
-                    let _t = this
-                    this.createMap(_t)
-                }, 1000);
-            }
-        },
-        modifyGridPop(val){
-            if (val) {
-                setTimeout(() => {
-                    let _t = this
-                    this.createMap(_t)
-                }, 1000);
-            }
-        }
+      } else {
+        this.$message.error(msg)
+      }
     },
-    mounted(){
-        // this.initMap()
-    },
-    methods:{
-        // 点击后获取id
-        handleChange (e) {
-            this.transferForm.orgId = e[1]
-            if(this.transferForm.orgId != null || ''){
-                if(this.transferForm.orgId === 0){
-                    if(e[2] == null || ''){
-                        this.transferForm.orgType = 'dept'
-                        this.transferForm.orgId = "14f572e724eecf7668b655505d789cab"
-                    }else{
-                        this.transferForm.orgId = e[2]
-                        this.transferForm.orgType = 'dept'
-                    }
-                } else {
-                    if(e[2] == null || ''){
-                        this.transferForm.orgType = 'grid'
-                        this.transferForm.orgId = "63d5ff92ea981b1c58e4914ac894c610"
-                    } else {
-                        this.transferForm.orgId = e[2]
-                        this.transferForm.orgType = 'grid'
-                    }
-                    
-                }
-            }else{
-                this.transferForm.orgId = e[0]
-                this.transferForm.orgType = 'agency'
-            }
-        },
-        /** 查询系统工作人员角色（职责） */
-        async getRoleList () {
-            const url = "/gov/org/staff/rolelist"
-            let params = {
-                agencyId: this.currentAgencyId
-            }
-            const { data, code, msg } = await requestPost(url,params)
-            if(code === 0){
-                this.dutyList = data
-            }else{
-                this.$message.error(msg)
-            }
-        },
-        /** 查询组织列表 */
-        async getAgencyList(){
-            const url = "/gov/org/agency/agencylist"
-            let params = {
-                agencyId: this.currentAgencyId
-            }
+    // 添加网格
+    async submitGrid () {
+      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,
+        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.GridForm = []
+        this.getAgencyList()
+        this.getDepartmentList()
+        this.getGridList()
+        this.getAgencyStaffListData()
 
-            const { data, code, msg } = await requestPost(url,params)
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-            if(code === 0){
-                this.agencyTableListData = data
-            }else{
-                this.$message.error(msg)
-            }
-        },
-        /** 查询社区列表 */
-        async getDepartmentList(){
-            const url = "/gov/org/department/departmentlist"
+    // 添加人员
+    async submitPeo () {
+      const url = "/gov/org/staff/addstaffv2"
 
-            let params = {
-                agencyId: this.currentAgencyId
-            }
+      let params = {
+        orgType: this.peoForm.orgType,
+        name: this.peoForm.name,
+        mobile: this.peoForm.mobile,
+        gender: this.peoForm.gender,
+        workType: this.peoForm.post,
+        roles: this.peoForm.duty,
+        newRoles: this.peoForm.newRoles,
+        orgId: this.currentAgencyId,
 
-            const { data, code, msg } = await requestPost(url,params)
+      }
 
-            if(code === 0){
-                this.departmentTableListData = data
-            }else{
-                this.$message.error(msg)
-                
-            }
-        },
-        /** 查询网格列表 */
-        async getGridList(){
-            const url = "/gov/org/grid/allgrids"
+      const { data, code, msg } = await requestPost(url, params)
 
-            let params = {
-                agencyId: this.currentAgencyId
-            }
+      if (code === 0) {
 
-            const { data, code, msg } = await requestPost(url,params)
+        this.$message.success("添加成功")
+        this.dialogVisiblePeo = false
+        this.peoForm = []
+        this.getAgencyList()
+        this.getDepartmentList()
+        this.getGridList()
+        this.getAgencyStaffListData()
+        this.insertFormRest()
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-            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
-            }
+    // 人员修改
+    async updatePeo () {
+      const url = "/gov/org/staff/editstaff"
 
-            const { data, code, msg } = await requestPost(url,params)
+      let params = {
+        staffId: this.userStaffId,
+        name: this.peoForm.name,
+        mobile: this.peoForm.mobile,
+        gender: this.peoForm.gender === '男' ? 1 : 0,
+        workType: this.peoForm.post,
+        roles: this.peoForm.duty,
+        newRoles: this.peoForm.newRoles,
+        agencyId: this.currentAgencyId,
+      }
 
-            if(code === 0) {
-                this.agencyStaffTableListData = data.staffList
-            } else {
-                this.$message.error(msg)
-            }
-        },
+      const { data, code, msg } = await requestPost(url, params)
 
-        // 查询部门人员
-        async getDepartmentStaffListData(){
-            const url = "/data/aggregator/org/stafflist"
+      if (code === 0) {
+        this.$message.success("修改成功")
+        this.modifyPeo = false
 
-            let params = {
-               orgId:this.currentDepartmentId,
-               orgType:'dept',
-               pageNo:1,
-               pageSize:100
-            }
+        this.getAgencyList()
+        this.getDepartmentList()
+        this.getGridList()
+        this.getAgencyStaffListData()
+        this.getDepartmentStaffListData()
+        this.getGridStaffListData()
+        this.insertFormRest()
 
-            const { data, code, msg } = await requestPost(url,params)
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-            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
-            }
+    // 字典
+    async getDictionaries () {
+      const url = "/sys/dict/data/dictlist"
 
-            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(){
-            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,
-                manageDistrict:this.GridForm.manageDistrict,
-                gridType:this.GridForm.gridType,
-                latitude:this.lat,
-                longitude:this.lng
-            }
+      let params = {
+        dictType: 'grid_type'
+      }
 
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-                this.$message.success("添加成功")
-                this.dialogVisibleGrid = false
-                this.GridForm = []
-                this.getAgencyList()
-                this.getDepartmentList()
-                this.getGridList()
-                this.getAgencyStaffListData()
-            } else {
-                this.$message.error(msg)
-            }
-        },
-
-        // 添加人员
-        async submitPeo(){
-            const url = "/gov/org/staff/addstaffv2"
-
-            let params = {
-                orgType:this.peoForm.orgType,
-                name:this.peoForm.name,
-                mobile:this.peoForm.mobile,
-                gender:this.peoForm.gender,
-                workType:this.peoForm.post,
-                roles:this.peoForm.duty,
-                orgId:this.currentAgencyId
-            }
+      const { data, code, msg } = await requestPost(url, params)
 
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-                
-                this.$message.success("添加成功")
-                this.dialogVisiblePeo = false
-                this.peoForm = []
-                this.getAgencyList()
-                this.getDepartmentList()
-                this.getGridList()
-                this.getAgencyStaffListData()
-            } else {
-                this.$message.error(msg)
-            }
-        },
-
-        // 人员修改
-        async updatePeo(){
-            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,
-                workType:this.peoForm.post,
-                roles:this.peoForm.duty,
-                agencyId:this.currentAgencyId,
-            }
+      if (code === 0) {
+        this.typeList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-            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()
-                
-            } 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.departmentName = ''
+
+      this.peoForm = {
+        name: '',
+        mobile: '',
+        gender: '',
+        post: '',
+        duty: [],
+        orgType: '',
+        activeTime: '',
+        zuzhi: '',
+        disableFlag: '',
+        newRoles: []
+      }
+    },
+    // 网格新增弹框重置函数
+    GridFormRest () {
+      this.GridForm.gridName = '',
+        this.GridForm.code = '',
+        this.GridForm.centerAddress = '',
+        this.GridForm.contacts = '',
+        this.GridForm.mobile = '',
+        this.GridForm.agencyId = '',
+        this.GridForm.manageDistrict = '',
+        this.GridForm.gridType = '',
+        this.GridForm.location = '',
+        this.GridForm.longitude = '',
+        this.GridForm.latitude = ''
+    },
+    /** 人员清空 */
+    peoFormRest () {
+      this.peoForm.name = '',
+        this.peoForm.mobile = '',
+        this.peoForm.gender = '',
+        this.peoForm.post = '',
+        this.peoForm.duty = ''
+      this.peoForm.newRoles = []
 
-        // 字典
-        async getDictionaries(){
-            const url = "/sys/dict/data/dictlist"
+    },
+    // 人员调动
+    transferRest () {
+      this.transferForm.name = '',
+        this.transferForm.remarks = '',
+        this.transferForm.transferTo = ''
+      this.transferForm.staffId = '',
+        this.transferForm.orgId = '',
+        this.transferForm.orgType = ''
+      this.selectValue = ''
+      this.options[0] = []
+    },
+    // 新增组织
+    addNewAgencyRest () {
+      this.agencyForm.parentAgencyId = '',
+        this.agencyForm.agencyName = '',
+        this.agencyForm.level = '',
+        this.agencyForm.areaCodeSwitch = '',
+        this.agencyForm.areaCode = '',
+        this.agencyForm.areaName = '',
+        this.agencyForm.contacts = '',
+        this.agencyForm.mobile = '',
+        this.agencyForm.code = '',
+        this.latitude = '',
+        this.longitude = ''
+    },
+    // 修改市级组织
+    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()
 
-            let params = {
-                dictType:'grid_type'
-            }
-            
-            const { data, code, msg } = await requestPost(url,params)
+    },
+    /** 取消按钮 */
+    cancelPeo () {
+      this.dialogVisiblePeo = false
+      this.peoFormRest()
+    },
+    // 修改取消
+    cancelXiugai () {
+      this.modifyPeo = false
+      this.peoFormRest()
+    },
+    // 查看弹窗
+    cancelDetails () {
+      this.details = false
+    },
+    /** 人员调动取消按钮 */
+    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 (departmentId) {
+      this.gridStaffTableListData = []
+      this.departmentStaffTableListData = []
+      this.agencyStaffTableListData = []
+      this.currentDepartmentId = departmentId
+      this.departmentStaffTableFlag = true
+      this.currentAgencyStaffTableFlag = false
+      this.gridStaffTableFlag = false
+      this.gridTableFlag = false
+      this.agencyTableFlag = false
+      this.departmentTableFlag = false
+      this.getDepartmentStaffListData()
+      this.assembleBreadcrumbArr(departmentId, 'department')
+    },
 
-            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.departmentName = ''
-        },
-        // 网格新增弹框重置函数
-        GridFormRest(){
-            this.GridForm.gridName = '',
-            this.GridForm.code = '',
-            this.GridForm.centerAddress = '',
-            this.GridForm.contacts = '',
-            this.GridForm.mobile = '',
-            this.GridForm.agencyId = '',
-            this.GridForm.manageDistrict = '',
-            this.GridForm.gridType = '',
-            this.GridForm.location = '',
-            this.GridForm.longitude = '',
-            this.GridForm.latitude = ''
-        },
-        /** 人员清空 */
-        peoFormRest(){
-            this.peoForm.name = '',
-            this.peoForm.mobile = '',
-            this.peoForm.gender = '',
-            this.peoForm.post = '',
-            this.peoForm.duty = ''
-            
-        },
-        // 人员调动
-        transferRest(){
-            this.transferForm.name = '',
-            this.transferForm.remarks = '',
-            this.transferForm.transferTo = ''
-            this.transferForm.staffId = '',
-            this.transferForm.orgId = '',
-            this.transferForm.orgType = ''
-            this.selectValue = ''
-            this.options[0] = []
-        },
-        // 新增组织
-        addNewAgencyRest(){
-            this.agencyForm.parentAgencyId = '',
-            this.agencyForm.agencyName = '',
-            this.agencyForm.level = '', 
-            this.agencyForm.areaCodeSwitch = '',
-            this.agencyForm.areaCode = '',
-            this.agencyForm.areaName = '',
-            this.agencyForm.contacts = '',
-            this.agencyForm.mobile = '',
-            this.agencyForm.code = '',
-            this.latitude = '',
-            this.longitude = ''
-        },
-        // 修改市级组织
-        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
-        },
-        /** 人员调动取消按钮 */
-        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(departmentId){
-            this.gridStaffTableListData = []
-            this.departmentStaffTableListData = []
-            this.agencyStaffTableListData = []
-            this.currentDepartmentId = departmentId
-            this.departmentStaffTableFlag = true
-            this.currentAgencyStaffTableFlag = false
-            this.gridStaffTableFlag = false
-            this.gridTableFlag = false
-            this.agencyTableFlag = false
-            this.departmentTableFlag = false
-            this.getDepartmentStaffListData()
-            this.assembleBreadcrumbArr(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'
-            
-        },
-
-        // 新增网格人员
-        addGridPeo(){
-            this.dialogVisiblePeo = true
-            this.peoForm.orgType = 'grid'
-            
-        },
-        // 修改网格人员
-        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.post = data.workType
-                // 已有的权限（职责）
-                let existedRoleArr = []
-                data.roleList.forEach(function (sysRole) {
-                    if (sysRole.selected === true) {
-                        existedRoleArr.push(sysRole.roleId)
-                    }
-                })
-                this.peoForm.duty = existedRoleArr
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        // 修改人员
-        async xiuPeo(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
-            }
+    // 进入组织，重新渲染
+    entryAgency (agencyId) {
 
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-                this.peoForm.name = data.name
-                this.peoForm.mobile = data.mobile
-                this.peoForm.post = data.workType
-                this.peoForm.gender = data.gender === 1 ? '男' : '女'
-                // 已有的权限（职责）
-                let existedRoleArr = []
-                data.roleList.forEach(function (sysRole) {
-                    if (sysRole.selected === true) {
-                        existedRoleArr.push(sysRole.roleId)
-                    }
-                })
-                this.peoForm.duty = existedRoleArr
-            } else {
-                this.$message.error(msg)
-            }
+      this.currentAgencyId = agencyId
 
-            
-        },
-        // 修改社区人员
-        async xiuCommunityPeo(row){
-            this.modifyPeo = true
-            this.peoForm.orgType = 'dept'
-            
-            this.userStaffId = row.staffId
+      this.agencyTableListData = []
+      this.departmentTableListData = []
+      this.gridTableListData = []
+      this.gridStaffTableListData = []
+      this.agencyStaffTableListData = []
+      this.departmentStaffTableListData = []
 
-            const url = '/gov/org/staff/editstaffinit'
+      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
+    },
 
-            let params = {
-                staffId:row.staffId,
-                agencyId:this.currentAgencyId
-            }
+    // 新增人员
+    addPeo (row) {
+      this.dialogVisiblePeo = true
+      this.peoForm.orgType = 'agency'
 
-            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.post = data.workType
-                // 已有的权限（职责）
-                let existedRoleArr = []
-                data.roleList.forEach(function (sysRole) {
-                    if (sysRole.selected === true) {
-                        existedRoleArr.push(sysRole.roleId)
-                    }
-                })
-                this.peoForm.duty = 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
-            }
+    // 新增社区人员
+    addCommunityPeo () {
+      this.dialogVisiblePeo = true
+      this.peoForm.orgType = 'dept'
 
-            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
-            }
+    // 新增网格人员
+    addGridPeo () {
+      this.dialogVisiblePeo = true
+      this.peoForm.orgType = 'grid'
 
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-                this.peoForm.name = data.name
-                this.peoForm.mobile = data.mobile.substr(0,3) + "****" + data.mobile.substr(7)
-                this.peoForm.activeTime = data.activeTime
-                this.peoForm.duty = data.roles
-                this.peoForm.zuzhi = data.orgName
-                if (data.enableFlag === 'enable') {
-                    this.peoForm.disableFlag = '已启用'
-                } else {
-                    this.peoForm.disableFlag = '已禁用'
-                }
-            }
-            this.details = true
-        },
-        
-        // 人员调动
-        async transfer(row){
+    },
+    // 修改网格人员
+    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.post = data.workType
+        // 已有的权限（职责）
+        let existedDutyArr = []
+        data.roleList.forEach(function (sysDuty) {
+          if (sysDuty.selected === true) {
+            existedDutyArr.push(sysDuty.roleId)
+          }
+        })
+        this.peoForm.duty = existedDutyArr
+        // 已有的权限（角色）
+        let existedRoleArr = []
+        data.newRoleList.forEach(function (sysRole) {
+          if (sysRole.selected === true) {
+            existedRoleArr.push(sysRole.roleId)
+          }
+        })
+        this.peoForm.newRoles = existedRoleArr
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    // 修改人员
+    async xiuPeo (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) {
+        this.peoForm.name = data.name
+        this.peoForm.mobile = data.mobile
+        this.peoForm.post = data.workType
+        this.peoForm.gender = data.gender === 1 ? '男' : '女'
+        // 已有的权限（职责）
+        let existedDutyArr = []
+        data.roleList.forEach(function (sysDuty) {
+          if (sysDuty.selected === true) {
+            existedDutyArr.push(sysDuty.roleId)
+          }
+        })
+        this.peoForm.duty = existedDutyArr
+        // 已有的权限（角色）
+        let existedRoleArr = []
+        data.newRoleList.forEach(function (sysRole) {
+          if (sysRole.selected === true) {
+            existedRoleArr.push(sysRole.roleId)
+          }
+        })
+        this.peoForm.newRoles = existedRoleArr
+      } else {
+        this.$message.error(msg)
+      }
 
-            this.transferForm.name = row.name
-            this.transferForm.staffId = row.staffId
 
-            this.transferPeo = true
-            const url = "/gov/org/customeragency/orgtree"
+    },
+    // 修改社区人员
+    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.post = data.workType
+        // 已有的权限（职责）
+        let existedDutyArr = []
+        data.roleList.forEach(function (sysDuty) {
+          if (sysDuty.selected === true) {
+            existedDutyArr.push(sysDuty.roleId)
+          }
+        })
+        this.peoForm.duty = existedDutyArr
+        // 已有的权限（角色）
+        let existedRoleArr = []
+        data.newRoleList.forEach(function (sysRole) {
+          if (sysRole.selected === true) {
+            existedRoleArr.push(sysRole.roleId)
+          }
+        })
+        this.peoForm.newRoles = existedRoleArr
+      } else {
+        this.$message.error(msg)
+      }
 
-            let params = {
 
-            }
-            
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-                this.options[0].label = data.agencyName
-                this.options[0].value = data.agencyId
-
-                    console.log('--------',this.options)
-                let depart = Array.from(data.departmentList)
-                let gr = Array.from(data.gridList)
-
-                depart.forEach(item => {
-                    const ob = {
-                        value:item.deptId,
-                        label:item.deptName                        
-                    }
-                    this.options[0].children[0].children.push(ob)
-                })
-                    this.options[0].children[0].value = 0
-                    this.options[0].children[0].label = "部门"
-                    this.options[0].children[1].value = 1
-                    this.options[0].children[1].label = "网格"
-                gr.forEach(item => {
-                    const obj = {
-                        value:item.gridId,
-                        label:item.gridName                        
-                    }
-                    this.options[0].children[1].children.push(obj)
-                })
-            }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
-            }
+    },
+    // 取消禁用按钮
+    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)
-
-            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)
-            }
-        },
-
-        // 获取导航
-        // async getNavigation(){
-
-        //     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
-                    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)
-                }
-            }
-        },
+      let params = {
+        staffId: this.DisableForm.staffId,
+        agencyId: this.DisableForm.agencyId,
+        customerId: this.DisableForm.customerId
+      }
 
-        async refreshThisPage (index) {
+      const { data, code, msg } = await requestPost(url, params)
 
-            // 点击最后一级不触发响应
-            if (index === this.breadcrumbArr.length - 1) {
-                return
-            }
+      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.duty = data.roles
+        this.peoForm.zuzhi = data.orgName
+        if (data.enableFlag === 'enable') {
+          this.peoForm.disableFlag = '已启用'
+        } else {
+          this.peoForm.disableFlag = '已禁用'
+        }
+      }
+      this.details = true
+    },
 
-            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
-            }
+    // 人员调动
+    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) {
+        this.options[0].label = data.agencyName
+        this.options[0].value = data.agencyId
+
+        console.log('--------', this.options)
+        let depart = Array.from(data.departmentList)
+        let gr = Array.from(data.gridList)
+
+        depart.forEach(item => {
+          const ob = {
+            value: item.deptId,
+            label: item.deptName
+          }
+          this.options[0].children[0].children.push(ob)
+        })
+        this.options[0].children[0].value = 0
+        this.options[0].children[0].label = "部门"
+        this.options[0].children[1].value = 1
+        this.options[0].children[1].label = "网格"
+        gr.forEach(item => {
+          const obj = {
+            value: item.gridId,
+            label: item.gridName
+          }
+          this.options[0].children[1].children.push(obj)
+        })
+      } 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()
 
-            const { data, code, msg } = await requestPost(url,params)
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-            if(code === 0){
-                this.zonings = data
-            }else{
-                this.$message.error(msg)
-            }
+    // 获取导航
+    // async getNavigation(){
 
-        },
+    //     const url = "/gov/org/customeragency/orgtree"
 
-        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
-                }
+    //     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
+          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
+              }
             })
-        },
-
-        addAgency(){
-            this.createAgencyDialogFlag = true
-            this.addNewAgencyRest()
-            this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel)
-        },
-        // 新增组织确定按钮
-        async submitaddNewAgency(){
-            const url = '/gov/org/agency/addagency-v2'
-
-            let params = {
-                parentAgencyId: this.parentAgencyId,
-                agencyName: this.agencyForm.agencyName,
-                level: this.agencyForm.level,
-                areaCodeSwitch: 'closed',
-                areaCode: this.agencyForm.areaCode,
-                areaName: this.agencyForm.areaName,
-                contacts: this.agencyForm.contacts,
-                mobile: this.agencyForm.mobile,
-                code: this.agencyForm.code,
-                latitude: this.latitude,
-                longitude: this.longitude
+            if (hasBreadcrumbArr === false) {
+              let breadcrumb = { id: data.agencyId, name: data.agencyName, type: orgType }
+              this.breadcrumbArr.push(breadcrumb)
             }
-
-            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)
+          }
+        } 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)
             }
-        },
-
-        // 修改面包屑
-        modifyOrgInfo(){
-            this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length-1]
-            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()
+          }
+        } 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)
+        }
+      }
+    },
+
+    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'
 
-        // 根据id获取组织机构详细信息
-        async getOrgDetailsById(){
-            const url = '/gov/org/agency/agencydetail'
+      let params = {
+        areaCode: areaCode,
+        level: parentAgencyLevel,
+        parentAgencyId: parentAgencyId
+      }
 
-            let params = {
-                agencyId:this.judgeOrgInfoLevel.id
-            }
+      const { data, code, msg } = await requestPost(url, params)
 
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-
-                this.currentAgencyLevel = data.level
-                this.currentAreaCode = data.areaCode
-                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)
-            }
-        },
+      if (code === 0) {
+        this.zonings = data
+      } else {
+        this.$message.error(msg)
+      }
 
-        // 根据id获取下级机关单位详情
-        async getOrgUnitDetailsById(){
-            const url = '/gov/org/department/departmentdetail'
+    },
 
-            let params = {
-                departmentId:this.judgeOrgInfoLevel.id
-            }
+    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
+        }
+      })
+    },
 
-            const { data, code, msg } = await requestPost(url,params)
+    addAgency () {
+      this.createAgencyDialogFlag = true
+      this.addNewAgencyRest()
+      this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel)
+    },
+    // 新增组织确定按钮
+    async submitaddNewAgency () {
+      const url = '/gov/org/agency/addagency-v2'
+
+      let params = {
+        parentAgencyId: this.parentAgencyId,
+        agencyName: this.agencyForm.agencyName,
+        level: this.agencyForm.level,
+        areaCodeSwitch: 'closed',
+        areaCode: this.agencyForm.areaCode,
+        areaName: this.agencyForm.areaName,
+        contacts: this.agencyForm.contacts,
+        mobile: this.agencyForm.mobile,
+        code: this.agencyForm.code,
+        latitude: this.latitude,
+        longitude: this.longitude
+      }
+
+      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)
+      }
+    },
 
-            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)
-            }
-        },
+    // 修改面包屑
+    modifyOrgInfo () {
+      this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length - 1]
+      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 getGridDetailsById(){
-            const url = '/gov/org/grid/griddetail'
+    // 根据id获取组织机构详细信息
+    async getOrgDetailsById () {
+      const url = '/gov/org/agency/agencydetail'
 
-            let params = {
-                gridId: this.judgeOrgInfoLevel.id
-            }
+      let params = {
+        agencyId: 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.griId
-            }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,
-                latitude: this.latitude,
-                longitude: this.longitude
-            }
+      const { data, code, msg } = await requestPost(url, params)
 
-            const { data, code, msg } = await requestPost(url,params)
-
-            if(code === 0){
-                this.$message.success("修改成功")
-                this.modifyCityOrgPop = false
-                this.streetOrCommunity = false
-                this.getAgencyList()
-                this.getDepartmentList()
-                this.getGridList()
-                this.agencyPeo()
-            }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
-            }
+      if (code === 0) {
 
-            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
-            }
+        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
+        }
 
-            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)
-            }
-        },
-
-       /** 地图初始化 */
-       initMap(_that) {
-           
-            var position = document.getElementById("position");
-
-            var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
-            //初始化地图
-            var map = new window.TMap.Map("container", {
-                center: center
-            });
-            
-            //绑定点击事件
-            map.on("click",function(evt){
-                _that.lat = evt.latLng.getLat().toFixed(6);
-                _that.lng = evt.latLng.getLng().toFixed(6);
-                position.innerHTML = _that.lat + "," + _that.lng;
-            })
-        },
-        createMap(_t){
-            document.getElementById("con").innerHTML = ''
-            document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
-            var position = document.getElementById("pos");
-
-            if(this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === ""){
-                var center = new window.TMap.LatLng(36.116796, 120.339959);
-            }else {
-                var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
-            }
+        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)
+      }
+    },
 
-            //初始化地图
-            var map = new window.TMap.Map("con", {
-                center: center
-            });
-            
-            //绑定点击事件
-            map.on("click",function(evt){
-                _t.latitude = evt.latLng.getLat().toFixed(6);
-                _t.longitude = evt.latLng.getLng().toFixed(6);
-                position.innerHTML = _t.latitude + "," + _t.longitude;
-            })
+    // 根据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.griId
+      } 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,
+        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
+      }
+
+      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)
+      }
+    },
+
+    /** 地图初始化 */
+    initMap (_that) {
+
+      var position = document.getElementById("position");
+
+      var center = new window.TMap.LatLng(39.984104, 116.307503);//设置中心点坐标
+      //初始化地图
+      var map = new window.TMap.Map("container", {
+        center: center
+      });
+
+      //绑定点击事件
+      map.on("click", function (evt) {
+        _that.lat = evt.latLng.getLat().toFixed(6);
+        _that.lng = evt.latLng.getLng().toFixed(6);
+        position.innerHTML = _that.lat + "," + _that.lng;
+      })
+    },
+    createMap (_t) {
+      document.getElementById("con").innerHTML = ''
+      document.getElementById("con").innerHTML = '当前点击坐标为：<span id="pos"></span>'
+      var position = document.getElementById("pos");
+
+      if (this.latitude === null || this.latitude === "" || this.longitude === null || this.longitude === "") {
+        var center = new window.TMap.LatLng(36.116796, 120.339959);
+      } else {
+        var center = new window.TMap.LatLng(this.latitude, this.longitude);//设置中心点坐标
+      }
+
+      //初始化地图
+      var map = new window.TMap.Map("con", {
+        center: center
+      });
+
+      //绑定点击事件
+      map.on("click", function (evt) {
+        _t.latitude = evt.latLng.getLat().toFixed(6);
+        _t.longitude = evt.latLng.getLng().toFixed(6);
+        position.innerHTML = _t.latitude + "," + _t.longitude;
+      })
 
-        }
-        
     }
+
+  }
 }
 </script>
 
 <style scoped>
-    #container {
-        width: 100%;
-        height: 100%;
-    }
-    #info{
-        left: 20px;
-        top: 20px;
-        font-size: 14px;
-        background: #fff;
-        width: 270px;
-        padding: 10px;
-        border-radius: 3px;
-    }
-    #con {
-        width: 100%;
-        height: 100%;
-    }
-    .el-tag + .el-tag {
-        margin-left: 10px;
-    }
+#container {
+  width: 100%;
+  height: 100%;
+}
+#info {
+  left: 20px;
+  top: 20px;
+  font-size: 14px;
+  background: #fff;
+  width: 270px;
+  padding: 10px;
+  border-radius: 3px;
+}
+#con {
+  width: 100%;
+  height: 100%;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index c70125bc..f61225cd 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -16,7 +16,7 @@
           </el-input>
 
         </el-form-item>
-        <el-form-item label="创建时间"
+        <!-- <el-form-item label="创建时间"
                       label-width="110px"
                       prop="createdTime">
           <el-date-picker v-model="formData.createdTime"
@@ -28,7 +28,7 @@
                           placeholder="创建时间">
           </el-date-picker>
 
-        </el-form-item>
+        </el-form-item> -->
 
         <el-button style="margin-left:30px"
                    size="small"
@@ -92,12 +92,15 @@
 
             <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="true"
-                       type="text"
+            <el-button type="text"
                        class="div-table-button--delete "
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
@@ -158,7 +161,7 @@ export default {
       timeRange: [],
       formData: {
         name: '',//名称
-        createdTime: '',//时间
+        // createdTime: '',//时间
 
 
       },
@@ -260,6 +263,13 @@ export default {
         this.$refs.ref_form.initForm('edit', row.id)
       })
     },
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.id)
+      })
+    },
 
     addFormOk () {
       this.formShow = false
@@ -285,12 +295,10 @@ export default {
 
     async deleteRole (row) {
 
-      const url = "/gov/access/govrole/del/" + array
+      const url = "/gov/access/govrole/del"
 
 
-      let params = {
-        ids: [row.id]
-      }
+      let params = [row.id]
 
       const { data, code, msg } = await requestPost(url, params)
 
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 289db50e..c7b4f185 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -43,6 +43,7 @@
                    :data="menuList"
                    :props="{ label: 'name', children: 'children' }"
                    node-key="id"
+                   :default-expanded-keys="['000']"
                    ref="menuListTree"
                    accordion
                    show-checkbox>
@@ -56,6 +57,7 @@
                    :data="menuListShuju"
                    :props="{ label: 'name', children: 'children' }"
                    node-key="id"
+                   :default-expanded-keys="['000']"
                    ref="menuListShujuTree"
                    accordion
                    show-checkbox>
@@ -111,9 +113,7 @@ export default {
   components: {},
   async mounted () {
 
-    //获取菜单
-    await this.getMenuList()
-    await this.getMenuShujuList()
+
   },
 
   methods: {
@@ -122,6 +122,9 @@ export default {
       this.startLoading()
       this.customerId = localStorage.getItem("customerId");
       this.formData.customerId = this.customerId
+      //获取菜单
+      await this.getMenuList()
+      await this.getMenuShujuList()
 
       this.$refs['ref_form'].resetFields();
       this.$refs.menuListTree.setCheckedKeys([])
@@ -149,7 +152,14 @@ export default {
       const { data, code, msg } = await requestGet(url, params)
 
       if (code === 0) {
-        this.menuList = data
+        this.menuList = [
+          {
+            id: '000',
+            name: '全部菜单',
+            children: [...data]
+          }
+        ]
+        // this.menuList = data
 
       } else {
         this.$message.error(msg)
@@ -167,7 +177,14 @@ export default {
       const { data, code, msg } = await requestGet(url, params)
 
       if (code === 0) {
-        this.menuListShuju = data
+        this.menuListShuju = [
+          {
+            id: '000',
+            name: '全部菜单',
+            children: [...data]
+          }
+        ]
+        // this.menuListShuju = data
 
       } else {
         this.$message.error(msg)
@@ -188,6 +205,9 @@ export default {
 
         this.formData.menuIdList.forEach(item => {
           this.$refs.menuListTree.setChecked(item, true)
+
+        })
+        this.formData.menuIdList.forEach(item => {
           this.$refs.menuListShujuTree.setChecked(item, true)
         })
         this.formData.customerId = this.customerId
@@ -231,6 +251,7 @@ export default {
         ...this.$refs.menuListShujuTree.getCheckedKeys(),
         ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
       ]
+      this.formData.menuIdList = this.formData.menuIdList.filter(item => item !== '000')
 
       console.log('menuAll', this.formData)
 

From 15017b5caadda01411a6e52df3986fdbf7d613dc Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 13 Jul 2022 14:13:02 +0800
Subject: [PATCH 15/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/fiveLayerMap.scss     |  12 +-
 .../communityGovern/fivelayers/mapIndex.vue   | 122 +++++++++---------
 2 files changed, 69 insertions(+), 65 deletions(-)

diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss
index 1b01dc8e..abe74a6b 100644
--- a/src/assets/scss/modules/visual/fiveLayerMap.scss
+++ b/src/assets/scss/modules/visual/fiveLayerMap.scss
@@ -56,7 +56,7 @@
     .div_tips{
       box-sizing: border-box;
       width: 100%;
-      height: 302px;
+      height: 300px;
       color: #fff;
 
       .div_coverage{
@@ -89,7 +89,7 @@
       .div_category {
         @include scrollBar;
         box-sizing: border-box;
-        height:178px;
+        height:176px;
         padding:0 10px 0;  
         overflow-y: auto;
         overflow-x: hidden;
@@ -162,11 +162,12 @@
       margin-top:10px;
       height: calc(810px - 302px - 10px);
       color: #fff;
+      overflow-x: hidden;
 
       .div_search_list {
         margin: 6px auto;
         text-align: center;
-        width: 590px;
+        width: 570px;
         height: 48px;
         background-color: #011168;
         border-radius: 4px;
@@ -191,14 +192,14 @@
         .btn {
           text-align: center;
           flex: 0 0 113px;
-          height: 48px;
+          height: 52px;
           background: linear-gradient(90deg, #1A5AFD, #26C4FF);
           border-radius: 0px 4px 4px 0px;
           font-size: 20px;
           font-family: PingFang SC;
           font-weight: 400;
           color: #ffffff;
-          line-height: 48px;
+          line-height: 52px;
         }
         .btn:hover {
           cursor: pointer;
@@ -216,6 +217,7 @@
       .m-pagination {
         // position: absolute;
         box-sizing: border-box;
+        margin-top: 2px;
         width: 100%;
         height: 40px;
         display: flex;
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index a131e9c4..d812085a 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -26,79 +26,81 @@
       </div>
 
       <div class="div_data">
+        <div class="div_tips">
+          <cpt-card>
+            <div class="div_coverage">
+
+              <div class="coverage_item"
+                  @click="handleClickCoverage(index)"
+                  v-for="(item,index) in coverageTypesList"
+                  :key="index">
+                <img :src="item.select?selImg:noSelImg" />
+                <span>{{item.label}}</span>
+              </div>
+            </div>
+            <div class="div_category">
+              <div v-for="(item,index) in categoryListshow"
+                    :key="index"
+                    class="category_item">
 
-        <cpt-card class="div_tips">
+                <div v-for="(colItem,colIndex) in item"
+                      :key="colIndex"
+                      class="list_item"
+                      @click="handleClickCategory(index,colIndex)">
+                  <img :src="colItem.dataIcon"
+                        alt />
+                  <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
 
-          <div class="div_coverage">
-
-            <div class="coverage_item"
-                 @click="handleClickCoverage(index)"
-                 v-for="(item,index) in coverageTypesList"
-                 :key="index">
-              <img :src="item.select?selImg:noSelImg" />
-              <span>{{item.label}}</span>
-            </div>
-          </div>
-          <div class="div_category">
-            <div v-for="(item,index) in categoryListshow"
-                  :key="index"
-                  class="category_item">
-
-              <div v-for="(colItem,colIndex) in item"
-                    :key="colIndex"
-                    class="list_item"
-                    @click="handleClickCategory(index,colIndex)">
-                <img :src="colItem.dataIcon"
-                      alt />
-                <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
+                  </div>
 
                 </div>
 
               </div>
-
             </div>
-          </div>
-        </cpt-card>
-
-        <cpt-card class="div_info">
-          <div class="div_search_list">
-            <el-input size="mini"
-                      WarningColor='warning'
-                      placeholder="请输入搜索内容"
-                      v-model="search">
-              <i slot="prefix"
-                 class="icon">
-                <img src="../../../../../assets/img/modules/visual/sousuo.png"
-                     alt />
-              </i>
-            </el-input>
-
-            <div class="btn"
-                 @click="handleSearch">搜索</div>
+          </cpt-card>
+        </div>
 
-          </div>
-          <div class="m-tb">
+        <div class="div_info">
+          <cpt-card>
+            <div class="div_search_list">
+              <el-input size="mini"
+                        WarningColor='warning'
+                        placeholder="请输入搜索内容"
+                        v-model="search">
+                <i slot="prefix"
+                  class="icon">
+                  <img src="../../../../../assets/img/modules/visual/sousuo.png"
+                      alt />
+                </i>
+              </el-input>
 
-            <div class="tb">
-              <cpt-tb :col-list="demand.colList"
-                      :loading="demand.loading"
-                      :header="demand.header"
-                      :list="demand.list"
-                      @handleClickRow="handleClickRow"></cpt-tb>
+              <div class="btn"
+                  @click="handleSearch">搜索</div>
 
             </div>
-            <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
-                             :page-size="demand.pageSize"
-                             :total="demand.total"
-                             background
-                             layout="prev, pager, next,total"
-                             @current-change="handlePageNoChange_demand">
-              </el-pagination>
+            <div class="m-tb">
+
+              <div class="tb">
+                <cpt-tb :col-list="demand.colList"
+                        :loading="demand.loading"
+                        :header="demand.header"
+                        :list="demand.list"
+                        @handleClickRow="handleClickRow"></cpt-tb>
+
+              </div>
+              <div class="m-pagination">
+                <el-pagination :current-page="demand.pageNo"
+                              :page-size="demand.pageSize"
+                              :total="demand.total"
+                              background
+                              layout="prev, pager, next,total"
+                              @current-change="handlePageNoChange_demand">
+                </el-pagination>
+              </div>
             </div>
-          </div>
 
-        </cpt-card>
+          </cpt-card>
+        </div>
 
       </div>
     </div>

From a99d46ed527d5851c23d0539cbdfaef568a7888a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 13 Jul 2022 15:09:19 +0800
Subject: [PATCH 16/28] 11

---
 src/views/modules/workSys/role/role.vue     |  2 +-
 src/views/modules/workSys/role/roleForm.vue | 26 ++++-----------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index f61225cd..c6b03d01 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -242,7 +242,7 @@ export default {
     },
 
     diaClose () {
-      this.$refs.ref_form.resetData()
+
       this.formShow = false
 
     },
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index c7b4f185..753a1ce0 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -126,7 +126,7 @@ export default {
       await this.getMenuList()
       await this.getMenuShujuList()
 
-      this.$refs['ref_form'].resetFields();
+
       this.$refs.menuListTree.setCheckedKeys([])
       this.$refs.menuListShujuTree.setCheckedKeys([])
 
@@ -297,31 +297,15 @@ export default {
 
     },
 
-
-
     resetData () {
       this.roleId = ''
-      this.fileList = []
-      this.hideUploadEdit = false
 
       this.formData = {
-        roleId: '',
-        agencyId: '',//当前网格所属组织Id	
-        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
-        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
+        id: '',
         name: '',
-        idCard: '',
-        mobile: '',
-        natTime: '',
-        natAddress: '',
-        natResult: '',
-        isSelChannel: false,
-        channel: [],
-        content: '',
-
-        fileName: '',//附件名	
-        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
-        attachmentUrl: '',//附件地址	
+        remark: '',//备注
+        menuIdList: [],
+        customerId: ''
 
       }
     },

From 762773ff4c8e36b188b40a2d46a10df9aac7253d Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 13 Jul 2022 15:11:15 +0800
Subject: [PATCH 17/28] 11

---
 src/router/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index a3c1e3f3..ad616091 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => {
   // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 
   http
-    .get("gov/access/menu/navDigitalCommunity?tableName=data_menu")
+    .get("/gov/access/menu/nav?tableName=data_menu")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => {
     });
 
   http
-    .get("gov/access/menu/navDigitalCommunity")
+    .get("/gov/access/menu/nav")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录

From 6c6eb0a1810ada99a7a2848beb36981b79158670 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 13 Jul 2022 15:13:00 +0800
Subject: [PATCH 18/28] 11

---
 src/router/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index ad616091..a3c1e3f3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => {
   // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 
   http
-    .get("/gov/access/menu/nav?tableName=data_menu")
+    .get("gov/access/menu/navDigitalCommunity?tableName=data_menu")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => {
     });
 
   http
-    .get("/gov/access/menu/nav")
+    .get("gov/access/menu/navDigitalCommunity")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录

From c76d469248a243c55d4318396b3461b17a63d331 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 13 Jul 2022 17:33:15 +0800
Subject: [PATCH 19/28] =?UTF-8?q?404=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js              | 36 +++++++++++++++++++++++++-------
 src/views/modules/404.vue        | 16 ++++++++++++++
 src/views/modules/visual/404.vue | 16 ++++++++++++++
 src/views/pages/404.vue          |  4 ++--
 4 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 src/views/modules/404.vue
 create mode 100644 src/views/modules/visual/404.vue

diff --git a/src/router/index.js b/src/router/index.js
index a3c1e3f3..b367df8c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -94,6 +94,16 @@ export const moduleRoutes = {
         isTab: true,
       },
     },
+    {
+      path: "404",
+      props: true,
+      component: () => import("@/views/modules/404"),
+      name: "main-404",
+      meta: {
+        title: "页面未找到或无权访问",
+        isTab: false,
+      },
+    },
   ],
 };
 
@@ -129,6 +139,16 @@ export const moduleShujuRoutes = {
         isTab: false,
       },
     },
+    {
+      path: "404",
+      props: true,
+      component: () => import("@/views/modules/visual/404"),
+      name: "main-shuju-404",
+      meta: {
+        title: "页面未找到或无权访问",
+        isTab: false,
+      },
+    },
   ],
 };
 
@@ -519,10 +539,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
       children: routes,
     },
     {
-      path: "*",
-      // redirect: {
-      //   name: "404",
-      // },
+      path: "/main/*",
+      redirect: {
+        path: "/main/404",
+      },
     },
   ]);
   window.SITE_CONFIG["dynamicMenuRoutes"] = routes;
@@ -593,10 +613,10 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) {
       children: routes,
     },
     {
-      path: "*",
-      // redirect: {
-      //   name: "404",
-      // },
+      path: "/main-shuju/*",
+      redirect: {
+        path: "/main-shuju/404",
+      },
     },
   ]);
   window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes;
diff --git a/src/views/modules/404.vue b/src/views/modules/404.vue
new file mode 100644
index 00000000..33682a33
--- /dev/null
+++ b/src/views/modules/404.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="m-404">页面未找到或无权访问</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped>
+.m-404 {
+  margin-top: 200px;
+  font-size: 60px;
+  color: rgba(#000, 0.3);
+  text-align: center;
+}
+</style>
diff --git a/src/views/modules/visual/404.vue b/src/views/modules/visual/404.vue
new file mode 100644
index 00000000..047aec70
--- /dev/null
+++ b/src/views/modules/visual/404.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="m-404">页面未找到或无权访问</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped>
+.m-404 {
+  margin-top: 200px;
+  font-size: 60px;
+  color: rgba(#fff, 0.6);
+  text-align: center;
+}
+</style>
diff --git a/src/views/pages/404.vue b/src/views/pages/404.vue
index 5d49d643..e7796ec6 100644
--- a/src/views/pages/404.vue
+++ b/src/views/pages/404.vue
@@ -2,11 +2,11 @@
   <div class="aui-wrapper aui-page__not-found">
     <div class="aui-content__wrapper">
       <div class="aui-content">
-        <h2 class="title">404</h2>
+        <h2 class="title" style="font-size: 60px">页面未找到或无权访问</h2>
         <p class="desc" v-html="$t('notFound.desc')"></p>
         <div class="btn-bar">
           <el-button @click="$router.go(-1)">{{ $t('notFound.back') }}</el-button>
-          <el-button type="primary" @click="$router.push({ name: 'home' })">{{ $t('notFound.home') }}</el-button>
+          <el-button type="primary" @click="$router.push({ name: 'index' })">{{ $t('notFound.home') }}</el-button>
         </div>
       </div>
     </div>

From 03029c1505c3fdf39abd6d2a03386f74474a71e6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 14 Jul 2022 08:51:00 +0800
Subject: [PATCH 20/28] 11

---
 src/views/modules/workSys/role/roleForm.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 753a1ce0..05f6281f 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -126,7 +126,6 @@ export default {
       await this.getMenuList()
       await this.getMenuShujuList()
 
-
       this.$refs.menuListTree.setCheckedKeys([])
       this.$refs.menuListShujuTree.setCheckedKeys([])
 
@@ -329,7 +328,7 @@ export default {
     dataRule () {
       return {
         name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
+          { required: true, message: '角色名称不能为空', trigger: 'change' }
         ],
 
 
@@ -340,11 +339,6 @@ export default {
   props: {
 
 
-
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
   }
 }
 </script>

From 280de3840b40d62c2855aae0216b62ea7846df53 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 14 Jul 2022 09:09:16 +0800
Subject: [PATCH 21/28] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/visual/communityGovern/fivelayers/mapIndex copy.vue | 2 +-
 .../modules/visual/communityGovern/fivelayers/mapIndex.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index efc340eb..981f4b0a 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -923,7 +923,7 @@ const vueGis = {
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
 
       let params = {
-        icSuperiorResourceId: info.id
+        icDangerousChemicalsId: info.id
       }
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 35664c13..9485e3ce 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -923,7 +923,7 @@ const vueGis = {
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
 
       let params = {
-        icSuperiorResourceId: info.id
+        icDangerousChemicalsId: info.id
       }
 
       const { data, code, msg } = await requestPost(url, params)

From d6ea1c75ef4507687303c7c6126b9f1450cfddf3 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 14 Jul 2022 10:19:52 +0800
Subject: [PATCH 22/28] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/dai/request.js     |   2 +
 src/js/dai/request2.js    |   2 +
 src/router/index.js       | 186 --------------------------------------
 src/utils/index.js        |   1 +
 src/views/pages/index.vue |  65 +++++++------
 src/views/pages/login.vue |   2 +-
 6 files changed, 44 insertions(+), 214 deletions(-)

diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index 92fb7831..709895d6 100644
--- a/src/js/dai/request.js
+++ b/src/js/dai/request.js
@@ -4,6 +4,7 @@
 import axios from "axios";
 import curry from "dai-js/tools/curry";
 import { Message } from "element-ui";
+import { clearLoginInfo } from "@/utils";
 
 const request = curry(
   (method, url, data = {}, headers = {}, progress = () => {}) => {
@@ -42,6 +43,7 @@ const request = curry(
           // 10005 token为空  10006登陆超时 10007别处登录
           console.log("登录失效");
           Message.error(res.data.msg);
+          clearLoginInfo();
           return next({
             name: "login",
           });
diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js
index 92fb7831..709895d6 100644
--- a/src/js/dai/request2.js
+++ b/src/js/dai/request2.js
@@ -4,6 +4,7 @@
 import axios from "axios";
 import curry from "dai-js/tools/curry";
 import { Message } from "element-ui";
+import { clearLoginInfo } from "@/utils";
 
 const request = curry(
   (method, url, data = {}, headers = {}, progress = () => {}) => {
@@ -42,6 +43,7 @@ const request = curry(
           // 10005 token为空  10006登陆超时 10007别处登录
           console.log("登录失效");
           Message.error(res.data.msg);
+          clearLoginInfo();
           return next({
             name: "login",
           });
diff --git a/src/router/index.js b/src/router/index.js
index b367df8c..9f87613e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -213,192 +213,6 @@ router.beforeEach((to, from, next) => {
   const customerId = localStorage.getItem("customerId");
   console.log("customerId：", customerId);
 
-  window.SITE_CONFIG["menuShujuList"] = [
-    // {
-    //   url: "/visual/plugin/power/organization",
-    //   name: "动力主轴",
-    //   id: "5feawfwaefwa577",
-    // },
-    {
-      id: "22213213",
-      name: "基础信息",
-      // url: "visual/basicinfo/basicInfoMain",
-      children: [
-        {
-          url: "/visual/basicinfo/basicInfoMain",
-          name: "人房信息统计",
-          id: "5feawfwaefwa5",
-        },
-        {
-          url: "/visual/basicinfo/personCategory/index",
-          name: "人员类别分析",
-          id: "5fwaefwaefawef5",
-        },
-        {
-          url: "/visual/basicinfo/houseStatic/houseStatic",
-          name: "人房概览统计",
-          id: "5fwaefwaefawef6",
-        },
-      ],
-    },
-    {
-      icon: "icon-setting",
-      id: "2",
-      name: "人员图谱",
-      url: "visual/basicinfo/peopleSearch",
-    },
-    {
-      icon: "icon-setting",
-      id: "3",
-      name: "人员预警",
-      url: "visual/warning/index",
-    },
-    {
-      icon: "icon-setting",
-      id: "2221321001",
-      name: "社区党建",
-      // url: "visual/basicinfo/basicInfoMain",
-      children: [
-        {
-          url: "/visual/communityParty/gridParty",
-          name: "网格党建平面图",
-          id: "5feawfwaefwa579",
-        },
-        {
-          url: "/visual/communityParty/party",
-          name: "党员信息统计",
-          id: "5feawfwaefwa578",
-        },
-        {
-          url: "/visual/communityParty/community",
-          name: "联建单位分析",
-          id: "5fwaefwaefawef588",
-        },
-        {
-          url: "/visual/communityParty/elegant",
-          name: "党员风采榜",
-          id: "5fwaefwaefawef589",
-        },
-      ],
-    },
-    {
-      icon: "icon-setting",
-      id: "2221321123",
-      name: "社区服务",
-      // url: "visual/basicinfo/basicInfoMain",
-      children: [
-        {
-          url: "/visual/measure/service",
-          name: "需求服务分析",
-          id: "5feawfwaefwa57",
-        },
-        {
-          url: "/visual/measure/volunteer",
-          name: "志愿服务分析",
-          id: "5fwaefwaefawef58",
-        },
-      ],
-    },
-    {
-      icon: "icon-setting",
-      id: "6",
-      name: "社区治理",
-      children: [
-        {
-          url: "visual/communityGovern/shijianchuli/shijianchulifenxi",
-          name: "事件处理分析",
-          id: "shijianchulifenxi",
-        },
-        // {
-        //   url: "visual/communityGovern/processAnalyze",
-        //   name: "事件处置分析",
-        //   id: "processAnalyze",
-        // },
-        {
-          url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi",
-          name: "事件分类分析",
-          id: "shijianfenleifenxi",
-        },
-        {
-          url: "/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi",
-          name: "多元服务分析",
-          id: "duoyuanfuwufenxi",
-        },
-        // {
-        //   url: "/visual/communityGovern/typeAnalyze",
-        //   name: "事件分类分析",
-        //   id: "typeAnalyze",
-        // },
-        // {
-        //   url: "/visual/communityGovern/resibuzz",
-        //   name: "居民热议分析",
-        //   id: "resibuzz",
-        // },
-        // {
-        //   url: "/visual/communityGovern/distributionAnalyze",
-        //   name: "事件分布分析",
-        //   id: "distributionAnalyze",
-        // },
-      ],
-    },
-
-    {
-      icon: "icon-setting",
-      id: "2221321fefefaewfa123",
-      name: "初心互助",
-      url: "visual/heart/index",
-      children: [],
-    },
-    {
-      icon: "icon-setting",
-      id: "2221321fefefaewfa122223",
-      name: "疫情防控",
-      url: "",
-      children: [],
-    },
-    {
-      icon: "icon-setting",
-      id: "44rq22222q2222",
-      name: "智慧安防",
-      // url: "visual/basicinfo/basicInfoMain",
-      children: [
-        {
-          url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel",
-          // url: "/visual/ai/index",
-          name: "视频监控",
-          id: "5feawfwa111111efwa57",
-        },
-        /*{
-      url: "/visual/ai/renliu",
-      name: "人流数据",
-      id: "5fwaefwae222112fawef58",
-    },
-    {
-      url: "/visual/ai/cheliu",
-      name: "车流数据",
-      id: "erawerwecsxefwaw",
-    },
-    {
-      url: "/visual/ai/shebei",
-      name: "设备数据",
-      id: "zfzffewaf",
-    },
-    {
-      url: "/visual/ai/gongdan",
-      name: "工单数据",
-      id: "fewafwafewaefddd",
-    },*/
-        {
-          // url: "/visual/ai/yujing",
-          url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
-          name: "预警分析",
-          id: "545345fdsfs",
-        },
-      ],
-    },
-  ];
-  // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
-
   http
     .get("gov/access/menu/navDigitalCommunity?tableName=data_menu")
     .then(({ data: res }) => {
diff --git a/src/utils/index.js b/src/utils/index.js
index c2232ac7..1e6b6e6f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -45,6 +45,7 @@ export function getDictLabel(dictType, dictValue) {
 export function clearLoginInfo() {
   store.commit('resetStore')
   Cookies.remove('token')
+  localStorage.setItem("token", '');
   window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false
 }
 
diff --git a/src/views/pages/index.vue b/src/views/pages/index.vue
index 056814c6..19ec9d88 100644
--- a/src/views/pages/index.vue
+++ b/src/views/pages/index.vue
@@ -5,14 +5,14 @@
         <div class="list">
           <div class="item" @click="handleClickItem(1)">
             <img class="logo" src="@/assets/img/index/logo-1.png" alt="" />
-             <!-- 党建引领基层治理互联管理平台 -->
+            <!-- 党建引领基层治理互联管理平台 -->
             <div class="name">数字社区管理平台</div>
             <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
 
           <div class="item z-on" @click="handleClickItem(2)">
             <img class="logo" src="@/assets/img/index/logo-2.png" alt="" />
-             <!-- 数据分析可视化平台 -->
+            <!-- 数据分析可视化平台 -->
             <div class="name">数字社区可视化平台</div>
             <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
@@ -21,7 +21,9 @@
       <div class="m-footer">
         <div class="login-footer">
           <p>
-            <a href="http://www.elinkchina.com.cn/" target="_blank">{{ $t('login.copyright') }}</a>
+            <a href="http://www.elinkchina.com.cn/" target="_blank">{{
+              $t("login.copyright")
+            }}</a>
           </p>
         </div>
       </div>
@@ -29,60 +31,69 @@
   </div>
 </template>
 <script>
-import Cookies from 'js-cookie'
-import debounce from 'lodash/debounce'
-import { messages } from '@/i18n'
-import { getUUID } from '@/utils'
-import { Loading } from 'element-ui' // 引入Loading服务
-import JSEncrypt from 'jsencrypt' //引入加密
+import Cookies from "js-cookie";
+import debounce from "lodash/debounce";
+import { messages } from "@/i18n";
+import { getUUID } from "@/utils";
+import { Loading } from "element-ui"; // 引入Loading服务
+import JSEncrypt from "jsencrypt"; //引入加密
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
   data() {
     return {
       pubKey: null, // 获取到公钥
       isShowLogin: true,
-      i18nMessages: messages
-    }
+      i18nMessages: messages,
+    };
   },
   components: {},
   computed: {},
   created() {},
   mounted() {},
 
+  beforeRouteEnter(to, from, next) {
+    console.log(from);
+    if (from.name == "login") {
+      next();
+      location.reload();
+    }
+    next();
+  },
+
   methods: {
     handleClickItem(k) {
       if (k == 1) {
-        this.$router.replace({ name: 'main' })
+        this.$router.replace({ name: "main" });
       } else if (k == 2) {
-        this.$router.replace({ name: 'main-shuju' })
+        this.$router.replace({ name: "main-shuju" });
       }
     },
 
     // 平阴联动 自动登录接口
     getAutoLogin(platformToken) {
-      this.dataForm.thirdToken = platformToken
-      this.dataForm.platform = 'pyld'
+      this.dataForm.thirdToken = platformToken;
+      this.dataForm.platform = "pyld";
       this.$http
         .post(`/auth/sso/oper/third/login`, this.dataForm)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             if (res.code == 8302) {
-              return this.$message.error(res.msg)
+              return this.$message.error(res.msg);
             }
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           }
-          localStorage.setItem('customerId', res.data.customerId)
-          localStorage.setItem('userType', 'work')
-          localStorage.setItem('showHeader', '0')
-          localStorage.setItem('token', res.data.token)
-          this.$router.replace({ name: 'home' })
+          localStorage.setItem("customerId", res.data.customerId);
+          localStorage.setItem("userType", "work");
+          localStorage.setItem("showHeader", "0");
+          localStorage.setItem("token", res.data.token);
+          this.$router.replace({ name: "home" });
         })
-        .catch(() => {})
+        .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" src="@/assets/scss/pages/indexWork.scss" scoped></style>
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 6db09b13..10cf96a9 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -247,7 +247,7 @@ export default {
           localStorage.setItem("userType", "work");
           localStorage.setItem("showHeader", "0");
           localStorage.setItem("token", res.data.token);
-          this.$router.replace({ name: "home" });
+          this.$router.replace({ name: "index" });
         })
         .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin

From fd9d98ad4a0e9ca85db66b49766e5061019fce34 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 14 Jul 2022 10:42:29 +0800
Subject: [PATCH 23/28] 11

---
 src/views/modules/workSys/role/roleForm.vue | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index 05f6281f..0e0304a2 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -91,8 +91,6 @@ export default {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
 
-
-
       btnDisable: false,
 
       roleId: '',
@@ -230,19 +228,7 @@ export default {
 
     async addNat () {
 
-      // let menuList1 = [
-      //   ...this.$refs.menuListTree.getCheckedKeys(),
-      //   ...this.$refs.menuListTree.getHalfCheckedKeys(),
-      // ]
-      // let menuList2 = [
-      //   ...this.$refs.menuListShujuTree.getCheckedKeys(),
-      //   ...this.$refs.menuListShujuTree.getHalfCheckedKeys()
-      // ]
-
-      //   console.log('menuList1', menuList1)
-      //   console.log('menuList2', menuList2)
-      // let menuAll=menuList1.concat(menuList2)
-      // console.log('menuAll',menuAll)
+
       this.formData.menuIdList = []
       this.formData.menuIdList = [
         ...this.$refs.menuListTree.getCheckedKeys(),
@@ -297,6 +283,7 @@ export default {
     },
 
     resetData () {
+
       this.roleId = ''
 
       this.formData = {
@@ -307,6 +294,7 @@ export default {
         customerId: ''
 
       }
+      this.$refs['ref_form'].resetFields()
     },
     // 开启加载动画
     startLoading () {

From 38cd589aad02e9d77e6148f32d41e1fa6927bc0f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 14 Jul 2022 10:45:44 +0800
Subject: [PATCH 24/28] 11

---
 src/views/modules/workSys/role/role.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index c6b03d01..f61225cd 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -242,7 +242,7 @@ export default {
     },
 
     diaClose () {
-
+      this.$refs.ref_form.resetData()
       this.formShow = false
 
     },

From 376d05bbdbf84aeff81de5f02af5d7e0a6e2d140 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 14 Jul 2022 14:26:40 +0800
Subject: [PATCH 25/28] 11

---
 src/views/modules/workSys/role/role.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index f61225cd..da7d11f5 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -317,17 +317,13 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        orgType: 'current',//当前组织:current 根组织：all		
+
         name: '',//姓名	
-        mobile: '',//手机号	
-        idCard: '',//身份证号码	
-        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
-        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+
       }
-      this.timeRange = []
 
       this.pageNo = 0
-      // this.loadTable()
+      this.loadTable()
     },
 
     handleSizeChange (val) {

From 9af0447d917f63f0341d859a4bf4680d0c923152 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 14 Jul 2022 16:10:46 +0800
Subject: [PATCH 26/28] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=A9=BF=E9=80=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/basicInfoMain.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 819f2df3..c21671d6 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -424,6 +424,7 @@
   width: 370px;
   height: 470px;
   overflow: hidden;
+  pointer-events: none;
 
   .wrap {
     display: flex;
@@ -433,6 +434,7 @@
     transform: translateX(-5px);
     transition: all ease 1s;
     border-radius: 4px;
+    pointer-events: auto;
   }
 
   .wrap-hidden {

From ae38c0901fcdb4527da54559d81b0cee0e573651 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 14 Jul 2022 16:35:33 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E4=B8=80=E9=A1=B5?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=A1=B5=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue             | 8 ++++----
 src/views/modules/visual/basicinfo/peopleList.vue         | 2 +-
 src/views/modules/visual/basicinfo/peopleSearch.vue       | 2 +-
 .../visual/basicinfo/personCategory/recordList.vue        | 2 +-
 .../communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue      | 2 +-
 .../visual/communityGovern/fivelayers/mapIndex copy 2.vue | 2 +-
 .../visual/communityGovern/fivelayers/mapIndex copy.vue   | 2 +-
 .../visual/communityGovern/fivelayers/mapIndex-baidu.vue  | 2 +-
 .../visual/communityGovern/fivelayers/mapIndex.vue        | 2 +-
 src/views/modules/visual/communityGovern/resibuzz.vue     | 2 +-
 .../shijianchuli/shijianchulifenxi copy.vue               | 2 +-
 .../communityGovern/shijianchuli/shijianchulifenxi.vue    | 2 +-
 .../communityGovern/shijianfenlei/shijianfenleifenxi.vue  | 2 +-
 src/views/modules/visual/communityGovern/typeAnalyze.vue  | 2 +-
 src/views/modules/visual/communityParty/community.vue     | 4 ++--
 src/views/modules/visual/communityParty/elegant.vue       | 2 +-
 src/views/modules/visual/communityParty/gridParty.vue     | 2 +-
 src/views/modules/visual/communityParty/party.vue         | 4 ++--
 src/views/modules/visual/communityParty/partyOld.vue      | 4 ++--
 src/views/modules/visual/measure/service.vue              | 2 +-
 src/views/modules/visual/plugin/power/organization.vue    | 2 +-
 .../warning/components/screen-table/people-list.vue       | 2 +-
 src/views/modules/visual/warning/index.vue                | 2 +-
 src/views/modules/warning/index.vue                       | 2 +-
 24 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index e0a9cea6..2fe8caee 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -330,7 +330,7 @@
               ></cpt-tb>
 
               <div class="m-pagination" v-if="demand.total > demand.pageSize">
-                <el-pagination
+                <el-pagination hide-on-single-page
                   :current-page="demand.pageNo"
                   :page-size="demand.pageSize"
                   :total="demand.total"
@@ -380,7 +380,7 @@
                   class="m-pagination"
                   v-if="incident.total > incident.pageSize"
                 >
-                  <el-pagination
+                  <el-pagination hide-on-single-page
                     :current-page="incident.pageNo"
                     :page-size="incident.pageSize"
                     :total="incident.total"
@@ -413,7 +413,7 @@
                 </div>
 
                 <div class="m-pagination" v-if="topic.total > topic.pageSize">
-                  <el-pagination
+                  <el-pagination hide-on-single-page
                     :current-page="topic.pageNo"
                     :page-size="topic.pageSize"
                     :total="topic.total"
@@ -462,7 +462,7 @@
                 </div>
 
                 <div class="m-pagination" v-if="point.total > point.pageSize">
-                  <el-pagination
+                  <el-pagination hide-on-single-page
                     :current-page="point.pageNo"
                     :page-size="point.pageSize"
                     :total="point.total"
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index 302b02cb..83758251 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -69,7 +69,7 @@
 
         </div>
         <div class="pagination">
-          <el-pagination background
+          <el-pagination hide-on-single-page background
                         layout="prev, pager, next, total"
                         :current-page="pageNo"
                         :page-size="pageSize"
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index 4ef10830..160afc19 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -85,7 +85,7 @@
 
       </div>
       <div class="pagination">
-        <el-pagination background
+        <el-pagination hide-on-single-page background
                        layout="prev, pager, next"
                        :current-page="pageNo"
                        :page-size="pageSize"
diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
index 0d36a46c..ba5183d6 100644
--- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
@@ -71,7 +71,7 @@
       </div>
     </div>
     <div class="pagination-record">
-      <el-pagination :current-page="pageNo"
+      <el-pagination hide-on-single-page :current-page="pageNo"
                      :page-size="pageSize"
                      background
                      layout="prev, pager, next"
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 3f98ac65..29316194 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -35,7 +35,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index 7ee8f5f8..050beb36 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
@@ -92,7 +92,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index efc340eb..f2834df4 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -92,7 +92,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 049037cd..6d7d9141 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -92,7 +92,7 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index d812085a..e7ad5d08 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -89,7 +89,7 @@
 
               </div>
               <div class="m-pagination">
-                <el-pagination :current-page="demand.pageNo"
+                <el-pagination hide-on-single-page :current-page="demand.pageNo"
                               :page-size="demand.pageSize"
                               :total="demand.total"
                               background
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 11f929fd..6b3ea9c4 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -54,7 +54,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
index 301a60a9..c73db8d0 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
@@ -103,7 +103,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
index c38f83ef..40467b1f 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
@@ -103,7 +103,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
index 20ba99f1..59a707c4 100644
--- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
+++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
@@ -90,7 +90,7 @@
 
           </div>
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index 8d7885cc..b1987c48 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -55,7 +55,7 @@
           </div>
 
           <div class="m-pagination">
-            <el-pagination :current-page="demand.pageNo"
+            <el-pagination hide-on-single-page :current-page="demand.pageNo"
                            :page-size="demand.pageSize"
                            :total="demand.total"
                            background
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 9227f734..8b3dc562 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -70,7 +70,7 @@
                           :operate="true"
                           @look="handleUnitLook"></screen-table>
             <div class="pagination">
-              <el-pagination :current-page="unitpageNo"
+              <el-pagination hide-on-single-page :current-page="unitpageNo"
                              :page-size="unitpageSize"
                              background
                              layout="prev, pager, next"
@@ -162,7 +162,7 @@
                           :operate="true"
                           @look="handleLook"></screen-table>
             <div class="pagination">
-              <el-pagination :current-page="pageNo"
+              <el-pagination hide-on-single-page :current-page="pageNo"
                              :page-size="pageSize"
                              background
                              layout="prev, pager, next"
diff --git a/src/views/modules/visual/communityParty/elegant.vue b/src/views/modules/visual/communityParty/elegant.vue
index bc45c547..2e974129 100644
--- a/src/views/modules/visual/communityParty/elegant.vue
+++ b/src/views/modules/visual/communityParty/elegant.vue
@@ -54,7 +54,7 @@
         
       </div>
       <div class="pagination">
-          <el-pagination
+          <el-pagination hide-on-single-page
             :current-page="pageNo"
             :page-size="pageSize"
             background
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index a00b0687..c70b00ea 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -36,7 +36,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index e1a4fc83..82633351 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -67,7 +67,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="agePageNo"
                 :page-size="agePageSize"
                 background
@@ -114,7 +114,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
diff --git a/src/views/modules/visual/communityParty/partyOld.vue b/src/views/modules/visual/communityParty/partyOld.vue
index 26668709..6e358108 100644
--- a/src/views/modules/visual/communityParty/partyOld.vue
+++ b/src/views/modules/visual/communityParty/partyOld.vue
@@ -56,7 +56,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="agePageNo"
                 :page-size="agePageSize"
                 background
@@ -103,7 +103,7 @@
               @row="handleClickRow"
             ></screen-table>
             <div class="pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 150fc5f2..6929b485 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -129,7 +129,7 @@
           @look="handleLook"
         ></screen-table>
         <div class="pagination">
-          <el-pagination
+          <el-pagination hide-on-single-page
             :current-page="pageNo"
             :page-size="pageSize"
             background
diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue
index 7d35ec28..e27852e7 100644
--- a/src/views/modules/visual/plugin/power/organization.vue
+++ b/src/views/modules/visual/plugin/power/organization.vue
@@ -32,7 +32,7 @@
                           :operate="true"
                           @look="handleLook"></screen-table>
             <div class="pagination">
-              <el-pagination :current-page="pageNo"
+              <el-pagination hide-on-single-page :current-page="pageNo"
                              :page-size="pageSize"
                              background
                              layout="prev, pager, next"
diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue
index 0cc25b6b..742e13c7 100644
--- a/src/views/modules/visual/warning/components/screen-table/people-list.vue
+++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue
@@ -22,7 +22,7 @@
             </div>
 
             <div class="m-pagination">
-              <el-pagination
+              <el-pagination hide-on-single-page
                 :current-page="pageNo"
                 :page-size="pageSize"
                 background
diff --git a/src/views/modules/visual/warning/index.vue b/src/views/modules/visual/warning/index.vue
index 3ed6dc27..310e6887 100644
--- a/src/views/modules/visual/warning/index.vue
+++ b/src/views/modules/visual/warning/index.vue
@@ -53,7 +53,7 @@
           :visibleLoading="visibleLoading"
         ></screen-table>
         <div class="pagination">
-          <el-pagination
+          <el-pagination hide-on-single-page
             :current-page="pageNo"
             :page-size="pageSize"
             background
diff --git a/src/views/modules/warning/index.vue b/src/views/modules/warning/index.vue
index aa668dc8..bb693617 100644
--- a/src/views/modules/warning/index.vue
+++ b/src/views/modules/warning/index.vue
@@ -52,7 +52,7 @@
         :visibleLoading="visibleLoading"
       ></screen-table>
       <div class="pagination">
-        <el-pagination
+        <el-pagination hide-on-single-page
           :current-page="pageNo"
           :page-size="pageSize"
           background

From 95780a0456c8f7e7b3a77c0d3508111e14b3eed8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 14 Jul 2022 16:48:35 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=80=8E=E4=B9=88=E5=8E=BB=E9=99=A4=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=AF=BC=E8=87=B4=E7=9A=84card=E9=BB=91=E7=BA=BF?=
 =?UTF-8?q?=E5=91=A2=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/shuju-card.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/assets/scss/shuju-card.scss b/src/assets/scss/shuju-card.scss
index 04b4e1d4..f331fd28 100644
--- a/src/assets/scss/shuju-card.scss
+++ b/src/assets/scss/shuju-card.scss
@@ -38,6 +38,7 @@
 
         &.card-line-t {
             background-image: url(../img/shuju/card/line-t.png);
+            background-size: auto 22px;
             left: 22px;
             right: 240px;
             top: 0;
@@ -45,6 +46,7 @@
         }
         &.card-line-r {
             background-image: url(../img/shuju/card/line-r.png);
+            background-size: 22px auto;
             top: 22px;
             bottom: 22px;
             right: 0;
@@ -52,6 +54,7 @@
         }
         &.card-line-b {
             background-image: url(../img/shuju/card/line-b.png);
+            background-size: auto 22px;
             left: 22px;
             right: 240px;
             bottom: 0;
@@ -59,6 +62,7 @@
         }
         &.card-line-l {
             background-image: url(../img/shuju/card/line-l.png);
+            background-size: 22px auto;
             top: 22px;
             bottom: 22px;
             left: 0;