From decb93753a59a8c1ef97edf2b05adf9b914bad31 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 6 Apr 2023 14:57:12 +0800
Subject: [PATCH 01/34] =?UTF-8?q?=E5=B8=82=E5=8C=97=E5=8C=BA=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        | 2 +-
 src/views/components/resiSearch.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 76454b2f6..c256d3319 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "jsencrypt": "3.0.3",
     "lodash": "4.17.15",
     "mint-ui": "2.2.13",
-    "node-sass": "4.12.0",
+    "node-sass": "^4.12.0",
     "ol": "6.9.0",
     "portfinder": "1.0.21",
     "proj4": "2.8.0",
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 0caa14e6c..60e4b748c 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -308,7 +308,7 @@ export default {
       HOME_ID: ''
     }
     let orgOptionProps = {
-      multiple: false,
+      multiple: true,// 市北项目开启多选，2023-04-06
       value: 'agencyId',
       label: 'agencyName',
       children: 'subAgencyList',

From e16a9e2acf82caf3019e0c57a3ae28be8af9ad23 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 6 Apr 2023 15:36:17 +0800
Subject: [PATCH 02/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 22 +++++++++++++++-------
 src/views/modules/base/resi.vue     | 14 +-------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 60e4b748c..721c3bf75 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -302,6 +302,7 @@ export default {
     let constForm = {
       ...form,
       GRID_ID: '',
+      GRID_IDS: '',
       VILLAGE_ID: '',
       BUILD_ID: '',
       UNIT_ID: '',
@@ -341,7 +342,9 @@ export default {
       form: {
         ...form,
         AGENCY_ID: '',
+        AGENCY_IDS: '',
         GRID_ID: '',
+        GRID_IDS:'',
         VILLAGE_ID: '',
         BUILD_ID: '',
         UNIT_ID: '',
@@ -381,7 +384,7 @@ export default {
       },
 
       queryType:{
-        'AGENCY_ID':'like'
+        'AGENCY_ID':'list_equal'
       }
     }
   },
@@ -518,17 +521,22 @@ export default {
     handleChangeAgency(val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
+        //市北定制化需求，组织与网格多选
         if(obj.level === 'grid'){
-          this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          // this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.GRID_IDS = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
           this.form.AGENCY_ID=''
         }else{
-          this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.form.AGENCY_IDS = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          // this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
           this.form.GRID_ID = ''
         }
 
       }else{
-         this.form.AGENCY_ID=''
-         this.form.GRID_ID = ''
+        //  this.form.AGENCY_ID=''
+        //  this.form.GRID_ID = ''
+         this.form.AGENCY_IDS=''
+         this.form.GRID_IDS = ''
       }
 
       this.form.VILLAGE_ID = ''
@@ -641,8 +649,8 @@ export default {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
-          gridId: this.form.GRID_ID,
-          agencyId: this.form.AGENCY_ID,
+          gridIds: this.form.GRID_IDS,
+          agencyIds: this.form.AGENCY_IDS,
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 750e0087c..85d4d8fc2 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -656,14 +656,9 @@ export default {
     handleSearchFrom () {
       let arr = [];
       this.searchList.forEach((item) => {
-        const arr1 =
-          this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
+        const arr1 = this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
         arr = arr.concat(arr1);
-        // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
       });
-      console.log("search-----refs", this.$refs);
-
-      console.log("search-----arr", arr);
       this.currentPage = 1;
       this.conditions = arr;
       this.getTableData();
@@ -675,10 +670,6 @@ export default {
       this.getTableData();
     },
     resetSearchForm (formName) {
-      // for(const n in this.form) {
-      //   this.form[n] = ''
-      // }
-      // this.handleSearch()
       this.searchList.forEach((item) => {
         this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
         // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
@@ -1246,15 +1237,12 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
           } else {
-            console.log("获取查询详情成功--sss", res);
-
             res.data.forEach((item) => {
               item.queryItemList.forEach((n) => {
                 if (n.optionSourceType === "remote") {
                   this.getOptionsList(n.optionSourceValue).then((res) => {
                     n.options = this.getTreeData(res);
                   });
-                  // console.log('')
                 } else if (n.itemType == "radio" && n.options.length == 0) {
                   n.options = [
                     {

From 6073b8a4cb6897906a8c2f43eb0efc007258a3a0 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 6 Apr 2023 17:08:44 +0800
Subject: [PATCH 03/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 721c3bf75..5769a0ebc 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -342,9 +342,9 @@ export default {
       form: {
         ...form,
         AGENCY_ID: '',
-        AGENCY_IDS: '',
+        AGENCY_IDS: [],
         GRID_ID: '',
-        GRID_IDS:'',
+        GRID_IDS:[],
         VILLAGE_ID: '',
         BUILD_ID: '',
         UNIT_ID: '',
@@ -520,23 +520,15 @@ export default {
     },
     handleChangeAgency(val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      console.log('val====',val);
+      console.log('obj====',obj);
       if (obj) {
         //市北定制化需求，组织与网格多选
-        if(obj.level === 'grid'){
-          // this.form.GRID_ID =  this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.GRID_IDS = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.AGENCY_ID=''
-        }else{
-          this.form.AGENCY_IDS = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          // this.form.AGENCY_ID = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.form.GRID_ID = ''
-        }
-
+          this.form.GRID_IDS.push(obj.agencyId);
+          this.form.AGENCY_IDS.push( obj.pid);
       }else{
-        //  this.form.AGENCY_ID=''
-        //  this.form.GRID_ID = ''
-         this.form.AGENCY_IDS=''
-         this.form.GRID_IDS = ''
+         this.form.AGENCY_IDS=[]
+         this.form.GRID_IDS = []
       }
 
       this.form.VILLAGE_ID = ''

From ff682c24b4007495e483fa46428f4032b313a216 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Thu, 6 Apr 2023 17:09:10 +0800
Subject: [PATCH 04/34] =?UTF-8?q?=E7=A7=BB=E9=99=A4log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 5769a0ebc..e4e46366e 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -520,8 +520,6 @@ export default {
     },
     handleChangeAgency(val) {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      console.log('val====',val);
-      console.log('obj====',obj);
       if (obj) {
         //市北定制化需求，组织与网格多选
           this.form.GRID_IDS.push(obj.agencyId);
@@ -538,7 +536,6 @@ export default {
       this.getValiheList()
     },
     handleChangeGrid(val) {
-      console.log('val', val)
       this.form.VILLAGE_ID = ''
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
@@ -546,7 +543,6 @@ export default {
       this.getValiheList()
     },
     handleChangeV(val) {
-      console.log('val', val)
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
@@ -599,7 +595,6 @@ export default {
           }
         }
       }
-      console.log('fixedList----999', this.fixedList)
       this.tempFormList.forEach((item) => {
         if (item.columnName === val) item.isChange = true
       })

From d4f16929ffc93b8d388dca8e059bb49b5404f574 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Fri, 7 Apr 2023 03:03:51 +0800
Subject: [PATCH 05/34] =?UTF-8?q?fix:=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 69 ++++++++++++++++++++++-------
 src/views/modules/base/resi.vue     |  2 +-
 2 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index e4e46366e..64173307a 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -242,6 +242,7 @@
 
 <script>
 import inputRange from './rangeInput.vue'
+import Ar from 'element-ui/src/locale/lang/ar'
 export default {
   name: 'ResiSearch',
   components: {
@@ -332,7 +333,9 @@ export default {
       fixedList: [],
       fixedForm: {
         AGENCY_ID: '',
+        AGENCY_IDS: [],
         GRID_ID: '',
+        GRID_IDS: [],
         VILLAGE_ID: '',
         BUILD_ID: '',
         UNIT_ID: '',
@@ -519,21 +522,38 @@ export default {
       }
     },
     handleChangeAgency(val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      if (obj) {
-        //市北定制化需求，组织与网格多选
-          this.form.GRID_IDS.push(obj.agencyId);
-          this.form.AGENCY_IDS.push( obj.pid);
-      }else{
-         this.form.AGENCY_IDS=[]
-         this.form.GRID_IDS = []
-      }
+      // let checkedNodes = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.$nextTick(()=> {
+        let checkedNodes = this.$refs["myCascader"].getCheckedNodes();
+        if (checkedNodes) {
+          //市北定制化需求，组织与网格多选
+          //   this.form.GRID_IDS.push(obj.agencyId);
+          //   this.form.AGENCY_IDS.push( obj.pid);
 
-      this.form.VILLAGE_ID = ''
-      this.form.BUILD_ID = ''
-      this.form.UNIT_ID = ''
-      this.form.HOME_ID = ''
-      this.getValiheList()
+          // 清空旧的数组，重新组装
+          this.form.GRID_IDS = [];
+          this.form.AGENCY_IDS = [];
+
+          for (let i in checkedNodes) {
+            let nodeData = checkedNodes[i].data;
+            if (nodeData.level == 'grid') {
+              this.form.GRID_IDS.push(nodeData.agencyId);
+            } else {
+              this.form.AGENCY_IDS.push(nodeData.agencyId);
+            }
+          }
+
+        } else {
+          this.form.AGENCY_IDS = []
+          this.form.GRID_IDS = []
+        }
+
+        this.form.VILLAGE_ID = ''
+        this.form.BUILD_ID = ''
+        this.form.UNIT_ID = ''
+        this.form.HOME_ID = ''
+        this.getValiheList()
+      })
     },
     handleChangeGrid(val) {
       this.form.VILLAGE_ID = ''
@@ -570,15 +590,32 @@ export default {
             this.fixedList.forEach((item, index) => {
               if (item.columnName == val) {
                 hasVal = true
-                item.columnValue[0] = this.form[val]
+                let valueInForm = this.form[val]
+                if (valueInForm instanceof Array) {
+                  // 如果参数本身就是数组，直接赋值
+                  item.columnValue = valueInForm
+                } else {
+                  // 如果参数不是数组，构造为数组
+                  item.columnValue[0] = this.form[val]
+                }
                 if (!this.form[val]) this.fixedList.splice(index, 1)
                 console.log('fixedList----val', this.fixedList)
               } else {
+                let columnValue = undefined;
+                let valueInForm = this.form[val]
+                if (valueInForm instanceof Array) {
+                  // 如果参数本身就是数组，直接赋值
+                  columnValue = valueInForm
+                } else {
+                  // 如果参数不是数组，构造为数组
+                  columnValue = [valueInForm]
+                }
+
                 _item = {
                   queryType: this.queryType[val]?this.queryType[val]:'equal',//'equal',
                   tableName: 'ic_resi_user',
                   columnName: val,
-                  columnValue: [this.form[val]]
+                  columnValue: columnValue
                 }
                 console.log('fixedList----else', _item)
                 // this.$set(this.fixedList, index, _item)
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 85d4d8fc2..b1c4cb86d 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -142,7 +142,7 @@
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button> -->
-            <!-- <el-button @click="handleTransfer(scope.row)" 
+            <!-- <el-button @click="handleTransfer(scope.row)"
                        type="text"
                        size="small"
                        class="div-table-button--detail">变动</el-button> -->

From b38a172c4d0c8b7b745a245dc20b29531c7afe4d Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Fri, 7 Apr 2023 09:48:58 +0800
Subject: [PATCH 06/34] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=80=89=E6=8B=A9=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 64173307a..812de530f 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -13,6 +13,7 @@
                              :options="orgOptions"
                              :props="orgOptionProps"
                              :show-all-levels="false"
+                             collapse-tags
                              @change="handleChangeAgency"></el-cascader>
               </div>
             </div>
@@ -314,7 +315,8 @@ export default {
       value: 'agencyId',
       label: 'agencyName',
       children: 'subAgencyList',
-      checkStrictly: true
+      checkStrictly: true,
+      
     }
 
     return {

From 9832ec93e170c61246b859b8f6b71136e09e12e5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:48:06 +0800
Subject: [PATCH 07/34] =?UTF-8?q?=E8=AF=95=E8=AF=95=E7=BF=B0=E6=9E=97?=
 =?UTF-8?q?=E9=99=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |   3 +-
 src/js/store/index.js                |   2 +
 src/views/main-shuju/main-navbar.vue | 486 +++++++++++++++------------
 src/views/main-shuju/main.vue        | 286 ++++++++--------
 4 files changed, 417 insertions(+), 360 deletions(-)

diff --git a/.env.development b/.env.development
index d1c8a3e7c..d38c11f03 100644
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,13 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epmet-panshi.elinkservice.cn/api
 
 # VUE_APP_NODE_ENV=dev_sdtdt
 VUE_APP_NODE_ENV=dev
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 7ebb31e94..eb25c128e 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -45,6 +45,8 @@ export default new Vuex.Store({
     fixed1920: {
       height: document.documentElement.clientHeight,
     },
+
+    fullscreen: false, //是否全屏状态
   },
   modules: {
     user,
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 12346a8a6..aa2c272a3 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -1,86 +1,100 @@
 <template>
-  <div>
-    <nav v-if="showHeader" class="m-navbar">
-      <div class="navbar__header">
-        <h1 class="navbar__brand">
-          <a class="navbar__brand-lg" href="javascript:;">{{ customerName }}</a>
-          <a class="navbar__brand-mini" href="javascript:;">{{
-            customerName.slice(0, 2)
-          }}</a>
-        </h1>
-      </div>
-      <div class="navbar__body">
-        <el-menu class="navbar__menu mr-auto" mode="horizontal">
-          <el-menu-item
-            index="1"
-            @click="$store.state.sidebarFold = !$store.state.sidebarFold"
-          >
-            <svg
-              class="icon-svg navbar__icon-menu navbar__icon-menu--switch"
-              aria-hidden="true"
-            >
-              <use xlink:href="#icon-outdent"></use>
-            </svg>
-          </el-menu-item>
+	<div>
+		<nav v-if="showHeader" class="m-navbar">
+			<div class="navbar__header">
+				<h1 class="navbar__brand">
+					<a class="navbar__brand-lg" href="javascript:;">{{
+						customerName
+					}}</a>
+					<a class="navbar__brand-mini" href="javascript:;">{{
+						customerName.slice(0, 2)
+					}}</a>
+				</h1>
+			</div>
+			<div class="navbar__body">
+				<el-menu class="navbar__menu mr-auto" mode="horizontal">
+					<el-menu-item
+						index="1"
+						@click="
+							$store.state.sidebarFold = !$store.state.sidebarFold
+						"
+					>
+						<svg
+							class="icon-svg navbar__icon-menu navbar__icon-menu--switch"
+							aria-hidden="true"
+						>
+							<use xlink:href="#icon-outdent"></use>
+						</svg>
+					</el-menu-item>
 
-          <el-menu-item index="2" @click="refresh()">
-            <svg class="icon-svg navbar__icon-menu" aria-hidden="true">
-              <use xlink:href="#icon-sync"></use>
-            </svg>
-          </el-menu-item>
-        </el-menu>
+					<el-menu-item index="2" @click="refresh()">
+						<svg
+							class="icon-svg navbar__icon-menu"
+							aria-hidden="true"
+						>
+							<use xlink:href="#icon-sync"></use>
+						</svg>
+					</el-menu-item>
+				</el-menu>
 
-        <el-menu
-          :default-active="$store.state.mainShuju.activeName"
-          :unique-opened="true"
-          :collapseTransition="false"
-          mode="horizontal"
-          class="navbar__menu mr-auto z-div"
-        >
-          <el-menu-item index="index" @click="toIndexPage">
-            <span>首页</span>
-          </el-menu-item>
+				<el-menu
+					:default-active="$store.state.mainShuju.activeName"
+					:unique-opened="true"
+					:collapseTransition="false"
+					mode="horizontal"
+					class="navbar__menu mr-auto z-div"
+				>
+					<el-menu-item index="index" @click="toIndexPage">
+						<span>首页</span>
+					</el-menu-item>
 
-          <template v-for="(menu, idx) in $store.state.mainShuju.menuList">
-            <li
-              class="sub-menu"
-              :class="
-                $store.state.mainShuju.activeName == menu.id ? 'z-on' : ''
-              "
-              v-if="menu.children"
-              :key="menu.id"
-              @click="gotoRouteHandle(menu.id, idx)"
-            >
-              <span>{{ menu.name }}</span>
-              <div class="sub-menu-list">
-                <div
-                  :class="
-                    $store.state.mainShuju.activeName == subMenu.id
-                      ? 'z-on'
-                      : ''
-                  "
-                  :key="subMenu.id"
-                  @click="gotoRouteHandle(subMenu.id, subIndex)"
-                  v-for="(subMenu, subIndex) in menu.children"
-                >
-                  {{ subMenu.name }}
-                </div>
-              </div>
-            </li>
-            <el-menu-item
-              v-else
-              :key="menu.id"
-              :menu="menu"
-              :index="menu.id"
-              @click="gotoRouteHandle(menu.id, idx)"
-            >
-              <span>{{ menu.name }}</span>
-            </el-menu-item>
-          </template>
-        </el-menu>
+					<template
+						v-for="(menu, idx) in $store.state.mainShuju.menuList"
+					>
+						<li
+							class="sub-menu"
+							:class="
+								$store.state.mainShuju.activeName == menu.id
+									? 'z-on'
+									: ''
+							"
+							v-if="menu.children"
+							:key="menu.id"
+							@click="gotoRouteHandle(menu.id, idx)"
+						>
+							<span>{{ menu.name }}</span>
+							<div class="sub-menu-list">
+								<div
+									:class="
+										$store.state.mainShuju.activeName ==
+										subMenu.id
+											? 'z-on'
+											: ''
+									"
+									:key="subMenu.id"
+									@click="
+										gotoRouteHandle(subMenu.id, subIndex)
+									"
+									v-for="(subMenu, subIndex) in menu.children"
+								>
+									{{ subMenu.name }}
+								</div>
+							</div>
+						</li>
+						<el-menu-item
+							v-else
+							:key="menu.id"
+							:menu="menu"
+							:index="menu.id"
+							@click="gotoRouteHandle(menu.id, idx)"
+						>
+							<span>{{ menu.name }}</span>
+						</el-menu-item>
+					</template>
+				</el-menu>
 
-        <el-menu class="navbar__menu" mode="horizontal">
-          <!-- <el-menu-item index="1">
+				<el-menu class="navbar__menu" mode="horizontal">
+					<!-- <el-menu-item index="1">
             <el-dropdown placement="bottom"
                          :show-timeout="0">
               <el-button size="mini">{{ $t('_lang') }}</el-button>
@@ -91,7 +105,7 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-menu-item> -->
-          <!-- <el-menu-item index="2">
+					<!-- <el-menu-item index="2">
             <a href="//www.renren.io/"
                target="_blank">
               <svg class="icon-svg navbar__icon-menu"
@@ -100,39 +114,48 @@
               </svg>
             </a>
           </el-menu-item> -->
-          <el-menu-item index="3" @click="fullscreenHandle()">
-            <svg class="icon-svg navbar__icon-menu" aria-hidden="true">
-              <use xlink:href="#icon-fullscreen"></use>
-            </svg>
-          </el-menu-item>
+					<el-menu-item index="3" @click="fullscreenHandle()">
+						<svg
+							class="icon-svg navbar__icon-menu"
+							aria-hidden="true"
+						>
+							<use xlink:href="#icon-fullscreen"></use>
+						</svg>
+					</el-menu-item>
 
-          <el-menu-item index="4" class="navbar__avatar">
-            <el-dropdown placement="bottom" :show-timeout="0">
-              <span class="el-dropdown-link">
-                <img src="~@/assets/img/staff-default-avatar.png" />
-                <span>{{ $store.state.user.realName }}</span>
-                <i class="el-icon-arrow-down"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="updatePasswordHandle()">{{
-                  $t("updatePassword.title")
-                }}</el-dropdown-item>
-                <el-dropdown-item @click.native="logoutHandle()">{{
-                  $t("logout")
-                }}</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-menu-item>
-        </el-menu>
-      </div>
-      <!-- 弹窗, 修改密码 -->
-      <update-password-work
-        v-if="updatePassowrdVisible"
-        ref="updatePassowrd"
-      ></update-password-work>
-    </nav>
-    <nav v-else class="navbar main-line"></nav>
-  </div>
+					<el-menu-item index="4" class="navbar__avatar">
+						<el-dropdown placement="bottom" :show-timeout="0">
+							<span class="el-dropdown-link">
+								<img
+									src="~@/assets/img/staff-default-avatar.png"
+								/>
+								<span>{{ $store.state.user.realName }}</span>
+								<i class="el-icon-arrow-down"></i>
+							</span>
+							<el-dropdown-menu slot="dropdown">
+								<el-dropdown-item
+									@click.native="updatePasswordHandle()"
+									>{{
+										$t("updatePassword.title")
+									}}</el-dropdown-item
+								>
+								<el-dropdown-item
+									@click.native="logoutHandle()"
+									>{{ $t("logout") }}</el-dropdown-item
+								>
+							</el-dropdown-menu>
+						</el-dropdown>
+					</el-menu-item>
+				</el-menu>
+			</div>
+			<!-- 弹窗, 修改密码 -->
+			<update-password-work
+				v-if="updatePassowrdVisible"
+				ref="updatePassowrd"
+			></update-password-work>
+		</nav>
+		<nav v-else class="navbar main-line"></nav>
+	</div>
 </template>
 
 <script>
@@ -142,122 +165,147 @@ import screenfull from "screenfull";
 import UpdatePasswordWork from "@/views/main-navbar-update-password-work";
 import { clearLoginInfo } from "@/utils";
 export default {
-  inject: ["refresh"],
-  data() {
-    return {
-      showHeader: true,
-      i18nMessages: messages,
-      updatePassowrdVisible: false,
-      customerName: "",
-    };
-  },
-  components: {
-    UpdatePasswordWork,
-  },
-  created() {
-    // let platformToken = localStorage.getItem("showHeader") || "";
-    // if (
-    //   typeof platformToken !== "undefined" &&
-    //   platformToken !== "undefined" &&
-    //   platformToken !== ""
-    // ) {
-    //   this.showHeader = false;
-    // }
-    this.changeCustomerName();
-    const customerId = localStorage.getItem("customerId");
-    let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
-    //暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
-    if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){
-      for (let index in siteconfigElement){
-        if (siteconfigElement[index].id == '6'){
-          let newMenuArr =  siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi');
-          siteconfigElement[index].children = newMenuArr;
-        }
-      }
-    }
-    this.$store.state.mainShuju.menuList = siteconfigElement;
-  },
-  computed: {},
-  methods: {
-    toIndexPage() {
-      this.$router.replace("/indexWork");
-    },
-    // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
-    gotoRouteHandle(menuId, idx) {
-      var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter(
-        (item) => item.meta.menuId === menuId
-      )[0];
-      if (route) {
-        this.$router.push({ name: route.name });
-        this.$store.state.mainShuju.activeName = menuId;
-      }
-    },
-    changeCustomerName() {
-      this.customerName =
-        localStorage.getItem("customerName") || "数据分析可视化平台";
-    },
-    // 全屏
-    fullscreenHandle() {
-      if (!screenfull.enabled) {
-        return this.$message({
-          message: this.$t("fullscreen.prompt"),
-          type: "warning",
-          duration: 500,
-        });
-      }
-      screenfull.toggle();
-    },
-    // 修改密码
-    updatePasswordHandle() {
-      this.updatePassowrdVisible = true;
-      this.$nextTick(() => {
-        this.$refs.updatePassowrd.init();
-      });
-    },
-    // 退出
-    logoutHandle() {
-      this.$confirm(
-        this.$t("prompt.info", { handle: this.$t("logout") }),
-        this.$t("prompt.title"),
-        {
-          confirmButtonText: this.$t("confirm"),
-          cancelButtonText: this.$t("cancel"),
-          type: "warning",
-        }
-      )
-        .then(() => {
-          //关闭所有标签页
-          // tabs, 关闭全部
-          this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-            (item) => item.name === "home2"
-          );
+	inject: ["refresh"],
+	data() {
+		return {
+			showHeader: true,
+			i18nMessages: messages,
+			updatePassowrdVisible: false,
+			customerName: "",
+		};
+	},
+	components: {
+		UpdatePasswordWork,
+	},
+	created() {
+		// let platformToken = localStorage.getItem("showHeader") || "";
+		// if (
+		//   typeof platformToken !== "undefined" &&
+		//   platformToken !== "undefined" &&
+		//   platformToken !== ""
+		// ) {
+		//   this.showHeader = false;
+		// }
+		this.changeCustomerName();
+		const customerId = localStorage.getItem("customerId");
+		let siteconfigElement = window.SITE_CONFIG["menuShujuList"];
+		//暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单
+		if (
+			"04c0d396e298f13e57aa5904a657eaa6" != customerId &&
+			"3fdd0380deff5b30f45376cdf995d1c1" != customerId
+		) {
+			for (let index in siteconfigElement) {
+				if (siteconfigElement[index].id == "6") {
+					let newMenuArr = siteconfigElement[index].children.filter(
+						(item) => item.id !== "duoyuanfuwufenxi"
+					);
+					siteconfigElement[index].children = newMenuArr;
+				}
+			}
+		}
+		this.$store.state.mainShuju.menuList = siteconfigElement;
+
+		// 监听全屏事件
+		this.checkFullscreen();
+	},
+	computed: {},
+	methods: {
+		// 监听全屏事件
+		checkFullscreen() {
+			const fn = () => {
+				if (document.fullscreenElement === null) {
+					console.log("Exited fullscreen");
+					this.$store.state.fullscreen = false;
+				} else {
+					console.log("Entered fullscreen");
+					this.$store.state.fullscreen = true;
+				}
+			};
+			// 监听全屏
+			document.addEventListener("fullscreenchange", fn);
+			fn();
+		},
+
+		toIndexPage() {
+			this.$router.replace("/indexWork");
+		},
+		// 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
+		gotoRouteHandle(menuId, idx) {
+			var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter(
+				(item) => item.meta.menuId === menuId
+			)[0];
+			if (route) {
+				this.$router.push({ name: route.name });
+				this.$store.state.mainShuju.activeName = menuId;
+			}
+		},
+		changeCustomerName() {
+			this.customerName =
+				localStorage.getItem("customerName") || "数据分析可视化平台";
+		},
+		// 全屏
+		fullscreenHandle() {
+			if (!screenfull.enabled) {
+				return this.$message({
+					message: this.$t("fullscreen.prompt"),
+					type: "warning",
+					duration: 500,
+				});
+			}
+			screenfull.toggle();
+		},
+		// 修改密码
+		updatePasswordHandle() {
+			this.updatePassowrdVisible = true;
+			this.$nextTick(() => {
+				this.$refs.updatePassowrd.init();
+			});
+		},
+		// 退出
+		logoutHandle() {
+			this.$confirm(
+				this.$t("prompt.info", { handle: this.$t("logout") }),
+				this.$t("prompt.title"),
+				{
+					confirmButtonText: this.$t("confirm"),
+					cancelButtonText: this.$t("cancel"),
+					type: "warning",
+				}
+			)
+				.then(() => {
+					//关闭所有标签页
+					// tabs, 关闭全部
+					this.$store.state.contentTabs =
+						this.$store.state.contentTabs.filter(
+							(item) => item.name === "home2"
+						);
 
-          this.$http
-            .post("/auth/login/logout")
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                //别处登陆时 退出不提示 直接跳登陆页即可
-                if (res.code !== 10007) {
-                  this.$message.error(res.msg);
-                }
-              }
+					this.$http
+						.post("/auth/login/logout")
+						.then(({ data: res }) => {
+							if (res.code !== 0) {
+								//别处登陆时 退出不提示 直接跳登陆页即可
+								if (res.code !== 10007) {
+									this.$message.error(res.msg);
+								}
+							}
 
-              clearLoginInfo();
+							clearLoginInfo();
 
-              this.$router.push({ name: "login" });
-            })
-            .catch(() => {});
-        })
-        .catch(() => {});
-    },
-  },
+							this.$router.push({ name: "login" });
+						})
+						.catch(() => {});
+				})
+				.catch(() => {});
+		},
+	},
 };
 </script>
 
 <style lang="scss" scoped>
 .main-line {
-  height: 50px;
-  background: #eeeeee;
+	height: 50px;
+	background: #eeeeee;
 }
 </style>
 
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index e1026e6fd..06839ba0e 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,30 +1,33 @@
 <template>
-  <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,
-        },
-        { 'z-iframe': $store.state.inIframe },
-      ]"
-    >
-      <template v-if="!loading">
-        <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
+	<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,
+				},
+				{ 'z-iframe': $store.state.inIframe || ($store.state.fullscreen && $route.name=='i-1642710158240174082') },
+			]"
+		>
+			<template v-if="!loading">
+				<main-navbar
+					ref="ref_navbar"
+					v-if="!$store.state.inIframe && !($store.state.fullscreen && $route.name=='i-1642710158240174082')"
+				/>
 
-        <div class="g-cnt">
-          <main-content
-            v-if="!$store.state.contentIsNeedRefresh"
-            @changeCustomerName="changeCustomerName"
-          />
-        </div>
-        <main-theme-tools />
-      </template>
-    </div>
-  </fixed1920>
+				<div class="g-cnt">
+					<main-content
+						v-if="!$store.state.contentIsNeedRefresh"
+						@changeCustomerName="changeCustomerName"
+					/>
+				</div>
+				<main-theme-tools />
+			</template>
+		</div>
+	</fixed1920>
 </template>
 
 <script>
@@ -38,138 +41,141 @@ import fixed1920 from "@/views/components/fixed1920.vue";
 import MainThemeTools from "./main-theme-tools";
 
 export default {
-  provide() {
-    return {
-      // 刷新
-      refresh() {
-        this.$store.state.contentIsNeedRefresh = true;
-        this.$nextTick(() => {
-          this.$store.state.contentIsNeedRefresh = false;
-        });
-      },
-    };
-  },
-  data() {
-    return {
-      loading: true,
-      userType: localStorage.getItem("userType"),
-    };
-  },
-  components: {
-    MainNavbar,
-    MainContent,
-    fixed1920,
-    MainThemeTools,
-  },
+	provide() {
+		return {
+			// 刷新
+			refresh() {
+				this.$store.state.contentIsNeedRefresh = true;
+				this.$nextTick(() => {
+					this.$store.state.contentIsNeedRefresh = false;
+				});
+			},
+		};
+	},
+	data() {
+		return {
+			loading: true,
+			userType: localStorage.getItem("userType"),
+		};
+	},
+	components: {
+		MainNavbar,
+		MainContent,
+		fixed1920,
+		MainThemeTools,
+	},
 
-  watch: {
-    $route: "routeHandle",
-  },
-  async created() {
-    this.windowResizeHandle();
-    this.routeHandle(this.$route);
-    Promise.all([this.getWorkUserInfo()]).then(() => {
-      this.loading = false;
-    });
-  },
-  computed: {},
-  methods: {
-    changeCustomerName(customerName) {
-      this.$refs["ref_navbar"].changeCustomerName(customerName);
-    },
-    // 窗口改变大小
-    windowResizeHandle() {
-      this.$store.state.sidebarFold =
-        document.documentElement["clientWidth"] <= 992 || false;
-      window.addEventListener(
-        "resize",
-        debounce(() => {
-          this.$store.state.sidebarFold =
-            document.documentElement["clientWidth"] <= 992 || false;
-        }, 150)
-      );
-    },
-    // 路由, 监听
-    routeHandle(route) {
-      if (!route.meta.isTab) {
-        this.$store.state.mainShuju.activeName = "";
-        this.$store.state.mainShuju.contentTabsActiveName = "";
-        return false;
-      }
-      var tab = this.$store.state.contentTabs.filter(
-        (item) => item.name === route.name
-      )[0];
-      if (!tab) {
-        tab = {
-          ...window.SITE_CONFIG["contentTabDefault"],
-          ...route.meta,
-          name: route.name,
-          params: { ...route.params },
-          query: { ...route.query },
-        };
-        this.$store.state.contentTabs =
-          this.$store.state.contentTabs.concat(tab);
-      }
+	watch: {
+		$route: "routeHandle",
+	},
+	async created() {
+		this.windowResizeHandle();
+		this.routeHandle(this.$route);
+		Promise.all([this.getWorkUserInfo()]).then(() => {
+			this.loading = false;
+		});
+	},
+	computed: {},
+	methods: {
+		changeCustomerName(customerName) {
+			this.$refs["ref_navbar"].changeCustomerName(customerName);
+		},
+		// 窗口改变大小
+		windowResizeHandle() {
+			this.$store.state.sidebarFold =
+				document.documentElement["clientWidth"] <= 992 || false;
+			window.addEventListener(
+				"resize",
+				debounce(() => {
+					this.$store.state.sidebarFold =
+						document.documentElement["clientWidth"] <= 992 || false;
+				}, 150)
+			);
+		},
+		// 路由, 监听
+		routeHandle(route) {
+			if (!route.meta.isTab) {
+				this.$store.state.mainShuju.activeName = "";
+				this.$store.state.mainShuju.contentTabsActiveName = "";
+				return false;
+			}
+			var tab = this.$store.state.contentTabs.filter(
+				(item) => item.name === route.name
+			)[0];
+			if (!tab) {
+				tab = {
+					...window.SITE_CONFIG["contentTabDefault"],
+					...route.meta,
+					name: route.name,
+					params: { ...route.params },
+					query: { ...route.query },
+				};
+				this.$store.state.contentTabs =
+					this.$store.state.contentTabs.concat(tab);
+			}
 
-      this.$store.state.mainShuju.activeName = tab.menuId;
-      this.$store.state.mainShuju.contentTabsActiveName = tab.name;
-    },
+			this.$store.state.mainShuju.activeName = tab.menuId;
+			this.$store.state.mainShuju.contentTabsActiveName = tab.name;
+		},
 
-    // 获取当前管理员信息
-    async getWorkUserInfo() {
-      const url = "/epmetuser/customerstaff/staffbasicinfo";
-      let params = {};
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$store.state.user = { ...data };
-        console.log("user---hahha", this.$store.state.user);
-        localStorage.setItem("roleList", data.roleList);
-        localStorage.setItem("customerId", data.customerId);
-        localStorage.setItem("staffId", data.id);
-        localStorage.setItem("agencyId", data.agencyId);
-        localStorage.setItem("level", data.level);
-        if (!localStorage.getItem("customerName")) {
-          localStorage.setItem("customerName", data.customerName || "");
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-  },
+		// 获取当前管理员信息
+		async getWorkUserInfo() {
+			const url = "/epmetuser/customerstaff/staffbasicinfo";
+			let params = {};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$store.state.user = { ...data };
+				console.log("user---hahha", this.$store.state.user);
+				localStorage.setItem("roleList", data.roleList);
+				localStorage.setItem("customerId", data.customerId);
+				localStorage.setItem("staffId", data.id);
+				localStorage.setItem("agencyId", data.agencyId);
+				localStorage.setItem("level", data.level);
+				if (!localStorage.getItem("customerName")) {
+					localStorage.setItem(
+						"customerName",
+						data.customerName || ""
+					);
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
 };
 </script>
 
 <style lang="scss" src="@/assets/scss/main-shuju.scss" scoped></style>
 <style lang="scss">
 .info-h {
-  height: calc(100% - 320px);
-  // overflow: auto;
+	height: calc(100% - 320px);
+	// overflow: auto;
 }
 .info-scroll {
-  &::-webkit-scrollbar {
-    width: 8px;
-    // background: linear-gradient(270deg, #0063FE, #0095FF);
-  }
+	&::-webkit-scrollbar {
+		width: 8px;
+		// background: linear-gradient(270deg, #0063FE, #0095FF);
+	}
 
-  &::-webkit-scrollbar-corner,
+	&::-webkit-scrollbar-corner,
     /* 滚动条角落 */
   &::-webkit-scrollbar-thumb,
   &::-webkit-scrollbar-track {
-    /*滚动条的轨道*/
-    border-radius: 4px;
-  }
+		/*滚动条的轨道*/
+		border-radius: 4px;
+	}
 
-  &::-webkit-scrollbar-corner,
-  &::-webkit-scrollbar-track {
-    /* 滚动条轨道 */
+	&::-webkit-scrollbar-corner,
+	&::-webkit-scrollbar-track {
+		/* 滚动条轨道 */
 
-    background: rgba(12, 129, 254, 0.24);
-    // box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
-  }
+		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);
-  }
+	&::-webkit-scrollbar-thumb {
+		/* 滚动条手柄 */
+		background: linear-gradient(270deg, #1257c9, #0095ff);
+	}
 }
 </style>

From 71346cbe8f913a8f1e929a1d7de3597fc3a29715 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:52:22 +0800
Subject: [PATCH 08/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9iframe=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-shuju/main-content.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index b9914005e..770032932 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -18,7 +18,7 @@
           height="100%"
           frameborder="0"
           scrolling="yes"
-          :style="{ height: $store.state.fixed1920.height - 100 + 'px' }"
+          :style="{ width: '1920px', height: $store.state.fixed1920.height+ 'px' }"
         />
       </template>
       <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">

From 683f7cb4ff2d00c38c83f10da331fdccf4ee00fb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:56:53 +0800
Subject: [PATCH 09/34] =?UTF-8?q?=E6=8A=8Aenv=E6=96=87=E4=BB=B6=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index d38c11f03..ea43786c3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,13 +1,13 @@
 NODE_ENV=development
 
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
-VUE_APP_API_SERVER =  https://epmet-panshi.elinkservice.cn/api
+# VUE_APP_API_SERVER =  https://epmet-panshi.elinkservice.cn/api
 
 # VUE_APP_NODE_ENV=dev_sdtdt
 VUE_APP_NODE_ENV=dev

From 5601e60c105d76b8f6d7c0d8f0b7f9fd568e2bcd Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Apr 2023 16:03:54 +0800
Subject: [PATCH 10/34] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=9508?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwujilu/fuwuList08.vue  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/views/modules/communityService/fuwujilu/fuwuList08.vue

diff --git a/src/views/modules/communityService/fuwujilu/fuwuList08.vue b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
new file mode 100644
index 000000000..e7db1167e
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
@@ -0,0 +1,34 @@
+<template>
+	<div>
+		<fuwu-list :serviceCategoryKey="serviceCategoryKey"></fuwu-list>
+	</div>
+</template>
+
+<script>
+import fuwuList from "./fuwuList";
+
+export default {
+	components: { fuwuList },
+
+	data() {
+		return {
+			serviceCategoryKey: "08",
+		};
+	},
+	computed: {},
+	watch: {
+		// "formData.serviceTimeEnd": function (val) {
+		//   if (val && val != '') {
+		//     let arrayTemp = val.split(' ')
+		//     this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+		//   }
+		// },
+	},
+	mounted() {},
+	methods: {},
+
+	props: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

From ffb711a34dc7a16151bf71fc79a946cd2c623e46 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 19 Apr 2023 17:07:14 +0800
Subject: [PATCH 11/34] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC=E5=8D=95=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 812de530f..3f964c6d3 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -211,6 +211,7 @@
                   clearable
                   size="small"
                   class="resi-cell-select"
+                  @change="handelChangeCascader($event,n.columnName)"
                 >
                 </el-cascader>
                 <template v-else-if="n.itemType === 'checkbox'">
@@ -512,6 +513,13 @@ export default {
       this.$emit('search', arr3)
       return arr3
     },
+    handelChangeCascader(val,name){
+      if(val.length==1){
+          this.form[name] = val[0] || ''
+        }else{
+          this.form[name] = val[1] || ''
+        }
+    },
     handleOpenSearch() {
       this.openSearch = !this.openSearch
     },

From df6c6dc25ad10353982a61939a340851c7c824c3 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 26 Apr 2023 14:27:48 +0800
Subject: [PATCH 12/34] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A2=9E=E5=8A=A0=E6=88=B7=E4=B8=BB=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D,=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81,=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/collect.vue | 892 +++++++++++++++++------------
 1 file changed, 519 insertions(+), 373 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 4ae414aa8..dfa9e969a 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <el-form ref="searchForm"
-               :inline="true"
-               :model="fmData"
-               class="demo-form-inline">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
         <!-- <el-form-item
           v-if="communityList.length > 0"
           label="所在社区"
@@ -27,82 +28,118 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="居住地址"
-                      prop="address">
-          <el-input v-model="fmData.address"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="居住地址" prop="address">
+          <el-input
+            v-model="fmData.address"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="户籍地址"
-                      prop="domicilePlace">
-          <el-input v-model="fmData.domicilePlace"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
+        <el-form-item label="户籍地址" prop="domicilePlace">
+          <el-input
+            v-model="fmData.domicilePlace"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="填写时间"
-                      prop="startTime">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          clearable
-                          size="small"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          value-format="yyyy-MM-dd">
+        <el-form-item label="户主姓名" prop="houseHolderName">
+          <el-input
+            v-model="fmData.houseHolderName"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="checkState">
+          <el-select v-model="fmData.checkState">
+            <el-option
+              v-for="item in checkStateList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="填写时间" prop="startTime">
+          <el-date-picker
+            v-model="timeRange"
+            type="daterange"
+            clearable
+            size="small"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search"
-                     size="small"
-                     @click="handleSearch">查询</el-button>
-          <el-button class="diy-button--reset"
-                     size="small"
-                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
       </div>
-      <el-table :data="tableData"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight"
-                :span-method="arraySpanMethod">
-        <el-table-column label="序号"
-                         prop="desc"
-                         align="center"
-                         width="50" />
-        <el-table-column prop="houseHolderName"
-                         width="100"
-                         label="户主姓名"
-                         align="center"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="address"
-                         align="center"
-                         min-width="140"
-                         label="居住地址"
-                         :show-overflow-tooltip="true">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+        :span-method="arraySpanMethod"
+      >
+        <el-table-column label="序号" prop="desc" align="center" width="50" />
+        <el-table-column
+          prop="houseHolderName"
+          width="100"
+          label="户主姓名"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="address"
+          align="center"
+          min-width="140"
+          label="居住地址"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <span v-if="scope.row.homeId == 'other'"
-                  class="badge">房屋缺失</span>
-            <span>{{scope.row.address}}</span>
+            <span v-if="scope.row.homeId == 'other'" class="badge"
+              >房屋缺失</span
+            >
+            <span>{{ scope.row.address }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="houseType"
-                         align="center"
-                         width="100"
-                         label="房屋状态">
+        <el-table-column
+          prop="houseType"
+          align="center"
+          width="100"
+          label="房屋状态"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.houseType == 1">出租</span>
             <span v-if="scope.row.houseType == 2">闲置</span>
@@ -110,85 +147,110 @@
             <span v-if="scope.row.houseType == 0">自住</span>
           </template>
         </el-table-column>
-        <el-table-column prop="totalResi"
-                         width="80"
-                         align="center"
-                         label="居住人数" />
-        <el-table-column prop="memberName"
-                         width="100"
-                         label="成员姓名"
-                         align="center"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="memberIdNum"
-                         width="180"
-                         align="center"
-                         label="成员证件号"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="memberMobile"
-                         width="140"
-                         align="center"
-                         label="成员手机号"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="relationship"
-                         min-width="120"
-                         align="center"
-                         label="与户主关系"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="totalResi"
+          width="80"
+          align="center"
+          label="居住人数"
+        />
+        <el-table-column
+          prop="memberName"
+          width="100"
+          label="成员姓名"
+          align="center"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="memberIdNum"
+          width="180"
+          align="center"
+          label="成员证件号"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="memberMobile"
+          width="140"
+          align="center"
+          label="成员手机号"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="relationship"
+          min-width="120"
+          align="center"
+          label="与户主关系"
+          :show-overflow-tooltip="true"
+        >
           <template slot-scope="scope">
-            <span>{{getRelationshipName(scope.row.relationship)}}</span>
+            <span>{{ getRelationshipName(scope.row.relationship) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="heSuanCount"
-                         width="120"
-                         align="center"
-                         label="核酸检测次数" />
+        <el-table-column
+          prop="heSuanCount"
+          width="120"
+          align="center"
+          label="核酸检测次数"
+        />
 
-        <el-table-column prop="ymjz"
-                         width="140"
-                         align="center"
-                         label="疫苗接种情况">
+        <el-table-column
+          prop="ymjz"
+          width="140"
+          align="center"
+          label="疫苗接种情况"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
             <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
-        <el-table-column prop="domicilePlace"
-                         min-width="140"
-                         align="center"
-                         label="户籍地址"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="workPlace"
-                         min-width="120"
-                         align="center"
-                         label="单位名称"
-                         :show-overflow-tooltip="true" />
-        <el-table-column prop="remark"
-                         align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true">
+        <el-table-column
+          prop="domicilePlace"
+          min-width="140"
+          align="center"
+          label="户籍地址"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="workPlace"
+          min-width="120"
+          align="center"
+          label="单位名称"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          prop="remark"
+          align="center"
+          label="备注"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column prop="faceImg"
-                         min-width="120"
-                         align="center"
-                         label="人脸">
+        <el-table-column
+          prop="faceImg"
+          min-width="120"
+          align="center"
+          label="人脸"
+        >
           <template slot-scope="scope">
-            <el-image style="max-height: 50px; max-width: 50px;"
-                      :src="scope.row.faceImg"
-                      :preview-src-list="[scope.row.faceImg]">
-              <div slot="error"
-                   class="image-slot">
+            <el-image
+              style="max-height: 50px; max-width: 50px"
+              :src="scope.row.faceImg"
+              :preview-src-list="[scope.row.faceImg]"
+            >
+              <div slot="error" class="image-slot">
                 <!-- <i class="el-icon-picture-outline"></i> -->
               </div>
             </el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="checkState"
-                         min-width="120"
-                         align="center"
-                         label="状态"
-                         :show-overflow-tooltip="true"
-                         fixed="right">
+        <el-table-column
+          prop="checkState"
+          min-width="120"
+          align="center"
+          label="状态"
+          :show-overflow-tooltip="true"
+          fixed="right"
+        >
           <template slot-scope="scope">
             <span v-if="scope.row.checkState === '0'">未审核</span>
             <span v-else-if="scope.row.checkState === '1'">未通过</span>
@@ -196,81 +258,96 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="100"
-                         fixed="right">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleWatch('look', scope.row)">查看</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleWatch('look', scope.row)"
+              >查看</el-button
+            >
             <!-- <el-button type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleWatch('check', scope.row)">审核</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
-                       @click="handleWatch('check', scope.row)">审核</el-button>
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              v-if="
+                scope.row.agencyId == agencyId && scope.row.checkState === '0'
+              "
+              @click="handleWatch('check', scope.row)"
+              >审核</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="parseInt(pageSize)"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="信息详情"
-               width="1100px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="信息详情"
+      width="1100px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
       <div class="scroll-h">
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="dataForm"
-                 :disabled="true"
-                 class="form">
-          <el-form-item label="户主姓名:"
-                        prop="houseHolderName"
-                        label-width="150px">
+        <el-form
+          ref="ref_form"
+          :inline="true"
+          :model="dataForm"
+          :disabled="true"
+          class="form"
+        >
+          <el-form-item
+            label="户主姓名:"
+            prop="houseHolderName"
+            label-width="150px"
+          >
             <!-- <el-input class="item_width_1"
                         v-model="dataForm.houseHolderName">
               </el-input> -->
             <div class="wd50">{{ dataForm.houseHolderName }}</div>
           </el-form-item>
-          <el-form-item label="居住地址:"
-                        prop="address"
-                        label-width="150px">
+          <el-form-item label="居住地址:" prop="address" label-width="150px">
             <!-- <el-input class="wd50" v-model="dataForm.address">
               </el-input> -->
             <div class="wd50">{{ dataForm.address }}</div>
           </el-form-item>
           <div>
-            <el-form-item label="房屋状态:"
-                          prop="houseType"
-                          label-width="150px">
+            <el-form-item
+              label="房屋状态:"
+              prop="houseType"
+              label-width="150px"
+            >
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.houseType">
                 </el-input> -->
               <div class="wd50">{{ dataForm.houseType }}</div>
             </el-form-item>
-            <el-form-item label="居住人数:"
-                          prop="totalResi"
-                          label-width="150px">
+            <el-form-item
+              label="居住人数:"
+              prop="totalResi"
+              label-width="150px"
+            >
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.totalResi">
                 </el-input> -->
@@ -278,70 +355,98 @@
             </el-form-item>
           </div>
         </el-form>
-        <el-table :data="dataForm.list"
-                  border
-                  style="width: 1060px; margin: 20px"
-                  class="resi-table"
-                  :height="dialogTableHeight">
-          <el-table-column label="序号"
-                           type="index"
-                           align="center"
-                           width="50" />
-          <el-table-column prop="memberName"
-                           width="100"
-                           label="成员姓名"
-                           align="center"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="memberIdNum"
-                           width="180"
-                           align="center"
-                           label="成员证件号"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="memberMobile"
-                           width="140"
-                           align="center"
-                           label="成员手机号"
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="heSuanCount"
-                           width="120"
-                           align="center"
-                           label="核酸检测次数" />
-
-          <el-table-column prop="ymjz"
-                           width="140"
-                           align="center"
-                           label="疫苗接种情况">
+        <el-table
+          :data="dataForm.list"
+          border
+          style="width: 1060px; margin: 20px"
+          class="resi-table"
+          :height="dialogTableHeight"
+        >
+          <el-table-column
+            label="序号"
+            type="index"
+            align="center"
+            width="50"
+          />
+          <el-table-column
+            prop="memberName"
+            width="100"
+            label="成员姓名"
+            align="center"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="memberIdNum"
+            width="180"
+            align="center"
+            label="成员证件号"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="memberMobile"
+            width="140"
+            align="center"
+            label="成员手机号"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="heSuanCount"
+            width="120"
+            align="center"
+            label="核酸检测次数"
+          />
+          <el-table-column
+            prop="ymjz"
+            width="140"
+            align="center"
+            label="疫苗接种情况"
+          >
             <template slot-scope="scope">
               <span v-if="scope.row.ymjz == 1">全程接种</span>
               <span v-if="scope.row.ymjz == 2">未全程接种</span>
               <span v-if="scope.row.ymjz == 0">未接种</span>
             </template>
           </el-table-column>
-          <el-table-column prop="domicilePlace"
-                           min-width="140"
-                           align="center"
-                           label="户籍所在地 "
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="workPlace"
-                           min-width="120"
-                           align="center"
-                           label="单位或学校 "
-                           :show-overflow-tooltip="true" />
-          <el-table-column prop="remark"
-                           align="center"
-                           label="备注"
-                           :show-overflow-tooltip="true">
+          <el-table-column
+            prop="relationShipName"
+            width="120"
+            align="center"
+            label="与户主关系"
+          />
+          <el-table-column
+            prop="domicilePlace"
+            min-width="140"
+            align="center"
+            label="户籍所在地 "
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="workPlace"
+            min-width="120"
+            align="center"
+            label="单位或学校 "
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="remark"
+            align="center"
+            label="备注"
+            :show-overflow-tooltip="true"
+          >
           </el-table-column>
-          <el-table-column prop="faceImg"
-                           min-width="120"
-                           align="center"
-                           label="人脸">
+          <el-table-column
+            prop="faceImg"
+            min-width="120"
+            align="center"
+            label="人脸"
+          >
             <template slot-scope="scope">
-              <el-image style="max-height: 50px; max-width: 50px;"
-                        :src="scope.row.faceImg"
-                        :preview-src-list="[scope.row.faceImg]">
-                <div slot="error"
-                     class="image-slot">
+              <el-image
+                style="max-height: 50px; max-width: 50px"
+                :src="scope.row.faceImg"
+                :preview-src-list="[scope.row.faceImg]"
+              >
+                <div slot="error" class="image-slot">
                   <!-- <i class="el-icon-picture-outline"></i> -->
                 </div>
               </el-image>
@@ -349,28 +454,38 @@
           </el-table-column>
         </el-table>
         <div class="resi-btns">
-          <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>
-          <el-button v-if="dialogType == 'check'"
-                     type="danger"
-                     @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
-          <el-button v-if="dialogType == 'check'"
-                     type="danger"
-                     @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
+          <el-button @click="formShow = false">{{ $t("cancel") }}</el-button>
+          <el-button
+            v-if="dialogType == 'check'"
+            type="danger"
+            @click="checkHandle('1')"
+            >{{ $t("checkBTGBtn") }}</el-button
+          >
+          <el-button
+            v-if="dialogType == 'check'"
+            type="danger"
+            @click="showAddHouse"
+            >{{ $t("checkTGBtn") }}</el-button
+          >
         </div>
       </div>
     </el-dialog>
     <!-- 新增房屋弹出框 -->
-    <el-dialog :visible.sync="addHouseShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="新增房屋"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="addHouseShow = false">
-      <room-form ref="ref_form"
-                 @dialogCancle="addHouseShow = false"
-                 @dialogOk="roomFormOk"></room-form>
+    <el-dialog
+      :visible.sync="addHouseShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="新增房屋"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="addHouseShow = false"
+    >
+      <room-form
+        ref="ref_form"
+        @dialogCancle="addHouseShow = false"
+        @dialogOk="roomFormOk"
+      ></room-form>
     </el-dialog>
   </div>
 </template>
@@ -380,12 +495,12 @@ import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
-import roomForm from './roomForm'
+import roomForm from "./roomForm";
 
 export default {
-  data () {
+  data() {
     return {
-      agencyId: '',
+      agencyId: "",
       openSearch: false,
 
       formShow: false,
@@ -403,6 +518,8 @@ export default {
         endTime: "",
         address: "",
         domicilePlace: "",
+        checkState: "",
+        houseHolderName: "",
       },
       dataForm: {},
       communityList: [],
@@ -410,28 +527,33 @@ export default {
       importBtnTitle: "导入",
       importLoading: false,
       addHouseShow: false,
-      dialogType: 'look', // 对话框是check审核还是look查看
-      relationshipOptions: []
-    }
+      dialogType: "look", // 对话框是check审核还是look查看
+      relationshipOptions: [],
+      checkStateList: [
+        { value: "0", label: "待审核" },
+        { value: "1", label: "审核不通过" },
+        { value: "2", label: "审核通过" },
+      ],
+    };
   },
   components: {
-    roomForm
+    roomForm,
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    tableHeight () {
+    tableHeight() {
       const h = this.clientHeight - 360 + this.iframeHeigh;
       const _h = this.clientHeight - 360;
       return this.$store.state.inIframe ? h : _h;
     },
-    dialogTableHeight () {
+    dialogTableHeight() {
       const h = this.clientHeight - 460 + this.iframeHeigh;
       const _h = this.clientHeight - 460;
       return this.$store.state.inIframe ? h : _h;
     },
   },
   watch: {
-    timeRange (val) {
+    timeRange(val) {
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.startTime = val[0];
         this.fmData.endTime = val[1];
@@ -441,35 +563,37 @@ export default {
       }
     },
   },
-  created () {
-    this.agencyId = localStorage.getItem('agencyId')
+  created() {
+    this.agencyId = localStorage.getItem("agencyId");
   },
-  mounted () {
+  mounted() {
     // this.getcommunityList();
-    this.getDictList()
-    this.getTableData()
+    this.getDictList();
+    this.getTableData();
   },
   methods: {
-    async getDictList () {
-      const url = "/sys/dict/data/relationship"
-      const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" })
+    async getDictList() {
+      const url = "/sys/dict/data/relationship";
+      const { data, code, msg } = await requestPost(url, {
+        formCode: "resi_base_info",
+      });
 
       if (code === 0) {
-        this.relationshipOptions = [...data]
+        this.relationshipOptions = [...data];
       } else {
-        this.$message.success("操作失败！")
+        this.$message.success("操作失败！");
       }
     },
-    getRelationshipName (value) {
-      let label = ''
-      this.relationshipOptions.forEach(item => {
+    getRelationshipName(value) {
+      let label = "";
+      this.relationshipOptions.forEach((item) => {
         if (item.value == value) {
-          label = item.label
+          label = item.label;
         }
-      })
-      return label
+      });
+      return label;
     },
-    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
       // console.log('row-----r', row)
       // console.log('column-----c', column)
       if (
@@ -497,7 +621,7 @@ export default {
         }
       }
     },
-    async handleChu () {
+    async handleChu() {
       const url = "/epmetuser/icresicollect/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
@@ -531,34 +655,34 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm (formName) {
+    resetForm(formName) {
       this.$refs[formName].resetFields();
       this.timeRange = "";
       this.handleSearch();
     },
 
-    async handleWatch (type, row) {
-      this.dialogType = type
+    async handleWatch(type, row) {
+      this.dialogType = type;
       // this.formShow = true;
       await nextTick();
       const url = "/epmetuser/icresicollect/detail";
@@ -571,7 +695,14 @@ export default {
         console.log("data----de", data);
         this.dataForm = {
           ...data,
-          houseType: data.houseType == '1' ? '出租' : data.houseType == '2' ? '闲置' : data.houseType == '3' ? '未售出' : '自住' // 1：出租 0：自住  2：闲置 3：未售出
+          houseType:
+            data.houseType == "1"
+              ? "出租"
+              : data.houseType == "2"
+              ? "闲置"
+              : data.houseType == "3"
+              ? "未售出"
+              : "自住", // 1：出租 0：自住  2：闲置 3：未售出
         };
         // this.getTableData();
         this.formShow = true;
@@ -580,17 +711,17 @@ export default {
       }
     },
 
-    async handleEdit (rowIndex) {
+    async handleEdit(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -607,7 +738,7 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    async getcommunityList () {
+    async getcommunityList() {
       const url = "/gov/org/agency/community-list";
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
@@ -616,39 +747,39 @@ export default {
       } else {
       }
     },
-    async getTableData () {
-      const url = "/epmetuser/icresicollect/list"
-      const { pageSize, pageNo, fmData } = this
+    async getTableData() {
+      const url = "/epmetuser/icresicollect/list";
+      const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
         ...fmData,
-      })
+      });
       if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！")
-        this.total = data.total || 0
-        let _i = 0
-        let arr = []
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        let _i = 0;
+        let arr = [];
         this.spanIndex =
           data.list &&
           data.list.map((item, index) => {
-            if (index == 0) _i = 0
+            if (index == 0) _i = 0;
             else _i = _i + data.list[index - 1].list.length;
-            arr.push(_i)
+            arr.push(_i);
             // console.log("_i-----", _i, arr)
             // if (index === data.list.length - 1) firstIndex = _i - item.list.length
             return {
               firstIndex: _i,
               len: item.list.length,
-            }
-          })
-        this.tableData = data.list && this.formatArr(data.list)
-        console.log("tableData----0", this.spanIndex)
+            };
+          });
+        this.tableData = data.list && this.formatArr(data.list);
+        console.log("tableData----0", this.spanIndex);
       } else {
       }
     },
     // 数组扁平化
-    formatArr (arr) {
+    formatArr(arr) {
       let res = [];
       let arr1 = arr.map((n, index) => {
         return {
@@ -656,13 +787,13 @@ export default {
           list:
             n.list.length > 0
               ? n.list.map((i) => {
-                return {
-                  ...n,
-                  ...i,
-                  desc: index + 1,
-                  list: [],
-                };
-              })
+                  return {
+                    ...n,
+                    ...i,
+                    desc: index + 1,
+                    list: [],
+                  };
+                })
               : [],
         };
       });
@@ -673,89 +804,104 @@ export default {
       });
       return res;
     },
-    showAddHouse () {
-      if (this.dataForm.homeId == 'other') {
-        this.addHouseShow = true
+    showAddHouse() {
+      if (this.dataForm.homeId == "other") {
+        this.addHouseShow = true;
         this.$nextTick(() => {
-          this.$refs.ref_form.initForm('add', null, this.dataForm.id)
-        })
+          this.$refs.ref_form.initForm("add", null, this.dataForm.id);
+        });
       } else {
-        this.checkHandle('2')
+        this.checkHandle("2");
       }
     },
     // 审核提交方法
-    checkHandle (type) {
+    checkHandle(type) {
       const params = {
         id: this.dataForm.id,
         checkState: type, // 0-未审核 1-未通过 2-已通过
-        checkReason: '',
-        buildingUnitId: this.dataForm.buildingUnitId || '',
-        doorName: this.dataForm.doorName || ''
-      }
-      if (type == '1') {
-        const h = this.$createElement
+        checkReason: "",
+        buildingUnitId: this.dataForm.buildingUnitId || "",
+        doorName: this.dataForm.doorName || "",
+      };
+      if (type == "1") {
+        const h = this.$createElement;
         this.$prompt(
-          h('p', null, [h('i', { style: 'color: red' }, '* '),
-          h('span', null, '请输入不通过的原因：')]),
-          '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          inputPattern: /^.+$/,
-          inputErrorMessage: '请输入原因'
-        }).then(({ value }) => {
-          // if (!value) {
-          //   return this.$message.error('请填写审核不通过原因')
-          // }
-          params.checkReason = value
-          this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
+          h("p", null, [
+            h("i", { style: "color: red" }, "* "),
+            h("span", null, "请输入不通过的原因："),
+          ]),
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            inputPattern: /^.+$/,
+            inputErrorMessage: "请输入原因",
+          }
+        )
+          .then(({ value }) => {
+            // if (!value) {
+            //   return this.$message.error('请填写审核不通过原因')
+            // }
+            params.checkReason = value;
+            this.$http
+              .post("/epmetuser/icresicollect/collectCheck", params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.formShow = false;
+                this.getTableData();
+                // 调用文件下发权限接口
+                // this.fileJurisdiction(params)
+              })
+              .catch(() => {});
+          })
+          .catch(() => {
+            // 取消输入原因
+          });
+      } else {
+        this.$http
+          .post("/epmetuser/icresicollect/collectCheck", params)
+          .then(({ data: res }) => {
             if (res.code !== 0) {
-              return this.$message.error(res.msg)
+              return this.$message.error(res.msg);
             }
-            this.formShow = false
-            this.getTableData()
+            this.addHouseShow = false;
+            this.formShow = false;
+            this.getTableData();
             // 调用文件下发权限接口
             // this.fileJurisdiction(params)
-          }).catch(() => { })
-        }).catch(() => {
-          // 取消输入原因
-        })
-      } else {
-        this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.addHouseShow = false
-          this.formShow = false
-          this.getTableData()
-          // 调用文件下发权限接口
-          // this.fileJurisdiction(params)
-        }).catch(() => { })
+          })
+          .catch(() => {});
       }
     },
     // 文件下发权限接口
-    fileJurisdiction (params) {
-      this.$http.post('/pli/power/rentContractInfo/send', params).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.disabledBtn = false
-            this.checkVisible = false
-            this.visible = false
-            this.$emit('refreshDataList')
+    fileJurisdiction(params) {
+      this.$http
+        .post("/pli/power/rentContractInfo/send", params)
+        .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.disabledBtn = false;
+              this.checkVisible = false;
+              this.visible = false;
+              this.$emit("refreshDataList");
+            },
+          });
         })
-      }).catch(() => { })
+        .catch(() => {});
+    },
+    roomFormOk(e) {
+      this.dataForm.buildingUnitId = e.buildingUnitId;
+      this.dataForm.doorName = e.doorName;
+      this.checkHandle("2");
     },
-    roomFormOk (e) {
-      this.dataForm.buildingUnitId = e.buildingUnitId
-      this.dataForm.doorName = e.doorName
-      this.checkHandle('2')
-    }
   },
 };
 </script>

From 0862040d297ee18fec4ce48959229eed3e5036a4 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 3 Apr 2023 17:36:07 +0800
Subject: [PATCH 13/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E5=BD=95=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E5=9D=90=E6=A0=87?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 81 ++++---------------
 1 file changed, 17 insertions(+), 64 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 38367c655..73cba7801 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1513,7 +1513,7 @@ export default {
 		modifyGridPop(val) {
 			if (val) {
 				setTimeout(() => {
-					this.createMap();
+					this.createMap("modifyGridFrom");
 				}, 1000);
 			}
 		},
@@ -2892,6 +2892,8 @@ export default {
 				this.modifyGridFrom.manageDistrict = data.manageDistrict;
 				this.modifyGridFrom.griId = data.grid;
 				this.modifyGridFrom.gridSort = data.gridSort;
+				this.modifyGridFrom.latitude = data.latitude;
+				this.modifyGridFrom.longitude = data.longitude;
 			} else {
 				this.$message.error(msg);
 			}
@@ -2908,8 +2910,8 @@ export default {
 				mobile: this.OrgDetailsForm.mobile,
 				code: this.OrgDetailsForm.code,
 				latitude: this.latitude,
-				remark: this.OrgDetailsForm.remark,
 				longitude: this.longitude,
+				remark: this.OrgDetailsForm.remark,
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2964,6 +2966,8 @@ export default {
 				code: this.modifyGridFrom.code,
 				gridType: this.modifyGridFrom.gridType,
 				sort: this.modifyGridFrom.gridSort,
+				latitude: this.modifyGridFrom.latitude,
+				longitude: this.modifyGridFrom.longitude,
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2981,8 +2985,8 @@ export default {
 		},
 
 		/** 地图初始化 */
-		createMap() {
-			let { latitude, longitude } = this;
+		createMap(type) {
+			let { latitude, longitude } = this[type] || this;
 			if (
 				latitude === null ||
 				latitude === "" ||
@@ -2999,7 +3003,6 @@ export default {
 					longitude = longitude2;
 				}
 			}
-			// var center = new window.TMap.LatLng(latitude, longitude); //设置中心点坐标
 			var map = new daiMap(
 				document.getElementById("con"),
 				{ latitude, longitude },
@@ -3009,72 +3012,22 @@ export default {
 					rotation: 45, // 设置地图旋转角度
 				}
 			);
-			// //初始化地图
-			// var map = new window.TMap.Map("con", {
-			//   center: center,
-			//   zoom: 13, // 设置地图缩放级别
-			//   pitch: 43.5, // 设置俯仰角
-			//   rotation: 45, // 设置地图旋转角度
-			// });
-
-			// // 新建一个地点搜索类
-			// let markers = new window.TMap.MultiMarker({
-			//   map: map,
-			//   geometries: [],
-			// });
-
-			// map.on("panend", (e) => {
-			//   handleMoveCenter(e);
-			// });
 
 			// 监听地图平移结束
 			map.on("dragend", (e) => {
-				handleMoveCenter(e);
-			});
-
-			// map.setCenter(latitude, longitude);
-			map.setMarker(latitude, longitude);
-
-			// setMarker(latitude, longitude);
-
-			// function setMarker(lat, lng) {
-			//   console.log("setMarker", lat, lng);
-			//   markers.setGeometries([]);
-
-			//   markers.add([
-			//     {
-			//       id: "4",
-			//       styleId: "marker",
-			//       position: new window.TMap.LatLng(lat, lng),
-			//       properties: {
-			//         title: "marker4",
-			//       },
-			//     },
-			//   ]);
-			// }
-
-			function handleMoveCenter(e) {
 				//修改地图中心点
 				const { lat, lng } = map.getCenter();
-				// const lat = lat;
-				// const lng = lng;
 				map.setMarker(lat, lng);
+				if (type) {
+					this[type].latitude = lat;
+					this[type].longitude = lng;
+				} else {
+					this.latitude = lat;
+					this.longitude = lng;
+				}
+			});
 
-				// let { msg, data } = await map.getAddress(lat, lng);
-				// if (msg == "success") {
-				//   this.formData.address = data.address
-				//   this.searchValue = data.address
-				//   this.searchOptions = []
-
-				// }
-
-				//修改地图中心点
-				// const center = map.getCenter();
-				// const lat = center.getLat();
-				// const lng = center.getLng();
-
-				// setMarker(lat, lng);
-			}
+			map.setMarker(latitude, longitude);
 		},
 	},
 };

From 089e5d27657bc7a58373408e2344c38085acea8c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 4 Apr 2023 15:19:05 +0800
Subject: [PATCH 14/34] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/mapConfig.vue | 2434 ++++++++++++-----------
 1 file changed, 1253 insertions(+), 1181 deletions(-)

diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 939b9e36b..27976d219 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -1,180 +1,192 @@
 <template>
-  <div>
-    <div style="position: relative">
-      <div class="div_search">
-        <el-select
-          v-model="selAgencyId"
-          size="small"
-          placeholder="请选择或点击区域选择"
-        >
-          <el-option
-            @click.native="orgChange(index)"
-            v-for="(item, index) in subAgencyArray"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-        <div v-if="selAgencyId && subAgencyArray.length > 0">
-          <el-button
-            v-if="showBtn && !hasPolygon"
-            size="small"
-            style="margin-left: 10px"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAddPolygon"
-            >{{ method === "mAddPolygon" ? "取消绘制" : "绘制区域" }}</el-button
-          >
-          <el-button
-            v-if="showBtn && hasPolygon"
-            size="small"
-            style="margin-left: 10px"
-            type="primary"
-            icon="el-icon-edit"
-            @click="handleEditPolygon"
-            >{{
-              method === "mEditPolygon" ? "取消绘制" : "重新绘制"
-            }}</el-button
-          >
-          <!-- <el-button v-if="showBtn&&hasPolygon"
+	<div>
+		<div style="position: relative">
+			<div class="div_search">
+				<el-select
+					v-model="selAgencyId"
+					size="small"
+					placeholder="请选择或点击区域选择"
+				>
+					<el-option
+						@click.native="orgChange(index)"
+						v-for="(item, index) in subAgencyArray"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					>
+					</el-option>
+				</el-select>
+				<div v-if="selAgencyId && subAgencyArray.length > 0">
+					<el-button
+						v-if="showBtn && !hasPolygon"
+						size="small"
+						style="margin-left: 10px"
+						type="primary"
+						icon="el-icon-plus"
+						@click="handleAddPolygon"
+						>{{
+							method === "mAddPolygon" ? "取消绘制" : "绘制区域"
+						}}</el-button
+					>
+					<el-button
+						v-if="showBtn && hasPolygon"
+						size="small"
+						style="margin-left: 10px"
+						type="primary"
+						icon="el-icon-edit"
+						@click="handleEditPolygon"
+						>{{
+							method === "mEditPolygon" ? "取消绘制" : "重新绘制"
+						}}</el-button
+					>
+					<!-- <el-button v-if="showBtn&&hasPolygon"
                      size="small"
                      style="margin-left:10px"
                      type="primary"
                      icon="el-icon-delete"
                      @click="handleDelPolygon">删除区域</el-button> -->
-          <el-button
-            v-if="showBtn"
-            size="small"
-            style="margin-left: 10px"
-            type="primary"
-            icon="el-icon-upload2"
-            @click="handleManually"
-            >手动录入</el-button
-          >
-          <!-- <el-button v-if="showBtn"
+					<el-button
+						v-if="showBtn"
+						size="small"
+						style="margin-left: 10px"
+						type="primary"
+						icon="el-icon-upload2"
+						@click="handleManually"
+						>手动录入</el-button
+					>
+					<!-- <el-button v-if="showBtn"
                      style="margin-left:10px"
                      type="primary"
                      icon="el-icon-delete"
                      @click="handleSetOffset">设置偏差</el-button> -->
-          <span v-if="showBtn && hasPolygon"> 经度偏差：</span>
-          <el-input-number
-            v-if="showBtn && hasPolygon"
-            resize="none"
-            size="small"
-            style="width: 200px"
-            :precision="5"
-            :step="0.0001"
-            placeholder="请输入经度偏差"
-            v-model="xOffset"
-          >
-          </el-input-number>
-          <span v-if="showBtn && hasPolygon"> 纬度偏差：</span>
-          <el-input-number
-            v-if="showBtn && hasPolygon"
-            resize="none"
-            size="small"
-            :precision="5"
-            :step="0.0001"
-            style="width: 200px"
-            placeholder="请输入维度偏差"
-            v-model="yOffset"
-          >
-          </el-input-number>
-
-          <el-button
-            v-if="showBtn && hasPolygon"
-            style="margin-left: 10px"
-            type="primary"
-            size="small"
-            icon="el-icon-folder-add"
-            @click="handleOffsetOk"
-            >保存</el-button
-          >
-          <!-- <el-button v-if="showBtn"
+					<span v-if="showBtn && hasPolygon"> 经度偏差：</span>
+					<el-input-number
+						v-if="showBtn && hasPolygon"
+						resize="none"
+						size="small"
+						style="width: 200px"
+						:precision="5"
+						:step="0.0001"
+						placeholder="请输入经度偏差"
+						v-model="xOffset"
+					>
+					</el-input-number>
+					<span v-if="showBtn && hasPolygon"> 纬度偏差：</span>
+					<el-input-number
+						v-if="showBtn && hasPolygon"
+						resize="none"
+						size="small"
+						:precision="5"
+						:step="0.0001"
+						style="width: 200px"
+						placeholder="请输入维度偏差"
+						v-model="yOffset"
+					>
+					</el-input-number>
+
+					<el-button
+						v-if="showBtn && hasPolygon"
+						style="margin-left: 10px"
+						type="primary"
+						size="small"
+						icon="el-icon-folder-add"
+						@click="handleOffsetOk"
+						>保存</el-button
+					>
+					<!-- <el-button v-if="showBtn"
                      style="margin-left:10px"
                      type="primary"
                      size="mini"
                      icon="el-icon-delete"
                      @click="handleOffsetCancel">预览</el-button> -->
-        </div>
-      </div>
-      <div class="div_back">
-        <el-button
-          v-if="runNum > 0"
-          style="margin-left: 10px"
-          type="primary"
-          icon="el-icon-back"
-          @click="handleBack"
-          >返回上一级</el-button
-        >
-      </div>
-      <div class="div_tip">
-        <span>按住alt键单击标注，可以进入下一级地图</span>
-      </div>
-      <div id="map" class="div_map" :style="{ height: mapHeight + 'px' }"></div>
-    </div>
-    <el-dialog
-      title="手动录入"
-      :visible.sync="dialogVisible"
-      width="50%"
-      :before-close="handleClose"
-    >
-      <div class="div_textarea">
-        <div style="margin-top: 10px">
-          <span> 中心点经度：</span>
-          <el-input-number
-            size="small"
-            style="width: 250px"
-            v-model="longitude"
-          >
-          </el-input-number>
-          <span style="margin-left: 15px"> 中心点纬度：</span>
-          <el-input-number size="small" style="width: 250px" v-model="latitude">
-          </el-input-number>
-        </div>
-        <div style="margin-top: 20px">
-          <el-input
-            type="textarea"
-            :rows="15"
-            style="width: 600px; max-height: 500px"
-            placeholder="请复制坐标数据"
-            v-model="polygonManullyString"
-          >
-          </el-input>
-        </div>
-        <div style="margin-top: 20px">
-          <span> 经度偏差：</span>
-          <el-input-number
-            resize="none"
-            size="small"
-            style="width: 200px"
-            :precision="5"
-            :step="0.0001"
-            placeholder="请输入经度偏差"
-            v-model="xOffset_customize"
-          >
-          </el-input-number>
-          <span style="margin-left: 15px"> 纬度偏差：</span>
-          <el-input-number
-            resize="none"
-            size="small"
-            :precision="5"
-            :step="0.0001"
-            style="width: 200px"
-            placeholder="请输入维度偏差"
-            v-model="yOffset_customize"
-          >
-          </el-input-number>
-        </div>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handleManuallyOk">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
+				</div>
+			</div>
+			<div class="div_back">
+				<el-button
+					v-if="runNum > 0"
+					style="margin-left: 10px"
+					type="primary"
+					icon="el-icon-back"
+					@click="handleBack"
+					>返回上一级</el-button
+				>
+			</div>
+			<div class="div_tip">
+				<span>按住alt键单击标注，可以进入下一级地图</span>
+			</div>
+			<div
+				id="map"
+				class="div_map"
+				:style="{ height: mapHeight + 'px' }"
+			></div>
+		</div>
+		<el-dialog
+			title="手动录入"
+			:visible.sync="dialogVisible"
+			width="50%"
+			:before-close="handleClose"
+		>
+			<div class="div_textarea">
+				<div style="margin-top: 10px">
+					<span> 中心点经度：</span>
+					<el-input-number
+						size="small"
+						style="width: 250px"
+						v-model="longitude"
+					>
+					</el-input-number>
+					<span style="margin-left: 15px"> 中心点纬度：</span>
+					<el-input-number
+						size="small"
+						style="width: 250px"
+						v-model="latitude"
+					>
+					</el-input-number>
+				</div>
+				<div style="margin-top: 20px">
+					<el-input
+						type="textarea"
+						:rows="15"
+						style="width: 600px; max-height: 500px"
+						placeholder="请复制坐标数据"
+						v-model="polygonManullyString"
+					>
+					</el-input>
+				</div>
+				<div style="margin-top: 20px">
+					<span> 经度偏差：</span>
+					<el-input-number
+						resize="none"
+						size="small"
+						style="width: 200px"
+						:precision="5"
+						:step="0.0001"
+						placeholder="请输入经度偏差"
+						v-model="xOffset_customize"
+					>
+					</el-input-number>
+					<span style="margin-left: 15px"> 纬度偏差：</span>
+					<el-input-number
+						resize="none"
+						size="small"
+						:precision="5"
+						:step="0.0001"
+						style="width: 200px"
+						placeholder="请输入维度偏差"
+						v-model="yOffset_customize"
+					>
+					</el-input-number>
+				</div>
+			</div>
+
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="handleManuallyOk"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
@@ -187,10 +199,10 @@ import VectorSource from "ol/source/Vector.js";
 import GeoJSON from "ol/format/GeoJSON.js";
 import { defaults as defaultControls, ZoomToExtent } from "ol/control.js";
 import {
-  defaults as defaultInteractions,
-  Modify,
-  Select,
-  DoubleClickZoom,
+	defaults as defaultInteractions,
+	Modify,
+	Select,
+	DoubleClickZoom,
 } from "ol/interaction.js";
 import { getCenter, getWidth } from "ol/extent.js";
 import { Circle as CircleStyle, Fill, Stroke, Style, Text } from "ol/style.js";
@@ -205,6 +217,7 @@ import { mapType } from "@/utils/dai-map";
 import { get as getProjection, Projection, addProjection } from "ol/proj.js";
 import proj4 from "proj4";
 import { register as registerProj4 } from "ol/proj/proj4";
+import tdtWpZw from "@/utils/tdt-wp-zw";
 
 var centerPointGlobal = [120.664619, 36.504963];
 let loading; //加载动画
@@ -214,9 +227,9 @@ let y = 700;
 let size = [x, y];
 let extent = [-x, -y, x, y];
 let projection = new Projection({
-  code: "xkcd-image",
-  units: "pixels",
-  extent: extent,
+	code: "xkcd-image",
+	units: "pixels",
+	extent: extent,
 });
 
 let map;
@@ -234,1045 +247,1104 @@ let selectedFeatures;
 
 //标注的文字样式
 var createTextStyle = function (feature) {
-  return new Text({
-    textAlign: undefined,
-    font: "bold 18px Arial",
-    //fontFamily: "Courier New, monospace",
-    fontWeight: "bold",
-    text: feature.values_.name,
-    //text: "名称",
-    fill: new Fill({ color: "#007ab9" }),
-    stroke: new Stroke({ color: "#ffffff", width: 3 }),
-    offsetY: 0,
-    overflow: true,
-  });
+	return new Text({
+		textAlign: undefined,
+		font: "bold 18px Arial",
+		//fontFamily: "Courier New, monospace",
+		fontWeight: "bold",
+		text: feature.values_.name,
+		//text: "名称",
+		fill: new Fill({ color: "#007ab9" }),
+		stroke: new Stroke({ color: "#ffffff", width: 3 }),
+		offsetY: 0,
+		overflow: true,
+	});
 };
 //上级组织标注样式
 var parentStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      // fill: new Fill({
-      //   color: [255, 255, 255, 0.3]
-      // }),
-      stroke: new Stroke({
-        color: [0, 103, 182, 1],
-        width: 2,
-      }),
-
-      // text: createTextStyle(feature)
-    });
-  };
+	return function (feature) {
+		return new Style({
+			// fill: new Fill({
+			//   color: [255, 255, 255, 0.3]
+			// }),
+			stroke: new Stroke({
+				color: [0, 103, 182, 1],
+				width: 2,
+			}),
+
+			// text: createTextStyle(feature)
+		});
+	};
 })();
 
 var polygonStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      fill: new Fill({
-        color: [255, 255, 255, 0.3],
-      }),
-      stroke: new Stroke({
-        color: [0, 153, 255, 1],
-        width: 3,
-      }),
-
-      text: createTextStyle(feature),
-    });
-  };
+	return function (feature) {
+		return new Style({
+			fill: new Fill({
+				color: [255, 255, 255, 0.3],
+			}),
+			stroke: new Stroke({
+				color: [0, 153, 255, 1],
+				width: 3,
+			}),
+
+			text: createTextStyle(feature),
+		});
+	};
 })();
 
 const vueGis = {
-  name: "HomeMap",
-  data() {
-    return {
-      method: "", //绘制方法
-      centerPoint: [], //中心点位置
-      zoom: 14, //缩放范围：区14
-      minZoom: 1, //最小缩放
-      isMapLoaded: false, //地图是否加载完毕
-
-      orgData: {}, //当前组织对象
-      orgId: "",
-      orgLevel: "",
-
-      subAgencyArray: [], //下拉框数据
-      selAgencyIndex: 0,
-      selAgencyId: "", //下拉框选中的组织id
-      selAgency: {}, //下拉框选中的组织对象
-      hasPolygon: false, //下拉框选中的组织是否有标注
-      showBtn: false,
-
-      selPolygonId: "", //选择的多边形id
-      selPolygon: {},
-
-      //下钻层级记录
-      runNum: 0,
-      runAgency: [],
-      center: [],
-      zoom: null,
-      parentPolygon: [],
-
-      //手动录入弹出框
-      dialogVisible: false,
-      showOffset: false,
-      // polygonManullyString: "POLYGON (( 120.33902844 36.10290786, 120.33928218 36.10292997, 120.33956336 36.10316381, 120.34016675 36.10367715, 120.34044913 36.10391476, 120.34045707 36.10392145, 120.34068696 36.10411489, 120.34103181 36.10436285, 120.34117309 36.10441824, 120.34134613 36.10447927, 120.34164715 36.10465122, 120.34124679 36.10507284, 120.34088128 36.10538902, 120.34076198 36.10549222, 120.34053890 36.10520966, 120.34044967 36.10507284, 120.34030632 36.10494761, 120.34019091 36.10484679, 120.33976558 36.10448095, 120.33966658 36.10439980, 120.33947147 36.10425822, 120.33932037 36.10417613, 120.33913002 36.10411307, 120.33895751 36.10406073, 120.33879451 36.10403693, 120.33864104 36.10403158, 120.33864031 36.10395235, 120.33863211 36.10305897, 120.33902175 36.10290728, 120.33902844 36.10290786))",
-      polygonManullyString: "",
-
-      xOffset: 0,
-      yOffset: 0,
-      xOffset_customize: 0,
-      yOffset_customize: 0,
-      // xOffset_customize: 0.0051,//市北默认偏移
-      // yOffset_customize: 0.0002,//市北默认偏移
-
-      longitude: undefined,
-      latitude: undefined,
-    };
-  },
-  async mounted() {
-    //加载组织数据
-    await this.loadOrgData();
-    // this.runAgency.push(this.orgData)
-
-    //
-    if (mapType == "tdzw") {
-      this.initMap2();
-    } else {
-      this.initMap();
-    }
-
-    //上级组织多边形图层
-    this.addParentLayer();
-    this.loadParentPolygon();
-
-    //添加标注图层
-    this.addPolygonLayer();
-
-    //加载当前园区的标注
-    this.loadPolygon(this.subAgencyArray);
-  },
-  methods: {
-    //切换下级组织
-    orgChange(index) {
-      this.selAgencyIndex = index;
-
-      selectedFeatures.clear();
-
-      if (this.subAgencyArray.length > 0 && (index || index === 0)) {
-        this.showBtn = true;
-        this.selAgency = this.subAgencyArray[index];
-        if (this.selAgency.coordinates) {
-          this.hasPolygon = true;
-          this.highlightPolygon();
-        } else {
-          this.hasPolygon = false;
-        }
-      } else {
-        this.showBtn = false;
-      }
-    },
-
-    //刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
-    async refreshMap(isRefreshView) {
-      //加载组织数据
-      await this.loadOrgData();
-      this.loadParentPolygon();
-      //加载当前园区的标注
-      this.loadPolygon(this.subAgencyArray);
-
-      //重置地图中心点
-      // if (isRefreshView) {
-      //   this.setMapLocation()
-      //   mapView.setCenter(this.centerPoint);
-      //   mapView.setZoom(this.zoom);
-      // }
-    },
-
-    //返回上一级组织
-    handleBack() {
-      this.center = this.runAgency[this.runNum - 1].center;
-      this.zoom = this.runAgency[this.runNum - 1].zoom;
-      this.selAgencyId = "";
-      this.runNum--;
-      this.runAgency.pop();
-
-      if (this.runNum === 0) {
-        this.orgId = "";
-        this.orgLevel = "";
-      } else {
-        this.orgId = this.runAgency[this.runAgency.length - 1].id;
-        this.orgLevel = this.runAgency[this.runAgency.length - 1].level;
-      }
-
-      this.refreshMap(true);
-    },
-
-    //加载组织数据
-    async loadOrgData() {
-      const url = "/gov/org/agency/maporg";
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
-      let params = {
-        orgId: this.orgId,
-        level: this.orgLevel,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.orgData = data;
-        this.subAgencyArray = [];
-        if (this.runNum === 0) {
-          //第一次进入，绘制本级
-          this.subAgencyArray.push(data);
-          // this.selAgencyId = data.id
-        } else {
-          this.parentPolygon = [];
-          this.parentPolygon.push(data);
-
-          if (data.children && data.children.length > 0) {
-            this.subAgencyArray = data.children;
-            // this.selAgencyId = this.subAgencyArray[0].id
-          } else {
-            this.subAgencyArray = [];
-            // this.selAgencyId = ''
-          }
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    //加载父级组织多边形
-    loadParentPolygon() {
-      parentSource.clear(); //清空标注
-
-      let featureData = []; //标注数据
-      if (this.parentPolygon && this.parentPolygon.length > 0) {
-        //判断是否存在下级标注
-        let oneData = {};
-
-        this.parentPolygon.forEach((agencyItem) => {
-          if (agencyItem.coordinates && agencyItem.coordinates !== "") {
-            //如果有坐标
-            oneData = {
-              type: "Feature",
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-              },
-              geometry: {
-                type: "Polygon",
-                coordinates: [],
-              },
-            };
-            let coorArray = agencyItem.coordinates.split(","); //坐标数组
-
-            let itemArray = []; //单个点位的[lon,lat]，数组
-            let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
-
-            coorArray.forEach((item, index) => {
-              itemArray.push(item);
-              if (index % 2 == 0) {
-                //偶
-              } else {
-                //奇
-                polygonArray.push(itemArray);
-                itemArray = [];
-              }
-            });
-            oneData.geometry.coordinates.push(polygonArray);
-            featureData.push(oneData);
-          }
-        });
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          type: "FeatureCollection",
-          features: featureData,
-        };
-        let feature = new GeoJSON().readFeatures(geojsonObject);
-        parentSource.addFeatures(feature);
-      }
-    },
-    //加载当前园区的标注
-    loadPolygon(subAgencyArray) {
-      polygonSource.clear(); //清空标注
-
-      let featureData = []; //标注数据
-      if (subAgencyArray && subAgencyArray.length > 0) {
-        //判断是否存在下级标注
-        let oneData = {};
-
-        subAgencyArray.forEach((agencyItem) => {
-          if (agencyItem.coordinates && agencyItem.coordinates !== "") {
-            //如果有坐标
-            oneData = {
-              type: "Feature",
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-              },
-              geometry: {
-                type: "Polygon",
-                coordinates: [],
-              },
-            };
-            let coorArray = agencyItem.coordinates.split(","); //坐标数组
-
-            let itemArray = []; //单个点位的[lon,lat]，数组
-            let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
-
-            coorArray.forEach((item, index) => {
-              itemArray.push(item);
-              if (index % 2 == 0) {
-                //偶
-              } else {
-                //奇
-                polygonArray.push(itemArray);
-                itemArray = [];
-              }
-            });
-            oneData.geometry.coordinates.push(polygonArray);
-            featureData.push(oneData);
-          }
-        });
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          type: "FeatureCollection",
-          features: featureData,
-        };
-        let feature = new GeoJSON().readFeatures(geojsonObject);
-        polygonSource.addFeatures(feature);
-      }
-      this.orgChange(this.selAgencyIndex);
-    },
-
-    //选择feature
-    selectFeature(e) {
-      if (e.selected.length > 0) {
-        console.log("selectFeature22222222222222222222222");
-        if (this.method === undefined || this.method === "") {
-          this.selAgencyId = e.selected[0].id_;
-          this.subAgencyArray.forEach((element, index) => {
-            if (element.id === e.selected[0].id_) {
-              this.selAgencyIndex = index;
-              this.orgChange(index);
-            }
-          });
-        }
-      }
-    },
-    //下钻到下一级
-    toSubAgency(e) {
-      if (!e.selected[0]) {
-        return false;
-      }
-
-      if (this.method != "mAddPolygon" && this.level != "neighborHood") {
-        this.selAgencyId = "";
-        //下钻到下一级
-        this.subAgencyArray.forEach((item) => {
-          if (item.id === e.selected[0].id_) {
-            this.selPolygonId = item.id;
-            this.selPolygon = item;
-            this.orgId = item.id;
-            this.orgLevel = item.level;
-          }
-        });
-
-        this.runNum++;
-        this.selPolygon.center = map.getView().getCenter();
-        this.selPolygon.zoom = map.getView().getZoom();
-        console.log("center", map.getView().getCenter());
-        console.log("zoom", map.getView().getZoom());
-
-        this.runAgency.push(this.selPolygon);
-        this.selAgencyIndex = 0;
-        this.refreshMap(true);
-      }
-    },
-
-    //高亮某个标注
-    highlightPolygon() {
-      let features = polygonSource.getFeatures();
-      features.forEach((element) => {
-        if (element.id_ === this.selAgencyId) {
-          selectedFeatures.push(element);
-          let polygon = element.getGeometry();
-          map.getView().fit(polygon, map.getSize());
-          this.zoom = map.getView().getZoom() - 2;
-          mapView.setZoom(this.zoom);
-        }
-      });
-    },
-    //设置地图定位的中心点和缩放级别
-    setMapLocation() {
-      this.centerPoint = [];
-
-      if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center;
-      } else if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude);
-        this.centerPoint.push(this.orgData.latitude);
-      } else {
-        this.centerPoint = centerPointGlobal;
-      }
-
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel);
-      }
-    },
-
-    //根据组织层级设置缩放级别
-    setZoom(agencyLevel) {
-      if (agencyLevel === "district") {
-        this.zoom = 12;
-      } else if (agencyLevel === "street") {
-        this.zoom = 13;
-      } else if (agencyLevel === "community") {
-        this.zoom = 14;
-      } else {
-        this.zoom = 11;
-      }
-    },
-
-    initMap() {
-      this.setMapLocation();
-
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        // source: new XYZ({
-        //   url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
-        // }),
-        // source: new XYZ({
-        //   url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
-        // }),
-        source: new XYZ({
-          //指定url瓦片
-          url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}",
-          wrapX: true, //x方向平铺，也可以选择false
-        }),
-        // zIndex: 20
-      });
-      // var sourceMark = new XYZ({
-      //   url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
-      //   // zIndex: 22
-      // });
-      // var tileMark = new TileLayer({
-      //   title: "标注图层",
-      //   source: sourceMark,
-      // });
-
-      (mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        // projection: 'EPSG:3857',
-        projection: "EPSG:4326",
-        zoom: this.zoom,
-        minZoom: this.minZoom,
-      })),
-        //初始化map和地图底图
-        //创建地图容器
-        (map = new Map({
-          layers: [gaodeMapLayer],
-          // layers: [gaodeMapLayer, tileMark],
-          //加载瓦片图层数据
-          view: mapView,
-          target: "map",
-          //目标加载到map中
-        }));
-
-      map.on("singleclick", function (e) {
-        // console.log(e.coordinate)
-        // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
-      });
-
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find((interaction) => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
-    },
-
-    // 烟台专用
-    initMap2() {
-      this.setMapLocation();
-
-      proj4.defs(
-        "EPSG:4490",
-        'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
-      );
-      registerProj4(proj4);
-      //重写projection4490，
-      var projection = new Projection({
-        code: "EPSG:4490",
-        units: "degrees",
-        axisOrientation: "neu",
-      });
-      projection.setExtent([-180, -90, 180, 90]);
-      projection.setWorldExtent([-180, -90, 180, 90]);
-      addProjection(projection);
-
-      let projectionExtent = projection.getExtent();
-      let size = getWidth(projectionExtent) / 256; //size就是一个像素代表的经纬度
-      let matrixIds = [];
-
-      function getResolutions() {
-        let resolutions = [];
-        for (let z = 7; z < 19; ++z) {
-          resolutions[z] = size / Math.pow(2, z);
-          matrixIds[z] = z;
-        }
-        return resolutions;
-      }
-
-      const resolutions = getResolutions();
-
-      console.log("========= getProjection", getProjection("EPSG:4490"));
-
-      let url = "http://59.206.203.34/tileservice/SDPubMap";
-      if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
-        url =
-          "http://service.sdmap.gov.cn/tileservice/sdpubmap?tk=e758167d5b90c351b70a979c0820840c";
-      }
-
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        source: new WMTS({
-          url,
-          layer: "sdvec",
-          matrixSet: "c",
-          format: "image/png",
-          projection: getProjection("EPSG:4490"),
-          tileGrid: new WMTSTileGrid({
-            origin: [-180, 90],
-            resolutions,
-            matrixIds,
-          }),
-          style: "default",
-          tilematrixset: "c",
-          // wrapX: true,
-          tileLoadFunction(imageTile, src) {
-            // 使用滤镜 将白色修改为深色
-            let img = new Image();
-            // img.crossOrigin = ''
-            // 设置图片不从缓存取，从缓存取可能会出现跨域，导致加载失败
-            img.setAttribute("crossOrigin", "anonymous");
-            img.onload = function () {
-              let canvas = document.createElement("canvas");
-              let w = img.width;
-              let h = img.height;
-              canvas.width = w;
-              canvas.height = h;
-              let context = canvas.getContext("2d");
-              context.filter =
-                "grayscale(92%) invert(100%) sepia(20%) hue-rotate(140deg) saturate(2000%) brightness(70%) contrast(80%)";
-              context.drawImage(img, 0, 0, w, h, 0, 0, w, h);
-              imageTile.getImage().src = canvas.toDataURL("image/png");
-            };
-            img.src = src;
-          },
-        }),
-      });
-
-      (mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        projection: getProjection("EPSG:4490"),
-        zoom: this.zoom,
-        minZoom: this.minZoom,
-      })),
-        //初始化map和地图底图
-        //创建地图容器
-        (map = new Map({
-          layers: [gaodeMapLayer],
-          //加载瓦片图层数据
-          view: mapView,
-          target: "map",
-          //目标加载到map中
-        }));
-
-      map.on("singleclick", function (e) {
-        // console.log(e.coordinate)
-        // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
-      });
-
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find((interaction) => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
-    },
-
-    //添加标注图层
-    addParentLayer() {
-      parentSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      parentLayer = new VectorLayer({
-        source: parentSource,
-        style: parentStyleFunction,
-        zIndex: 50,
-      });
-
-      map.addLayer(parentLayer);
-    },
-    //添加标注图层
-    addPolygonLayer() {
-      polygonSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      polygonLayer = new VectorLayer({
-        source: polygonSource,
-        style: polygonStyleFunction,
-        zIndex: 50,
-      });
-
-      //选中多边形后的样式
-      var overlayStyle = (function () {
-        return function (feature) {
-          var styles = {};
-          styles["Polygon"] = [
-            new Style({
-              stroke: new Stroke({
-                color: "#ec9000",
-                width: 2,
-              }),
-            }),
-
-            new Style({
-              fill: new Fill({
-                color: "rgba(0, 0, 255, 0.1)",
-              }),
-            }),
-            new Style({
-              text: createTextStyle(feature),
-            }),
-          ];
-          styles["MultiPolygon"] = styles["Polygon"];
-          return styles[feature.getGeometry().getType()];
-        };
-      })();
-
-      select = new Select({
-        style: overlayStyle,
-      });
-
-      selectAltClick = new Select({
-        condition: function (mapBrowserEvent) {
-          return click(mapBrowserEvent) && altKeyOnly(mapBrowserEvent);
-        },
-      });
-
-      selectedFeatures = select.getFeatures();
-
-      map.addLayer(polygonLayer);
-      map.addInteraction(select);
-      map.addInteraction(selectAltClick);
-
-      select.on("select", (e) => {
-        this.selectFeature(e);
-      });
-      selectAltClick.on("select", (e) => {
-        this.toSubAgency(e);
-      });
-    },
-    //点击【手动录入】
-    handleManually() {
-      this.dialogVisible = true;
-      this.polygonManullyString = "";
-      this.longitude = undefined;
-      this.latitude = undefined;
-      if (this.selAgency) {
-        if (this.selAgency.longitude) {
-          this.longitude = this.selAgency.longitude;
-        }
-        if (this.selAgency.latitude) {
-          this.latitude = this.selAgency.latitude;
-        }
-      }
-    },
-
-    //点击【手动录入】
-    handleClose() {
-      this.dialogVisible = false;
-    },
-
-    handleManuallyOk() {
-      if (this.longitude || this.latitude) {
-        if (!(this.longitude && this.latitude)) {
-          this.$message({
-            type: "warning",
-            message: "请同时填写中心点经纬度，或不填写",
-          });
-          return false;
-        }
-      }
-      //转化成需要的格式
-      //120.54033616308595,36.53603370922851,120.69620469335939,36.5408402277832,120.63166001562502,36.46771248120117,120.52728989843752,36.458786089599606,120.54033616308595,36.53603370922851
-      //中国经纬度范围
-      // 经度范围：73°33′E至135°05′E 东经
-      // 纬度范围：3°51′N至53°33′N 北纬
-      let aaa = this.polygonManullyString.replace(/\[/g, ",");
-      aaa = aaa.replace(/\]/g, ",");
-
-      let array = aaa.split(/[, ()]/);
-      // const arrayString = this.polygonManullyString
-      // let array = arrayString.split(",|(|)|[|]")
-      console.log(array);
-      let polygonStringResult = "";
-
-      // const arrayString = this.polygonManullyString
-      // let array = arrayString.split(/[, ()]/)
-      // console.log(array)
-      // let polygonStringResult = ''
-
-      array.forEach((element) => {
-        let num = Number(element);
-        if (num) {
-          polygonStringResult = polygonStringResult + element + ",";
-        }
-      });
-
-      polygonStringResult = polygonStringResult.substring(
-        0,
-        polygonStringResult.length - 1
-      );
-
-      if (this.xOffset_customize !== 0 || this.yOffset_customize !== 0) {
-        this.saveOffset(
-          this.xOffset_customize,
-          this.yOffset_customize,
-          polygonStringResult
-        );
-      } else {
-        this.addPolygon(polygonStringResult);
-      }
-    },
-
-    handleSetOffset() {
-      this.showOffset = true;
-    },
-    handleOffsetOk() {
-      let selPolygonString = "";
-
-      this.subAgencyArray.forEach((element) => {
-        if (
-          element.id === this.selAgencyId &&
-          element.coordinates &&
-          element.coordinates.length > 0
-        ) {
-          selPolygonString = element.coordinates;
-        }
-      });
-
-      if (selPolygonString) {
-        this.saveOffset(this.xOffset, this.yOffset, selPolygonString);
-      }
-    },
-    saveOffset(xOffset, yOffset, selPolygonString) {
-      let offsetPolygonString = ""; //偏移后的坐标字符串
-      let tempArray = selPolygonString.split(",");
-
-      tempArray.forEach((element, index) => {
-        let aaa = 0;
-
-        if (index % 2 === 0) {
-          //偶数
-          aaa = parseFloat(element) + parseFloat(xOffset);
-        } else {
-          aaa = parseFloat(element) + parseFloat(yOffset);
-        }
-
-        if (index % 2 !== 0) {
-          //奇数
-        }
-        offsetPolygonString = offsetPolygonString + aaa + ",";
-      });
-
-      offsetPolygonString = offsetPolygonString.substring(
-        0,
-        offsetPolygonString.length - 1
-      );
-      this.addPolygon(offsetPolygonString);
-    },
-    handleSetOffset() {
-      this.handleOffsetCancel = false;
-    },
-
-    //点击【绘制区域】
-    handleAddPolygon() {
-      if (this.method === "mAddPolygon") {
-        this.method = "";
-        map.removeInteraction(draw);
-      } else if (this.selAgency) {
-        this.method = "mAddPolygon";
-        //绘制
-        this.drawPolygon();
-      } else {
-        this.$message({
-          type: "warning",
-          message: "请先选择组织",
-        });
-      }
-    },
-
-    //点击【重新绘制】
-    handleEditPolygon() {
-      if (this.method === "mEditPolygon") {
-        this.method = "";
-        map.removeInteraction(draw);
-        this.loadPolygon(this.subAgencyArray);
-      } else {
-        this.method = "mEditPolygon";
-        //暂时隐藏要重新绘制的标注
-        this.hidePolygon();
-
-        //绘制
-        this.drawPolygon();
-      }
-    },
-
-    //点击【删除标注】
-    handleDelPolygon() {
-      map.removeInteraction(draw);
-      this.$confirm("确认删除" + this.selAgency.name + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.method = "delPolygon";
-          this.delPolygon();
-        })
-        .catch((err) => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-          this.method = "";
-        });
-    },
-
-    //隐藏Polygon（前端隐藏，非删除）
-    hidePolygon() {
-      let polygonTempArray = [];
-
-      this.subAgencyArray.forEach((element) => {
-        if (element.id !== this.selAgencyId) {
-          polygonTempArray.push(element);
-        }
-      });
-
-      this.loadPolygon(polygonTempArray);
-    },
-
-    //绘制Polygon
-    drawPolygon() {
-      draw = new Draw({
-        source: polygonSource,
-        type: "Polygon",
-      });
-      map.addInteraction(draw);
-
-      draw.on("drawend", (feature) => {
-        this.polygonCoor = feature.feature.values_.geometry.flatCoordinates;
-
-        let coorString = "";
-        for (let i = 0; i < this.polygonCoor.length; i++) {
-          coorString = coorString + this.polygonCoor[i] + ",";
-        }
-        if (this.polygonCoor.length > 0) {
-          coorString = coorString.substring(0, coorString.length - 1);
-        }
-
-        if (this.method === "mEditPolygon") {
-          this.$confirm("是否确认覆盖原有区域?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.addPolygon(coorString);
-            })
-            .catch((err) => {
-              this.loadPolygon(this.subAgencyArray);
-            });
-        } else {
-          this.addPolygon(coorString);
-        }
-
-        this.method = "";
-        map.removeInteraction(draw);
-      });
-    },
-
-    //新增标注
-    async addPolygon(coorString) {
-      console.log(coorString);
-      const url = "/gov/org/agency/mapaddarea";
-
-      let params = {
-        orgId: this.selAgency.id,
-        level: this.selAgency.level,
-        coordinates: coorString,
-        longitude: this.longitude,
-        latitude: this.latitude,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "绘制成功",
-        });
-        if (this.dialogVisible) {
-          this.polygonManullyString = "";
-          this.dialogVisible = false;
-        }
-        this.refreshMap(false);
-      } else {
-        this.$message({
-          type: "error",
-          message: "绘制失败，请重试",
-        });
-      }
-    },
-
-    //删除标注
-    async delPolygon() {
-      const url = "/gov/org/agency/mapdelarea";
-
-      let params = {
-        orgId: this.selAgency.id,
-        level: this.selAgency.level,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功",
-        });
-        this.method = "";
-        this.selAgencyIndex = 0;
-        this.refreshMap(false);
-      }
-    },
-    //开启加载动画
-    startLoading() {
-      loading = Loading.service({
-        lock: true, //是否锁定
-        text: "正在加载……", //加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", //背景颜色
-      });
-    },
-
-    //结束加载动画
-    endLoading() {
-      //clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
-    },
-  },
-  props: {
-    vueFlag: {
-      type: String,
-      default: "alarm",
-    },
-  },
-  computed: {
-    extentXOffset() {
-      if (this.clientHeight < 900) {
-        return 0.88;
-      } else {
-        return 0.95;
-      }
-    },
-    extentYOffset() {
-      return 0.95;
-    },
-    imgExtent() {
-      return [
-        -x * this.extentXOffset,
-        -y * this.extentYOffset,
-        x * this.extentXOffset,
-        y * this.extentYOffset,
-      ];
-    },
-    mapHeight() {
-      return this.clientHeight - 170;
-    },
-    // zoom: {
-    //   get () {
-    //     //根据不同屏幕分辨率，控制zoom大小
-    //     if (this.clientHeight < 900) {
-    //       return 2.3
-    //     } else {
-    //       return 2.8
-    //     }
-    //   },
-    //   set (value) {
-    //   }
-    // },
-    ...mapGetters(["clientHeight"]),
-  },
-  components: {},
+	name: "HomeMap",
+	data() {
+		return {
+			method: "", //绘制方法
+			centerPoint: [], //中心点位置
+			zoom: 14, //缩放范围：区14
+			minZoom: 1, //最小缩放
+			isMapLoaded: false, //地图是否加载完毕
+
+			orgData: {}, //当前组织对象
+			orgId: "",
+			orgLevel: "",
+
+			subAgencyArray: [], //下拉框数据
+			selAgencyIndex: 0,
+			selAgencyId: "", //下拉框选中的组织id
+			selAgency: {}, //下拉框选中的组织对象
+			hasPolygon: false, //下拉框选中的组织是否有标注
+			showBtn: false,
+
+			selPolygonId: "", //选择的多边形id
+			selPolygon: {},
+
+			//下钻层级记录
+			runNum: 0,
+			runAgency: [],
+			center: [],
+			zoom: null,
+			parentPolygon: [],
+
+			//手动录入弹出框
+			dialogVisible: false,
+			showOffset: false,
+			// polygonManullyString: "POLYGON (( 120.33902844 36.10290786, 120.33928218 36.10292997, 120.33956336 36.10316381, 120.34016675 36.10367715, 120.34044913 36.10391476, 120.34045707 36.10392145, 120.34068696 36.10411489, 120.34103181 36.10436285, 120.34117309 36.10441824, 120.34134613 36.10447927, 120.34164715 36.10465122, 120.34124679 36.10507284, 120.34088128 36.10538902, 120.34076198 36.10549222, 120.34053890 36.10520966, 120.34044967 36.10507284, 120.34030632 36.10494761, 120.34019091 36.10484679, 120.33976558 36.10448095, 120.33966658 36.10439980, 120.33947147 36.10425822, 120.33932037 36.10417613, 120.33913002 36.10411307, 120.33895751 36.10406073, 120.33879451 36.10403693, 120.33864104 36.10403158, 120.33864031 36.10395235, 120.33863211 36.10305897, 120.33902175 36.10290728, 120.33902844 36.10290786))",
+			polygonManullyString: "",
+
+			xOffset: 0,
+			yOffset: 0,
+			xOffset_customize: 0,
+			yOffset_customize: 0,
+			// xOffset_customize: 0.0051,//市北默认偏移
+			// yOffset_customize: 0.0002,//市北默认偏移
+
+			longitude: undefined,
+			latitude: undefined,
+		};
+	},
+	async mounted() {
+		//加载组织数据
+		await this.loadOrgData();
+		// this.runAgency.push(this.orgData)
+
+		//
+		if (mapType == "tdzw") {
+			this.initMap2();
+		} else {
+			this.initMap();
+		}
+
+		//上级组织多边形图层
+		this.addParentLayer();
+		this.loadParentPolygon();
+
+		//添加标注图层
+		this.addPolygonLayer();
+
+		//加载当前园区的标注
+		this.loadPolygon(this.subAgencyArray);
+	},
+	methods: {
+		//切换下级组织
+		orgChange(index) {
+			this.selAgencyIndex = index;
+
+			selectedFeatures.clear();
+
+			if (this.subAgencyArray.length > 0 && (index || index === 0)) {
+				this.showBtn = true;
+				this.selAgency = this.subAgencyArray[index];
+				if (this.selAgency.coordinates) {
+					this.hasPolygon = true;
+					this.highlightPolygon();
+				} else {
+					this.hasPolygon = false;
+				}
+			} else {
+				this.showBtn = false;
+			}
+		},
+
+		//刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
+		async refreshMap(isRefreshView) {
+			//加载组织数据
+			await this.loadOrgData();
+			this.loadParentPolygon();
+			//加载当前园区的标注
+			this.loadPolygon(this.subAgencyArray);
+
+			//重置地图中心点
+			// if (isRefreshView) {
+			//   this.setMapLocation()
+			//   mapView.setCenter(this.centerPoint);
+			//   mapView.setZoom(this.zoom);
+			// }
+		},
+
+		//返回上一级组织
+		handleBack() {
+			this.center = this.runAgency[this.runNum - 1].center;
+			this.zoom = this.runAgency[this.runNum - 1].zoom;
+			this.selAgencyId = "";
+			this.runNum--;
+			this.runAgency.pop();
+
+			if (this.runNum === 0) {
+				this.orgId = "";
+				this.orgLevel = "";
+			} else {
+				this.orgId = this.runAgency[this.runAgency.length - 1].id;
+				this.orgLevel = this.runAgency[this.runAgency.length - 1].level;
+			}
+
+			this.refreshMap(true);
+		},
+
+		//加载组织数据
+		async loadOrgData() {
+			const url = "/gov/org/agency/maporg";
+			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+			let params = {
+				orgId: this.orgId,
+				level: this.orgLevel,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.orgData = data;
+				this.subAgencyArray = [];
+				if (this.runNum === 0) {
+					//第一次进入，绘制本级
+					this.subAgencyArray.push(data);
+					// this.selAgencyId = data.id
+				} else {
+					this.parentPolygon = [];
+					this.parentPolygon.push(data);
+
+					if (data.children && data.children.length > 0) {
+						this.subAgencyArray = data.children;
+						// this.selAgencyId = this.subAgencyArray[0].id
+					} else {
+						this.subAgencyArray = [];
+						// this.selAgencyId = ''
+					}
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//加载父级组织多边形
+		loadParentPolygon() {
+			parentSource.clear(); //清空标注
+
+			let featureData = []; //标注数据
+			if (this.parentPolygon && this.parentPolygon.length > 0) {
+				//判断是否存在下级标注
+				let oneData = {};
+
+				this.parentPolygon.forEach((agencyItem) => {
+					if (
+						agencyItem.coordinates &&
+						agencyItem.coordinates !== ""
+					) {
+						//如果有坐标
+						oneData = {
+							type: "Feature",
+							id: agencyItem.id,
+							properties: {
+								id: agencyItem.id,
+								level: agencyItem.level,
+								name: agencyItem.name,
+							},
+							geometry: {
+								type: "Polygon",
+								coordinates: [],
+							},
+						};
+						let coorArray = agencyItem.coordinates.split(","); //坐标数组
+
+						let itemArray = []; //单个点位的[lon,lat]，数组
+						let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+						coorArray.forEach((item, index) => {
+							itemArray.push(item);
+							if (index % 2 == 0) {
+								//偶
+							} else {
+								//奇
+								polygonArray.push(itemArray);
+								itemArray = [];
+							}
+						});
+						oneData.geometry.coordinates.push(polygonArray);
+						featureData.push(oneData);
+					}
+				});
+			}
+
+			if (featureData && featureData.length > 0) {
+				var geojsonObject = {
+					type: "FeatureCollection",
+					features: featureData,
+				};
+				let feature = new GeoJSON().readFeatures(geojsonObject);
+				parentSource.addFeatures(feature);
+			}
+		},
+		//加载当前园区的标注
+		loadPolygon(subAgencyArray) {
+			polygonSource.clear(); //清空标注
+
+			let featureData = []; //标注数据
+			if (subAgencyArray && subAgencyArray.length > 0) {
+				//判断是否存在下级标注
+				let oneData = {};
+
+				subAgencyArray.forEach((agencyItem) => {
+					if (
+						agencyItem.coordinates &&
+						agencyItem.coordinates !== ""
+					) {
+						//如果有坐标
+						oneData = {
+							type: "Feature",
+							id: agencyItem.id,
+							properties: {
+								id: agencyItem.id,
+								level: agencyItem.level,
+								name: agencyItem.name,
+							},
+							geometry: {
+								type: "Polygon",
+								coordinates: [],
+							},
+						};
+						let coorArray = agencyItem.coordinates.split(","); //坐标数组
+
+						let itemArray = []; //单个点位的[lon,lat]，数组
+						let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+						coorArray.forEach((item, index) => {
+							itemArray.push(item);
+							if (index % 2 == 0) {
+								//偶
+							} else {
+								//奇
+								polygonArray.push(itemArray);
+								itemArray = [];
+							}
+						});
+						oneData.geometry.coordinates.push(polygonArray);
+						featureData.push(oneData);
+					}
+				});
+			}
+
+			if (featureData && featureData.length > 0) {
+				var geojsonObject = {
+					type: "FeatureCollection",
+					features: featureData,
+				};
+				let feature = new GeoJSON().readFeatures(geojsonObject);
+				polygonSource.addFeatures(feature);
+			}
+			this.orgChange(this.selAgencyIndex);
+		},
+
+		//选择feature
+		selectFeature(e) {
+			if (e.selected.length > 0) {
+				console.log("selectFeature22222222222222222222222");
+				if (this.method === undefined || this.method === "") {
+					this.selAgencyId = e.selected[0].id_;
+					this.subAgencyArray.forEach((element, index) => {
+						if (element.id === e.selected[0].id_) {
+							this.selAgencyIndex = index;
+							this.orgChange(index);
+						}
+					});
+				}
+			}
+		},
+		//下钻到下一级
+		toSubAgency(e) {
+			if (!e.selected[0]) {
+				return false;
+			}
+
+			if (this.method != "mAddPolygon" && this.level != "neighborHood") {
+				this.selAgencyId = "";
+				//下钻到下一级
+				this.subAgencyArray.forEach((item) => {
+					if (item.id === e.selected[0].id_) {
+						this.selPolygonId = item.id;
+						this.selPolygon = item;
+						this.orgId = item.id;
+						this.orgLevel = item.level;
+					}
+				});
+
+				this.runNum++;
+				this.selPolygon.center = map.getView().getCenter();
+				this.selPolygon.zoom = map.getView().getZoom();
+				console.log("center", map.getView().getCenter());
+				console.log("zoom", map.getView().getZoom());
+
+				this.runAgency.push(this.selPolygon);
+				this.selAgencyIndex = 0;
+				this.refreshMap(true);
+			}
+		},
+
+		//高亮某个标注
+		highlightPolygon() {
+			let features = polygonSource.getFeatures();
+			features.forEach((element) => {
+				if (element.id_ === this.selAgencyId) {
+					selectedFeatures.push(element);
+					let polygon = element.getGeometry();
+					map.getView().fit(polygon, map.getSize());
+					this.zoom = map.getView().getZoom() - 2;
+					mapView.setZoom(this.zoom);
+				}
+			});
+		},
+		//设置地图定位的中心点和缩放级别
+		setMapLocation() {
+			this.centerPoint = [];
+
+			if (this.center && this.center.length > 0) {
+				this.centerPoint = this.center;
+			} else if (this.orgData.longitude && this.orgData.latitude) {
+				this.centerPoint.push(this.orgData.longitude);
+				this.centerPoint.push(this.orgData.latitude);
+			} else {
+				this.centerPoint = centerPointGlobal;
+			}
+
+			if (!this.zoom) {
+				this.setZoom(this.orgData.agencyLevel);
+			}
+		},
+
+		//根据组织层级设置缩放级别
+		setZoom(agencyLevel) {
+			if (agencyLevel === "district") {
+				this.zoom = 12;
+			} else if (agencyLevel === "street") {
+				this.zoom = 13;
+			} else if (agencyLevel === "community") {
+				this.zoom = 14;
+			} else {
+				this.zoom = 11;
+			}
+		},
+
+		initMap() {
+			this.setMapLocation();
+
+			gaodeMapLayer = new TileLayer({
+				title: "地图",
+				// source: new XYZ({
+				//   url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+				// }),
+				// source: new XYZ({
+				//   url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
+				// }),
+
+				source: new XYZ({
+					//指定url瓦片
+					url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}",
+					wrapX: true, //x方向平铺，也可以选择false
+				}),
+				// zIndex: 20
+			});
+			// var sourceMark = new XYZ({
+			//   url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+			//   // zIndex: 22
+			// });
+			// var tileMark = new TileLayer({
+			//   title: "标注图层",
+			//   source: sourceMark,
+			// });
+
+			(mapView = new View({
+				//中心点坐标
+				center: this.centerPoint,
+				// projection: 'EPSG:3857',
+				projection: "EPSG:4326",
+				zoom: this.zoom,
+				minZoom: this.minZoom,
+			})),
+				//初始化map和地图底图
+				//创建地图容器
+				(map = new Map({
+					layers: [gaodeMapLayer],
+					// layers: [gaodeMapLayer, tileMark],
+					//加载瓦片图层数据
+					view: mapView,
+					target: "map",
+					//目标加载到map中
+				}));
+
+			map.on("singleclick", function (e) {
+				// console.log(e.coordinate)
+				// console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+			});
+
+			//去除双击放大效果
+			const dblClickInteraction = map
+				.getInteractions()
+				.getArray()
+				.find((interaction) => {
+					return interaction instanceof DoubleClickZoom;
+				});
+			map.removeInteraction(dblClickInteraction);
+		},
+
+		// 烟台用，就改了个地图地址
+		initMap2() {
+			this.setMapLocation();
+
+			gaodeMapLayer = new TileLayer({
+				title: "地图",
+
+				source: new XYZ({
+					//指定url瓦片
+					url: tdtWpZw.vec,
+					wrapX: true, //x方向平铺，也可以选择false
+				}),
+				// zIndex: 20
+			});
+
+			(mapView = new View({
+				//中心点坐标
+				center: this.centerPoint,
+				// projection: 'EPSG:3857',
+				projection: "EPSG:4326",
+				zoom: this.zoom,
+				minZoom: this.minZoom,
+			})),
+				//初始化map和地图底图
+				//创建地图容器
+				(map = new Map({
+					layers: [gaodeMapLayer],
+					// layers: [gaodeMapLayer, tileMark],
+					//加载瓦片图层数据
+					view: mapView,
+					target: "map",
+					//目标加载到map中
+				}));
+
+			map.on("singleclick", function (e) {
+				// console.log(e.coordinate)
+				// console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+			});
+
+			//去除双击放大效果
+			const dblClickInteraction = map
+				.getInteractions()
+				.getArray()
+				.find((interaction) => {
+					return interaction instanceof DoubleClickZoom;
+				});
+			map.removeInteraction(dblClickInteraction);
+		},
+
+		// 烟台专用 先弃用
+		// initMap2() {
+		//   this.setMapLocation();
+
+		//   proj4.defs(
+		//     "EPSG:4490",
+		//     'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
+		//   );
+		//   registerProj4(proj4);
+		//   //重写projection4490，
+		//   var projection = new Projection({
+		//     code: "EPSG:4490",
+		//     units: "degrees",
+		//     axisOrientation: "neu",
+		//   });
+		//   projection.setExtent([-180, -90, 180, 90]);
+		//   projection.setWorldExtent([-180, -90, 180, 90]);
+		//   addProjection(projection);
+
+		//   let projectionExtent = projection.getExtent();
+		//   let size = getWidth(projectionExtent) / 256; //size就是一个像素代表的经纬度
+		//   let matrixIds = [];
+
+		//   function getResolutions() {
+		//     let resolutions = [];
+		//     for (let z = 7; z < 19; ++z) {
+		//       resolutions[z] = size / Math.pow(2, z);
+		//       matrixIds[z] = z;
+		//     }
+		//     return resolutions;
+		//   }
+
+		//   const resolutions = getResolutions();
+
+		//   console.log("========= getProjection", getProjection("EPSG:4490"));
+
+		//   let url = "http://59.206.203.34/tileservice/SDPubMap";
+		//   if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
+		//     url =
+		//       "http://service.sdmap.gov.cn/tileservice/sdpubmap?tk=e758167d5b90c351b70a979c0820840c";
+		//   }
+
+		//   gaodeMapLayer = new TileLayer({
+		//     title: "地图",
+		//     source: new WMTS({
+		//       url,
+		//       layer: "sdvec",
+		//       matrixSet: "c",
+		//       format: "image/png",
+		//       projection: getProjection("EPSG:4490"),
+		//       tileGrid: new WMTSTileGrid({
+		//         origin: [-180, 90],
+		//         resolutions,
+		//         matrixIds,
+		//       }),
+		//       style: "default",
+		//       tilematrixset: "c",
+		//       // wrapX: true,
+		//       // tileLoadFunction(imageTile, src) {
+		//       //   // 使用滤镜 将白色修改为深色
+		//       //   let img = new Image();
+		//       //   // img.crossOrigin = ''
+		//       //   // 设置图片不从缓存取，从缓存取可能会出现跨域，导致加载失败
+		//       //   img.setAttribute("crossOrigin", "anonymous");
+		//       //   img.onload = function () {
+		//       //     let canvas = document.createElement("canvas");
+		//       //     let w = img.width;
+		//       //     let h = img.height;
+		//       //     canvas.width = w;
+		//       //     canvas.height = h;
+		//       //     let context = canvas.getContext("2d");
+		//       //     context.filter =
+		//       //       "grayscale(92%) invert(100%) sepia(20%) hue-rotate(140deg) saturate(2000%) brightness(70%) contrast(80%)";
+		//       //     context.drawImage(img, 0, 0, w, h, 0, 0, w, h);
+		//       //     imageTile.getImage().src = canvas.toDataURL("image/png");
+		//       //   };
+		//       //   img.src = src;
+		//       // },
+		//     }),
+		//   });
+
+		//   (mapView = new View({
+		//     //中心点坐标
+		//     center: this.centerPoint,
+		//     projection: getProjection("EPSG:4490"),
+		//     zoom: this.zoom,
+		//     minZoom: this.minZoom,
+		//   })),
+		//     //初始化map和地图底图
+		//     //创建地图容器
+		//     (map = new Map({
+		//       layers: [gaodeMapLayer],
+		//       //加载瓦片图层数据
+		//       view: mapView,
+		//       target: "map",
+		//       //目标加载到map中
+		//     }));
+
+		//   map.on("singleclick", function (e) {
+		//     // console.log(e.coordinate)
+		//     // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+		//   });
+
+		//   //去除双击放大效果
+		//   const dblClickInteraction = map
+		//     .getInteractions()
+		//     .getArray()
+		//     .find((interaction) => {
+		//       return interaction instanceof DoubleClickZoom;
+		//     });
+		//   map.removeInteraction(dblClickInteraction);
+		// },
+
+		//添加标注图层
+		addParentLayer() {
+			parentSource = new VectorSource({
+				//features: (new GeoJSON()).readFeatures(geojsonObject)
+			});
+
+			parentLayer = new VectorLayer({
+				source: parentSource,
+				style: parentStyleFunction,
+				zIndex: 50,
+			});
+
+			map.addLayer(parentLayer);
+		},
+		//添加标注图层
+		addPolygonLayer() {
+			polygonSource = new VectorSource({
+				//features: (new GeoJSON()).readFeatures(geojsonObject)
+			});
+
+			polygonLayer = new VectorLayer({
+				source: polygonSource,
+				style: polygonStyleFunction,
+				zIndex: 50,
+			});
+
+			//选中多边形后的样式
+			var overlayStyle = (function () {
+				return function (feature) {
+					var styles = {};
+					styles["Polygon"] = [
+						new Style({
+							stroke: new Stroke({
+								color: "#ec9000",
+								width: 2,
+							}),
+						}),
+
+						new Style({
+							fill: new Fill({
+								color: "rgba(0, 0, 255, 0.1)",
+							}),
+						}),
+						new Style({
+							text: createTextStyle(feature),
+						}),
+					];
+					styles["MultiPolygon"] = styles["Polygon"];
+					return styles[feature.getGeometry().getType()];
+				};
+			})();
+
+			select = new Select({
+				style: overlayStyle,
+			});
+
+			selectAltClick = new Select({
+				condition: function (mapBrowserEvent) {
+					return (
+						click(mapBrowserEvent) && altKeyOnly(mapBrowserEvent)
+					);
+				},
+			});
+
+			selectedFeatures = select.getFeatures();
+
+			map.addLayer(polygonLayer);
+			map.addInteraction(select);
+			map.addInteraction(selectAltClick);
+
+			select.on("select", (e) => {
+				this.selectFeature(e);
+			});
+			selectAltClick.on("select", (e) => {
+				this.toSubAgency(e);
+			});
+		},
+		//点击【手动录入】
+		handleManually() {
+			this.dialogVisible = true;
+			this.polygonManullyString = "";
+			this.longitude = undefined;
+			this.latitude = undefined;
+			if (this.selAgency) {
+				if (this.selAgency.longitude) {
+					this.longitude = this.selAgency.longitude;
+				}
+				if (this.selAgency.latitude) {
+					this.latitude = this.selAgency.latitude;
+				}
+			}
+		},
+
+		//点击【手动录入】
+		handleClose() {
+			this.dialogVisible = false;
+		},
+
+		handleManuallyOk() {
+			if (this.longitude || this.latitude) {
+				if (!(this.longitude && this.latitude)) {
+					this.$message({
+						type: "warning",
+						message: "请同时填写中心点经纬度，或不填写",
+					});
+					return false;
+				}
+			}
+			//转化成需要的格式
+			//120.54033616308595,36.53603370922851,120.69620469335939,36.5408402277832,120.63166001562502,36.46771248120117,120.52728989843752,36.458786089599606,120.54033616308595,36.53603370922851
+			//中国经纬度范围
+			// 经度范围：73°33′E至135°05′E 东经
+			// 纬度范围：3°51′N至53°33′N 北纬
+			let aaa = this.polygonManullyString.replace(/\[/g, ",");
+			aaa = aaa.replace(/\]/g, ",");
+
+			let array = aaa.split(/[, ()]/);
+			// const arrayString = this.polygonManullyString
+			// let array = arrayString.split(",|(|)|[|]")
+			console.log(array);
+			let polygonStringResult = "";
+
+			// const arrayString = this.polygonManullyString
+			// let array = arrayString.split(/[, ()]/)
+			// console.log(array)
+			// let polygonStringResult = ''
+
+			array.forEach((element) => {
+				let num = Number(element);
+				if (num) {
+					polygonStringResult = polygonStringResult + element + ",";
+				}
+			});
+
+			polygonStringResult = polygonStringResult.substring(
+				0,
+				polygonStringResult.length - 1
+			);
+
+			if (this.xOffset_customize !== 0 || this.yOffset_customize !== 0) {
+				this.saveOffset(
+					this.xOffset_customize,
+					this.yOffset_customize,
+					polygonStringResult
+				);
+			} else {
+				this.addPolygon(polygonStringResult);
+			}
+		},
+
+		handleSetOffset() {
+			this.showOffset = true;
+		},
+		handleOffsetOk() {
+			let selPolygonString = "";
+
+			this.subAgencyArray.forEach((element) => {
+				if (
+					element.id === this.selAgencyId &&
+					element.coordinates &&
+					element.coordinates.length > 0
+				) {
+					selPolygonString = element.coordinates;
+				}
+			});
+
+			if (selPolygonString) {
+				this.saveOffset(this.xOffset, this.yOffset, selPolygonString);
+			}
+		},
+		saveOffset(xOffset, yOffset, selPolygonString) {
+			let offsetPolygonString = ""; //偏移后的坐标字符串
+			let tempArray = selPolygonString.split(",");
+
+			tempArray.forEach((element, index) => {
+				let aaa = 0;
+
+				if (index % 2 === 0) {
+					//偶数
+					aaa = parseFloat(element) + parseFloat(xOffset);
+				} else {
+					aaa = parseFloat(element) + parseFloat(yOffset);
+				}
+
+				if (index % 2 !== 0) {
+					//奇数
+				}
+				offsetPolygonString = offsetPolygonString + aaa + ",";
+			});
+
+			offsetPolygonString = offsetPolygonString.substring(
+				0,
+				offsetPolygonString.length - 1
+			);
+			this.addPolygon(offsetPolygonString);
+		},
+		handleSetOffset() {
+			this.handleOffsetCancel = false;
+		},
+
+		//点击【绘制区域】
+		handleAddPolygon() {
+			if (this.method === "mAddPolygon") {
+				this.method = "";
+				map.removeInteraction(draw);
+			} else if (this.selAgency) {
+				this.method = "mAddPolygon";
+				//绘制
+				this.drawPolygon();
+			} else {
+				this.$message({
+					type: "warning",
+					message: "请先选择组织",
+				});
+			}
+		},
+
+		//点击【重新绘制】
+		handleEditPolygon() {
+			if (this.method === "mEditPolygon") {
+				this.method = "";
+				map.removeInteraction(draw);
+				this.loadPolygon(this.subAgencyArray);
+			} else {
+				this.method = "mEditPolygon";
+				//暂时隐藏要重新绘制的标注
+				this.hidePolygon();
+
+				//绘制
+				this.drawPolygon();
+			}
+		},
+
+		//点击【删除标注】
+		handleDelPolygon() {
+			map.removeInteraction(draw);
+			this.$confirm("确认删除" + this.selAgency.name + "?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.method = "delPolygon";
+					this.delPolygon();
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+						// this.$message({
+						//   type: "info",
+						//   message: "已取消删除"
+						// });
+					}
+					this.method = "";
+				});
+		},
+
+		//隐藏Polygon（前端隐藏，非删除）
+		hidePolygon() {
+			let polygonTempArray = [];
+
+			this.subAgencyArray.forEach((element) => {
+				if (element.id !== this.selAgencyId) {
+					polygonTempArray.push(element);
+				}
+			});
+
+			this.loadPolygon(polygonTempArray);
+		},
+
+		//绘制Polygon
+		drawPolygon() {
+			draw = new Draw({
+				source: polygonSource,
+				type: "Polygon",
+			});
+			map.addInteraction(draw);
+
+			draw.on("drawend", (feature) => {
+				this.polygonCoor =
+					feature.feature.values_.geometry.flatCoordinates;
+
+				let coorString = "";
+				for (let i = 0; i < this.polygonCoor.length; i++) {
+					coorString = coorString + this.polygonCoor[i] + ",";
+				}
+				if (this.polygonCoor.length > 0) {
+					coorString = coorString.substring(0, coorString.length - 1);
+				}
+
+				if (this.method === "mEditPolygon") {
+					this.$confirm("是否确认覆盖原有区域?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+						.then(() => {
+							this.addPolygon(coorString);
+						})
+						.catch((err) => {
+							this.loadPolygon(this.subAgencyArray);
+						});
+				} else {
+					this.addPolygon(coorString);
+				}
+
+				this.method = "";
+				map.removeInteraction(draw);
+			});
+		},
+
+		//新增标注
+		async addPolygon(coorString) {
+			console.log(coorString);
+			const url = "/gov/org/agency/mapaddarea";
+
+			let params = {
+				orgId: this.selAgency.id,
+				level: this.selAgency.level,
+				coordinates: coorString,
+				longitude: this.longitude,
+				latitude: this.latitude,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "绘制成功",
+				});
+				if (this.dialogVisible) {
+					this.polygonManullyString = "";
+					this.dialogVisible = false;
+				}
+				this.refreshMap(false);
+			} else {
+				this.$message({
+					type: "error",
+					message: "绘制失败，请重试",
+				});
+			}
+		},
+
+		//删除标注
+		async delPolygon() {
+			const url = "/gov/org/agency/mapdelarea";
+
+			let params = {
+				orgId: this.selAgency.id,
+				level: this.selAgency.level,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "删除成功",
+				});
+				this.method = "";
+				this.selAgencyIndex = 0;
+				this.refreshMap(false);
+			}
+		},
+		//开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, //是否锁定
+				text: "正在加载……", //加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", //背景颜色
+			});
+		},
+
+		//结束加载动画
+		endLoading() {
+			//clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+	props: {
+		vueFlag: {
+			type: String,
+			default: "alarm",
+		},
+	},
+	computed: {
+		extentXOffset() {
+			if (this.clientHeight < 900) {
+				return 0.88;
+			} else {
+				return 0.95;
+			}
+		},
+		extentYOffset() {
+			return 0.95;
+		},
+		imgExtent() {
+			return [
+				-x * this.extentXOffset,
+				-y * this.extentYOffset,
+				x * this.extentXOffset,
+				y * this.extentYOffset,
+			];
+		},
+		mapHeight() {
+			return this.clientHeight - 170;
+		},
+		// zoom: {
+		//   get () {
+		//     //根据不同屏幕分辨率，控制zoom大小
+		//     if (this.clientHeight < 900) {
+		//       return 2.3
+		//     } else {
+		//       return 2.8
+		//     }
+		//   },
+		//   set (value) {
+		//   }
+		// },
+		...mapGetters(["clientHeight"]),
+	},
+	components: {},
 };
 export default vueGis;
 </script>
 
 <style scoped>
 .div_search {
-  z-index: 10;
+	z-index: 10;
 
-  display: flex;
+	display: flex;
 }
 .div_back {
-  z-index: 10;
-  right: 10px;
-  top: 1px;
-  position: absolute;
-  display: flex;
+	z-index: 10;
+	right: 10px;
+	top: 1px;
+	position: absolute;
+	display: flex;
 }
 .div_tip {
-  z-index: 10;
-  position: absolute;
-  bottom: 1px;
-  right: 2px;
-  background: rgba(255, 255, 255, 0.6);
-  padding: 3px 10px;
-  font-size: 15px;
+	z-index: 10;
+	position: absolute;
+	bottom: 1px;
+	right: 2px;
+	background: rgba(255, 255, 255, 0.6);
+	padding: 3px 10px;
+	font-size: 15px;
 }
 .div_map {
-  margin-top: 15px;
-  width: 100%;
+	margin-top: 15px;
+	width: 100%;
 }
 .div_textarea {
-  text-align: center;
+	text-align: center;
 }
 </style>
 <style>
 .ol-overlaycontainer-stopevent {
-  display: none;
+	display: none;
 }
 </style>

From dba257956170d9a3a85fbdae78b09700e58dbdea Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 4 Apr 2023 15:34:36 +0800
Subject: [PATCH 15/34] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/tdt-wp-zw.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/utils/tdt-wp-zw.js b/src/utils/tdt-wp-zw.js
index 149116066..d8bd7f463 100644
--- a/src/utils/tdt-wp-zw.js
+++ b/src/utils/tdt-wp-zw.js
@@ -2,13 +2,16 @@
 //   "http://59.206.203.34/tileservice/SDPubMap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng";
 
 let vec =
-  "http://172.20.46.177/map_tile_proxy/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}";
+	"http://172.20.46.177/map_tile_proxy/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}";
+// let vec =
+// 	"http://wprd03.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}";
 if (window.SITE_CONFIG["nodeEnv"] == "dev_sdtdt") {
-  vec =
-    "http://service.sdmap.gov.cn/tileservice/sdpubmap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng&tk=e758167d5b90c351b70a979c0820840c";
-  vec = 'http://wprd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}';
+	vec =
+		"http://service.sdmap.gov.cn/tileservice/sdpubmap?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=sdvec&STYLE=default&TILEMATRIXSET=c&TILEMATRIX={z}&TILEROW={x}&TILECOL={y}&FORMAT=image%2Fpng&tk=e758167d5b90c351b70a979c0820840c";
+	vec =
+		"http://wprd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}";
 }
 
 export default {
-  vec,
+	vec,
 };

From 58ba2a2a398759ad29fbf13fbd0716082d5ba40d Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Wed, 19 Apr 2023 18:09:26 +0800
Subject: [PATCH 16/34] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A4=87=E4=B8=AA=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-accountActiveList.vue    |  7 ++++---
 src/views/modules/census/census-accountList.vue    |  3 ++-
 src/views/modules/census/census-houseList.vue      | 10 +++++-----
 src/views/modules/census/census-nineList.vue       |  1 +
 src/views/modules/census/census-orgStatusList.vue  |  5 +++--
 src/views/modules/census/census-residentList.vue   | 14 ++++++++------
 src/views/modules/communityParty/dyhx/party.vue    |  4 +++-
 7 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue
index 9987471cc..1ad37e0fc 100644
--- a/src/views/modules/census/census-accountActiveList.vue
+++ b/src/views/modules/census/census-accountActiveList.vue
@@ -67,10 +67,10 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号"  type="index" align="center" width="50" />
-							<el-table-column prop="agencyName" align="center" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="loginCount" label="登录次数" width="110" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="agencyName" align="center" width="200" label="组织名称" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="loginCount" label="登录次数"  align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="accountActivityCount" label="活跃账号数" align="center" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="accountCount" align="center" width="110" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="accountCount" align="center" label="总账号数" :show-overflow-tooltip="true"></el-table-column>
 						</el-table>
 						<el-pagination
 							@size-change="handleSizeChange"
@@ -228,6 +228,7 @@ export default {
 				if (typeof this.formData[n] == 'object') this.formData[n] = [];
 				else this.formData[n] = '';
 			}
+			this.handleSearch();
 		},
 		handleSizeChange(val) {
 			this.pageSize = val;
diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 0062d99f4..5aaa0bde7 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -15,7 +15,7 @@
 								:show-all-levels="false"
 							/>
 						</el-form-item>
-						<el-form-item label="上报时间" prop="startDate">
+						<el-form-item label="登录时间" prop="startDate">
 							<el-date-picker
 								v-model="formData.startDate"
 								:picker-options="startPickerOptions"
@@ -281,6 +281,7 @@ export default {
 				if (typeof this.formData[n] == 'object') this.formData[n] = [];
 				else this.formData[n] = '';
 			}
+			this.handleSearch();
 		},
 		async handleExport() {
 			const url = '/gov/org/staffLoginLog/community-count-export';
diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index ecf0896c9..a0decafb1 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -65,7 +65,7 @@
 										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
 											<div class="kuai" :style="{ backgroundColor: color1[index] }"></div>
 											<div class="content">
-												<div class="name">{{ index }}{{ item.name }}</div>
+												<div class="name">{{ item.name }}</div>
 												<div class="num">{{ item.value }}</div>
 												<div class="unit" :style="{ color: color1[index] }">{{ item.radio }}%</div>
 											</div>
@@ -122,7 +122,7 @@
 							style="width: 100%;"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号"  type="index" align="center" width="50" />
+							<el-table-column label="序号" type="index" align="center" width="50" />
 							<el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="districtName" label="区县" width="110" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="communityName" width="110" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
@@ -276,6 +276,7 @@ export default {
 			this.orgId = this.optionData.agencyId;
 			this.orgIdPath = this.optionData.orgIdPath;
 			this.orgType = this.optionData.level;
+			this.handleSearch();
 		},
 		show(row) {
 			this.dialogVisible = true;
@@ -412,7 +413,7 @@ export default {
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
 				};
 			});
-
+			this.$forceUpdate();
 			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
@@ -432,7 +433,7 @@ export default {
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
 				};
 			});
-
+			this.$forceUpdate();
 			this.iniPieChart2(this.chartData2);
 		},
 		// 获取饼状图
@@ -954,5 +955,4 @@ export default {
 		}
 	}
 }
-
 </style>
diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue
index 75cec240f..f46418def 100644
--- a/src/views/modules/census/census-nineList.vue
+++ b/src/views/modules/census/census-nineList.vue
@@ -218,6 +218,7 @@ export default {
 				else this.formData[n] = '';
 			}
 			this.orgType = '';
+			this.handleSearch();
 		},
 		show(row) {
 			this.dialogVisible = true;
diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index f6757a57b..e538903c8 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -113,13 +113,13 @@
 				</el-col>
 			</el-row>
 		</div>
-		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="30%" :before-close="handleClose">
+		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="50%" :before-close="handleClose">
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
 				<el-table-column label="序号" type="index" align="center" width="50" />
 				<el-table-column prop="name" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
 				<el-table-column prop="streeName" label="所属街道" align="center" :show-overflow-tooltip="true" />
 				<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
-				<el-table-column prop="createTime" align="center" width="110" label="开通时间" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column prop="createTime" align="center" width="200" label="开通时间" :show-overflow-tooltip="true"></el-table-column>
 			</el-table>
 
 			<el-pagination
@@ -260,6 +260,7 @@ export default {
 				if (typeof this.formData[n] == 'object') this.formData[n] = [];
 				else this.formData[n] = '';
 			}
+			this.handleSearch();
 		},
 		handleSearch(val) {
 			this.getTableData();
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 9ded3ce79..a6368f6a3 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -97,7 +97,7 @@
 							style="width: 100%;"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号"  type="index" align="center" width="50" />
+							<el-table-column label="序号" type="index" align="center" width="50" />
 							<el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
@@ -201,7 +201,7 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color: ['#3C94FE', '#F0D915', '#6FC364', '#FEB349', '#F44230', '#A17AFA', '#22C1C3', '#A19FFF', '#FE6252', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],
@@ -246,6 +246,7 @@ export default {
 				else this.formData[n] = '';
 			}
 			this.orgType = '';
+			this.handleSearch();
 		},
 		show(row) {
 			this.dialogVisible = true;
@@ -758,8 +759,8 @@ export default {
 		cursor: pointer;
 		min-width: 100px;
 		display: flex;
-	margin-top: 10px;
-	margin-bottom: 10px;
+		margin-top: 10px;
+		margin-bottom: 10px;
 		margin-right: 25px;
 		width: 160px;
 		.kuai {
@@ -840,7 +841,9 @@ export default {
 }
 .div_table {
 	padding: 30px !important;
-	.table{margin-top: 16px!important;}
+	.table {
+		margin-top: 16px !important;
+	}
 }
 .div_table_title {
 	margin-top: -10px;
@@ -881,5 +884,4 @@ export default {
 		}
 	}
 }
-
 </style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index c4f8a07cd..46555b69e 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -218,7 +218,8 @@ export default {
 			pieInitState2: false,
 			pieOption: [],
 			pieOption2: [],
-			color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
+			color: ['#3C94FE', '#F0D915', '#6FC364', '#FEB349', '#F44230', '#A17AFA', '#22C1C3', '#A19FFF', '#FE6252', '#5DC7F0'],
+			// color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
 			chartData: [],
 			chartData2: [],
 			pieData: [],
@@ -300,6 +301,7 @@ export default {
 				if (typeof this.formData[n] == 'object') this.formData[n] = [];
 				else this.formData[n] = '';
 			}
+			this.handleSearch();
 		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;

From 42b222a09d2880f92206202270c786a54be5bdf0 Mon Sep 17 00:00:00 2001
From: tianqian <277562116@qq.com>
Date: Wed, 19 Apr 2023 19:26:02 +0800
Subject: [PATCH 17/34] =?UTF-8?q?=E7=BB=9F=E8=AE=A1legend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue | 10 ++--
 .../modules/census/census-residentList.vue    | 47 ++++++++++---------
 .../modules/communityParty/dyhx/party.vue     | 14 +++---
 3 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index a0decafb1..ef7102252 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -62,7 +62,7 @@
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
 											<div class="kuai" :style="{ backgroundColor: color1[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -91,7 +91,7 @@
 							<div class="flex1">
 								<div class="box">
 									<div class="legend2">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
 											<div class="kuai" v-if="item.name == '自住'"><img src="../../../assets/img/census/自住.png" /></div>
 											<div class="kuai" v-if="item.name == '出租'"><img src="../../../assets/img/census/出租.png" /></div>
 											<div class="kuai" v-if="item.name == '闲置'"><img src="../../../assets/img/census/闲置.png" /></div>
@@ -242,7 +242,9 @@ export default {
 			orgId: '',
 			purpose: '',
 			rentFlag: '',
-			orgIdPath: ''
+			orgIdPath: '',
+			chartDataData:[],
+			chartData2Data:[]
 		};
 	},
 	computed: {
@@ -413,6 +415,7 @@ export default {
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
 				};
 			});
+			this.chartDataData=this.chartData.data ;
 			this.$forceUpdate();
 			this.iniPieChart(this.chartData);
 		},
@@ -433,6 +436,7 @@ export default {
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
 				};
 			});
+			this.chartData2Data=this.chartData2.data ;
 			this.$forceUpdate();
 			this.iniPieChart2(this.chartData2);
 		},
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index a6368f6a3..68b23a91a 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -40,7 +40,7 @@
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -69,7 +69,7 @@
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -211,7 +211,9 @@ export default {
 			code: '',
 			pieDatatotal: 0,
 			pieDatatotal2: 0,
-			codeType: 'education'
+			codeType: 'education',
+			chartDataData: [],
+			chartData2Data: []
 		};
 	},
 	computed: {
@@ -362,34 +364,35 @@ export default {
 			}
 		},
 		setPieData() {
-			let data = [...this.pieData];
-			this.pieDatatotal = data
-				.map(item => item.totalResi)
-				.reduce(function(prev, cur, index, arr) {
-					console.log(prev, cur, index);
-					return prev + cur;
-				});
+			let data = [...this.pieData.list];
+			// this.pieDatatotal = data
+			// 	.map(item => item.totalResi)
+			// 	.reduce(function(prev, cur, index, arr) {
+			// 		console.log(prev, cur, index);
+			// 		return prev + cur;
+			// 	});
 			this.chartData.name = data.map(item => item.codeName);
 			this.chartData.data = data.map(item => {
 				return {
 					value: item.totalResi,
 					name: item.codeName,
 					code: item.code,
-					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieDatatotal) * 100).toFixed(2)
+					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData.total) * 100).toFixed(2)
 				};
 			});
+			this.chartDataData = this.chartData.data;
 			console.log('chartData', this.chartData);
 			this.iniPieChart(this.chartData);
 		},
 		setPieData2() {
-			let data = [...this.pieData2];
+			let data = [...this.pieData2.list];
 
-			this.pieDatatotal2 = data
-				.map(item => item.totalResi)
-				.reduce(function(prev, cur, index, arr) {
-					console.log(prev, cur, index);
-					return prev + cur;
-				});
+			// this.pieDatatotal2 = data
+			// 	.map(item => item.totalResi)
+			// 	.reduce(function(prev, cur, index, arr) {
+			// 		console.log(prev, cur, index);
+			// 		return prev + cur;
+			// 	});
 
 			this.chartData2.name = data.map(item => item.codeName);
 			this.chartData2.data = data.map(item => {
@@ -397,10 +400,10 @@ export default {
 					value: item.totalResi,
 					name: item.codeName,
 					code: item.code,
-					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieDatatotal2) * 100).toFixed(2)
+					radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData2.total) * 100).toFixed(2)
 				};
 			});
-
+			this.chartData2Data = this.chartData2.data;
 			console.log('chartData', this.chartData2);
 			this.iniPieChart2(this.chartData2);
 		},
@@ -420,7 +423,7 @@ export default {
 				},
 				color: this.color,
 				title: {
-					text: this.pieDatatotal,
+					text: this.pieData.total,
 					subtext: '总数',
 					x: 'center',
 					y: 'center',
@@ -530,7 +533,7 @@ export default {
 				},
 				color: this.color,
 				title: {
-					text: this.pieDatatotal2,
+					text: this.pieData2.total,
 					subtext: '总数',
 					x: 'center',
 					y: 'center',
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 46555b69e..87f84974f 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -37,7 +37,7 @@
 						<div class="flex1">
 							<div class="box">
 								<div class="legend">
-									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
 										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 										<div class="content">
 											<div class="name">{{ item.name }}</div>
@@ -103,7 +103,7 @@
 						<div class="flex1">
 							<div class="box">
 								<div class="legend">
-									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem(item)">
 										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 										<div class="content">
 											<div class="name">{{ item.name }}</div>
@@ -269,7 +269,9 @@ export default {
 			pieEduOptions: null,
 			formData: {
 				orgId: ''
-			}
+			},
+			chartDataData: [],
+			chartData2Data: []
 		};
 	},
 	computed: {
@@ -671,7 +673,7 @@ export default {
 					console.log(prev, cur, index);
 					return prev + cur;
 				});
-			console.log('this.pieDatatotal',this.pieDatatotal);
+			console.log('this.pieDatatotal', this.pieDatatotal);
 			this.chartData.name = data.map(item => item.value);
 			this.chartData.data = data.map(item => {
 				return {
@@ -681,6 +683,7 @@ export default {
 					radio: item.radio
 				};
 			});
+			this.chartDataData = this.chartData.data;
 			console.log('chartData', this.chartData);
 			this.$forceUpdate();
 			this.initAgeCharts(this.chartData);
@@ -705,7 +708,7 @@ export default {
 					radio: item.radio
 				};
 			});
-
+			this.chartData2Data = this.chartData2.data;
 			console.log('chartData', this.chartData2);
 			this.$forceUpdate();
 			this.initEduCharts(this.chartData2);
@@ -1026,5 +1029,4 @@ export default {
 		}
 	}
 }
-
 </style>

From 489a5efa6645ffaaca2be2698b2d50c0aeda5a11 Mon Sep 17 00:00:00 2001
From: tianqian <277562116@qq.com>
Date: Wed, 19 Apr 2023 19:28:35 +0800
Subject: [PATCH 18/34] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 5aaa0bde7..45bd20e33 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -126,7 +126,7 @@
     margin-top: -30px;
     margin-bottom: 10px;"
 			>
-				<el-button size="small" class="diy-button--output" @click="handleExport()">导出</el-button>
+				<el-button size="small" v-if="orgType == 'community'" class="diy-button--output" @click="handleExport()">导出</el-button>
 			</div>
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
 				<template v-if="orgType == 'community'">

From 6243538d4ba03e34d66a40c96e32388a6b68a58f Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 08:53:30 +0800
Subject: [PATCH 19/34] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-accountList.vue     |  29 +-
 src/views/modules/census/chart.vue            | 302 +++++++++---------
 2 files changed, 165 insertions(+), 166 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 45bd20e33..64d7ca082 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -97,7 +97,7 @@
 							style="width: 100%"
 							:height="maxTableHeight"
 						>
-							<el-table-column label="序号"  type="index" align="center" width="50" />
+							<el-table-column label="序号" type="index" align="center" width="50" />
 							<el-table-column prop="agencyName" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="streetName" label="所属街道" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
@@ -123,27 +123,27 @@
 		<el-dialog :title="title" :visible.sync="dialogVisible" v-if="dialogVisible" width="50%" :before-close="handleClose">
 			<div
 				style=" text-align: right;
-    margin-top: -30px;
+    margin-top: -10px;
     margin-bottom: 10px;"
 			>
 				<el-button size="small" v-if="orgType == 'community'" class="diy-button--output" @click="handleExport()">导出</el-button>
 			</div>
 			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
 				<template v-if="orgType == 'community'">
-					<el-table-column label="序号"  type="index" align="center" width="50" />
+					<el-table-column label="序号" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="streetName" label="所属街道" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'street'">
-					<el-table-column label="序号"  type="index" align="center" width="50" />
+					<el-table-column label="序号" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" label="镇街名称" align="center" :show-overflow-tooltip="true" />
 					<el-table-column prop="districtName" label="所属区县" align="center" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
 				<template v-if="orgType == 'district'">
-					<el-table-column label="序号"  type="index" align="center" width="50" />
+					<el-table-column label="序号" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" label="区县名称" align="center" :show-overflow-tooltip="true"></el-table-column>
 					<el-table-column prop="count" align="center" label="登录次数" :show-overflow-tooltip="true"></el-table-column>
 				</template>
@@ -540,7 +540,7 @@ export default {
 		// 获取饼状图
 		async iniPieChart(chartData) {
 			this.$refs.pieChart.clear();
-			
+
 			// 获取pieChart配置
 			this.pieOption = {
 				grid: {
@@ -591,8 +591,8 @@ export default {
 							color: '#F3F7FD'
 						}
 					},
-					min:0,
-					max:1000,
+					min: 0,
+					max: 1000
 				},
 				series: [
 					{
@@ -601,14 +601,14 @@ export default {
 						type: 'bar',
 						itemStyle: {
 							color: 'rgb(33, 149, 254)',
-							borderRadius: [4, 4, 0, 0],
+							borderRadius: [4, 4, 0, 0]
 						}
 					}
 				]
 			};
-			if (chartData.data.length>0) {
-				this.pieOption.yAxis.max=null
-			} 
+			if (chartData.data.length > 0) {
+				this.pieOption.yAxis.max = null;
+			}
 			this.$refs.pieChart.setOption(this.pieOption);
 		},
 		handelClickMyPei(param) {
@@ -687,8 +687,8 @@ export default {
 		}
 	}
 }
-.div_table{
-	padding: 30px!important;
+.div_table {
+	padding: 30px !important;
 }
 .div_table_title {
 	margin-top: -10px;
@@ -719,5 +719,4 @@ export default {
 		flex: 1;
 	}
 }
-
 </style>
diff --git a/src/views/modules/census/chart.vue b/src/views/modules/census/chart.vue
index b78f0595c..f4f9e9a10 100644
--- a/src/views/modules/census/chart.vue
+++ b/src/views/modules/census/chart.vue
@@ -1,163 +1,163 @@
 <template>
-  <div class="screenEchartsFrame"
-       ref="screenEchartsFrame"></div>
+	<div class="screenEchartsFrame" ref="screenEchartsFrame"></div>
 </template>
 
 <script>
 import * as echarts from 'echarts';
 export default {
-  name: 'screen-echarts-frame',
-  data () {
-    return {
-      myChart: ''
-    }
-  },
-  props: {
-    chartMethod: {
-      type: Function
-    }
-  },
-  mounted () {
-    this.initChart()
-    window.onresize = () => {
-      this.myChart.resize()
-    }
-  },
-  beforeDestroy () {
-    // 销毁echarts实例对象
-    if (this.myChart) this.myChart.dispose()
-  },
-  watch: {},
-  methods: {
-    initChart () {
-      this.$nextTick(() => {
-        const dom = this.$refs.screenEchartsFrame
-        this.myChart = echarts.init(dom)
-        // this.myChart.setOption(this.chartMethod())
-        this.$emit('myChartMethod', this.myChart)
-      })
-    },
-    // 配置option
-    setOption (option) {
-      this.myChart.setOption(option)
-     let than = this
-      this.myChart.on('click',function(param){
-        than.$emit('handelClickMyPei',param)
-				})
-    },
-    // 获取option
-    getOption () {
-      if (this.myChart) {
-        return this.myChart.getOption()
-      } else {
-        return null
-      }
-    },
-    //
-    resize () {
-      if (this.myChart) {
-        this.myChart.resize()
-      }
-    },
-    clear () {
-      if (this.myChart) {
-        this.myChart.clear()
-      }
-    },
-    showLoading () {
-      if (this.myChart) {
-        this.$nextTick(() => {
-          this.myChart.showLoading({
-            text: '',
-            color: '#29cdff',
-            textColor: '#29cdff',
-            maskColor: 'rgba(255, 255, 255, 0)',
-            zlevel: 0
-          })
-        })
-      }
-    },
-    hideLoading () {
-      if (this.myChart) {
-        this.myChart.hideLoading()
-      }
-    },
-    // 启动动画时使用
-    tooltipAnimate (chart, length) {
-      // 清除上一次动画
-      this.timeTicket && clearInterval(this.timeTicket)
-      const count = 0
-      // 启动动画
-      this._action(chart, count, length)
-      chart && // 移除动画
-        chart.on('mouseover', params => {
-          this._cleanAction(chart, params)
-        })
-      // 重写启动动画
-      chart &&
-        chart.on('mouseout', () => {
-          this._action(chart, count, length)
-        })
-    },
-    // tooltip动画action
-    _action (chart, count, length) {
-      this.timeTicket && clearInterval(this.timeTicket)
-      this.timeTicket = setInterval(() => {
-        if (!chart) {
-          clearInterval(this.timeTicket)
-          return
-        }
-        chart &&
-          chart.dispatchAction({
-            type: 'downplay',
-            seriesIndex: 0
-          })
-        chart &&
-          chart.dispatchAction({
-            type: 'highlight',
-            seriesIndex: 0,
-            dataIndex: count % length
-          })
-        chart &&
-          chart.dispatchAction({
-            type: 'showTip',
-            seriesIndex: 0,
-            dataIndex: count % length
-          })
-        count++
-      }, 1000 * 3)
-    },
-    _cleanAction (chart, params) {
-      this.timeTicket && clearInterval(this.timeTicket)
-      if (!chart) {
-        clearInterval(this.timeTicket)
-        return
-      }
-      chart &&
-        chart.dispatchAction({
-          type: 'downplay',
-          seriesIndex: 0
-        })
-      chart &&
-        chart.dispatchAction({
-          type: 'highlight',
-          seriesIndex: 0,
-          dataIndex: params.dataIndex
-        })
-      chart &&
-        chart.dispatchAction({
-          type: 'showTip',
-          seriesIndex: 0,
-          dataIndex: params.dataIndex
-        })
-    }
-  }
-}
+	name: 'screen-echarts-frame',
+	data() {
+		return {
+			myChart: ''
+		};
+	},
+	props: {
+		chartMethod: {
+			type: Function
+		}
+	},
+	mounted() {
+		this.initChart();
+		window.onresize = () => {
+			this.myChart.resize();
+		};
+	},
+	beforeDestroy() {
+		// 销毁echarts实例对象
+		if (this.myChart) this.myChart.dispose();
+	},
+	watch: {},
+	methods: {
+		initChart() {
+			this.$nextTick(() => {
+				const dom = this.$refs.screenEchartsFrame;
+				this.myChart = echarts.init(dom);
+				// this.myChart.setOption(this.chartMethod())
+				this.$emit('myChartMethod', this.myChart);
+			});
+		},
+		// 配置option
+		setOption(option) {
+			this.myChart.setOption(option);
+			let than = this;
+			this.myChart.off('click');
+			this.myChart.on('click', function(param) {
+				than.$emit('handelClickMyPei', param);
+			});
+		},
+		// 获取option
+		getOption() {
+			if (this.myChart) {
+				return this.myChart.getOption();
+			} else {
+				return null;
+			}
+		},
+		//
+		resize() {
+			if (this.myChart) {
+				this.myChart.resize();
+			}
+		},
+		clear() {
+			if (this.myChart) {
+				this.myChart.clear();
+			}
+		},
+		showLoading() {
+			if (this.myChart) {
+				this.$nextTick(() => {
+					this.myChart.showLoading({
+						text: '',
+						color: '#29cdff',
+						textColor: '#29cdff',
+						maskColor: 'rgba(255, 255, 255, 0)',
+						zlevel: 0
+					});
+				});
+			}
+		},
+		hideLoading() {
+			if (this.myChart) {
+				this.myChart.hideLoading();
+			}
+		},
+		// 启动动画时使用
+		tooltipAnimate(chart, length) {
+			// 清除上一次动画
+			this.timeTicket && clearInterval(this.timeTicket);
+			const count = 0;
+			// 启动动画
+			this._action(chart, count, length);
+			chart && // 移除动画
+				chart.on('mouseover', params => {
+					this._cleanAction(chart, params);
+				});
+			// 重写启动动画
+			chart &&
+				chart.on('mouseout', () => {
+					this._action(chart, count, length);
+				});
+		},
+		// tooltip动画action
+		_action(chart, count, length) {
+			this.timeTicket && clearInterval(this.timeTicket);
+			this.timeTicket = setInterval(() => {
+				if (!chart) {
+					clearInterval(this.timeTicket);
+					return;
+				}
+				chart &&
+					chart.dispatchAction({
+						type: 'downplay',
+						seriesIndex: 0
+					});
+				chart &&
+					chart.dispatchAction({
+						type: 'highlight',
+						seriesIndex: 0,
+						dataIndex: count % length
+					});
+				chart &&
+					chart.dispatchAction({
+						type: 'showTip',
+						seriesIndex: 0,
+						dataIndex: count % length
+					});
+				count++;
+			}, 1000 * 3);
+		},
+		_cleanAction(chart, params) {
+			this.timeTicket && clearInterval(this.timeTicket);
+			if (!chart) {
+				clearInterval(this.timeTicket);
+				return;
+			}
+			chart &&
+				chart.dispatchAction({
+					type: 'downplay',
+					seriesIndex: 0
+				});
+			chart &&
+				chart.dispatchAction({
+					type: 'highlight',
+					seriesIndex: 0,
+					dataIndex: params.dataIndex
+				});
+			chart &&
+				chart.dispatchAction({
+					type: 'showTip',
+					seriesIndex: 0,
+					dataIndex: params.dataIndex
+				});
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
 .screenEchartsFrame {
-  width: 100%;
-  height: 100%;
+	width: 100%;
+	height: 100%;
 }
 </style>

From 740be640c39fcb6dd9781eea33b3bfbaa5977e1a Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 09:46:17 +0800
Subject: [PATCH 20/34] =?UTF-8?q?=E6=9F=B1=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-accountList.vue     | 67 +++++++++++++++++--
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 64d7ca082..9fbc13b32 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -477,6 +477,7 @@ export default {
 		},
 		async getsubData() {
 			this.$refs.pieChart.showLoading();
+			// staffLoginLog/streetTotal
 			let url = '/gov/org/staffLoginLog/sub-count';
 			let param = {
 				orgId: this.formData.orgId,
@@ -495,6 +496,62 @@ export default {
 				this.$message.error(msg);
 			}
 		},
+		async getPiesubData(orgId, orgType) {
+			// staffLoginLog/streetTotal
+			this.orgType = orgType;
+			console.log(orgType);
+			let url = '';
+			if (orgType == 'community') {
+				url = '/gov/org/staffLoginLog/community-count';
+			} else {
+				url = '/gov/org/staffLoginLog/streetTotal';
+			}
+
+			this.dialogVisible = true;
+
+			let param = {};
+			console.log('orgType', orgType);
+			// district street community
+			// 1 是区县 2是镇街 3是社区  4是下级
+			switch (orgType) {
+				case 'district':
+					this.title = '区县级账号登录情况';
+					// url = '/gov/org/staffLoginLog/district-count';
+					break;
+				case 'street':
+					this.title = '镇街级账号登录情况';
+					// url = '/gov/org/staffLoginLog/street-count';
+					break;
+				case 'community':
+					this.title = '社区级账号登录情况';
+					// url = '/gov/org/staffLoginLog/community-count';
+					break;
+			}
+			param = {
+				orgId: orgId,
+				level: orgType,
+				startDate: this.formData.startDate,
+				endDate: this.formData.endDate,
+				isPage: true,
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
+			};
+			this.tableLoading2 = true;
+			const { data, code, msg } = await requestPost(url, param);
+			this.tableLoading2 = false;
+			if (code === 0) {
+				console.log('ddd data', data);
+				this.dialogVisible = true;
+				this.total = data.total || 0;
+				this.tableDataView = data.list
+					? data.list.map(item => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
 		handleSizeChange(val) {
 			this.pageSize = val;
 			window.localStorage.setItem('pageSize', val);
@@ -612,19 +669,17 @@ export default {
 			this.$refs.pieChart.setOption(this.pieOption);
 		},
 		handelClickMyPei(param) {
+			let orgType = '';
 			if (param.data.level != 'community') {
 				if (param.data.level == 'district') {
-					this.orgType = 'street';
+					orgType = 'street';
 				}
 				if (param.data.level == 'street') {
-					this.orgType = 'community';
+					orgType = 'community';
 				}
 
-				this.orgId = param.data.id;
-				this.orgName = param.data.name;
 				this.pageNo = 1;
-				this.showNext();
-				this.dialogVisible = true;
+				this.getPiesubData(param.data.id, orgType);
 			}
 		}
 	}

From cb9c91a826745298802c897023bbe218f246974e Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 10:06:30 +0800
Subject: [PATCH 21/34] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-accountList.vue     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 9fbc13b32..0cc58d5fe 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -376,7 +376,7 @@ export default {
 				endDate: this.formData.endDate,
 				isPage: true,
 				pageNo: this.pageNo,
-				pageSize: this.pageSize
+				pageSize: 10
 			};
 			this.tableLoading2 = true;
 			const { data, code, msg } = await requestPost(url, param);
@@ -669,17 +669,18 @@ export default {
 			this.$refs.pieChart.setOption(this.pieOption);
 		},
 		handelClickMyPei(param) {
-			let orgType = '';
+			console.log('param', param);
+
 			if (param.data.level != 'community') {
-				if (param.data.level == 'district') {
-					orgType = 'street';
-				}
-				if (param.data.level == 'street') {
-					orgType = 'community';
-				}
+				// if (param.data.level == 'district') {
+				// 	orgType = 'street';
+				// }
+				// if (param.data.level == 'street') {
+				// 	orgType = 'community';
+				// }
 
 				this.pageNo = 1;
-				this.getPiesubData(param.data.id, orgType);
+				this.getPiesubData(param.data.id, param.data.level);
 			}
 		}
 	}

From 5af831a8a75fb33c11bcacec544039ad0ce011f7 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 10:07:54 +0800
Subject: [PATCH 22/34] 2

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

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 0cc58d5fe..6847870d7 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -501,7 +501,7 @@ export default {
 			this.orgType = orgType;
 			console.log(orgType);
 			let url = '';
-			if (orgType == 'community') {
+			if (orgType == 'street') {
 				url = '/gov/org/staffLoginLog/community-count';
 			} else {
 				url = '/gov/org/staffLoginLog/streetTotal';

From d4682ef2c37b3f131b6f82ccdf28811a1758c07a Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 10:21:46 +0800
Subject: [PATCH 23/34] =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-accountList.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 6847870d7..aea098281 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -159,6 +159,7 @@
 				:total="total"
 			></el-pagination>
 		</el-dialog>
+		
 	</div>
 </template>
 
@@ -498,7 +499,7 @@ export default {
 		},
 		async getPiesubData(orgId, orgType) {
 			// staffLoginLog/streetTotal
-			this.orgType = orgType;
+			
 			console.log(orgType);
 			let url = '';
 			if (orgType == 'street') {
@@ -513,7 +514,7 @@ export default {
 			console.log('orgType', orgType);
 			// district street community
 			// 1 是区县 2是镇街 3是社区  4是下级
-			switch (orgType) {
+			switch (this.orgType) {
 				case 'district':
 					this.title = '区县级账号登录情况';
 					// url = '/gov/org/staffLoginLog/district-count';
@@ -672,12 +673,12 @@ export default {
 			console.log('param', param);
 
 			if (param.data.level != 'community') {
-				// if (param.data.level == 'district') {
-				// 	orgType = 'street';
-				// }
-				// if (param.data.level == 'street') {
-				// 	orgType = 'community';
-				// }
+				if (param.data.level == 'district') {
+					this.orgType = 'street';
+				}
+				if (param.data.level == 'street') {
+					this.orgType = 'community';
+				}
 
 				this.pageNo = 1;
 				this.getPiesubData(param.data.id, param.data.level);

From bb0d5828e9bf0fe9045279de218e56b466d0c329 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 10:31:12 +0800
Subject: [PATCH 24/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-accountList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index aea098281..7a17b01af 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -377,7 +377,7 @@ export default {
 				endDate: this.formData.endDate,
 				isPage: true,
 				pageNo: this.pageNo,
-				pageSize: 10
+				pageSize: this.pageSize,
 			};
 			this.tableLoading2 = true;
 			const { data, code, msg } = await requestPost(url, param);
@@ -455,7 +455,7 @@ export default {
 
 			const { pageSize, pageNo, formData } = this;
 			const { data, code, msg } = await requestPost(url, {
-				pageSize,
+				pageSize:10,
 				pageNo,
 				isPage: true,
 				dataRange: 'exclude_zero',

From 696bd75efea4957f93d079ef95b25e24bfdad0eb Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 10:35:05 +0800
Subject: [PATCH 25/34] =?UTF-8?q?=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-accountList.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 7a17b01af..6b41569ec 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -124,11 +124,11 @@
 			<div
 				style=" text-align: right;
     margin-top: -10px;
-    margin-bottom: 10px;"
+    margin-bottom: 10px;" 
 			>
 				<el-button size="small" v-if="orgType == 'community'" class="diy-button--output" @click="handleExport()">导出</el-button>
 			</div>
-			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%">
+			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%;height: 550px;overflow: auto;">
 				<template v-if="orgType == 'community'">
 					<el-table-column label="序号" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>
@@ -776,4 +776,7 @@ export default {
 		flex: 1;
 	}
 }
+/deep/.el-table::before {
+    z-index: inherit;
+}
 </style>

From 6e9a98ce7c9abf26c7aa5e14b11fee49f9a9b4fd Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 10:36:00 +0800
Subject: [PATCH 26/34] =?UTF-8?q?=E5=8E=BB=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue
index 6b41569ec..4f4ea7b7c 100644
--- a/src/views/modules/census/census-accountList.vue
+++ b/src/views/modules/census/census-accountList.vue
@@ -128,7 +128,7 @@
 			>
 				<el-button size="small" v-if="orgType == 'community'" class="diy-button--output" @click="handleExport()">导出</el-button>
 			</div>
-			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%;height: 550px;overflow: auto;">
+			<el-table :data="tableDataView" border v-loading="tableLoading2" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" class="table" style="width: 100%;">
 				<template v-if="orgType == 'community'">
 					<el-table-column label="序号" type="index" align="center" width="50" />
 					<el-table-column prop="agencyName" align="center" label="社区名称" :show-overflow-tooltip="true"></el-table-column>

From daf755e2e4510eb468c0dba1a46c9527fe7d38b4 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 12:38:14 +0800
Subject: [PATCH 27/34] =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-orgStatusList.vue   |  6 ++--
 .../modules/census/census-residentList.vue    | 36 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index e538903c8..936024bea 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -355,7 +355,7 @@ export default {
 
 			let agencyId = '';
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null){
 				agencyId = this.formData.orgId;
 				this.level = this.formData.level;
 			} else {
@@ -382,11 +382,13 @@ export default {
 			let url = '/gov/org/customeragency/getCommunityCountList';
 			let agencyId = '';
 			let tmp = this.formData.orgId;
-			if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
+			
+			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null){
 				agencyId = this.formData.orgId;
 			} else {
 				agencyId = this.agencyId;
 			}
+			console.log("agencyId",agencyId)
 			const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate });
 
 			this.$refs.pieChart.hideLoading();
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 68b23a91a..821eab078 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -25,22 +25,22 @@
 			<div class="div_table">
 				<el-row :gutter="20">
 					<el-col :span="12">
-						<div class="div_table_title">居民年龄统计</div>
+						<div class="div_table_title">居民学历统计</div>
 						<div class="flex">
 							<div class="width1">
 								<div class="box">
-									<screen-echarts-frame
-										@handelClickMyPei="handelClickMyPei"
+									<screen-echarts-frame2
+										@handelClickMyPei="handelClickMyPei2"
 										:style="{ width: '100%', height: '100%' }"
-										@myChartMethod="pieInitOk"
-										ref="pieChart"
-									></screen-echarts-frame>
+										@myChartMethod="pieInitOk2"
+										ref="pieChart2"
+									></screen-echarts-frame2>
 								</div>
 							</div>
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -54,22 +54,22 @@
 						</div>
 					</el-col>
 					<el-col :span="12">
-						<div class="div_table_title">居民学历统计</div>
+						<div class="div_table_title">居民年龄统计</div>
 						<div class="flex">
 							<div class="width1">
 								<div class="box">
-									<screen-echarts-frame2
-										@handelClickMyPei="handelClickMyPei2"
+									<screen-echarts-frame
+										@handelClickMyPei="handelClickMyPei"
 										:style="{ width: '100%', height: '100%' }"
-										@myChartMethod="pieInitOk2"
-										ref="pieChart2"
-									></screen-echarts-frame2>
+										@myChartMethod="pieInitOk"
+										ref="pieChart"
+									></screen-echarts-frame>
 								</div>
 							</div>
 							<div class="flex1">
 								<div class="box">
 									<div class="legend">
-										<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
+										<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
 											<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 											<div class="content">
 												<div class="name">{{ item.name }}</div>
@@ -248,6 +248,8 @@ export default {
 				else this.formData[n] = '';
 			}
 			this.orgType = '';
+			this.code='';
+			this.codeType='';
 			this.handleSearch();
 		},
 		show(row) {
@@ -653,11 +655,11 @@ export default {
 			const url = '/epmetuser/icresiuser/portrayal-listexport';
 			const { pageSize, pageNo, formData } = this;
 			let tmp = this.formData.orgId;
-			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)){
 				this.formData.orgId = '';
 				this.orgType = '';
-				this.code = '';
-				this.codeType = '';
+				// this.code = '';
+				// this.codeType = '';
 			}
 
 			axios({

From c6221cf1625ae3a59149d499c9028fd5f7d971ad Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 12:40:51 +0800
Subject: [PATCH 28/34] =?UTF-8?q?=E9=95=87=E8=A1=97=20=E5=8C=BA=E5=8E=BF?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/census/census-houseList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue
index ef7102252..02da30a92 100644
--- a/src/views/modules/census/census-houseList.vue
+++ b/src/views/modules/census/census-houseList.vue
@@ -123,8 +123,8 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" type="index" align="center" width="50" />
-							<el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="districtName" label="区县" width="110" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="streetName" width="110" label="镇街" align="center" :show-overflow-tooltip="true" />
 							<el-table-column prop="communityName" width="110" align="center" label="社区" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="gridName" align="center" width="110" label="网格" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="houseName" align="center" label="房屋名称" :show-overflow-tooltip="true"></el-table-column>
@@ -243,8 +243,8 @@ export default {
 			purpose: '',
 			rentFlag: '',
 			orgIdPath: '',
-			chartDataData:[],
-			chartData2Data:[]
+			chartDataData: [],
+			chartData2Data: []
 		};
 	},
 	computed: {
@@ -415,7 +415,7 @@ export default {
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2)
 				};
 			});
-			this.chartDataData=this.chartData.data ;
+			this.chartDataData = this.chartData.data;
 			this.$forceUpdate();
 			this.iniPieChart(this.chartData);
 		},
@@ -436,7 +436,7 @@ export default {
 					radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2)
 				};
 			});
-			this.chartData2Data=this.chartData2.data ;
+			this.chartData2Data = this.chartData2.data;
 			this.$forceUpdate();
 			this.iniPieChart2(this.chartData2);
 		},

From 48e5df2e9e383e76c3270b6eae9753bb2020e3cc Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 16:26:34 +0800
Subject: [PATCH 29/34] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/dyhx/chart.vue     | 302 +++++++++---------
 .../modules/communityParty/dyhx/party.vue     | 271 +++++++---------
 2 files changed, 259 insertions(+), 314 deletions(-)

diff --git a/src/views/modules/communityParty/dyhx/chart.vue b/src/views/modules/communityParty/dyhx/chart.vue
index b78f0595c..eccbdf7ef 100644
--- a/src/views/modules/communityParty/dyhx/chart.vue
+++ b/src/views/modules/communityParty/dyhx/chart.vue
@@ -1,163 +1,163 @@
 <template>
-  <div class="screenEchartsFrame"
-       ref="screenEchartsFrame"></div>
+	<div class="screenEchartsFrame" ref="screenEchartsFrame"></div>
 </template>
 
 <script>
 import * as echarts from 'echarts';
 export default {
-  name: 'screen-echarts-frame',
-  data () {
-    return {
-      myChart: ''
-    }
-  },
-  props: {
-    chartMethod: {
-      type: Function
-    }
-  },
-  mounted () {
-    this.initChart()
-    window.onresize = () => {
-      this.myChart.resize()
-    }
-  },
-  beforeDestroy () {
-    // 销毁echarts实例对象
-    if (this.myChart) this.myChart.dispose()
-  },
-  watch: {},
-  methods: {
-    initChart () {
-      this.$nextTick(() => {
-        const dom = this.$refs.screenEchartsFrame
-        this.myChart = echarts.init(dom)
-        // this.myChart.setOption(this.chartMethod())
-        this.$emit('myChartMethod', this.myChart)
-      })
-    },
-    // 配置option
-    setOption (option) {
-      this.myChart.setOption(option)
-     let than = this
-      this.myChart.on('click',function(param){
-        than.$emit('handelClickMyPei',param)
-				})
-    },
-    // 获取option
-    getOption () {
-      if (this.myChart) {
-        return this.myChart.getOption()
-      } else {
-        return null
-      }
-    },
-    //
-    resize () {
-      if (this.myChart) {
-        this.myChart.resize()
-      }
-    },
-    clear () {
-      if (this.myChart) {
-        this.myChart.clear()
-      }
-    },
-    showLoading () {
-      if (this.myChart) {
-        this.$nextTick(() => {
-          this.myChart.showLoading({
-            text: '',
-            color: '#29cdff',
-            textColor: '#29cdff',
-            maskColor: 'rgba(255, 255, 255, 0)',
-            zlevel: 0
-          })
-        })
-      }
-    },
-    hideLoading () {
-      if (this.myChart) {
-        this.myChart.hideLoading()
-      }
-    },
-    // 启动动画时使用
-    tooltipAnimate (chart, length) {
-      // 清除上一次动画
-      this.timeTicket && clearInterval(this.timeTicket)
-      const count = 0
-      // 启动动画
-      this._action(chart, count, length)
-      chart && // 移除动画
-        chart.on('mouseover', params => {
-          this._cleanAction(chart, params)
-        })
-      // 重写启动动画
-      chart &&
-        chart.on('mouseout', () => {
-          this._action(chart, count, length)
-        })
-    },
-    // tooltip动画action
-    _action (chart, count, length) {
-      this.timeTicket && clearInterval(this.timeTicket)
-      this.timeTicket = setInterval(() => {
-        if (!chart) {
-          clearInterval(this.timeTicket)
-          return
-        }
-        chart &&
-          chart.dispatchAction({
-            type: 'downplay',
-            seriesIndex: 0
-          })
-        chart &&
-          chart.dispatchAction({
-            type: 'highlight',
-            seriesIndex: 0,
-            dataIndex: count % length
-          })
-        chart &&
-          chart.dispatchAction({
-            type: 'showTip',
-            seriesIndex: 0,
-            dataIndex: count % length
-          })
-        count++
-      }, 1000 * 3)
-    },
-    _cleanAction (chart, params) {
-      this.timeTicket && clearInterval(this.timeTicket)
-      if (!chart) {
-        clearInterval(this.timeTicket)
-        return
-      }
-      chart &&
-        chart.dispatchAction({
-          type: 'downplay',
-          seriesIndex: 0
-        })
-      chart &&
-        chart.dispatchAction({
-          type: 'highlight',
-          seriesIndex: 0,
-          dataIndex: params.dataIndex
-        })
-      chart &&
-        chart.dispatchAction({
-          type: 'showTip',
-          seriesIndex: 0,
-          dataIndex: params.dataIndex
-        })
-    }
-  }
-}
+	name: 'screen-echarts-frame',
+	data() {
+		return {
+			myChart: ''
+		};
+	},
+	props: {
+		chartMethod: {
+			type: Function
+		}
+	},
+	mounted() {
+		this.initChart();
+		window.onresize = () => {
+			this.myChart.resize();
+		};
+	},
+	beforeDestroy() {
+		// 销毁echarts实例对象
+		if (this.myChart) this.myChart.dispose();
+	},
+	watch: {},
+	methods: {
+		initChart() {
+			this.$nextTick(() => {
+				const dom = this.$refs.screenEchartsFrame;
+				this.myChart = echarts.init(dom);
+				// this.myChart.setOption(this.chartMethod())
+				this.$emit('myChartMethod', this.myChart);
+			});
+		},
+		// 配置option
+		setOption(option) {
+			this.myChart.setOption(option);
+			let than = this;
+			this.myChart.off();
+			this.myChart.on('click', function(param) {
+				than.$emit('handelClickMyPei', param);
+			});
+		},
+		// 获取option
+		getOption() {
+			if (this.myChart) {
+				return this.myChart.getOption();
+			} else {
+				return null;
+			}
+		},
+		//
+		resize() {
+			if (this.myChart) {
+				this.myChart.resize();
+			}
+		},
+		clear() {
+			if (this.myChart) {
+				this.myChart.clear();
+			}
+		},
+		showLoading() {
+			if (this.myChart) {
+				this.$nextTick(() => {
+					this.myChart.showLoading({
+						text: '',
+						color: '#29cdff',
+						textColor: '#29cdff',
+						maskColor: 'rgba(255, 255, 255, 0)',
+						zlevel: 0
+					});
+				});
+			}
+		},
+		hideLoading() {
+			if (this.myChart) {
+				this.myChart.hideLoading();
+			}
+		},
+		// 启动动画时使用
+		tooltipAnimate(chart, length) {
+			// 清除上一次动画
+			this.timeTicket && clearInterval(this.timeTicket);
+			const count = 0;
+			// 启动动画
+			this._action(chart, count, length);
+			chart && // 移除动画
+				chart.on('mouseover', params => {
+					this._cleanAction(chart, params);
+				});
+			// 重写启动动画
+			chart &&
+				chart.on('mouseout', () => {
+					this._action(chart, count, length);
+				});
+		},
+		// tooltip动画action
+		_action(chart, count, length) {
+			this.timeTicket && clearInterval(this.timeTicket);
+			this.timeTicket = setInterval(() => {
+				if (!chart) {
+					clearInterval(this.timeTicket);
+					return;
+				}
+				chart &&
+					chart.dispatchAction({
+						type: 'downplay',
+						seriesIndex: 0
+					});
+				chart &&
+					chart.dispatchAction({
+						type: 'highlight',
+						seriesIndex: 0,
+						dataIndex: count % length
+					});
+				chart &&
+					chart.dispatchAction({
+						type: 'showTip',
+						seriesIndex: 0,
+						dataIndex: count % length
+					});
+				count++;
+			}, 1000 * 3);
+		},
+		_cleanAction(chart, params) {
+			this.timeTicket && clearInterval(this.timeTicket);
+			if (!chart) {
+				clearInterval(this.timeTicket);
+				return;
+			}
+			chart &&
+				chart.dispatchAction({
+					type: 'downplay',
+					seriesIndex: 0
+				});
+			chart &&
+				chart.dispatchAction({
+					type: 'highlight',
+					seriesIndex: 0,
+					dataIndex: params.dataIndex
+				});
+			chart &&
+				chart.dispatchAction({
+					type: 'showTip',
+					seriesIndex: 0,
+					dataIndex: params.dataIndex
+				});
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
 .screenEchartsFrame {
-  width: 100%;
-  height: 100%;
+	width: 100%;
+	height: 100%;
 }
 </style>
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 87f84974f..8cd96a086 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -22,22 +22,22 @@
 		<div class="div_table">
 			<el-row :gutter="20">
 				<el-col :span="12">
-					<div class="div_table_title">党员年龄统计</div>
+					<div class="div_table_title">党员学历统计</div>
 					<div class="flex">
 						<div class="width1">
 							<div class="box">
-								<screen-echarts-frame
-									@handelClickMyPei="handelClickMyPei"
+								<screen-echarts-frame2
+									@handelClickMyPei="handelClickMyPei2"
 									:style="{ width: '100%', height: '100%' }"
-									@myChartMethod="pieInitOk"
-									ref="pieChart"
-								></screen-echarts-frame>
+									@myChartMethod="pieInitOk2"
+									ref="pieChart2"
+								></screen-echarts-frame2>
 							</div>
 						</div>
 						<div class="flex1">
 							<div class="box">
 								<div class="legend">
-									<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem(item)">
 										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 										<div class="content">
 											<div class="name">{{ item.name }}</div>
@@ -49,24 +49,22 @@
 							</div>
 						</div>
 					</div>
-					<div class="census_searchcensus2">
+					<!-- <div class="census_searchcensus2">
 						<div class="census_searchcensus_box"></div>
-						<el-button size="small" class="diy-button--output" @click="handleExport('age')">导出</el-button>
-					</div>
-
-					<el-table
+						<el-button size="small" class="diy-button--output" @click="handleExport('edu')">导出</el-button>
+					</div> <el-table
 						class="table"
-						:data="tableDataAge"
+						:data="tableData"
 						border
 						:height="maxTableHeight"
-						v-loading="tableLoadingAge"
+						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" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
-						<el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" min-width="100"></el-table-column>
+						<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
 
 						<el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
 
@@ -75,35 +73,35 @@
 								<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
 							</template>
 						</el-table-column>
-					</el-table>
+					</el-table> 
 
 					<el-pagination
-						@size-change="pageSizeChangeHandleAge"
-						@current-change="pageCurrentChangeHandleAge"
-						:current-page.sync="agePageNo"
+						@size-change="pageSizeChangeHandleNew"
+						@current-change="pageCurrentChangeHandleNew"
+						:current-page.sync="pageNo"
 						:page-sizes="[10, 20, 50, 100, 200]"
-						:page-size="agePageSize"
+						:page-size="pageSize"
 						layout="sizes, prev, pager, next, total,jumper"
-						:total="ageTotal"
-					></el-pagination>
+						:total="total"
+					></el-pagination>-->
 				</el-col>
 				<el-col :span="12">
-					<div class="div_table_title">党员学历统计</div>
+					<div class="div_table_title">党员年龄统计</div>
 					<div class="flex">
 						<div class="width1">
 							<div class="box">
-								<screen-echarts-frame2
-									@handelClickMyPei="handelClickMyPei2"
+								<screen-echarts-frame
+									@handelClickMyPei="handelClickMyPei"
 									:style="{ width: '100%', height: '100%' }"
-									@myChartMethod="pieInitOk2"
-									ref="pieChart2"
-								></screen-echarts-frame2>
+									@myChartMethod="pieInitOk"
+									ref="pieChart"
+								></screen-echarts-frame>
 							</div>
 						</div>
 						<div class="flex1">
 							<div class="box">
 								<div class="legend">
-									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem(item)">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
 										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 										<div class="content">
 											<div class="name">{{ item.name }}</div>
@@ -115,45 +113,46 @@
 							</div>
 						</div>
 					</div>
-					<div class="census_searchcensus2">
-						<div class="census_searchcensus_box"></div>
-						<el-button size="small" class="diy-button--output" @click="handleExport('edu')">导出</el-button>
-					</div>
-
-					<el-table
-						class="table"
-						:data="tableData"
-						border
-						:height="maxTableHeight"
-						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" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
-						<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
-
-						<el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
-
-						<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
-							<template slot-scope="scope">
-								<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-
-					<el-pagination
-						@size-change="pageSizeChangeHandleNew"
-						@current-change="pageCurrentChangeHandleNew"
-						:current-page.sync="pageNo"
-						:page-sizes="[10, 20, 50, 100, 200]"
-						:page-size="pageSize"
-						layout="sizes, prev, pager, next, total,jumper"
-						:total="total"
-					></el-pagination>
 				</el-col>
 			</el-row>
+			<div class="census_searchcensus2">
+				<div class="census_searchcensus_box"></div>
+				<el-button size="small" class="diy-button--output" @click="handleExport('age')">导出</el-button>
+			</div>
+
+			<el-table
+				class="table"
+				:data="tableDataAge"
+				border
+				:height="maxTableHeight"
+				v-loading="tableLoadingAge"
+				: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" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
+				<el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
+				<el-table-column prop="idCard" header-align="center" align="center" :show-overflow-tooltip="true" label="证件号" min-width="130"></el-table-column>
+				<el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" min-width="100"></el-table-column>
+				<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
+
+				<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
+					<template slot-scope="scope">
+						<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+
+			<el-pagination
+				@size-change="pageSizeChangeHandleAge"
+				@current-change="pageCurrentChangeHandleAge"
+				:current-page.sync="pageNo"
+				:page-sizes="[10, 20, 50, 100, 200]"
+				:page-size="pageSize"
+				layout="sizes, prev, pager, next, total,jumper"
+				:total="total"
+			></el-pagination>
 		</div>
 
 		<!-- <crate-form v-if="memberDialog"
@@ -226,7 +225,9 @@ export default {
 			pieData2: [],
 			orgId: '',
 			orgType: '',
+
 			code: '',
+			codeType: '',
 			pieDatatotal: 0,
 			pieDatatotal2: 0,
 			memberDialog: false,
@@ -243,7 +244,7 @@ export default {
 			noInit: false,
 			noEduInit: false,
 			selectAgency: null,
-			ageTotalCount: 0,
+			totalCount: 0,
 			eduTotalCount: 0,
 			propTree: [],
 			value2: '',
@@ -251,14 +252,12 @@ export default {
 			visibleLoading: true,
 			agencyId: '',
 			orgType: '',
-			ageCode: '',
-			eduCode: '',
+			
 			pageNo: 1,
 			pageSize: 10,
-			agePageNo: 1,
-			agePageSize: 10,
+			
 			total: 0,
-			ageTotal: 0,
+			
 
 			partyOrgs: [],
 
@@ -292,7 +291,7 @@ export default {
 		this.getAgeCount();
 		this.getEduCount();
 		this.getAgeList();
-		this.getEduList();
+		// this.getEduList();
 	},
 	async created() {
 		// this.getGridList('query');
@@ -303,20 +302,21 @@ export default {
 				if (typeof this.formData[n] == 'object') this.formData[n] = [];
 				else this.formData[n] = '';
 			}
+			this.memberDialog = false;
+			this.pageNo = 1;
+			this.code = '';
+			this.codeType = '';
+			this.orgId = '';
 			this.handleSearch();
 		},
 		handleChangeAgency(val) {
 			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 			console.log('obj', obj);
 			if (obj) {
-				// this.orgType = obj.level === 'grid' ? 'grid' : 'agency';
-				// this.orgType = obj.level
 			} else {
 				this.orgType = '';
 			}
-
 			let tmp = this.formData.orgId;
-
 			if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
 				this.orgId = this.formData.orgId;
 			} else {
@@ -334,39 +334,14 @@ export default {
 		},
 		handleSearch(val) {
 			this.memberDialog = false;
-			this.eduCode = '';
-			this.ageCode = '';
+			this.code = '';
+			this.codeType = '';
+
 			this.getAgeCount();
 			this.getEduCount();
 			this.getAgeList();
-			this.getEduList();
+			// this.getEduList();
 		},
-		// async getGridList(type, agencyId) {
-		// 	const { user } = await this.$store.state;
-		// 	// addorupdate  query
-		// 	await this.$http
-		// 		.get('/resi/partymember/icPartyOrg/getSearchTreelist', { params: { agencyId: agencyId || user.agencyId } })
-		// 		.then(({ data: res }) => {
-		// 			if (res.code !== 0) {
-		// 				return this.$message.error(res.msg);
-		// 			} else {
-		// 				this.optionsG = this.deepArrTOnull(res.data);
-		// 			}
-		// 		})
-		// 		.catch(() => {
-		// 			return this.$message.error('网络错误');
-		// 		});
-		// },
-		// pieInitOk(dom) {
-		// 	console.log('pie准备好了', dom);
-		// 	this.pieAgeChartS = dom;
-		// 	// this.pieInitState = true
-		// },
-		// pieInitOks(dom) {
-		// 	console.log('pies准备好了', dom);
-		// 	this.pieEduChartS = dom;
-		// 	// this.pieInitState = true
-		// },
 
 		// 获取饼状图
 		async initAgeCharts(chartData) {
@@ -587,23 +562,24 @@ export default {
 			this.$refs.pieChart2.setOption(this.pieOption2);
 		},
 		handelClickMyPei(param) {
-			this.ageCode = param.data.code;
-
-			this.getAgeList()();
+			this.code = param.data.code;
+			this.codeType = 'age';
+			this.getAgeList();
 		},
 		handelClickMyPei2(param) {
-			console.log(param);
-			this.eduCode = param.data.code;
-			this.getEduList();
+			this.code = param.data.code;
+			this.codeType = 'education';
+			this.getAgeList();
 		},
 		handleClickItem(item) {
-			this.ageCode = item.code;
-
+			this.code = item.code;
+			this.codeType = 'age';
 			this.getAgeList();
 		},
 		handleClickItem2(item) {
-			this.eduCode = item.code;
-			this.getEduList();
+			this.code = item.code;
+			this.codeType = 'education';
+			this.getAgeList();
 		},
 
 		async getAgeCount() {
@@ -718,49 +694,27 @@ export default {
 			this.tableLoadingAge = true;
 			this.visibleAgeLoading = true;
 			// const url = "/epmetuser/icresiuser/partymemberagelist";
-			const url = '/resi/partymember/icPartyMember/partymemberagelist';
+			const url = '/resi/partymember/icPartyMember/partymember-portrait-list';
 			let params = {
 				orgId: this.orgId,
 				orgType: this.orgType,
-				code: this.ageCode,
-				pageNo: this.agePageNo,
-				pageSize: this.agePageSize
+				code: this.code,
+				codeType: this.codeType,
+				pageNo: this.pageNo,
+				pageSize: this.pageSize
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			this.tableLoadingAge = false;
 			if (code === 0) {
 				this.tableDataAge = data.list;
 
-				this.ageTotal = data.total;
+				this.total = data.total;
 			} else {
 				this.$message.error(msg);
 			}
 			// if (_code == 0 || _code) this.noInit = true
 			this.visibleAgeLoading = false;
 		},
-		async getEduList() {
-			this.tableLoading = true;
-			this.visibleLoading = true;
-			// const url = "/epmetuser/icresiuser/partymembereducationlist";
-			const url = '/resi/partymember/icPartyMember/partymembereducationlist';
-			let params = {
-				orgId: this.orgId,
-				orgType: this.orgType,
-				code: this.eduCode,
-				pageNo: this.pageNo,
-				pageSize: this.pageSize
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			this.tableLoading = false;
-			if (code === 0) {
-				this.tableData = data.list;
-
-				this.total = data.total;
-			} else {
-				this.$message.error(msg);
-			}
-			this.visibleLoading = false;
-		},
 
 		async getOrgTreeList() {
 			function deleteChildren(arr) {
@@ -832,39 +786,30 @@ export default {
 			}, 500);
 		},
 		pageSizeChangeHandleAge(val) {
-			this.agePageNo = 1;
-			this.agePageSize = val;
-			this.getAgeList(this.agencyId, this.orgType, this.ageCode);
-		},
-		pageCurrentChangeHandleAge(val) {
-			this.agePageNo = val;
-			this.getAgeList(this.agencyId, this.orgType, this.ageCode);
-		},
-		pageSizeChangeHandleNew(val) {
 			this.pageNo = 1;
 			this.pageSize = val;
-			this.getEduList(this.agencyId, this.orgType, this.eduCode);
+			this.getAgeList();
 		},
-		pageCurrentChangeHandleNew(val) {
+		pageCurrentChangeHandleAge(val) {
 			this.pageNo = val;
-			this.getEduList(this.agencyId, this.orgType, this.eduCode);
+			this.getAgeList();
 		},
+
 		async handleExport(type) {
-			const urls = {
-				age: '/epmetuser/icresiuser/partymemberagelist/export',
-				edu: '/epmetuser/icresiuser/partymembereducationlist/export'
-			};
-			const _arr = this.selectAgency[this.selectAgency.length - 1].split('-');
+			const url = '/resi/partymember/icPartyMember/partymember-portrait-export';
 
 			let params = {
 				orgId: this.orgId,
 				orgType: this.orgType,
-				code: type == 'age' ? this.ageCode : this.eduCode
+				code: this.code,
+				codeType: this.codeType
+				// pageNo: this.pageNo,
+				// pageSize: this.pageSize
 			};
 			// .post('epmetuser/icresiuser/exportExcel', params)
 			await this.$http({
 				method: 'POST',
-				url: urls[type],
+				url: url,
 				responseType: 'blob',
 				data: params
 			})

From 656d3bd809c6d88cbd8b4baff6a9f3ea56d2b120 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 20 Apr 2023 16:33:36 +0800
Subject: [PATCH 30/34] =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/dyhx/party.vue     | 38 +------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 8cd96a086..862605857 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -37,7 +37,7 @@
 						<div class="flex1">
 							<div class="box">
 								<div class="legend">
-									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem(item)">
+									<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
 										<div class="kuai" :style="{ backgroundColor: color[index] }"></div>
 										<div class="content">
 											<div class="name">{{ item.name }}</div>
@@ -49,41 +49,7 @@
 							</div>
 						</div>
 					</div>
-					<!-- <div class="census_searchcensus2">
-						<div class="census_searchcensus_box"></div>
-						<el-button size="small" class="diy-button--output" @click="handleExport('edu')">导出</el-button>
-					</div> <el-table
-						class="table"
-						:data="tableData"
-						border
-						:height="maxTableHeight"
-						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" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
-						<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
-
-						<el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
-
-						<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
-							<template slot-scope="scope">
-								<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
-							</template>
-						</el-table-column>
-					</el-table> 
-
-					<el-pagination
-						@size-change="pageSizeChangeHandleNew"
-						@current-change="pageCurrentChangeHandleNew"
-						:current-page.sync="pageNo"
-						:page-sizes="[10, 20, 50, 100, 200]"
-						:page-size="pageSize"
-						layout="sizes, prev, pager, next, total,jumper"
-						:total="total"
-					></el-pagination>-->
+					
 				</el-col>
 				<el-col :span="12">
 					<div class="div_table_title">党员年龄统计</div>

From 85107cd965dbb51a0e5291fc36bad2a2aebf7189 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Fri, 21 Apr 2023 10:19:39 +0800
Subject: [PATCH 31/34] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/census/census-orgStatusList.vue   |  3 ++-
 .../modules/census/census-residentList.vue    | 17 ++++++++--------
 .../modules/communityParty/dyhx/party.vue     | 20 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue
index 936024bea..85130b642 100644
--- a/src/views/modules/census/census-orgStatusList.vue
+++ b/src/views/modules/census/census-orgStatusList.vue
@@ -86,7 +86,8 @@
 							</div>
 						</div>
 					</div>
-					<div class="census_searchcensus" @click="show(3)">
+					<div class="census_searchcensus">
+						 <!-- @click="show(3)" -->
 						<div class="census_searchcensus_box">
 							<img src="../../../assets/img/census/工作人员.png" />
 							<div>
diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue
index 821eab078..894cf0a86 100644
--- a/src/views/modules/census/census-residentList.vue
+++ b/src/views/modules/census/census-residentList.vue
@@ -98,19 +98,18 @@
 							:height="maxTableHeight"
 						>
 							<el-table-column label="序号" type="index" align="center" width="50" />
-							<el-table-column prop="name" width="110" label="姓名" align="center" :show-overflow-tooltip="true" />
-							<el-table-column prop="mobile" label="手机号" width="210" align="center" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="name" label="姓名" align="center" :show-overflow-tooltip="true" />
+							<el-table-column prop="mobile" label="手机号" align="center" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="idCard" align="center" label="证件号" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="genderName" width="110" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="age" align="center" width="110" label="年龄" :show-overflow-tooltip="true"></el-table-column>
-							<el-table-column prop="educationName" width="110" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="genderName" width="160" align="center" label="性别" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="age" align="center" width="160" label="年龄" :show-overflow-tooltip="true"></el-table-column>
+							<el-table-column prop="educationName" width="160" align="center" label="学历" :show-overflow-tooltip="true"></el-table-column>
 							<el-table-column prop="count" align="center" width="110" label="操作" :show-overflow-tooltip="true">
 								<template slot-scope="scope">
 									<el-button size="small" type="text" @click="show(scope.row)">查看</el-button>
 								</template>
 							</el-table-column>
 						</el-table>
-
 						<el-pagination
 							@size-change="handleSizeChange"
 							@current-change="handleCurrentChange"
@@ -248,8 +247,8 @@ export default {
 				else this.formData[n] = '';
 			}
 			this.orgType = '';
-			this.code='';
-			this.codeType='';
+			this.code = '';
+			this.codeType = '';
 			this.handleSearch();
 		},
 		show(row) {
@@ -655,7 +654,7 @@ export default {
 			const url = '/epmetuser/icresiuser/portrayal-listexport';
 			const { pageSize, pageNo, formData } = this;
 			let tmp = this.formData.orgId;
-			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)){
+			if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) {
 				this.formData.orgId = '';
 				this.orgType = '';
 				// this.code = '';
diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue
index 862605857..05d3fa01d 100644
--- a/src/views/modules/communityParty/dyhx/party.vue
+++ b/src/views/modules/communityParty/dyhx/party.vue
@@ -49,7 +49,6 @@
 							</div>
 						</div>
 					</div>
-					
 				</el-col>
 				<el-col :span="12">
 					<div class="div_table_title">党员年龄统计</div>
@@ -97,15 +96,15 @@
 			>
 				<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
 
-				<el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
-				<el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
-				<el-table-column prop="idCard" header-align="center" align="center" :show-overflow-tooltip="true" label="证件号" min-width="130"></el-table-column>
-				<el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" min-width="100"></el-table-column>
-				<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
+				<el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true"></el-table-column>
+				<el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码"></el-table-column>
+				<el-table-column prop="idCard" header-align="center" align="center" :show-overflow-tooltip="true" label="证件号"></el-table-column>
+				<el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" width="160"></el-table-column>
+				<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" width="160"></el-table-column>
 
-				<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
+				<el-table-column label="操作" fixed="right" width="110" header-align="center" align="center" class="operate">
 					<template slot-scope="scope">
-						<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
+						<el-button type="text" size="small" @click="handleDetail(scope.row)">查看</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -218,12 +217,11 @@ export default {
 			visibleLoading: true,
 			agencyId: '',
 			orgType: '',
-			
+
 			pageNo: 1,
 			pageSize: 10,
-			
+
 			total: 0,
-			
 
 			partyOrgs: [],
 

From 09bfb1c9c6a7b610f860b662812b9521b1036c29 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Tue, 25 Apr 2023 17:03:38 +0800
Subject: [PATCH 32/34] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/userinfo/userInfoDetail.vue | 4 ++--
 src/views/modules/base/userinfo/userInfoList.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/userinfo/userInfoDetail.vue b/src/views/modules/base/userinfo/userInfoDetail.vue
index 229dba4c1..f576dd2d1 100644
--- a/src/views/modules/base/userinfo/userInfoDetail.vue
+++ b/src/views/modules/base/userinfo/userInfoDetail.vue
@@ -38,7 +38,7 @@
             <span>{{ formData.buildingAddress||'--'  }}</span>
           </div>
 
-          <div class="info-prop"
+          <!-- <div class="info-prop"
                v-if="formData.headImgUrl">
             <span class="info-title-2">头像：</span>
 
@@ -49,7 +49,7 @@
                    @click="watchImg(formData.headImgUrl)">
 
             </div>
-          </div>
+          </div> -->
 
         </div>
       </div>
diff --git a/src/views/modules/base/userinfo/userInfoList.vue b/src/views/modules/base/userinfo/userInfoList.vue
index e0e6249ca..59bd93c39 100644
--- a/src/views/modules/base/userinfo/userInfoList.vue
+++ b/src/views/modules/base/userinfo/userInfoList.vue
@@ -95,7 +95,7 @@
                          :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column prop="imageList"
+<!--        <el-table-column prop="imageList"
                          align="center"
                          width="80"
                          label="头像">
@@ -106,7 +106,7 @@
             </el-image>
             <span v-else></span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column prop="showIdNum"
                          label="证件号"

From 42b338faf500926e66c0dac10ae95b2853ddb2b3 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 27 Apr 2023 11:21:46 +0800
Subject: [PATCH 33/34] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 2035 ++++++-----------
 1 file changed, 688 insertions(+), 1347 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 73cba7801..c69687863 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,27 +1,11 @@
 <template>
 	<div class="app-container">
 		<el-row>
-			<el-col
-				:span="24"
-				style="margin-left: 10px; margin-top: 10px; margin-bottom: 20px"
-			>
+			<el-col :span="24" style="margin-left: 10px; margin-top: 10px; margin-bottom: 20px">
 				<el-breadcrumb separator-class="el-icon-arrow-right">
-					<el-breadcrumb-item
-						v-for="(breadcrumb, index) in breadcrumbArr"
-						:key="breadcrumb.id"
-					>
-						<el-link
-							v-if="breadcrumb.id === currentBreadcrumbKey"
-							type="primary"
-							@click.native="refreshThisPage(index)"
-							>{{ breadcrumb.name }}</el-link
-						>
-						<el-link
-							v-else
-							type="info"
-							@click.native="refreshThisPage(index)"
-							>{{ breadcrumb.name }}</el-link
-						>
+					<el-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"
@@ -33,172 +17,122 @@
 								cursor: pointer;
 							"
 							icon="el-icon-edit"
-							>修改</el-link
 						>
+							修改
+						</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 v-show="agencyTableFlag" height="250" :data="agencyTableListData" style="width: 100%">
+			<el-table-column prop="agencyName" label="下级组织"></el-table-column>
 			<el-table-column prop="contacts" label="联系人"></el-table-column>
 			<el-table-column prop="mobile" label="联系人电话"></el-table-column>
-			<el-table-column
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width"
-			>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot="header">
-					<el-button
-						size="mini"
-						type="primary"
-						icon="el-icon-plus"
-						@click="addAgency()"
-						>新增</el-button
-					>
+					<el-button size="mini" type="primary" icon="el-icon-plus" @click="addAgency()">新增</el-button>
 				</template>
 				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="warning"
-						icon="el-icon-arrow-right"
-						@click="entryAgency(scope.row.agencyId)"
-						>进入</el-button
-					>
+					<el-button size="mini" type="warning" icon="el-icon-arrow-right" @click="entryAgency(scope.row.agencyId)">进入</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 
 		<!-- 下级机关单位/基层科室列表 -->
-		<el-table
-			v-show="departmentTableFlag"
-			height="250"
-			:data="departmentTableListData"
-			style="width: 100%"
-		>
-			<el-table-column
-				prop="departmentName"
-				label="下级机关单位/基层科室"
-			></el-table-column>
-			<el-table-column
-				prop="departmentTypeShow"
-				label="部门类型"
-			></el-table-column>
+		<el-table v-show="departmentTableFlag" height="250" :data="departmentTableListData" style="width: 100%">
+			<el-table-column prop="departmentName" label="下级机关单位/基层科室"></el-table-column>
+			<el-table-column prop="departmentTypeShow" label="部门类型"></el-table-column>
 			<el-table-column prop="contacts" label="联系人"></el-table-column>
 			<el-table-column prop="mobile" label="联系人电话"></el-table-column>
-			<el-table-column
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width"
-			>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot="header" slot-scope="scope">
-					<el-button
+					<!-- <el-button
 						size="mini"
 						type="primary"
 						icon="el-icon-plus"
 						@click="addCommunity(scope.row)"
-						>新增</el-button
+						>下载导入模板</el-button
 					>
-				</template>
-				<template slot-scope="scope">
 					<el-button
 						size="mini"
-						type="warning"
-						icon="el-icon-arrow-right"
-						@click="entryDepartment(scope.row)"
-						>进入</el-button
-					>
+						type="primary"
+						icon="el-icon-plus"
+						@click="addCommunity(scope.row)"
+						>导入</el-button
+					> -->
+
+					<!-- <el-button class="diy-button--add"
+					             type="primary"
+					             size="small"
+					             @click="handleAdd">{{ $t('add') }}</el-button> -->
+					<div style="display: flex;">
+						<el-button size="small" style="margin-right:10px" type="primary" @click="handleExportModule()">下载导入模板</el-button>
+
+						<el-upload
+							:headers="$getElUploadHeaders()"
+							ref="upload"
+							class="upload-btn"
+							:multiple="false"
+							:show-file-list="false"
+							:before-upload="
+								file => {
+									beforeUpload(file);
+								}
+							"
+							action=""
+							accept=".xls,.xlsx"
+							:http-request="
+								() => {
+									uploadFile();
+								}
+							"
+						>
+							<el-button type="primary" style="margin-right:10px" size="small">导入</el-button>
+						</el-upload>
+						<!-- <el-button class="diy-button--reset"
+					             size="small"
+					             @click="handleExport">导出</el-button> -->
+
+						<el-button size="mini" type="primary" icon="el-icon-plus" @click="addCommunity(scope.row)">新增</el-button>
+					</div>
+				</template>
+				<template slot-scope="scope">
+					<el-button size="mini" type="warning" icon="el-icon-arrow-right" @click="entryDepartment(scope.row)">进入</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 
 		<!-- 网格列表 -->
-		<el-table
-			v-if="currentAgencyLevel == 'community'"
-			v-show="gridTableFlag"
-			height="250"
-			:data="gridTableListData"
-			style="width: 100%"
-		>
+		<el-table v-if="currentAgencyLevel == 'community'" 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="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"
-			>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot="header" slot-scope="scope">
-					<el-button
-						size="mini"
-						type="primary"
-						icon="el-icon-plus"
-						@click="addGrid(scope.row)"
-						>新增</el-button
-					>
+					<el-button size="mini" type="primary" icon="el-icon-plus" @click="addGrid(scope.row)">新增</el-button>
 				</template>
 				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="warning"
-						icon="el-icon-arrow-right"
-						@click="entryGrid(scope.row.gridId)"
-						>进入</el-button
-					>
+					<el-button size="mini" type="warning" icon="el-icon-arrow-right" @click="entryGrid(scope.row.gridId)">进入</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 
 		<!-- 本级工作人员 -->
-		<el-table
-			v-show="currentAgencyStaffTableFlag"
-			:data="cleanAgencyStaffTableListData"
-			style="width: 100%"
-			height="350"
-		>
+		<el-table v-show="currentAgencyStaffTableFlag" :data="cleanAgencyStaffTableListData" style="width: 100%" height="350">
 			<el-table-column prop="name" label="本级工作人员名字" width="260">
 				<template slot-scope="scope">
 					<span>{{ scope.row.name }}</span>
-					<el-tag
-						v-if="scope.row.enableFlag === 'disabled'"
-						type="danger"
-						style="margin-left: 10px"
-						size="mini"
-						disable-transitions
-						>{{ "已禁用" }}</el-tag
-					>
+					<el-tag v-if="scope.row.enableFlag === 'disabled'" type="danger" style="margin-left: 10px" size="mini" disable-transitions>{{ '已禁用' }}</el-tag>
 				</template>
 			</el-table-column>
 			<el-table-column prop="roles" label="本级工作人员职责" width="260">
 				<template slot-scope="scope">
-					<el-tag
-						type="primary"
-						size="mini"
-						v-for="(role, index) in scope.row.roles"
-						:key="index"
-						disable-transitions
-						>{{ role }}</el-tag
-					>
+					<el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width"
-			>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot="header" slot-scope="scope">
 					<el-input
 						placeholder="请输入姓名或手机号"
@@ -207,97 +141,31 @@
 						@input="handleSearchStaff"
 						class="input-with-select"
 					>
-						<el-button
-							@click.stop="handleSearchStaff"
-							slot="append"
-							icon="el-icon-search"
-						></el-button>
+						<el-button @click.stop="handleSearchStaff" slot="append" icon="el-icon-search"></el-button>
 					</el-input>
 
-					<el-button
-						size="mini"
-						type="primary"
-						icon="el-icon-plus"
-						@click="addPeo(scope.row)"
-						>新增</el-button
-					>
+					<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
-						v-if="scope.row.enableFlag === 'enable'"
-						size="mini"
-						type="danger"
-						icon="el-icon-circle-close"
-						@click="DisablePeo(scope.row)"
-						>禁用/删除</el-button
-					>
-					<el-button
-						v-if="scope.row.enableFlag === 'disabled'"
-						size="mini"
-						type="danger"
-						icon="el-icon-circle-close"
-						@click="enablestaff(scope.row)"
-						>解禁</el-button
-					>
+					<el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuPeo(scope.row)">修改</el-button>
+					<el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+					<el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+					<el-button v-if="scope.row.enableFlag === 'enable'" size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用/删除</el-button>
+					<el-button v-if="scope.row.enableFlag === 'disabled'" size="mini" type="danger" icon="el-icon-circle-close" @click="enablestaff(scope.row)">解禁</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 
 		<!-- 下级机关单位/基层科室工作人员 -->
-		<el-table
-			height="350"
-			v-show="departmentStaffTableFlag"
-			:data="cleanDepartmentStaffTableListData"
-			style="width: 100%"
-		>
-			<el-table-column
-				prop="name"
-				label="下级机关单位/基层科室工作人员"
-				width="260"
-			></el-table-column>
-
-			<el-table-column
-				prop="roles"
-				label="下级机关单位/基层科室工作人员职责"
-				width="260"
-			>
+		<el-table height="350" v-show="departmentStaffTableFlag" :data="cleanDepartmentStaffTableListData" style="width: 100%">
+			<el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
+
+			<el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260">
 				<template slot-scope="scope">
-					<el-tag
-						type="primary"
-						size="mini"
-						v-for="(role, index) in scope.row.roles"
-						:key="index"
-						disable-transitions
-						>{{ role }}</el-tag
-					>
+					<el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width"
-			>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot="header" slot-scope="scope">
 					<el-input
 						placeholder="请输入姓名或手机号"
@@ -306,85 +174,29 @@
 						@input="handleSearchDeptStaff"
 						class="input-with-select"
 					>
-						<el-button
-							@click.stop="handleSearchDeptStaff"
-							slot="append"
-							icon="el-icon-search"
-						></el-button>
+						<el-button @click.stop="handleSearchDeptStaff" slot="append" icon="el-icon-search"></el-button>
 					</el-input>
 
-					<el-button
-						v-if="selDeptType === 'duty'"
-						size="mini"
-						type="primary"
-						icon="el-icon-plus"
-						@click="addCommunityPeo(scope.row)"
-						>新增</el-button
-					>
+					<el-button v-if="selDeptType === 'duty'" size="mini" type="primary" icon="el-icon-plus" @click="addCommunityPeo(scope.row)">新增</el-button>
 				</template>
 				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="warning"
-						icon="el-icon-edit"
-						@click="xiuCommunityPeo(scope.row)"
-						>修改</el-button
-					>
-					<el-button
-						size="mini"
-						type="success"
-						icon="el-icon-view"
-						@click="lookAngency(scope.row)"
-						>查看</el-button
-					>
-					<el-button
-						v-if="selDeptType === 'duty'"
-						size="mini"
-						type="info"
-						icon="el-icon-rank"
-						@click="transfer(scope.row)"
-						>调动</el-button
-					>
-					<el-button
-						size="mini"
-						type="danger"
-						icon="el-icon-circle-close"
-						@click="DisablePeo(scope.row)"
-						>禁用/删除</el-button
-					>
+					<el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuCommunityPeo(scope.row)">修改</el-button>
+					<el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+					<el-button v-if="selDeptType === 'duty'" size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+					<el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用/删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 
 		<!-- 网格工作人员 -->
-		<el-table
-			v-show="gridStaffTableFlag"
-			:data="cleanGridStaffTableListData"
-			style="width: 100%"
-			height="350"
-		>
-			<el-table-column
-				prop="name"
-				label="网格工作人员名字"
-				width="260"
-			></el-table-column>
+		<el-table v-show="gridStaffTableFlag" :data="cleanGridStaffTableListData" style="width: 100%" height="350">
+			<el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
 			<el-table-column prop="roles" label="网格工作人员职责" width="260">
 				<template slot-scope="scope">
-					<el-tag
-						type="primary"
-						size="mini"
-						v-for="(role, index) in scope.row.roles"
-						:key="index"
-						disable-transitions
-						>{{ role }}</el-tag
-					>
+					<el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width"
-			>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot="header" slot-scope="scope">
 					<el-input
 						placeholder="请输入姓名或手机号"
@@ -393,86 +205,27 @@
 						@input="handleSearchGridStaff"
 						class="input-with-select"
 					>
-						<el-button
-							@click.stop="handleSearchGridStaff"
-							slot="append"
-							icon="el-icon-search"
-						></el-button>
+						<el-button @click.stop="handleSearchGridStaff" slot="append" icon="el-icon-search"></el-button>
 					</el-input>
 
-					<el-button
-						size="mini"
-						type="primary"
-						icon="el-icon-plus"
-						@click="addGridPeo(scope.row)"
-						>新增</el-button
-					>
+					<el-button size="mini" type="primary" icon="el-icon-plus" @click="addGridPeo(scope.row)">新增</el-button>
 				</template>
 				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="warning"
-						icon="el-icon-edit"
-						@click="xiuGridPeo(scope.row)"
-						>修改</el-button
-					>
-					<el-button
-						size="mini"
-						type="success"
-						icon="el-icon-view"
-						@click="lookAngency(scope.row)"
-						>查看</el-button
-					>
-					<el-button
-						size="mini"
-						type="info"
-						icon="el-icon-rank"
-						@click="transfer(scope.row)"
-						>调动</el-button
-					>
-					<el-button
-						size="mini"
-						type="danger"
-						icon="el-icon-circle-close"
-						@click="DisablePeo(scope.row)"
-						>禁用/删除</el-button
-					>
+					<el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuGridPeo(scope.row)">修改</el-button>
+					<el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
+					<el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
+					<el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用/删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
 
 		<!-- 新增下级机关单位/基层科室 -->
-		<el-dialog
-			title="新增部门"
-			:visible.sync="dialogVisible"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog title="新增部门" :visible.sync="dialogVisible" width="850" :before-close="handleClose">
 			<el-form label-width="120px" :rules="rules">
-				<el-form-item label="部门名称" prop="addDepartmentName">
-					<el-input
-						v-model="insertForm.departmentName"
-						placeholder="请输入部门名称"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="组织编码" prop="code">
-					<el-input
-						v-model="insertForm.code"
-						placeholder="请输入组织编码"
-					></el-input>
-				</el-form-item>
-				<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-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>
@@ -482,257 +235,93 @@
 
 		<!-- 新增网格 -->
 		<div v-if="dialogVisibleGrid">
-			<el-dialog
-				title="新增网格"
-				:visible.sync="dialogVisibleGrid"
-				width="850"
-				:before-close="handleClose"
-			>
+			<el-dialog title="新增网格" :visible.sync="dialogVisibleGrid" width="850" :before-close="handleClose">
 				<el-form label-width="120px" :rules="rules">
-					<el-form-item label="网格名称" prop="gridName">
-						<el-input
-							v-model="GridForm.gridName"
-							placeholder="请输入部门名称"
-						></el-input>
-					</el-form-item>
-					<el-form-item label="网格编码" prop="GridCode">
-						<el-input
-							v-model="GridForm.code"
-							placeholder="请输入网格编码"
-						></el-input>
-					</el-form-item>
+					<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 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 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 label="坐标">
-						<div id="con"></div>
-					</el-form-item>
+					<el-form-item label="坐标"><div id="con"></div></el-form-item>
 				</el-form>
 
 				<div slot="footer">
 					<el-button @click="cancelGrid">取 消</el-button>
-					<el-button type="primary" @click="submitGrid"
-						>确 定</el-button
-					>
+					<el-button type="primary" @click="submitGrid">确 定</el-button>
 				</div>
 			</el-dialog>
 		</div>
 
 		<!-- 新增人员 -->
 		<div v-if="dialogVisiblePeo">
-			<el-dialog
-				title="新增人员"
-				:visible.sync="dialogVisiblePeo"
-				width="850"
-				:before-close="handleClose"
-			>
-				<el-form
-					:model="peoForm"
-					label-width="120px"
-					ref="addPeoForm"
-					:rules="rulesPeo"
-				>
-					<el-form-item label="姓名" prop="name">
-						<el-input
-							v-model="peoForm.name"
-							placeholder="请输入姓名"
-						></el-input>
-					</el-form-item>
-					<el-form-item label="手机号" prop="mobile">
-						<el-input
-							v-model="peoForm.mobile"
-							placeholder="请输入手机号"
-						></el-input>
-					</el-form-item>
+			<el-dialog title="新增人员" :visible.sync="dialogVisiblePeo" width="850" :before-close="handleClose">
+				<el-form :model="peoForm" label-width="120px" ref="addPeoForm" :rules="rulesPeo">
+					<el-form-item label="姓名" prop="name"><el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input></el-form-item>
+					<el-form-item label="手机号" prop="mobile"><el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input></el-form-item>
 					<!-- 性别下拉框 -->
 					<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 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 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 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 v-model="peoForm.newRoles" multiple placeholder="请选择">
+							<el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-form>
 				<div slot="footer">
 					<el-button @click="cancelPeo">取 消</el-button>
-					<el-button type="primary" @click="submitPeo"
-						>确 定</el-button
-					>
+					<el-button type="primary" @click="submitPeo">确 定</el-button>
 				</div>
 			</el-dialog>
 		</div>
 
 		<!-- 人员修改 -->
-		<el-dialog
-			v-if="modifyPeo"
-			title="人员修改"
-			:visible.sync="modifyPeo"
-			width="850"
-			:before-close="handleClose"
-		>
-			<el-form
-				:model="peoForm"
-				label-width="120px"
-				ref="editPeoForm"
-				:rules="rulesPeo"
-			>
-				<el-form-item label="姓名" prop="name">
-					<el-input
-						v-model="peoForm.name"
-						placeholder="请输入姓名"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="手机号" prop="mobile">
-					<el-input
-						v-model="peoForm.mobile"
-						placeholder="请输入手机号"
-					></el-input>
-				</el-form-item>
+		<el-dialog v-if="modifyPeo" title="人员修改" :visible.sync="modifyPeo" width="850" :before-close="handleClose">
+			<el-form :model="peoForm" label-width="120px" ref="editPeoForm" :rules="rulesPeo">
+				<el-form-item label="姓名" prop="name"><el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input></el-form-item>
+				<el-form-item label="手机号" prop="mobile"><el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input></el-form-item>
 				<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 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 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 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 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>
@@ -743,99 +332,31 @@
 		</el-dialog>
 
 		<!-- 禁用弹窗 -->
-		<el-dialog
-			v-if="Disable"
-			title="确认禁用"
-			:visible.sync="Disable"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="Disable" title="确认禁用" :visible.sync="Disable" width="850" :before-close="handleClose">
 			<span>禁用后该用户将无法登录系统，是否继续？</span>
 			<div slot="footer">
 				<el-button @click="cancelDisable">取 消</el-button>
-				<el-button type="primary" @click="submitDisable"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="submitDisable">确 定</el-button>
 			</div>
 		</el-dialog>
 
 		<!-- 人员查看 -->
-		<el-dialog
-			v-if="details"
-			title="人员详情"
-			:visible.sync="details"
-			width="850"
-			:before-close="handleClosePeoView"
-		>
+		<el-dialog v-if="details" title="人员详情" :visible.sync="details" width="850" :before-close="handleClosePeoView">
 			<el-form label-width="120px">
-				<el-form-item label="姓名">
-					<el-input
-						v-model="peoForm.name"
-						placeholder="姓名"
-						:disabled="true"
-					></el-input>
-				</el-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-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>
+			<div slot="footer"><el-button type="primary" style="margin-right: 170px" @click="cancelDetails">关 闭</el-button></div>
 		</el-dialog>
 
 		<!-- 人员调动 -->
-		<el-dialog
-			v-if="transferPeo"
-			title="人员调动"
-			:visible.sync="transferPeo"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="transferPeo" title="人员调动" :visible.sync="transferPeo" width="850" :before-close="handleClose">
 			<el-form label-width="120px" :model="agencyForm">
-				<el-form-item label="姓名">
-					<el-input
-						v-model="transferForm.name"
-						placeholder="姓名"
-					></el-input>
-				</el-form-item>
+				<el-form-item label="姓名"><el-input v-model="transferForm.name" placeholder="姓名"></el-input></el-form-item>
 				<el-form-item label="调动至">
 					<el-cascader
 						clearable
@@ -847,363 +368,140 @@
 					>
 						<template slot-scope="{ data }">
 							<span>{{ data.label }}</span>
-							<span
-								v-if="data.type != 'agency'"
-								style="color: #aaa; font-size: 12px"
-								>（{{ data.typeName }}）
-							</span>
+							<span v-if="data.type != 'agency'" style="color: #aaa; font-size: 12px">（{{ data.typeName }}）</span>
 						</template>
 					</el-cascader>
 				</el-form-item>
 				<el-form-item label="调动原因">
-					<el-input
-						type="textarea"
-						:rows="2"
-						placeholder="请输入内容"
-						maxlength="500"
-						show-word-limit
-						v-model="transferForm.remarks"
-					>
-					</el-input>
+					<el-input type="textarea" :rows="2" placeholder="请输入内容" maxlength="500" show-word-limit v-model="transferForm.remarks"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer">
 				<el-button @click="cancelTransfer">取 消</el-button>
-				<el-button type="primary" @click="submitTransfer"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="submitTransfer">确 定</el-button>
 			</div>
 		</el-dialog>
 
 		<!-- 新增组织 -->
-		<el-dialog
-			v-if="createAgencyDialogFlag"
-			title="新增组织"
-			:visible.sync="createAgencyDialogFlag"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="createAgencyDialogFlag" title="新增组织" :visible.sync="createAgencyDialogFlag" width="850" :before-close="handleClose">
 			<el-form label-width="120px">
-				<el-form-item label="组织名称">
-					<el-input
-						v-model="agencyForm.agencyName"
-						placeholder="请输入组织名称"
-					></el-input>
-				</el-form-item>
+				<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 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 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 label="组织简介">
-					<el-input
-						v-model="agencyForm.remark"
-						type="textarea"
-						rows="3"
-						maxlength="500"
-						show-word-limit
-						placeholder="请输入组织简介"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="坐标">
-					<div id="con"></div>
+					<el-input v-model="agencyForm.remark" type="textarea" rows="3" maxlength="500" show-word-limit placeholder="请输入组织简介"></el-input>
 				</el-form-item>
+				<el-form-item label="坐标"><div id="con"></div></el-form-item>
 			</el-form>
 			<div slot="footer">
 				<el-button @click="canceladdNewAgency">取 消</el-button>
-				<el-button type="primary" @click="submitaddNewAgency"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
 			</div>
 		</el-dialog>
 
 		<!-- 修改市区级组织 -->
-		<el-dialog
-			v-if="modifyCityOrgPop"
-			title="修改组织"
-			:visible.sync="modifyCityOrgPop"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="modifyCityOrgPop" title="修改组织" :visible.sync="modifyCityOrgPop" width="850" :before-close="handleClose">
 			<el-form label-width="120px">
-				<el-form-item label="组织名称">
-					<el-input
-						v-model="OrgDetailsForm.agencyName"
-						placeholder="请输入组织名称"
-					></el-input>
-				</el-form-item>
+				<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 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 label="组织简介">
-					<el-input
-						type="textarea"
-						v-model="OrgDetailsForm.remark"
-						placeholder="请输入内容"
-						resize="none"
-						rows="3"
-						maxlength="500"
-						show-word-limit
-					>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="坐标">
-					<div id="con"></div>
+					<el-input type="textarea" v-model="OrgDetailsForm.remark" placeholder="请输入内容" resize="none" rows="3" maxlength="500" show-word-limit></el-input>
 				</el-form-item>
+				<el-form-item label="坐标"><div id="con"></div></el-form-item>
 			</el-form>
 			<div slot="footer">
 				<el-button @click="cancelModifyCityOrgPop">取 消</el-button>
-				<el-button type="primary" @click="sunmitModifyCityOrgPop"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
 			</div>
 		</el-dialog>
 
 		<!-- 修改街道/社区级组织 -->
-		<el-dialog
-			v-if="streetOrCommunity"
-			title="修改组织"
-			:visible.sync="streetOrCommunity"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="streetOrCommunity" title="修改组织" :visible.sync="streetOrCommunity" width="850" :before-close="handleClose">
 			<el-form label-width="120px">
-				<el-form-item label="组织名称">
-					<el-input
-						v-model="OrgDetailsForm.agencyName"
-						placeholder="请输入组织名称"
-					></el-input>
-				</el-form-item>
+				<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 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.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
-						type="textarea"
-						v-model="OrgDetailsForm.remark"
-						placeholder="请输入内容"
-						show-word-limit
-						maxlength="500"
-						resize="none"
-						rows="3"
-					>
-					</el-input>
-				</el-form-item>
-				<el-form-item label="联系电话">
-					<el-input
-						v-model="OrgDetailsForm.mobile"
-						placeholder="请输入联系电话"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="坐标">
-					<div id="con"></div>
+					<el-input type="textarea" v-model="OrgDetailsForm.remark" placeholder="请输入内容" show-word-limit maxlength="500" resize="none" rows="3"></el-input>
 				</el-form-item>
+				<el-form-item label="联系电话"><el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
+				<el-form-item label="坐标"><div id="con"></div></el-form-item>
 			</el-form>
 			<div slot="footer">
 				<el-button @click="cancelstreetOrCommunity">取 消</el-button>
-				<el-button type="primary" @click="sunmitModifyCityOrgPop"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
 			</div>
 		</el-dialog>
 
 		<!-- 修改下级机关单位 -->
-		<el-dialog
-			v-if="OrgUnitPop"
-			title="修改部门"
-			:visible.sync="OrgUnitPop"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="OrgUnitPop" title="修改部门" :visible.sync="OrgUnitPop" width="850" :before-close="handleClose">
 			<el-form label-width="120px">
-				<el-form-item label="部门名称">
-					<el-input
-						v-model="OrgUnitDetailsForm.departmentName"
-						placeholder="请输入组织名称"
-					></el-input>
-				</el-form-item>
+				<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="联系电话1">
-					<el-input
-						v-model="OrgUnitDetailsForm.mobile"
-						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="联系电话1"><el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
 			</el-form>
 			<div slot="footer">
 				<el-button @click="cancelOrgUnitPop">取 消</el-button>
-				<el-button type="primary" @click="sunmitOrgUnitForm"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
 			</div>
 		</el-dialog>
 
 		<!-- 修改网格 -->
-		<el-dialog
-			v-if="modifyGridPop"
-			title="修改网格"
-			:visible.sync="modifyGridPop"
-			width="850"
-			:before-close="handleClose"
-		>
+		<el-dialog v-if="modifyGridPop" title="修改网格" :visible.sync="modifyGridPop" width="850" :before-close="handleClose">
 			<el-form label-width="120px">
-				<el-form-item label="网格名称">
-					<el-input
-						v-model="modifyGridFrom.gridName"
-						placeholder="请输入组织名称"
-					></el-input>
-				</el-form-item>
+				<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="组织编码"><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 v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
+						<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 
 				<!-- 排序 -->
-				<el-form-item label="排序">
-					<el-input-number
-						v-model="modifyGridFrom.gridSort"
-						:min="1"
-						label="排序"
-					></el-input-number>
-				</el-form-item>
+				<el-form-item label="排序"><el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number></el-form-item>
 
-				<el-form-item label="负责人">
-					<el-input
-						v-model="modifyGridFrom.contacts"
-						placeholder="请输入负责人名字"
-					></el-input>
-				</el-form-item>
-				<el-form-item label="联系电话">
-					<el-input
-						v-model="modifyGridFrom.mobile"
-						placeholder="请输入联系电话"
-					></el-input>
-				</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 label="坐标">
-					<div id="con"></div>
-				</el-form-item>
+				<el-form-item label="坐标"><div id="con"></div></el-form-item>
 			</el-form>
 			<div slot="footer">
 				<el-button @click="cancelModifyGridPop">取 消</el-button>
-				<el-button type="primary" @click="submitModifyGrid"
-					>确 定</el-button
-				>
+				<el-button type="primary" @click="submitModifyGrid">确 定</el-button>
 			</div>
 		</el-dialog>
 	</div>
 </template>
 
 <script>
-import { requestPost, requestGet } from "@/js/dai/request";
-import daiMap from "@/utils/dai-map";
+import { requestPost, requestGet } from '@/js/dai/request';
+import daiMap from '@/utils/dai-map';
 
 export default {
 	data() {
@@ -1246,34 +544,34 @@ export default {
 			gridStaffTableListData: [],
 
 			// 用户所属组织ID
-			userAgencyId: localStorage.getItem("agencyId"),
+			userAgencyId: localStorage.getItem('agencyId'),
 			// 修改时操作的用户staffId
-			userStaffId: "",
+			userStaffId: '',
 			// 当前被操作的组织的ID
-			currentAgencyId: localStorage.getItem("agencyId"),
+			currentAgencyId: localStorage.getItem('agencyId'),
 			// 当前被操作的部门的ID
-			currentDepartmentId: "14f572e724eecf7668b655505d789cab",
+			currentDepartmentId: '14f572e724eecf7668b655505d789cab',
 			// 当前被操作的网格的ID
-			currentGridOrgId: "63d5ff92ea981b1c58e4914ac894c610",
+			currentGridOrgId: '63d5ff92ea981b1c58e4914ac894c610',
 
 			// 当前被操作的组织的级别
-			currentAgencyLevel: localStorage.getItem("level"),
-			currentAreaCode: "",
-			currentAreaCodeSwitch: "",
-			parentAreaCode: "",
-			parentAgencyId: localStorage.getItem("agencyId"),
-			parentAgencyLevel: localStorage.getItem("level"),
+			currentAgencyLevel: localStorage.getItem('level'),
+			currentAreaCode: '',
+			currentAreaCodeSwitch: '',
+			parentAreaCode: '',
+			parentAgencyId: localStorage.getItem('agencyId'),
+			parentAgencyLevel: localStorage.getItem('level'),
 
 			// 经纬度坐标
-			lat: "",
-			lng: "",
-			latitude: "",
-			longitude: "",
-			Navigation: "",
+			lat: '',
+			lng: '',
+			latitude: '',
+			longitude: '',
+			Navigation: '',
 			// 查询参数
 			queryParams: {
 				deptName: undefined,
-				status: undefined,
+				status: undefined
 			},
 			// 状态列表
 			dictList: [],
@@ -1297,121 +595,114 @@ export default {
 			transferPeo: false,
 			// 社区添加表单项
 			insertForm: {
-				departmentName: "",
-				code: "",
-				contacts: "",
-				mobile: "",
-				agencyId: "",
-				departmentDuty: "123",
+				departmentName: '',
+				code: '',
+				contacts: '',
+				mobile: '',
+				agencyId: '',
+				departmentDuty: '123'
 			},
 			// 网格添加表单项
 			GridForm: {
-				gridName: "",
-				code: "",
-				contacts: "",
-				mobile: "",
-				agencyId: "",
-				manageDistrict: "",
-				gridType: "",
-				location: "", //坐标位置
-				longitude: "", //经度
-				latitude: "", //纬度
-				centerAddress: "",
+				gridName: '',
+				code: '',
+				contacts: '',
+				mobile: '',
+				agencyId: '',
+				manageDistrict: '',
+				gridType: '',
+				location: '', //坐标位置
+				longitude: '', //经度
+				latitude: '', //纬度
+				centerAddress: ''
 			},
 			// 新增组织
 			agencyForm: {
-				parentAgencyId: "",
-				agencyName: "",
-				level: "",
-				areaCodeSwitch: "",
-				areaCode: "",
-				areaName: "",
-				contacts: "",
-				mobile: "",
-				remark: "",
-				code: "",
+				parentAgencyId: '',
+				agencyName: '',
+				level: '',
+				areaCodeSwitch: '',
+				areaCode: '',
+				areaName: '',
+				contacts: '',
+				mobile: '',
+				remark: '',
+				code: ''
 			},
 			// 树
 			tree: [],
 			// 新增人员表单项
 			peoForm: {
-				name: "",
-				mobile: "",
-				gender: "",
-				post: "",
+				name: '',
+				mobile: '',
+				gender: '',
+				post: '',
 				duty: [],
-				orgType: "",
-				activeTime: "",
-				zuzhi: "",
-				disableFlag: "",
-				newRoles: [],
+				orgType: '',
+				activeTime: '',
+				zuzhi: '',
+				disableFlag: '',
+				newRoles: []
 			},
 			// 人员调动
 			transferForm: {
-				name: "",
-				remarks: "",
-				transferTo: "",
-				staffId: "",
-				orgId: "",
-				orgType: "",
+				name: '',
+				remarks: '',
+				transferTo: '',
+				staffId: '',
+				orgId: '',
+				orgType: ''
 			},
 			// 人员禁用
 			DisableForm: {
-				staffId: "",
-				agencyId: "",
-				customerId: "",
+				staffId: '',
+				agencyId: '',
+				customerId: ''
 			},
 			// 组织详细信息
 			OrgDetailsForm: {
-				level: "",
-				agencyName: "",
-				code: "",
-				contacts: "",
-				mobile: "",
-				centerAddress: "",
-				areaCode: "",
-				agencyId: "",
-				areaName: "",
-				remark: "",
+				level: '',
+				agencyName: '',
+				code: '',
+				contacts: '',
+				mobile: '',
+				centerAddress: '',
+				areaCode: '',
+				agencyId: '',
+				areaName: '',
+				remark: ''
 			},
 			// 下级机关单位
 			OrgUnitDetailsForm: {
-				code: "",
-				contacts: "",
-				departmentId: "",
-				departmentName: "",
-				mobile: "",
+				code: '',
+				contacts: '',
+				departmentId: '',
+				departmentName: '',
+				mobile: ''
 			},
 			// 网格修改表单
 			modifyGridFrom: {
-				gridName: "",
-				code: "",
-				gridTypeName: "",
-				contacts: "",
-				mobile: "",
-				latitude: "",
-				longitude: "",
-				agencyId: "",
-				gridType: "",
-				manageDistrict: "",
-				griId: "",
+				gridName: '',
+				code: '',
+				gridTypeName: '',
+				contacts: '',
+				mobile: '',
+				latitude: '',
+				longitude: '',
+				agencyId: '',
+				gridType: '',
+				manageDistrict: '',
+				griId: '',
 				// 排序
-				gridSort: 0,
+				gridSort: 0
 			},
 			judgeOrgInfoLevel: [],
-			keyWords: "",
+			keyWords: '',
 			typeList: [],
 			// 性别字典
-			genderList: [
-				{ value: 1, label: "男" },
-				{ value: 2, label: "女" },
-				{ value: 0, label: "未知" },
-			],
+			genderList: [{ value: 1, label: '男' }, { value: 2, label: '女' }, { value: 0, label: '未知' }],
 			// 专兼职字典
-			postList: [
-				{ value: "fulltime", label: "专职" },
-				{ value: "parttime", label: "兼职" },
-			],
+			postList: [{ value: 'fulltime', label: '专职' }, { value: 'parttime', label: '兼职' }],
 			// 职责字典
 			dutyList: [],
 			// 修改操作是否展示
@@ -1425,7 +716,7 @@ export default {
 			// 顶部 面包屑
 			breadcrumbArr: [],
 			// 面包屑 当前所属机构ID
-			currentBreadcrumbKey: "",
+			currentBreadcrumbKey: '',
 			// 组织区划数据
 			zonings: [],
 			// 校验
@@ -1433,52 +724,40 @@ export default {
 				departmentName: [
 					{
 						required: true,
-						message: "社区名称必填",
-						trigger: "blur",
-					},
+						message: '社区名称必填',
+						trigger: 'blur'
+					}
 				],
 				gridName: [
 					{
 						required: true,
-						message: "网格名称必填",
-						trigger: "blur",
-					},
+						message: '网格名称必填',
+						trigger: 'blur'
+					}
 				],
 				addDepartmentName: [
 					{
 						required: true,
-						message: "部门名称必填",
-						trigger: "blur",
-					},
-				],
+						message: '部门名称必填',
+						trigger: 'blur'
+					}
+				]
 			},
 
 			rulesPeo: {
-				name: [
-					{ required: true, message: "姓名必填", trigger: "blur" },
-				],
-				mobile: [
-					{ required: true, message: "手机号必填", trigger: "blur" },
-				],
-				gender: [
-					{ required: true, message: "性别必填", trigger: "blur" },
-				],
-				post: [
-					{ required: true, message: "专兼职必填", trigger: "blur" },
-				],
-				duty: [
-					{ required: true, message: "职责必填", trigger: "blur" },
-				],
-				newRoles: [
-					{ required: true, message: "角色必填", trigger: "blur" },
-				],
+				name: [{ required: true, message: '姓名必填', trigger: 'blur' }],
+				mobile: [{ required: true, message: '手机号必填', trigger: 'blur' }],
+				gender: [{ required: true, message: '性别必填', trigger: 'blur' }],
+				post: [{ required: true, message: '专兼职必填', trigger: 'blur' }],
+				duty: [{ required: true, message: '职责必填', trigger: 'blur' }],
+				newRoles: [{ required: true, message: '角色必填', trigger: 'blur' }]
 			},
 
-			selDeptType: "",
+			selDeptType: '',
 
-			searchStaffKeyword: "",
-			searchGridStaffKeyword: "",
-			searchDeptStaffKeyword: "",
+			searchStaffKeyword: '',
+			searchGridStaffKeyword: '',
+			searchDeptStaffKeyword: ''
 		};
 	},
 	watch: {
@@ -1513,23 +792,21 @@ export default {
 		modifyGridPop(val) {
 			if (val) {
 				setTimeout(() => {
-					this.createMap("modifyGridFrom");
+					this.createMap('modifyGridFrom');
 				}, 1000);
 			}
-		},
+		}
 	},
 	computed: {
 		cleanAgencyStaffTableListData() {
-			return this.agencyStaffTableListData.filter((item) => !item.hidden);
+			return this.agencyStaffTableListData.filter(item => !item.hidden);
 		},
 		cleanGridStaffTableListData() {
-			return this.gridStaffTableListData.filter((item) => !item.hidden);
+			return this.gridStaffTableListData.filter(item => !item.hidden);
 		},
 		cleanDepartmentStaffTableListData() {
-			return this.departmentStaffTableListData.filter(
-				(item) => !item.hidden
-			);
-		},
+			return this.departmentStaffTableListData.filter(item => !item.hidden);
+		}
 	},
 	mounted() {
 		this.getAgencyList();
@@ -1540,60 +817,163 @@ export default {
 		this.getRoleList();
 		// this.getNavigation()
 		// 更新顶部面包屑
-		this.assembleBreadcrumbArr(localStorage.getItem("agencyId"), "agency");
+		this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency');
 		// this.initMap()
 	},
 	methods: {
-		handleSearchStaff() {
-			const { searchStaffKeyword, agencyStaffTableListData } = this;
-			this.agencyStaffTableListData = agencyStaffTableListData.map(
-				(item) => {
-					return {
-						...item,
-						hidden: !(
-							item.name.indexOf(searchStaffKeyword) != -1 ||
-							item.mobile.indexOf(searchStaffKeyword) != -1
-						),
-					};
+		// async handleExport () {
+		//   let title = "部门导出";
+
+		//   const url = "/epmetuser/icVaccinePrarmeter/vaccine-export";
+
+		//   app.ajax.exportFilePost(
+		//     url,
+		//     this.dataForm,
+		//     (data, rspMsg) => {
+		//       console.log(data)
+		//       this.download(data, title + ".xlsx");
+		//     },
+		//     (rspMsg, data) => {
+		//       this.$message.error(rspMsg);
+		//     }
+		//   );
+		// },
+		beforeUpload(file) {
+			this.files = file;
+
+			const isText = file.type === 'application/vnd.ms-excel';
+			const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+
+			if (!isText && !isTextComputer) {
+				this.$message.error('请选择正确格式的文件');
+				this.files = null;
+				this.fileName = '';
+				return false;
+			} else {
+				this.fileName = file.name;
+				return true;
+			}
+		},
+		async uploadFile() {
+			if (this.fileName == '') {
+				this.$message.warning('请选择要上传的文件！');
+				return false;
+			}
+
+			this.$message({
+				showClose: true,
+				message: '导入中，请到系统管理-导入记录中查看进度',
+				duration: 0
+			});
+
+			//清空上传列表
+			this.$refs['upload'].clearFiles();
+			let url = '';
+
+			let fileFormData = new FormData();
+			fileFormData.append('file', this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+			fileFormData.append('agencyId',this.currentAgencyId);
+			url = '/gov/org/department/yantai/import';
+
+			window.app.ajax.post2(
+				url,
+				fileFormData,
+				(data, rspMsg) => {
+					if (data.code === 0 && data.msg == 'success') {
+						// this.getDepartmentList();
+						// this.$message.success('导入成功')
+					} else {
+						// this.$message({
+						//   showClose: true,
+						//   message: rspMsg,
+						//   duration: 0,
+						//   type: "error"
+						// })
+						// this.$message.error(rspMsg)
+					}
+					// this.loadTable();
+					
+				},
+				(rspMsg, data) => {},
+				{ headers: { 'Content-Type': 'multipart/form-data' } }
+			);
+			this.getDepartmentList();
+		},
+		download(data, fileName) {
+			if (!data) {
+				return;
+			}
+
+			var csvData = new Blob([data]);
+
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, fileName);
+			} else {
+				var a = document.createElement('a');
+				document.body.appendChild(a);
+				a.style = 'display: none';
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = fileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+		handleExportModule() {
+			let title = '部门导入模板';
+			let url = '/gov/org/department/yantai/download-tem';
+
+			let params = {};
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + '.xls');
+				},
+				(rspMsg, data) => {
+					this.$message.error(rspMsg);
 				}
 			);
 		},
+		handleSearchStaff() {
+			const { searchStaffKeyword, agencyStaffTableListData } = this;
+			this.agencyStaffTableListData = agencyStaffTableListData.map(item => {
+				return {
+					...item,
+					hidden: !(item.name.indexOf(searchStaffKeyword) != -1 || item.mobile.indexOf(searchStaffKeyword) != -1)
+				};
+			});
+		},
 		handleSearchGridStaff() {
 			const { searchGridStaffKeyword, gridStaffTableListData } = this;
-			this.gridStaffTableListData = gridStaffTableListData.map((item) => {
+			this.gridStaffTableListData = gridStaffTableListData.map(item => {
 				return {
 					...item,
-					hidden: !(
-						item.name.indexOf(searchGridStaffKeyword) != -1 ||
-						item.mobile.indexOf(searchGridStaffKeyword) != -1
-					),
+					hidden: !(item.name.indexOf(searchGridStaffKeyword) != -1 || item.mobile.indexOf(searchGridStaffKeyword) != -1)
 				};
 			});
 		},
 		handleSearchDeptStaff() {
-			const { searchDeptStaffKeyword, departmentStaffTableListData } =
-				this;
-			this.departmentStaffTableListData =
-				departmentStaffTableListData.map((item) => {
-					return {
-						...item,
-						hidden: !(
-							item.name.indexOf(searchDeptStaffKeyword) != -1 ||
-							item.mobile.indexOf(searchDeptStaffKeyword) != -1
-						),
-					};
-				});
+			const { searchDeptStaffKeyword, departmentStaffTableListData } = this;
+			this.departmentStaffTableListData = departmentStaffTableListData.map(item => {
+				return {
+					...item,
+					hidden: !(item.name.indexOf(searchDeptStaffKeyword) != -1 || item.mobile.indexOf(searchDeptStaffKeyword) != -1)
+				};
+			});
 		},
 
 		// 点击后获取id
 		handleChangeTransferCascader(e) {
-			console.log("*********************");
+			console.log('*********************');
 			function findItem(valueArr, coll) {
-				console.log("--------------------");
+				console.log('--------------------');
 				console.log(valueArr);
 				let copyArr = [...valueArr];
 				let firstValue = copyArr.shift();
-				let item = coll.find((a) => a.value == firstValue);
+				let item = coll.find(a => a.value == firstValue);
 				console.log(item);
 				if (copyArr.length > 0) {
 					return findItem(copyArr, item.children);
@@ -1607,9 +987,9 @@ export default {
 		},
 		/** 查询系统工作人员角色（职责） */
 		async getDutyList() {
-			const url = "/gov/org/staff/rolelist";
+			const url = '/gov/org/staff/rolelist';
 			let params = {
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -1622,7 +1002,7 @@ export default {
 		async getRoleList() {
 			this.tableLoading = true;
 
-			const url = "/gov/access/govrole/list";
+			const url = '/gov/access/govrole/list';
 
 			let params = {};
 
@@ -1637,9 +1017,9 @@ export default {
 		},
 		/** 查询组织列表 */
 		async getAgencyList() {
-			const url = "/gov/org/agency/agencylist";
+			const url = '/gov/org/agency/agencylist';
 			let params = {
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1652,10 +1032,10 @@ export default {
 		},
 		/** 查询社区列表 */
 		async getDepartmentList() {
-			const url = "/gov/org/department/departmentlist";
+			const url = '/gov/org/department/departmentlist';
 
 			let params = {
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1663,15 +1043,15 @@ export default {
 			if (code === 0) {
 				this.departmentTableListData = data;
 
-				this.departmentTableListData.forEach((element) => {
-					if (element.deptType === "duty") {
-						element.departmentTypeShow = "职能部门";
-					} else if (element.deptType === "party_unit") {
-						element.departmentTypeShow = "联建单位";
-					} else if (element.deptType === "community_org") {
-						element.departmentTypeShow = "社会自组织";
+				this.departmentTableListData.forEach(element => {
+					if (element.deptType === 'duty') {
+						element.departmentTypeShow = '职能部门';
+					} else if (element.deptType === 'party_unit') {
+						element.departmentTypeShow = '联建单位';
+					} else if (element.deptType === 'community_org') {
+						element.departmentTypeShow = '社会自组织';
 					} else {
-						element.departmentTypeShow = "";
+						element.departmentTypeShow = '';
 					}
 				});
 			} else {
@@ -1680,10 +1060,10 @@ export default {
 		},
 		/** 查询网格列表 */
 		async getGridList() {
-			const url = "/gov/org/grid/allgrids";
+			const url = '/gov/org/grid/allgrids';
 
 			let params = {
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1697,13 +1077,13 @@ export default {
 
 		// 查询网格人员列表
 		async getGridStaffListData() {
-			const url = "/data/aggregator/org/stafflist";
+			const url = '/data/aggregator/org/stafflist';
 
 			let params = {
 				orgId: this.currentGridOrgId,
-				orgType: "grid",
+				orgType: 'grid',
 				pageNo: 1,
-				pageSize: 10000,
+				pageSize: 10000
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1716,13 +1096,13 @@ export default {
 		},
 		// 查询组织工作人员
 		async getAgencyStaffListData() {
-			const url = "/data/aggregator/org/stafflist";
+			const url = '/data/aggregator/org/stafflist';
 
 			let params = {
 				orgId: this.currentAgencyId,
-				orgType: "agency",
+				orgType: 'agency',
 				pageNo: 1,
-				pageSize: 10000,
+				pageSize: 10000
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1735,13 +1115,13 @@ export default {
 		},
 		// 查询部门人员
 		async getDepartmentStaffListData() {
-			const url = "/data/aggregator/org/stafflist";
+			const url = '/data/aggregator/org/stafflist';
 
 			let params = {
 				orgId: this.currentDepartmentId,
-				orgType: "dept",
+				orgType: 'dept',
 				pageNo: 1,
-				pageSize: 10000,
+				pageSize: 10000
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1754,7 +1134,7 @@ export default {
 		},
 		// 添加组织
 		async submit() {
-			const url = "/gov/org/department/adddepartment";
+			const url = '/gov/org/department/adddepartment';
 
 			let params = {
 				agencyId: this.insertForm.agencyId,
@@ -1762,13 +1142,13 @@ export default {
 				departmentDuty: this.insertForm.departmentDuty,
 				contacts: this.insertForm.contacts,
 				mobile: this.insertForm.mobile,
-				code: this.insertForm.code,
+				code: this.insertForm.code
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("添加成功");
+				this.$message.success('添加成功');
 				this.dialogVisible = false;
 				this.insertForm = [];
 				this.getAgencyList();
@@ -1781,7 +1161,7 @@ export default {
 		},
 		// 添加网格
 		async submitGrid() {
-			const url = "/gov/org/grid/addgrid";
+			const url = '/gov/org/grid/addgrid';
 
 			let params = {
 				agencyId: this.GridForm.agencyId,
@@ -1792,13 +1172,13 @@ export default {
 				manageDistrict: this.GridForm.manageDistrict,
 				gridType: this.GridForm.gridType,
 				latitude: this.lat,
-				longitude: this.lng,
+				longitude: this.lng
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("添加成功");
+				this.$message.success('添加成功');
 				this.dialogVisibleGrid = false;
 				this.GridForm = [];
 				this.getAgencyList();
@@ -1811,21 +1191,21 @@ export default {
 		},
 
 		async submitPeo() {
-			this.$refs["addPeoForm"].validate((valid, err) => {
+			this.$refs['addPeoForm'].validate((valid, err) => {
 				if (valid) {
 					this.submitPeoDo();
 				} else {
 					app.util.validateRule(err);
-					return console.log("error submit!!", valid, err);
+					return console.log('error submit!!', valid, err);
 				}
 			});
 		},
 
 		// 添加人员
 		async submitPeoDo() {
-			const url = "/gov/org/staff/addstaffv2";
+			const url = '/gov/org/staff/addstaffv2';
 			const {
-				peoForm: { orgType },
+				peoForm: { orgType }
 			} = this;
 			let params = {
 				orgType: this.peoForm.orgType,
@@ -1835,18 +1215,13 @@ export default {
 				workType: this.peoForm.post,
 				roles: this.peoForm.duty,
 				newRoles: this.peoForm.newRoles,
-				orgId:
-					orgType == "agency"
-						? this.currentAgencyId
-						: orgType == "dept"
-						? this.currentDepartmentId
-						: this.currentGridOrgId,
+				orgId: orgType == 'agency' ? this.currentAgencyId : orgType == 'dept' ? this.currentDepartmentId : this.currentGridOrgId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("添加成功");
+				this.$message.success('添加成功');
 				this.dialogVisiblePeo = false;
 				this.peoForm = [];
 				this.getAgencyList();
@@ -1854,9 +1229,9 @@ export default {
 				this.getGridList();
 				this.getAgencyStaffListData();
 				this.insertFormRest();
-				if (orgType == "dept") {
+				if (orgType == 'dept') {
 					this.getDepartmentStaffListData();
-				} else if (orgType == "grid") {
+				} else if (orgType == 'grid') {
 					this.getGridStaffListData();
 				} else {
 					this.getAgencyStaffListData();
@@ -1867,18 +1242,18 @@ export default {
 		},
 
 		async updatePeo() {
-			this.$refs["editPeoForm"].validate((valid, err) => {
+			this.$refs['editPeoForm'].validate((valid, err) => {
 				if (valid) {
 					this.updatePeoDo();
 				} else {
 					app.util.validateRule(err);
-					return console.log("error updatePeo!!", valid, err);
+					return console.log('error updatePeo!!', valid, err);
 				}
 			});
 		},
 		// 人员修改
 		async updatePeoDo() {
-			const url = "/gov/org/staff/editstaff";
+			const url = '/gov/org/staff/editstaff';
 
 			let params = {
 				staffId: this.userStaffId,
@@ -1889,13 +1264,13 @@ export default {
 				workType: this.peoForm.post,
 				roles: this.peoForm.duty,
 				newRoles: this.peoForm.newRoles,
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("修改成功");
+				this.$message.success('修改成功');
 				this.modifyPeo = false;
 
 				this.getAgencyList();
@@ -1912,10 +1287,10 @@ export default {
 
 		// 字典
 		async getDictionaries() {
-			const url = "/sys/dict/data/dictlist";
+			const url = '/sys/dict/data/dictlist';
 
 			let params = {
-				dictType: "grid_type",
+				dictType: 'grid_type'
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -1943,12 +1318,12 @@ export default {
 		},
 		// 社区弹框关闭函数
 		handleClose(done) {
-			this.$confirm("确认关闭？")
-				.then((_) => {
+			this.$confirm('确认关闭？')
+				.then(_ => {
 					this.insertFormRest();
 					done();
 				})
-				.catch((_) => {});
+				.catch(_ => {});
 		},
 		// 人员查看叉号关闭
 		handleClosePeoView(done) {
@@ -1957,107 +1332,99 @@ export default {
 		},
 		// 社区新增弹框重置函数
 		insertFormRest() {
-			this.insertForm.name = "";
-			this.insertForm.contacts = "";
-			this.insertForm.code = "";
-			this.insertForm.mobile = "";
-			this.insertForm.departmentName = "";
+			this.insertForm.name = '';
+			this.insertForm.contacts = '';
+			this.insertForm.code = '';
+			this.insertForm.mobile = '';
+			this.insertForm.departmentName = '';
 
 			this.peoForm = {
-				name: "",
-				mobile: "",
-				gender: "",
-				post: "",
+				name: '',
+				mobile: '',
+				gender: '',
+				post: '',
 				duty: [],
-				orgType: "",
-				activeTime: "",
-				zuzhi: "",
-				disableFlag: "",
-				newRoles: [],
+				orgType: '',
+				activeTime: '',
+				zuzhi: '',
+				disableFlag: '',
+				newRoles: []
 			};
 		},
 		// 网格新增弹框重置函数
 		GridFormRest() {
-			(this.GridForm.gridName = ""),
-				(this.GridForm.code = ""),
-				(this.GridForm.centerAddress = ""),
-				(this.GridForm.contacts = ""),
-				(this.GridForm.mobile = ""),
-				(this.GridForm.agencyId = ""),
-				(this.GridForm.manageDistrict = ""),
-				(this.GridForm.gridType = ""),
-				(this.GridForm.location = ""),
-				(this.GridForm.longitude = ""),
-				(this.GridForm.latitude = "");
+			(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.name = ''), (this.peoForm.mobile = ''), (this.peoForm.gender = ''), (this.peoForm.post = ''), (this.peoForm.duty = '');
 			this.peoForm.newRoles = [];
 		},
 		// 人员调动
 		transferRest() {
-			(this.transferForm.name = ""),
-				(this.transferForm.remarks = ""),
-				(this.transferForm.transferTo = "");
-			(this.transferForm.staffId = ""),
-				(this.transferForm.orgId = ""),
-				(this.transferForm.orgType = "");
-			this.selectValue = "";
+			(this.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.agencyForm.remark = ""),
-				(this.latitude = ""),
-				(this.longitude = "");
+			(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.agencyForm.remark = ''),
+				(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 = "");
+			(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 = "");
+			(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 = "");
+			(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() {
@@ -2127,7 +1494,7 @@ export default {
 			this.departmentTableFlag = false;
 			this.gridTableFlag = false;
 			this.getGridStaffListData();
-			this.assembleBreadcrumbArr(gridId, "grid");
+			this.assembleBreadcrumbArr(gridId, 'grid');
 		},
 		// 进入部门，查询部门所属人员
 		entryDepartment(row) {
@@ -2145,7 +1512,7 @@ export default {
 
 			this.selDeptType = row.deptType;
 			this.getDepartmentStaffListData();
-			this.assembleBreadcrumbArr(row.departmentId, "department");
+			this.assembleBreadcrumbArr(row.departmentId, 'department');
 		},
 
 		// 进入组织，重新渲染
@@ -2163,7 +1530,7 @@ export default {
 			this.getGridList();
 			this.getAgencyStaffListData();
 			this.getAgencyList();
-			this.assembleBreadcrumbArr(agencyId, "agency");
+			this.assembleBreadcrumbArr(agencyId, 'agency');
 		},
 		// 新增组织
 		addCommunity(row) {
@@ -2180,31 +1547,31 @@ export default {
 		// 新增人员
 		addPeo(row) {
 			this.dialogVisiblePeo = true;
-			this.peoForm.orgType = "agency";
+			this.peoForm.orgType = 'agency';
 		},
 
 		// 新增社区人员
 		addCommunityPeo() {
 			this.dialogVisiblePeo = true;
-			this.peoForm.orgType = "dept";
+			this.peoForm.orgType = 'dept';
 		},
 
 		// 新增网格人员
 		addGridPeo() {
 			this.dialogVisiblePeo = true;
-			this.peoForm.orgType = "grid";
+			this.peoForm.orgType = 'grid';
 		},
 		// 修改网格人员
 		async xiuGridPeo(row) {
 			this.modifyPeo = true;
-			this.peoForm.orgType = "grid";
+			this.peoForm.orgType = 'grid';
 
 			this.userStaffId = row.staffId;
 
-			const url = "/gov/org/staff/editstaffinit";
+			const url = '/gov/org/staff/editstaffinit';
 			let params = {
 				staffId: row.staffId,
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 			const { data, code, msg } = await requestPost(url, params);
 			if (code === 0) {
@@ -2215,7 +1582,7 @@ export default {
 				this.peoForm.post = data.workType;
 				// 已有的权限（职责）
 				let existedDutyArr = [];
-				data.roleList.forEach(function (sysDuty) {
+				data.roleList.forEach(function(sysDuty) {
 					if (sysDuty.selected === true) {
 						existedDutyArr.push(sysDuty.roleId);
 					}
@@ -2223,7 +1590,7 @@ export default {
 				this.peoForm.duty = existedDutyArr;
 				// 已有的权限（角色）
 				let existedRoleArr = [];
-				data.newRoleList.forEach(function (sysRole) {
+				data.newRoleList.forEach(function(sysRole) {
 					if (sysRole.selected === true) {
 						existedRoleArr.push(sysRole.roleId);
 					}
@@ -2236,15 +1603,15 @@ export default {
 		// 修改人员
 		async xiuPeo(row) {
 			this.modifyPeo = true;
-			this.peoForm.orgType = "agency";
+			this.peoForm.orgType = 'agency';
 
 			this.userStaffId = row.staffId;
 
-			const url = "/gov/org/staff/editstaffinit";
+			const url = '/gov/org/staff/editstaffinit';
 
 			let params = {
 				staffId: row.staffId,
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2257,7 +1624,7 @@ export default {
 				this.peoForm.gender = data.gender;
 				// 已有的权限（职责）
 				let existedDutyArr = [];
-				data.roleList.forEach(function (sysDuty) {
+				data.roleList.forEach(function(sysDuty) {
 					if (sysDuty.selected === true) {
 						existedDutyArr.push(sysDuty.roleId);
 					}
@@ -2265,7 +1632,7 @@ export default {
 				this.peoForm.duty = existedDutyArr;
 				// 已有的权限（角色）
 				let existedRoleArr = [];
-				data.newRoleList.forEach(function (sysRole) {
+				data.newRoleList.forEach(function(sysRole) {
 					if (sysRole.selected === true) {
 						existedRoleArr.push(sysRole.roleId);
 					}
@@ -2278,15 +1645,15 @@ export default {
 		// 修改社区人员
 		async xiuCommunityPeo(row) {
 			this.modifyPeo = true;
-			this.peoForm.orgType = "dept";
+			this.peoForm.orgType = 'dept';
 
 			this.userStaffId = row.staffId;
 
-			const url = "/gov/org/staff/editstaffinit";
+			const url = '/gov/org/staff/editstaffinit';
 
 			let params = {
 				staffId: row.staffId,
-				agencyId: this.currentAgencyId,
+				agencyId: this.currentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2299,7 +1666,7 @@ export default {
 				this.peoForm.post = data.workType;
 				// 已有的权限（职责）
 				let existedDutyArr = [];
-				data.roleList.forEach(function (sysDuty) {
+				data.roleList.forEach(function(sysDuty) {
 					if (sysDuty.selected === true) {
 						existedDutyArr.push(sysDuty.roleId);
 					}
@@ -2307,7 +1674,7 @@ export default {
 				this.peoForm.duty = existedDutyArr;
 				// 已有的权限（角色）
 				let existedRoleArr = [];
-				data.newRoleList.forEach(function (sysRole) {
+				data.newRoleList.forEach(function(sysRole) {
 					if (sysRole.selected === true) {
 						existedRoleArr.push(sysRole.roleId);
 					}
@@ -2327,16 +1694,16 @@ export default {
 			this.Disable = true;
 		},
 		enablestaff(row) {
-			this.$confirm("确认解禁该员工?", "提示", {
-				confirmButtonText: "确定",
-				cancelButtonText: "取消",
-				type: "warning",
+			this.$confirm('确认解禁该员工?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
 			})
 				.then(() => {
 					this.submitEnable(row);
 				})
-				.catch((err) => {
-					if (err == "cancel") {
+				.catch(err => {
+					if (err == 'cancel') {
 						// this.$message({
 						//   type: "info",
 						//   message: "已取消删除"
@@ -2346,16 +1713,16 @@ export default {
 		},
 		// 确定解禁
 		async submitEnable(row) {
-			const url = "/epmetuser/customerstaff/enablestaff";
+			const url = '/epmetuser/customerstaff/enablestaff';
 
 			let params = {
-				staffId: row.staffId,
+				staffId: row.staffId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("解禁成功");
+				this.$message.success('解禁成功');
 				this.Disable = false;
 				this.getAgencyList();
 				this.getDepartmentList();
@@ -2367,18 +1734,18 @@ export default {
 		},
 		// 确定禁用
 		async submitDisable() {
-			const url = "/epmetuser/customerstaff/disabledstaff";
+			const url = '/epmetuser/customerstaff/disabledstaff';
 
 			let params = {
 				staffId: this.DisableForm.staffId,
 				agencyId: this.DisableForm.agencyId,
-				customerId: this.DisableForm.customerId,
+				customerId: this.DisableForm.customerId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("禁用成功");
+				this.$message.success('禁用成功');
 				this.Disable = false;
 				this.getAgencyList();
 				this.getDepartmentList();
@@ -2390,25 +1757,24 @@ export default {
 		},
 		// 查看按钮
 		async lookAngency(row) {
-			const url = "/data/aggregator/org/staffdetailv2";
+			const url = '/data/aggregator/org/staffdetailv2';
 
 			let params = {
-				staffId: row.staffId,
+				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.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 = "已启用";
+				if (data.enableFlag === 'enable') {
+					this.peoForm.disableFlag = '已启用';
 				} else {
-					this.peoForm.disableFlag = "已禁用";
+					this.peoForm.disableFlag = '已禁用';
 				}
 			}
 			this.details = true;
@@ -2420,7 +1786,7 @@ export default {
 			this.transferForm.staffId = row.staffId;
 
 			this.transferPeo = true;
-			const url = "/gov/org/customeragency/orgtree";
+			const url = '/gov/org/customeragency/orgtree';
 
 			let params = {};
 
@@ -2431,49 +1797,47 @@ export default {
 					return {
 						label: opt.agencyName,
 						value: opt.agencyId,
-						type: "agency",
+						type: 'agency',
 						children: [
-							...(opt.departmentList || []).map((item) => ({
+							...(opt.departmentList || []).map(item => ({
 								label: item.deptName,
 								value: item.deptId,
-								type: "dept",
-								typeName: "部门",
+								type: 'dept',
+								typeName: '部门'
 							})),
-							...(opt.gridList || []).map((item) => ({
+							...(opt.gridList || []).map(item => ({
 								label: item.gridName,
 								value: item.gridId,
-								type: "grid",
-								typeName: "网格",
+								type: 'grid',
+								typeName: '网格'
 							})),
-							...(opt.subAgencyList || []).map((item) =>
-								computeOption(item)
-							),
-						],
+							...(opt.subAgencyList || []).map(item => computeOption(item))
+						]
 					};
 				}
 				if (data) {
 					this.options = [computeOption(data)];
-					console.log("树树树树树树树树树树", this.options[0]);
+					console.log('树树树树树树树树树树', this.options[0]);
 				}
 			} else {
-				this.$message.error("树查询失败", msg);
+				this.$message.error('树查询失败', msg);
 			}
 		},
 		// 人员调动确定
 		async submitTransfer() {
-			const url = "/gov/org/staff/stafftransferv2";
+			const url = '/gov/org/staff/stafftransferv2';
 
 			let params = {
 				staffId: this.transferForm.staffId,
 				orgId: this.transferForm.orgId,
 				orgType: this.transferForm.orgType,
-				remarks: this.transferForm.remarks,
+				remarks: this.transferForm.remarks
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("调动成功");
+				this.$message.success('调动成功');
 				this.transferRest();
 				this.transferPeo = false;
 				this.getAgencyList();
@@ -2505,10 +1869,10 @@ export default {
 		// 组装顶部面包屑数组
 		async assembleBreadcrumbArr(id, orgType) {
 			this.currentBreadcrumbKey = id;
-			if (orgType === "agency") {
-				const url = "/gov/org/agency/agencydetail";
+			if (orgType === 'agency') {
+				const url = '/gov/org/agency/agencydetail';
 				let params = {
-					agencyId: id,
+					agencyId: id
 				};
 				const { data, code, msg } = await requestPost(url, params);
 				if (code === 0) {
@@ -2517,16 +1881,11 @@ export default {
 					this.currentAreaCode = data.areaCode;
 					this.currentAreaCodeSwitch = data.areaCodeSwitch;
 					if (data.parentList && data.parentList.length > 0) {
-						this.parentAreaCode =
-							data.parentList[
-								data.parentList.length - 1
-							].areaCode;
-						this.parentAgencyId =
-							data.parentList[data.parentList.length - 1].id;
-						this.parentAgencyLevel =
-							data.parentList[data.parentList.length - 1].level;
+						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") {
+					if (data.level === 'community') {
 						this.agencyTableFlag = false;
 					} else {
 						this.agencyTableFlag = true;
@@ -2536,12 +1895,12 @@ export default {
 							{
 								id: data.agencyId,
 								name: data.agencyName,
-								type: orgType,
-							},
+								type: orgType
+							}
 						];
 					} else {
 						let hasBreadcrumbArr = false;
-						this.breadcrumbArr.forEach(function (bc) {
+						this.breadcrumbArr.forEach(function(bc) {
 							if (bc.id === id) {
 								hasBreadcrumbArr = true;
 							}
@@ -2550,7 +1909,7 @@ export default {
 							let breadcrumb = {
 								id: data.agencyId,
 								name: data.agencyName,
-								type: orgType,
+								type: orgType
 							};
 							this.breadcrumbArr.push(breadcrumb);
 						}
@@ -2558,10 +1917,10 @@ export default {
 				} else {
 					this.$message.error(msg);
 				}
-			} else if (orgType === "department") {
-				const url = "/gov/org/department/departmentdetail";
+			} else if (orgType === 'department') {
+				const url = '/gov/org/department/departmentdetail';
 				let params = {
-					departmentId: id,
+					departmentId: id
 				};
 				const { data, code, msg } = await requestPost(url, params);
 				if (code === 0) {
@@ -2570,12 +1929,12 @@ export default {
 							{
 								id: data.departmentId,
 								name: data.departmentName,
-								type: orgType,
-							},
+								type: orgType
+							}
 						];
 					} else {
 						let hasBreadcrumbArr = false;
-						this.breadcrumbArr.forEach(function (bc) {
+						this.breadcrumbArr.forEach(function(bc) {
 							if (bc.id === id) {
 								hasBreadcrumbArr = true;
 							}
@@ -2584,7 +1943,7 @@ export default {
 							let breadcrumb = {
 								id: data.departmentId,
 								name: data.departmentName,
-								type: orgType,
+								type: orgType
 							};
 							this.breadcrumbArr.push(breadcrumb);
 						}
@@ -2592,10 +1951,10 @@ export default {
 				} else {
 					this.$message.error(msg);
 				}
-			} else if (orgType === "grid") {
-				const url = "/gov/org/grid/griddetail";
+			} else if (orgType === 'grid') {
+				const url = '/gov/org/grid/griddetail';
 				let params = {
-					gridId: id,
+					gridId: id
 				};
 				const { data, code, msg } = await requestPost(url, params);
 				if (code === 0) {
@@ -2604,12 +1963,12 @@ export default {
 							{
 								id: data.grid,
 								name: data.gridName,
-								type: orgType,
-							},
+								type: orgType
+							}
 						];
 					} else {
 						let hasBreadcrumbArr = false;
-						this.breadcrumbArr.forEach(function (bc) {
+						this.breadcrumbArr.forEach(function(bc) {
 							if (bc.id === id) {
 								hasBreadcrumbArr = true;
 							}
@@ -2618,7 +1977,7 @@ export default {
 							let breadcrumb = {
 								id: data.grid,
 								name: data.gridName,
-								type: orgType,
+								type: orgType
 							};
 							this.breadcrumbArr.push(breadcrumb);
 						}
@@ -2641,7 +2000,7 @@ export default {
 			const orgId = selectOrg.id;
 			const orgType = selectOrg.type;
 
-			if (orgType === "agency") {
+			if (orgType === 'agency') {
 				this.agencyTableListData = [];
 				this.agencyStaffTableListData = [];
 				this.departmentTableListData = [];
@@ -2658,7 +2017,7 @@ export default {
 				this.gridTableFlag = true;
 				this.gridStaffTableFlag = false;
 
-				this.assembleBreadcrumbArr(orgId, "agency");
+				this.assembleBreadcrumbArr(orgId, 'agency');
 				this.getAgencyList();
 				this.getDepartmentList();
 				this.getGridList();
@@ -2702,12 +2061,12 @@ export default {
 		},
 		// 获取组织区划信息
 		async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
-			const url = "/data/aggregator/org/nextlevelareacodelist";
+			const url = '/data/aggregator/org/nextlevelareacodelist';
 
 			let params = {
 				areaCode: areaCode,
 				level: parentAgencyLevel,
-				parentAgencyId: parentAgencyId,
+				parentAgencyId: parentAgencyId
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2720,7 +2079,7 @@ export default {
 		},
 
 		handelZoing(val) {
-			this.zonings.forEach((item) => {
+			this.zonings.forEach(item => {
 				if (item.areaCode == val) {
 					this.agencyForm.level = item.level;
 					this.agencyForm.areaName = item.areaName;
@@ -2729,7 +2088,7 @@ export default {
 			});
 		},
 		handelStreeOrCommunityZoing(val) {
-			this.zonings.forEach((item) => {
+			this.zonings.forEach(item => {
 				if (item.areaCode == val) {
 					this.OrgDetailsForm.level = item.level;
 					this.OrgDetailsForm.areaName = item.areaName;
@@ -2741,15 +2100,11 @@ export default {
 		addAgency() {
 			this.createAgencyDialogFlag = true;
 			this.addNewAgencyRest();
-			this.getZoning(
-				this.currentAreaCode,
-				this.currentAgencyId,
-				this.currentAgencyLevel
-			);
+			this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel);
 		},
 		// 新增组织确定按钮
 		async submitaddNewAgency() {
-			const url = "/gov/org/agency/addagency-v2";
+			const url = '/gov/org/agency/addagency-v2';
 
 			let params = {
 				parentAgencyId: this.currentAgencyId,
@@ -2763,13 +2118,13 @@ export default {
 				code: this.agencyForm.code,
 				remark: this.agencyForm.remark,
 				latitude: this.latitude,
-				longitude: this.longitude,
+				longitude: this.longitude
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("添加成功");
+				this.$message.success('添加成功');
 				this.createAgencyDialogFlag = false;
 				this.getAgencyList();
 				this.getDepartmentList();
@@ -2782,25 +2137,20 @@ export default {
 
 		// 修改面包屑
 		modifyOrgInfo() {
-			this.judgeOrgInfoLevel =
-				this.breadcrumbArr[this.breadcrumbArr.length - 1];
-			if (this.judgeOrgInfoLevel.type === "agency") {
+			this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length - 1];
+			if (this.judgeOrgInfoLevel.type === 'agency') {
 				this.getOrgDetailsById();
 				setTimeout(() => {
-					if (this.OrgDetailsForm.level === "district") {
+					if (this.OrgDetailsForm.level === 'district') {
 						/** 修改市区级弹窗 */
 						this.modifyCityOrgPop = true;
 					} else {
 						/** 街道级和社区级弹窗 */
-						this.getZoning(
-							this.parentAreaCode,
-							this.parentAgencyId,
-							this.parentAgencyLevel
-						);
+						this.getZoning(this.parentAreaCode, this.parentAgencyId, this.parentAgencyLevel);
 						this.streetOrCommunity = true;
 					}
 				}, 1000);
-			} else if (this.judgeOrgInfoLevel.type === "department") {
+			} else if (this.judgeOrgInfoLevel.type === 'department') {
 				/** 下级机关单位修改 */
 				this.OrgUnitPop = true;
 				this.getOrgUnitDetailsById();
@@ -2814,10 +2164,10 @@ export default {
 
 		// 根据id获取组织机构详细信息
 		async getOrgDetailsById() {
-			const url = "/gov/org/agency/agencydetail";
+			const url = '/gov/org/agency/agencydetail';
 
 			let params = {
-				agencyId: this.judgeOrgInfoLevel.id,
+				agencyId: this.judgeOrgInfoLevel.id
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2826,12 +2176,9 @@ export default {
 				this.currentAgencyLevel = data.level;
 				this.currentAreaCode = data.areaCode;
 				if (data.parentList && data.parentList.length > 0) {
-					this.parentAreaCode =
-						data.parentList[data.parentList.length - 1].areaCode;
-					this.parentAgencyId =
-						data.parentList[data.parentList.length - 1].id;
-					this.parentAgencyLevel =
-						data.parentList[data.parentList.length - 1].level;
+					this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode;
+					this.parentAgencyId = data.parentList[data.parentList.length - 1].id;
+					this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level;
 				}
 
 				this.OrgDetailsForm.level = data.level;
@@ -2852,10 +2199,10 @@ export default {
 
 		// 根据id获取下级机关单位详情
 		async getOrgUnitDetailsById() {
-			const url = "/gov/org/department/departmentdetail";
+			const url = '/gov/org/department/departmentdetail';
 
 			let params = {
-				departmentId: this.judgeOrgInfoLevel.id,
+				departmentId: this.judgeOrgInfoLevel.id
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2873,10 +2220,10 @@ export default {
 
 		// 根据id获取网格详情
 		async getGridDetailsById() {
-			const url = "/gov/org/grid/griddetail";
+			const url = '/gov/org/grid/griddetail';
 
 			let params = {
-				gridId: this.judgeOrgInfoLevel.id,
+				gridId: this.judgeOrgInfoLevel.id
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
@@ -2901,7 +2248,7 @@ export default {
 
 		// 市级/街道/社区级组织修改确定按钮
 		async sunmitModifyCityOrgPop() {
-			const url = "/gov/org/agency/editagency";
+			const url = '/gov/org/agency/editagency';
 
 			let params = {
 				agencyId: this.OrgDetailsForm.agencyId,
@@ -2911,13 +2258,13 @@ export default {
 				code: this.OrgDetailsForm.code,
 				latitude: this.latitude,
 				longitude: this.longitude,
-				remark: this.OrgDetailsForm.remark,
+				remark: this.OrgDetailsForm.remark
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("修改成功");
+				this.$message.success('修改成功');
 				this.modifyCityOrgPop = false;
 				this.streetOrCommunity = false;
 				this.getAgencyList();
@@ -2930,20 +2277,20 @@ export default {
 		},
 		// 修改下级机关单位确定按钮
 		async sunmitOrgUnitForm() {
-			const url = "/gov/org/department/editdepartment";
+			const url = '/gov/org/department/editdepartment';
 
 			let params = {
 				code: this.OrgUnitDetailsForm.code,
 				contacts: this.OrgUnitDetailsForm.contacts,
 				departmentId: this.OrgUnitDetailsForm.departmentId,
 				departmentName: this.OrgUnitDetailsForm.departmentName,
-				mobile: this.OrgUnitDetailsForm.mobile,
+				mobile: this.OrgUnitDetailsForm.mobile
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("修改成功");
+				this.$message.success('修改成功');
 				this.OrgUnitPop = false;
 				this.getAgencyList();
 				this.getDepartmentList();
@@ -2955,7 +2302,7 @@ export default {
 		},
 		// 修改网格确定按钮
 		async submitModifyGrid() {
-			const url = "/gov/org/grid/editgrid";
+			const url = '/gov/org/grid/editgrid';
 
 			let params = {
 				gridId: this.modifyGridFrom.griId,
@@ -2967,13 +2314,13 @@ export default {
 				gridType: this.modifyGridFrom.gridType,
 				sort: this.modifyGridFrom.gridSort,
 				latitude: this.modifyGridFrom.latitude,
-				longitude: this.modifyGridFrom.longitude,
+				longitude: this.modifyGridFrom.longitude
 			};
 
 			const { data, code, msg } = await requestPost(url, params);
 
 			if (code === 0) {
-				this.$message.success("修改成功");
+				this.$message.success('修改成功');
 				this.modifyGridPop = false;
 				this.getAgencyList();
 				this.getDepartmentList();
@@ -2987,15 +2334,9 @@ export default {
 		/** 地图初始化 */
 		createMap(type) {
 			let { latitude, longitude } = this[type] || this;
-			if (
-				latitude === null ||
-				latitude === "" ||
-				longitude === null ||
-				longitude === ""
-			) {
-				let { latitude: latitude2, longitude: longitude2 } =
-					this.$store.state.user;
-				if (!latitude2 || latitude2 == "" || latitude2 == "0") {
+			if (latitude === null || latitude === '' || longitude === null || longitude === '') {
+				let { latitude: latitude2, longitude: longitude2 } = this.$store.state.user;
+				if (!latitude2 || latitude2 == '' || latitude2 == '0') {
 					latitude = 39.9088810666821;
 					longitude = 116.39743841556731;
 				} else {
@@ -3004,17 +2345,17 @@ export default {
 				}
 			}
 			var map = new daiMap(
-				document.getElementById("con"),
+				document.getElementById('con'),
 				{ latitude, longitude },
 				{
 					zoom: 16.2, // 设置地图缩放级别
 					pitch: 43.5, // 设置俯仰角
-					rotation: 45, // 设置地图旋转角度
+					rotation: 45 // 设置地图旋转角度
 				}
 			);
 
 			// 监听地图平移结束
-			map.on("dragend", (e) => {
+			map.on('dragend', e => {
 				//修改地图中心点
 				const { lat, lng } = map.getCenter();
 				map.setMarker(lat, lng);
@@ -3028,8 +2369,8 @@ export default {
 			});
 
 			map.setMarker(latitude, longitude);
-		},
-	},
+		}
+	}
 };
 </script>
 

From 090ac6cc25dd9a36f95de073b70b45eaad1d0504 Mon Sep 17 00:00:00 2001
From: tianq <tianq>
Date: Thu, 27 Apr 2023 13:52:12 +0800
Subject: [PATCH 34/34] xlsx

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

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index c69687863..a5aaabc72 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -930,7 +930,7 @@ export default {
 				url,
 				params,
 				(data, rspMsg) => {
-					this.download(data, title + '.xls');
+					this.download(data, title + '.xlsx');
 				},
 				(rspMsg, data) => {
 					this.$message.error(rspMsg);