diff --git a/package-lock.json b/package-lock.json
index c403dafe..1fe58925 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20888,7 +20888,7 @@
     "fastclick": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
-      "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==",
+      "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=",
       "dev": true
     },
     "fastparse": {
@@ -21041,7 +21041,7 @@
     "font-awesome.css": {
       "version": "4.7.2",
       "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz",
-      "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA=="
+      "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI="
     },
     "for-in": {
       "version": "1.0.2",
@@ -28866,7 +28866,7 @@
     "vue-html5-editor": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz",
-      "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==",
+      "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=",
       "dev": true
     },
     "vue-lazyload": {
diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index d70982fe..f176adac 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -791,7 +791,7 @@ export function signProcessArchive(id) {
 // 签署合同下载
 export function signedContractDownload(id) {
   return request({
-    url: '/service/cbht/sign/download/' + id,
+    url: '/open/villageAffairs/public/sign/download/' + id,
     method: 'get'
   });
 }
@@ -799,7 +799,7 @@ export function signedContractDownload(id) {
 // 签字合同预览
 export function viewSignedContract(id) {
   return request({
-    url: '/service/cbht/sign/view/' + id,
+    url: '/open/villageAffairs/public/sign/view/' + id,
     method: 'get'
   });
 }
diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js
index a2465f01..bf4cca86 100644
--- a/src/api/sunVillage_info/sysCbf.js
+++ b/src/api/sunVillage_info/sysCbf.js
@@ -16,7 +16,13 @@ export function getCbfList(data){
     params:data
   })
 }
-
+// 获取承包方详情
+export function getCbfById(id) {
+  return request({
+    url: '/service/cbf/get/' + id,
+    method: 'get'
+  });
+}
 //查询承包地块列表
 export function getCbdkms(data){
   return request({
@@ -90,4 +96,30 @@ export function cbfDataStatistics(){
   })
 }
 
+// 承包方家庭成员
+export function listFamilyMember(params){
+  return request({
+    url: '/open/villageAffairs/public/familyMember/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 获取承包合同
+export function getContractByCode(params) {
+  return request({
+    url: '/open/villageAffairs/public/contract/detail',
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取承包地块信息
+export function listContractedLand(params) {
+  return request({
+    url: '/open/villageAffairs/public/contractedLand/list',
+    method: 'get',
+    params: params
+  });
+}
 
diff --git a/src/assets/images/sunVillage_info/cbfwsh.png b/src/assets/images/sunVillage_info/cbfwsh.png
new file mode 100644
index 00000000..31e5f8c1
Binary files /dev/null and b/src/assets/images/sunVillage_info/cbfwsh.png differ
diff --git a/src/assets/images/sunVillage_info/cbfwsq.png b/src/assets/images/sunVillage_info/cbfwsq.png
new file mode 100644
index 00000000..49d9d90e
Binary files /dev/null and b/src/assets/images/sunVillage_info/cbfwsq.png differ
diff --git a/src/router/index.js b/src/router/index.js
index 3405220b..ff538b07 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4056,6 +4056,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/sunVillage_info/list_cbfsq'], resolve)
   },
+  {
+    path: '/sunVillage_info/list_cbfsq_view',
+    name: 'sunVillageInfoListCbfsqView',
+    meta: {
+      title: '承包方授权',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/sunVillage_info/list_cbfsq_view'], resolve)
+  },
   { ////阳光村务（新）-- 合同信息
     path: '/sunVillage_info/list_vote_detail',
     name: 'sunVillageInfoListVoteDetail',
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 22f58a05..419f4f26 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -852,10 +852,13 @@ export default {
         if(this.form.id == null){
 
           let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
-          this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
-          if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
-          this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
-          this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          if(this.form.theGeomJson instanceof Array){
+            this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          }else if(typeof this.form.theGeomJson === 'string'){
+            let theGeometry  = JSON.parse( this.form.theGeomJson);
+            if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的
+              this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates));
+          }
           this.$set(this.form, 'surveyId', surveyItem.id)
           addZjdzd(this.form).then(response => {
             let _this =this;
diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue
index b768c4f9..daf1039c 100644
--- a/src/views/homesteadSurvey/fsssAdd.vue
+++ b/src/views/homesteadSurvey/fsssAdd.vue
@@ -44,7 +44,7 @@
         </van-row>
       </div>
     </van-sticky>
-    <van-form ref = "form">
+    <van-form ref="form">
       <div style="margin:1.6rem auto;background: #ffffff;width: 95%;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16);border-radius:15px;padding-top: 20px;">
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">附属设施信息</p>
         <!--<van-field
@@ -209,10 +209,13 @@ export default {
     },
     submitzjd(){
       this.$refs.form.validate().then(() => {
-        this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
-        if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
-        this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
-        this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+        if(this.form.theGeomJson instanceof Array){
+          this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+        }else if(typeof this.form.theGeomJson === 'string'){
+          let theGeometry  = JSON.parse( this.form.theGeomJson);
+          if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的
+            this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates));
+        }
       if(this.form.id == null){
         addFsss(this.form).then(response => {
           let _this =this
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index 014ff227..d08dd274 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -70,7 +70,13 @@
       </div>
     </div>
     <div v-if="active==1" style="height:calc( 100vh - 350px);margin-top: 14%;overflow-y:auto;">
-      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask" :immediate-check="false">
+        <van-list
+          v-model:loading="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          :immediate-check="false"
+          @load="onRefreshtask"
+        >
       <van-cell  v-for="(item,index) in totalList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
@@ -93,10 +99,17 @@
           <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{item.rwzxr}}</p>
         </template>
       </van-cell>
-      </van-pull-refresh>
+        </van-list>
+
     </div>
     <div v-if="active==2" style="height:calc( 100vh - 350px);margin-top: 14%;overflow-y:auto;">
-      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        :immediate-check="false"
+        @load="onRefreshtask"
+      >
       <van-cell  v-for="(item,index) in doneList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
@@ -120,10 +133,16 @@
           <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{item.rwzxr}}</p>
         </template>
       </van-cell>
-      </van-pull-refresh>
+      </van-list>
     </div>
     <div v-if="active==3" style="height:calc( 100vh - 350px);margin-top: 14%;overflow-y:auto;">
-      <van-pull-refresh v-model="isLoadingtask" @refresh="onRefreshtask">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        :immediate-check="false"
+        @load="onRefreshtask"
+      >
       <van-cell  v-for="(item,index) in todoList" :key="item.id" size="small" @click.native="setCookies(item)" style="border-radius: 16px;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:0px auto 20px;height: 110px;">
         <template #title>
@@ -146,7 +165,7 @@
           <p style="display: flex;align-items: center;margin-top: 5px;"><van-icon name="manager" color="#22b7f2" style="margin-right:5px;"/>{{item.rwzxr}}</p>
         </template>
       </van-cell>
-      </van-pull-refresh>
+      </van-list>
     </div>
 
   </div>
@@ -207,12 +226,10 @@
           nickName:"",
           text:0,
           isLoadingtask:false,
-          countqb:0,
-          countyhc:0,
-          countwhc:0,
+          countqb:1,
+          countyhc:1,
+          countwhc:1,
 
-          //宅调人员列表
-          taskExecutortions:[],
           //当前用户级别
           businessLevel:1,
           // 字典列表json
@@ -220,9 +237,6 @@
         };
       },
       created(){
-        userList().then(response => {
-          this.taskExecutortions = response.data
-        })
         if(this.checked){
           setTimeout(() => {
             let userId = this.$store.state.user.userId;
@@ -304,76 +318,66 @@
             }
           return  '#FA5353'
         },
-        taskExecutorChange(row){
-          if(row.taskExecutor!=null&&row.taskExecutor!=""&&row.taskExecutor.length>1){
-            var actions = [];
-            row.taskExecutor.map(res => {
-              for(let i = 0;i<this.taskExecutortions.length;i++){
-                if(res == this.taskExecutortions[i].userName){
-                  actions.push(this.taskExecutortions[i].nickName)
-                }
-              }
-            })
-            return actions.join(',');
-          }else{
-            var actions = [];
-            Object.keys(this.taskExecutortions).some((key) => {
-              if (this.taskExecutortions[key].userName == ('' + row.taskExecutor)) {
-                actions.push(this.taskExecutortions[key].nickName);
-                return true;
-              }
-            })
-            return actions.join(',');
-          }
-        },
         onRefreshtask(){
           this.isLoadingtask = false;
           let _this = this
-          if(this.active==1){
+          if(this.active==1 && this.loading ){
             let params = {
               "rwfbzt":"PUBLISHED",
-              "params":{deptId:this.$store.state.user.loginDeptId},
+              "params":this.queryParams.params,
+              "parentId":this.queryParams.parentId,
               "pageNum": this.countyhc+1,
-              "pageSize":10,
+              "pageSize":4,
             }
             listTask(params).then((response) => {
-              if(response.rows.length>0&&this.doneList.length<response.total){
+              if(response.rows.length>0&&this.totalList.length<response.total){
                 response.rows.map(res => {
-                  this.doneList.unshift(res)
+                  this.totalList.push(res)
                 })
                 this.countyhc++
+                this.loading = false;
+              }else{
+                this.finished = true;
               }
             });
-          }else if(this.active==2){
+          }else if(this.active==2 && this.loading){
             let params = {
               "rwwczt": "PUBLISHED",
               "rwfbzt":"PUBLISHED",
-              "params":{deptId:this.$store.state.user.loginDeptId},
+              "params":this.queryParams.params,
+              "parentId":this.queryParams.parentId,
               "pageNum": this.countwhc+1,
-              "pageSize":10,
+              "pageSize":4,
             }
             listTask(params).then((response) => {
-              if(response.rows.lenght>0&&this.todoList.length<response.total){
+              if(response.rows.lenght>0&&this.doneList.length<response.total){
                 response.rows.map(res => {
-                  this.todoList.unshift(res)
+                  this.doneList.push(res)
                 })
                 this.countwhc++
+                this.loading = false;
+              }else{
+                this.finished = true;
               }
             });
-          }else{
+          }else if(this.active==3 && this.loading){
             let params = {
-              "rwwczt": "UNPUBLISHED",
+              "rwwczt": "UNFINISHED",
               "rwfbzt":"PUBLISHED",
-              "params":{deptId:this.$store.state.user.loginDeptId},
+              "params":this.queryParams.params,
+              "parentId":this.queryParams.parentId,
               "pageNum": this.countqb+1,
-              "pageSize":10,
+              "pageSize":4,
             }
             listTask(params).then((response) => {
-              if(response.rows.length>0&&this.totalList.length<response.total){
+              if(response.rows.length>0&&this.todoList.length<response.total){
                 response.rows.map(res => {
-                  this.totalList.unshift(res)
+                  this.todoList.push(res)
                 })
                 this.countqb++
+                this.loading = false;
+              }else{
+                this.finished = true
               }
             });
           }
@@ -440,6 +444,14 @@
           this.queryNum();
         },
         checkBadge(){
+          this.finished = false;
+          this.loading = false;
+          this.countqb = 1;
+          this.countyhc = 1;
+          this.countwhc = 1;
+          this.totalList = []
+          this.doneList = [];
+          this.todoList = [];
           this.getList();
           this.queryNum();
         },
@@ -464,10 +476,14 @@
             });
           }else{
             this.$set(this.switchParams, "rwzxr", null);
+            if(this.switchParams.parentId == null){
+              this.$set(this.switchParams, "params", {deptId:100});
+            }
             listTask(this.switchParams).then(response => {
               this.done = 0;
               this.todo = 0;
               this.total = response.total;
+              console.info(this.total)
               response.rows.map(res => {
                 if(res.rwwczt == "FINISHED"){
                   this.done+=1
@@ -485,16 +501,16 @@
           if(this.active==1) {
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "rwwczt", null);
-            this.$set(this.queryParams, "pageNum",  this.countyhc + 1);
-            this.$set(this.queryParams, "pageSize",  10);
+            this.$set(this.queryParams, "pageNum",  this.countyhc);
+            this.$set(this.queryParams, "pageSize",  4);
           }else if(this.active==2) {
             this.$set(this.queryParams, "rwwczt", "FINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
-            this.$set(this.queryParams, "pageNum",  this.countwhc + 1);
+            this.$set(this.queryParams, "pageNum",  this.countwhc);
           }else{
             this.$set(this.queryParams, "rwwczt", "UNFINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
-            this.$set(this.queryParams, "pageNum",  this.countqb + 1);
+            this.$set(this.queryParams, "pageNum",  this.countqb);
           }
           listTask(this.queryParams).then(response => {
             if(this.active==1) {
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 3463933d..886fe8f1 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -800,7 +800,7 @@
                   this.loading2 = false
                 }else{
                   this.loading2 = false
-                  this.loading2 = true
+                  this.finished2 = true
                 }
               });
           }else if(this.active==1&&this.loading2){
diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue
index b4f7b9ff..77442637 100644
--- a/src/views/homesteadSurvey/list2.vue
+++ b/src/views/homesteadSurvey/list2.vue
@@ -56,7 +56,7 @@
         </template>
       </van-search>
       <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
-        <van-button type="primary" style="width:110px;height: 20px;font-size: 12px;" round @click="onClickWcnh">增加外村农户</van-button>
+        <van-button type="primary" style="width:110px;height: 30px;font-size: 12px;" round @click="onClickWcnh">增加外村农户</van-button>
       </div>
     </van-sticky>
 
@@ -86,27 +86,8 @@
       </template>
     </van-cell>
     </van-list>
-    <van-dialog v-model="outsideOpen"  title="外村农户" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" >
-      <van-row>
-        <van-col span="24">
-          <van-field  v-model="outsideForm.nhdm" label="外村农户" placeholder="外村农户" input-align="right"  required :rules="[{ required: true }]"  @click="showWcnh = true"/>
-          <van-popup  v-model="showWcnh" position="bottom">
-            <van-search placeholder="请输入" v-model="hnncValue" />
-            <van-picker
-              show-toolbar
-              :columns="wcnhnewList"
-              @confirm="nhChange"
-              value-key="nhValue"
-              @cancel="showWcnh = false"
-            />
-          </van-popup>
-          <br/>
-          <br/>
-        </van-col>
-
-      </van-row>
-
-
+    <van-dialog v-model="outsideOpen" title="外村农户"  show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" @cancel="outsideCancel" >
+    <wcnhList  style="height: 600px;overflow: auto;"  ref="wcnh"/>
     </van-dialog>
 <!--    </van-pull-refresh>-->
   </div>
@@ -124,12 +105,14 @@
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import {deptGetId,} from "@/api/homestead/index";
+    import wcnhList from "@/views/homesteadSurvey/wcnhList";
     import $ from "jquery";
     import {Dialog} from "vant";
     import {ref} from "vue";
     import axios from "axios";
     export default {
       name: "homesteadList",
+      components: { wcnhList},
       data() {
         return {
           loading1:false,
@@ -819,9 +802,7 @@
         },
         /** 新增外村农户按钮操作 */
         onClickWcnh(){
-          this.getWcnhList().then((resp) => {
-            this.outsideOpen = true;
-          });
+          this.outsideOpen = true;
         },
         getWcnhList() {
           return queryHomesteadnhhncyList({
@@ -4940,15 +4921,32 @@
           value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
           value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
         },
+        /** 外村农户关闭事件 */
+        outsideCancel(){
+          this.$refs.wcnh.clearSelection();
+        },
         /** 外村农户提交按钮 */
         outsideSubmitForm() {
-          addOutsidenhhncy(this.outsideForm).then(response => {
-            if(response.code != 200) throw response.msg;
-            this.$toast("新增成功");
-            this.outsideOpen = false;
-            this.getList();
-            this.outDiglogStatus = true;
-          }).catch(() => this.outDiglogStatus = true);
+          let wcnhData = this.$refs.wcnh.wcnhData;
+          if(wcnhData == null){
+            this.$toast("请选择外村农户！");
+          }else {
+            this.$toast.loading({
+              message: "数据处理中",
+              forbidClick: true,
+              duration: 100000,
+            });
+            addOutsidenhhncy(wcnhData).then(response => {
+              if(response.code != 200) throw response.msg;
+              this.$toast.clear();
+              this.$toast("新增成功");
+              this.$refs.wcnh.clearSelection();
+              this.outsideOpen = false;
+              this.getList();
+              this.outDiglogStatus = true;
+            }).catch(() => this.outDiglogStatus = true);
+          }
+
         },
         closeSearchBox(){
           this.showSearch = false ;
diff --git a/src/views/homesteadSurvey/list4.vue b/src/views/homesteadSurvey/list4.vue
index 883e12e3..de0608e6 100644
--- a/src/views/homesteadSurvey/list4.vue
+++ b/src/views/homesteadSurvey/list4.vue
@@ -495,10 +495,10 @@
         <van-search
           v-model="seachText"
           show-action
-          placeholder="请输入宗地或权利人信息"
+          placeholder="请输入权利人信息"
         >
           <template #action>
-            <van-icon :name="require('../../assets/images/housesteadSurvey/add02.png')"  color="rgba(122,201,67,1)" size=".8rem" id="query" style="vertical-align:middle;"/>
+            <van-icon :name="require('../../assets/images/housesteadSurvey/add02.png')"  color="rgba(122,201,67,1)"  id="query" style="vertical-align:middle;"/>
           </template>
         </van-search>
         <div class="searchBox" style="display: none;">
@@ -1228,7 +1228,7 @@
     import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
     import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz";
     import {listFsss,getFsssZjdDmList,getFsss} from "@/api/homesteadSurvey/fsss";
-    import {getGeoServerConfigKey} from "@/api/system/config";
+    import {getGeoServerConfigKey,getConfigKey} from "@/api/system/config";
     import { listTown, getTown } from "@/api/homesteadSurvey/town";
     import { listVillage} from "@/api/homesteadSurvey/village";
     import {deptGetId,} from "@/api/homestead/index";
@@ -1287,6 +1287,11 @@
           showhncylist:false,
           showhncy:false,
           activeBtn:4,
+          mapGeoServerUrl:"",
+          mobileSurveykey:'',
+          mobileSurveyZrzkey:"",
+          mobileSurveyFssskey:"",
+          mobileSurveyCjqykey:"",
           value:'',
           // 宅基地搜索框
           zjdvalue:"",
@@ -3018,6 +3023,18 @@
           //     });
           //   }
           // });
+          getConfigKey("geoserver.layer.homestead.mobileSurvey").then(response => {
+            this.mobileSurveykey = response.msg;
+          });
+          getConfigKey("geoserver.layer.building").then(response => {
+            this.mobileSurveyZrzkey = response.msg;
+          });
+          getConfigKey("geoserver.layer.annex").then(response => {
+            this.mobileSurveyFssskey = response.msg;
+          });
+          getConfigKey("geoserver.layer.villageBorder").then(response => {
+            this.mobileSurveyCjqykey = response.msg;
+          });
           //通过数据直接查询方式--------加载较慢 end
           getGeoServerConfigKey().then(response => {
             this.mapGeoServerUrl = response.msg;
@@ -3025,6 +3042,7 @@
               this.GetMapsInit();
             }, 300);
           });
+
           var that = this;
           setTimeout(function () {
             var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
@@ -3109,7 +3127,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homespace_cjqy',
+                LAYERS: that.mobileSurveyCjqykey,
                 TILED: true,
                 cql_filter: cql_filter,
                 SRID: 3857,
@@ -3285,22 +3303,22 @@
           //村边界查询开始 ------------------------------end
           //国有数据加载-----------------------------------start
 
-          deptGetId(that.surveyItem.deptId).then((res) => {
-            var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
-            var guoyouTc = new ol.layer.Image({
-              source: new ol.source.ImageWMS({
-                url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
-                params: {
-                  LAYERS: 'zjd_gydl:DLTB',
-                  TILED: true,
-                  cql_filter: cql_filter_guoyou,
-                  SRID: 3857,
-                  TIMESTAMP: new Date().getTime(),
-                },
-              }),
-            });
-            map.addLayer(guoyouTc);
-          });
+          // deptGetId(that.surveyItem.deptId).then((res) => {
+          //   var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
+          //   var guoyouTc = new ol.layer.Image({
+          //     source: new ol.source.ImageWMS({
+          //       url: that.mapGeoServerUrl + "/wms",
+          //       params: {
+          //         LAYERS: 'zjd_gydl:DLTB',
+          //         TILED: true,
+          //         cql_filter: cql_filter_guoyou,
+          //         SRID: 3857,
+          //         TIMESTAMP: new Date().getTime(),
+          //       },
+          //     }),
+          //   });
+          //   map.addLayer(guoyouTc);
+          // });
           //国有数据加载----------------------------------end
           //宅基地图层查询开始 ------------------start
           //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
@@ -3308,7 +3326,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                LAYERS: that.mobileSurveykey,
                 TILED: true,
                 cql_filter: cql_filter+" and survey_status = '1'",
                 SRID: 3857,
@@ -3320,7 +3338,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                LAYERS: that.mobileSurveykey,
                 TILED: true,
                 cql_filter: cql_filter+" and survey_status = '2'",
                 SRID: 3857,
@@ -3332,7 +3350,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                LAYERS: that.mobileSurveykey,
                 TILED: true,
                 cql_filter: cql_filter+" and survey_status = '3'",
                 SRID: 3857,
@@ -3344,7 +3362,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                LAYERS: that.mobileSurveykey,
                 TILED: true,
                 cql_filter: cql_filter+" and survey_status = '4'",
                 SRID: 3857,
@@ -3356,7 +3374,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+                LAYERS: that.mobileSurveykey,
                 TILED: true,
                 cql_filter: cql_filter+" and survey_status = '5'",
                 SRID: 3857,
@@ -3370,7 +3388,7 @@
             service: "WFS",
             version: "1.0.0",
             request: "GetFeature",
-            typename: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
+            typename:that.mobileSurveykey,
             //featureNS: 'nsgk_hc',//命名空间 URI
             cql_filter: cql_filter,
             //featurePrefix: 'nationalwater',//工作区名称
@@ -3400,7 +3418,7 @@
                   source: new ol.source.ImageWMS({
                     url: that.mapGeoServerUrl + "/wms",
                     params: {
-                      LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
+                      LAYERS: that.mobileSurveyZrzkey,
                       TILED: true,
                       cql_filter: cql_filter_map,
                       SRID: 3857,
@@ -3416,7 +3434,7 @@
                   source: new ol.source.ImageWMS({
                     url: that.mapGeoServerUrl + "/wms",
                     params: {
-                      LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+                      LAYERS: that.mobileSurveyFssskey,
                       TILED: true,
                       cql_filter: cql_filter_map,
                       SRID: 3857,
@@ -3533,7 +3551,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
+                LAYERS: that.mobileSurveyZrzkey,
                 TILED: true,
                 cql_filter: cql_filter,
                 SRID: 3857,
@@ -3549,7 +3567,7 @@
             source: new ol.source.ImageWMS({
               url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+                LAYERS: that.mobileSurveyFssskey,
                 TILED: true,
                 cql_filter: cql_filter,
                 SRID: 3857,
@@ -4602,7 +4620,7 @@
               service: "WFS",
               version: "1.0.0",
               request: "GetFeature",
-              typename: "nsgk_wulanhaote:t_homespace_cjqy",
+              typename: that.mobileSurveyCjqykey,
               //featureNS: 'nsgk_hc',//命名空间 URI
               cql_filter: cql_filter,
               //featurePrefix: 'nationalwater',//工作区名称
@@ -4624,10 +4642,11 @@
                 return geojsonmap;
               })
               .then((data) => {
-                let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize());
-                resolution:resolution + Math.random() * 0.00000001,
-                map.getView().fit(data.bbox);
-                map.getView().setResolution(resolution);
+                  let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize());
+                  resolution:resolution + Math.random() * 0.00000001,
+                    map.getView().fit(data.bbox);
+                  map.getView().setResolution(resolution);
+
                 // var datamap = data.bbox;
                 // var center = ol.extent.getCenter(datamap);
                 // map.getView().animate({
@@ -4655,7 +4674,7 @@
           var wmsSource = new ol.source.TileWMS({
             url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
+              LAYERS:that.mobileSurveykey,
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4668,7 +4687,7 @@
           var ZjdwmsSource = new ol.source.TileWMS({
             url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
+              LAYERS: that.mobileSurveykey,
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4681,7 +4700,7 @@
           var ZrzwmsSource = new ol.source.TileWMS({
             url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "nsgk_wulanhaote:t_homespace_zrz",
+              LAYERS: that.mobileSurveyZrzkey,
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4694,7 +4713,7 @@
           var FssswmsSource = new ol.source.TileWMS({
             url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: "nsgk_wulanhaote:t_homestead_fsss",
+              LAYERS: that.mobileSurveyFssskey,
               TILED: true,
               SRID: 3857,
               serverType: "geoserver",
@@ -4879,7 +4898,7 @@
                             source: new ol.source.ImageWMS({
                               url: that.mapGeoServerUrl + "/wms",
                               params: {
-                                LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
+                                LAYERS: that.mobileSurveyZrzkey,
                                 TILED: true,
                                 cql_filter: cql_filter_map,
                                 SRID: 3857,
@@ -5068,7 +5087,7 @@
                               source: new ol.source.ImageWMS({
                                 url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
+                                  LAYERS: that.mobileSurveyZrzkey,
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5084,7 +5103,7 @@
                               source: new ol.source.ImageWMS({
                                 url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+                                  LAYERS: that.mobileSurveyFssskey,
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5255,7 +5274,7 @@
                               source: new ol.source.ImageWMS({
                                 url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
+                                  LAYERS: that.mobileSurveyZrzkey,
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
@@ -5271,7 +5290,7 @@
                               source: new ol.source.ImageWMS({
                                 url: that.mapGeoServerUrl + "/wms",
                                 params: {
-                                  LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+                                  LAYERS: that.mobileSurveyFssskey,
                                   TILED: true,
                                   cql_filter: cql_filter_map,
                                   SRID: 3857,
diff --git a/src/views/homesteadSurvey/nhDetails.vue b/src/views/homesteadSurvey/nhDetails.vue
index ab7f1b25..f94f2145 100644
--- a/src/views/homesteadSurvey/nhDetails.vue
+++ b/src/views/homesteadSurvey/nhDetails.vue
@@ -1485,7 +1485,7 @@
         submitzjd(){
           this.$refs.form.validate().then(() => {
             if(this.form.id == null){
-              addNh(this.form).then(response => {
+              addNhhncy(this.form).then(response => {
                 let _this =this
                 this.$toast({
                   icon: 'success', // 找到自己需要的图标
@@ -1497,7 +1497,7 @@
                 })
               });
             }else{
-              updateNh(this.form).then(response => {
+              updateNhhncy(this.form).then(response => {
                 let _this =this
                 this.$toast({
                   icon: 'success', // 找到自己需要的图标
diff --git a/src/views/homesteadSurvey/nhcyList.vue b/src/views/homesteadSurvey/nhcyList.vue
index 10e81d96..3d57b578 100644
--- a/src/views/homesteadSurvey/nhcyList.vue
+++ b/src/views/homesteadSurvey/nhcyList.vue
@@ -55,6 +55,7 @@
         <p style="display: flex;align-items: center;">
           <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
           <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
+          <span style="line-height: 1;font-size: 16px;margin-left: 70%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
         </p>
         <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
           <p style="flex:1;text-align:left;">证件号码:</p>
@@ -135,6 +136,7 @@ export default {
       // 使用权人列表
       shyqrData:{},
       hnnylist:[],
+      yhzgxList:[],
       permission:false,
       guohuData: {
         visible: false,
@@ -145,6 +147,9 @@ export default {
     };
   },
   created(){
+    this.houseGetDicts("family_status").then((response) => {
+      this.yhzgxList = response.data;
+    });
     this.shyqrData = this.$route.query;
     this.permission = localStorage.getItem("executePermission");
     this.getList();
@@ -172,6 +177,9 @@ export default {
       this.$router.push({name: this.$router.back(-1)});
       // }
     },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
     handleToHuzhu(row) {
       const ids = row.id || this.ids;
       Dialog.confirm({
diff --git a/src/views/homesteadSurvey/wcnhList.vue b/src/views/homesteadSurvey/wcnhList.vue
new file mode 100644
index 00000000..eff5cfec
--- /dev/null
+++ b/src/views/homesteadSurvey/wcnhList.vue
@@ -0,0 +1,4922 @@
+<template>
+  <div class="app-container"
+    <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
+
+    <van-list
+      v-model:loading="loading2"
+      :finished="finished2"
+      finished-text="没有更多了"
+      :immediate-check="false"
+      @load="onRefreshShyqr"
+    >
+      <van-sticky>
+        <van-search v-model="nhvalue" placeholder="请输入农户姓名"  @search="onSearch" ></van-search>
+      </van-sticky>
+      <van-cell  v-for="(item,index) in nhlist" :key="index" size="small" :clickable="true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
+
+        <template #title>
+          <div style="display: flex;align-items: center;">
+            <van-checkbox name="item.id" v-model="item.checkbox" @click="handleSelectionChange(item)"/>
+            <p style="display: flex;align-items: center;margin-left: 1%">
+              <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+              <span style="line-height: 1;">{{item.hzxm}}</span>
+            </p>
+<!--            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>-->
+
+          </div>
+        </template>
+        <template #label>
+          <p style="display: flex;align-items: center;margin-top: 10px;margin-left: 9%"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.hzzjhm}}</span> </p>
+          <p style="display: flex;align-items: center;margin-top: 5px;margin-left: 9%"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
+        </template>
+      </van-cell>
+    </van-list>
+    <!--    </van-pull-refresh>-->
+  </div>
+</template>
+
+<script>
+  import {getQueryLand,getZjdzd,delZjdzdInfo,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+  import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
+  import {addNhhncy, delNhhncy,queryHomesteadnhhncyList, addOutsidenhhncy,exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
+  import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
+  import {listSuyqr,updateSuyqr,addSuyqr} from "@/api/homesteadSurvey/suyqr";
+  import {listZrz,getZrzZjdDmList,getZrz} from "@/api/homesteadSurvey/zrz";
+  import {listFsss,getFsssZjdDmList,getFsss} from "@/api/homesteadSurvey/fsss";
+  import {getGeoServerConfigKey} from "@/api/system/config";
+  import { listTown, getTown } from "@/api/homesteadSurvey/town";
+  import { listVillage} from "@/api/homesteadSurvey/village";
+  import {deptGetId,} from "@/api/homestead/index";
+  import $ from "jquery";
+  import {Dialog} from "vant";
+  import {ref} from "vue";
+  import axios from "axios";
+  export default {
+    name: "homesteadList",
+    data() {
+      return {
+        loading1:false,
+        finished1:false,
+        loading2:false,
+        finished2:false,
+        loading3:false,
+        finished3:false,
+        //全部
+        qbNums:0,
+        //已调查数量
+        yhcNums:0,
+        //未数量
+        whcNums:0,
+        // 总户数
+        totalH:0,
+        // 总人数
+        totalR:0,
+        zjdSx:true,
+        zrzSx :true,
+        fsssSx:true,
+        wcnhData:null,
+        showhncysjly:false,
+        showhzsjly:false,
+        showhncycybz:false,
+        showhncyzjlx:false,
+        showhncyyhzgx:false,
+        showhzjzhcssfyzf:false,
+        showhncyoccupation:false,
+        showhncyjzqk:false,
+        showhzoccupation:false,
+        showhzjzqk:false,
+        // 下拉刷新
+        isLoadingnh:false,
+        countnh:0,
+        isLoadingzjd:false,
+        countqb:1,
+        countyhc:1,
+        countwhc:1,
+        // 使用权人表单弹出
+        shownh:false,
+        showhzht:false,
+        showhzlx:false,
+        showhncylist:false,
+        showhncy:false,
+        showWcnh: false,
+        activeBtn:2,
+        value:'',
+        // 宅基地搜索框
+        zjdvalue:"",
+        // 使用权人搜索框
+        nhvalue:"",
+        active:2,
+        // 全部列表
+        list:[],
+        // 已列表
+        list1:[],
+        // 未列表
+        list2:[],
+        // 户主列表
+        nhlist:[],
+        // 户内成员表单
+        form5: {},
+        // 户内成员列表
+        hncylist:[],
+        currentRate:20,
+        // 使用权人
+        nhform:[],
+        // 户主列表
+        hzform:{},
+        // 权利人列表
+        qlrform:[],
+        hnncValue:"",
+        // 权利人性质弹出框
+        showsuyqxz:false,
+        // 代理人证件类型弹出框
+        showdlrzjlx:false,
+        // 代表人证件类型弹出框
+        showdbrzjlx:false,
+        // 数据来源弹出框
+        showsjly:false,
+        // 证件类型字典
+        zjlxOptions: [],
+        // 所有权性质字典
+        suyqxzOption: [],
+        // 婚姻状况字典
+        hyzkOptions:[],
+        // 数据来源字典
+        sjlyOptions:[],
+        // 居住情况字典
+        jzqkOptions:[],
+        // 与户主关系字典
+        yhzgxOptions:[],
+        // 职业字典
+        occupationOptions:[],
+        // 集镇或城市是否有住房字典
+        jzhcssfyzfOptions:[],
+        // 成员备注字典
+        cybzOptions:[],
+        columns:[],
+        show1:false,
+        showhzzjlx: false,
+        // 路由传过来的任务基本信息。
+        item: {},
+        //地图使用 --start
+        openMap: false,
+        mapTheGeomZrzId: null,
+        mapTheGeomZjdId: null,
+        mapTheGeomFsssId: null,
+        drawInsert:null,
+        mapZjdData:"",
+        mapZrzData:"",
+        mapFsssData:"",
+        mapZjdDataTure:"",
+        mapZjdTeAll:{
+          active:"",
+          mapZjdAData:{},
+          mapZrzAData:{},
+          mapFsssAData:{},
+        },
+        mapHaDataValue:false,
+        mapHasDateStatus: 0, //0附属设施  1自然幢  2宅基地
+        selectionIconShow:false,
+        homesteadListStatus:false,
+        //地图绘制状态
+        draw: {
+          drawMapPolygon: false, //绘制地图
+        },
+        mapTownList: null,
+        mapVillageList: null,
+        coordinate:"",
+        checked:['zjdSx', 'zrzSx', 'fsssSx'],
+        checkAllMap: false,
+        sx:"",
+        drawingClick:true,
+        //搜索---start
+        seachText: "",
+        //搜索栏目-操作栏显隐
+        searchBarOperVisbile: false,
+        mapDataAll: [],
+        showSearch:false,
+        outsideOpen:false,
+        outsideForm:{nhdm:null},
+        wcnhList:[],
+        wcnhnewList:[],
+        bottomHeight:'0px',
+        //搜索---end
+        //测面
+        textMjAll:"",
+        clickBbox:"",
+        textMjAllNum:"",
+        //核查
+        zjdHcDy:"",
+        //绘图
+        htZjdZrzFsss:"",
+        //筛选
+        checkAllFlag: true,
+        CheckedAllArr: [],//全选数组
+        dataForm: {
+          imageUrl: []
+        },
+        dataList: [["fsssSx"],["zjdSx"],["zrzSx"]],          //地图使用 --end
+        checkBoxAll:[],
+        //地图跳转存之
+        mapAddJump:"",
+        mapAddJumpNum:"",
+        nhdm:"",
+        backTheGeom:"",
+        //地图服务地址
+        mapGeoServerUrl:"",
+        backMap:"",
+        // 任务完成标记
+        //宅基地点击事件
+        mapXs: false,
+        mapClick:"",
+        isFinished:false,
+        //
+        showImageList:false,
+        uploadImgList:[],
+        uploadImgList1:[],
+        // 字典列表json
+        dictTypeList:null,
+      };
+    },
+    mounted(){
+    },
+    created(){
+      axios.get('../static/dictyType.json').then(res => {
+        this.dictTypeList = res.data
+        this.zjlxOptions = this.dictTypeList.zjlx;
+        this.suyqxzOptions = this.dictTypeList.qsxz;
+        this.sjlyOptions = this.dictTypeList.sjly;
+        this.hyzkOptions = this.dictTypeList.hyzk;
+        this.occupationOptions = this.dictTypeList.occupation;
+        this.jzqkOptions = this.dictTypeList.living_condition;
+        this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
+        this.cybzOptions = this.dictTypeList.member_remark;
+      })
+      this.getNh();
+    },
+    methods: {
+      showUploadList(){
+        this.showImageList = true;
+      },
+      submitUploadList(){
+        submitUploadImageList(this.uploadImgList1).then(res => {
+          let _this = this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '上传成功',
+            duration:"1000",
+            onClose:function(){
+              _this.showImageList = false
+            }
+          })
+        })
+      },
+      onSearch(){
+        this.getNh();
+      },
+      // 图片上传前
+      beforeReadImageList(file){
+        let _this = this
+        if(file.length!=undefined){
+          file.map(res => {
+            let zjddm = res.file.name
+            //zjddm=zjddm.substring(0,zjddm.lastIndexOf("\("));
+            // 创建Canvas对象(画布)
+            let canvas =  document.createElement('canvas')
+            // 获取对应的CanvasRenderingContext2D对象(画笔)
+            let context = canvas.getContext('2d')
+            // 创建新的图片对象
+            let img = new Image()
+            // 指定图片的DataURL(图片的base64编码数据)
+            img.src = res.content
+            // 监听浏览器加载图片完成，然后进行进行绘制
+            img.onload = () => {
+              /*const h = img.height
+                const w = img.width*/
+              let ch = img.height/5
+              let cw = img.width/5
+              let canvas = document.createElement('canvas')
+              let ctx = canvas.getContext('2d')
+              canvas.height = ch
+              canvas.width = cw
+              ctx.clearRect(0,0,cw,ch)
+              ctx.drawImage(img,0,0,cw,ch)
+              let base_img = canvas.toDataURL('image/jpeg')
+              let blobBin = atob(base_img.split(',')[1])
+              let d = []
+              for (let i=0;i<blobBin.length;i++){
+                d.push(blobBin.charCodeAt(i))
+              }
+              let data2 = new FormData();
+              data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
+              uploadFile(data2).then(response => {
+                let p={
+                  "zjddm":zjddm,
+                  "url":response.fileName
+                }
+                _this.uploadImgList1.push(p)
+              })
+            }
+          })
+        }else{
+          let zjddm = file.file.name
+          //zjddm=zjddm.substring(0,zjddm.lastIndexOf("\("));
+          // 创建Canvas对象(画布)
+          let canvas =  document.createElement('canvas')
+          // 获取对应的CanvasRenderingContext2D对象(画笔)
+          let context = canvas.getContext('2d')
+          // 创建新的图片对象
+          let img = new Image()
+          // 指定图片的DataURL(图片的base64编码数据)
+          img.src = file.content
+          // 监听浏览器加载图片完成，然后进行进行绘制
+          img.onload = () => {
+            /*const h = img.height
+              const w = img.width*/
+            let ch = img.height/5
+            let cw = img.width/5
+            let canvas = document.createElement('canvas')
+            let ctx = canvas.getContext('2d')
+            canvas.height = ch
+            canvas.width = cw
+            ctx.clearRect(0,0,cw,ch)
+            ctx.drawImage(img,0,0,cw,ch)
+            let base_img = canvas.toDataURL('image/jpeg')
+            let blobBin = atob(base_img.split(',')[1])
+            let d = []
+            for (let i=0;i<blobBin.length;i++){
+              d.push(blobBin.charCodeAt(i))
+            }
+            let data2 = new FormData();
+            data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'}));
+            uploadFile(data2).then(response => {
+              let p={
+                "zjddm":zjddm,
+                "url":response.fileName
+              }
+              _this.uploadImgList1.push(p)
+            })
+          }
+        }
+
+      },
+      deleteFileImageList(file){
+        let url = file.file.name
+        this.uploadImgList1.map((res,index) => {
+          if(res.zjddm==url){
+            this.uploadImgList1.remove(index);
+          }
+        })
+      },
+      validatorIdcardqlr(val){
+        if(this.qlrform.dbrzjlx=='01'){
+          if(this.vcheckID(val)){
+            return true
+          }else {
+            return false
+          }
+        }else{
+          return true
+        }
+      },
+      validatorIdcardnh(val){
+        if(this.nhform.hzzjlx=='01'){
+          if(this.vcheckID(val)){
+            return true
+          }else {
+            return false
+          }
+        }else{
+          return true
+        }
+      },
+      validatorIdcardhncy(val){
+        if(this.form5.zjlx=='01'){
+          if(this.vcheckID(val)){
+            return true
+          }else {
+            return false
+          }
+        }else{
+          return true
+        }
+      },
+      checkCode(val) {
+        var p = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+        var factor = [ 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 ];
+        var parity = [ 1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2 ];
+        var code = val.substring(17);
+        if(p.test(val)) {
+          var sum = 0;
+          for(var i=0;i<17;i++) {
+            sum += val[i]*factor[i];
+          }
+          if(parity[sum % 11] == code.toUpperCase()) {
+            return true;
+          }
+        }
+        return false;
+      },
+      checkDate (val) {
+        var pattern = /^(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)$/;
+        if(pattern.test(val)) {
+          var year = val.substring(0, 4);
+          var month = val.substring(4, 6);
+          var date = val.substring(6, 8);
+          var date2 = new Date(year+"-"+month+"-"+date);
+          if(date2 && date2.getMonth() == (parseInt(month) - 1)) {
+            return true;
+          }
+        }
+        return false;
+      },
+      checkProv(val) {
+        var pattern = /^[1-9][0-9]/;
+        var provs = {11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古",21:"辽宁",22:"吉林",23:"黑龙江 ",31:"上海",32:"江苏",33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南",42:"湖北 ",43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆",51:"四川",52:"贵州",53:"云南",54:"西藏 ",61:"陕西",62:"甘肃",63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门"};
+        if(pattern.test(val)) {
+          if(provs[val]) {
+            return true;
+          }
+        }
+        return false;
+      },
+      vcheckID(val){
+        if(this.checkCode(val)) {
+          var date = val.substring(6,14);
+          if(this.checkDate(date)) {
+            if(this.checkProv(val.substring(0,2))) {
+              return true;
+            }
+          }
+        }
+        return false;
+      },
+
+      // 字数限制
+      limitWords(val){
+        if(val==null||val==""){
+          return "无"
+        }else{
+          if(val.length>11){
+            val = val.slice(0,10) +"..."
+          }
+          return val
+        }
+      },
+      // 与户主关系翻译
+      yhzgxfy(value){
+        let label
+        this.yhzgxOptions.map(res => {
+          if(res.dictValue == value){
+            label = res.dictLabel
+          }
+        })
+        return label
+      },
+      onRefreshShyqr(){
+        console.info(this.loading2);
+        this.isLoadingzjd = false;
+        if(this.loading2){
+          let params = {
+            deptId : this.item.deptId,
+            hzxm : this.nhvalue,
+            sfbccm : "0",
+            pageNum: this.countyhc+1,
+            pageSize:5,
+          }
+          listNh(params).then((response) => {
+            if(response.rows.length>0&&response.rows.length<response.total){
+              response.rows.map(res => {
+                this.nhlist.push(res)
+              })
+              this.countyhc++
+              this.loading2 = false
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
+            console.info( this.loading2);
+          });
+
+        }
+      },
+      onRefreshnh(){
+        this.isLoadingnh = false
+        let params = {
+          "deptId" : this.item.deptId,
+          "pageNum": this.countnh+1,
+          "pageSize":5,
+        }
+        listNh(params).then((response) => {
+          if(response.rows.length>0&&this.nhlist.length<response.total){
+            response.rows.map(res => {
+              this.nhlist.unshift(res)
+            })
+            this.countnh++
+          }
+        });
+      },
+      setCookies(item){
+        //this.$cookies.set("search",JSON.stringify(item));
+        this.$cookies.set("search","");
+        // let _this = this
+        // setTimeout(function(){
+        //   _this.$router.push({name:'homesteadAdd'});
+        // },1000)
+
+        this.$router.push({path:'/homesteadSurvey/add',query: {res: item}});
+      },
+      // 入户核查搜索框新增。
+      onClickzjd(){
+        this.$cookies.remove("search");
+        this.$router.push({name:'homesteadAdd'});
+      },
+      // 农户信息搜索框新增。
+      onClicknh(){
+        this.$cookies.remove("search");
+        this.$router.push({name:'hncyDetails',query:{item:{}}});
+      },
+      /** 新增外村农户按钮操作 */
+      onClickWcnh(){
+        this.outsideOpen = true;
+      },
+      nhChange(val){
+        this.outsideForm = val;
+        this.showWcnh = false;
+      },
+      // 返回
+      onClickLeft(){
+        this.$cookies.set("search","")
+        this.$router.push({name: this.$router.back(-1)});
+      },
+      onConfirmhncysjly(value){
+        this.form5.sjlyName = value.dictLabel
+        this.form5.sjly = value.dictValue
+        this.showhncysjly= false
+      },
+      onConfirmhzsjly(value){
+        this.nhform.sjlyName = value.dictLabel
+        this.nhform.sjly = value.dictValue
+        this.showhzsjly= false
+      },
+      onConfirmhncycybz(value){
+        this.form5.cybzName = value.dictLabel
+        this.form5.cybz = value.dictValue
+        this.showhncycybz= false
+      },
+      onConfirmhzjzhcssfyzf(value){
+        this.nhform.jzhcssfyzfName = value.dictLabel
+        this.nhform.jzhcssfyzf = value.dictValue
+        this.showhzjzhcssfyzf= false
+      },
+      onConfirmhncyyhzgx(value){
+        this.form5.yhzgxName = value.dictLabel
+        this.form5.yhzgx = value.dictValue
+        this.showhncyyhzgx = false
+      },
+      onConfirmhncyzjlx(value){
+        this.form5.zjlxName = value.dictLabel
+        this.form5.zjlx = value.dictValue
+        this.showhncyzjlx = false
+      },
+      onConfirmhncyjzqk(value){
+        this.form5.jzqkName = value.dictLabel
+        this.form5.jzqk = value.dictValue
+        this.showhncyjzqk = false
+      },
+      onConfirmhzjzqk(value){
+        this.nhform.jzqkName = value.dictLabel
+        this.nhform.jzqk = value.dictValue
+        this.showhzjzqk = false
+      },
+      onConfirmhncyoccupation(value){
+        this.form5.occupationName = value.dictLabel
+        this.form5.occupation = value.dictValue
+        this.showhncyoccupation = false
+      },
+      onConfirmhzoccupation(value){
+        this.nhform.occupationName = value.dictLabel
+        this.nhform.occupation = value.dictValue
+        this.showhzoccupation = false
+      },
+      onConfirmhzzjlx(value){
+        this.nhform.hzzjlxName = value.dictLabel
+        this.nhform.hzzjlx = value.dictValue
+        this.showhzzjlx = false
+      },
+      onConfirmdbrzjlx(value){
+        this.qlrform.dbrzjlxName = value.dictLabel
+        this.qlrform.dbrzjlx = value.dictValue
+        this.showdbrzjlx = false
+      },
+      onConfirmsuyqxz(value){
+        this.qlrform.suyqxzName = value.dictLabel
+        this.qlrform.suyqxz = value.dictValue
+        this.showsuyqxz = false
+      },
+      onConfirmdlrzjlx(value){
+        this.qlrform.dlrzjlxName = value.dictLabel
+        this.qlrform.dlrzjlx = value.dictValue
+        this.showdlrzjlx = false
+      },
+      onConfirmsjly(value){
+        this.qlrform.sjlyName = value.dictLabel
+        this.qlrform.sjly = value.dictValue
+        this.showsjly = false
+      },
+
+      // 查询农户列表
+      getNh(){
+        let params = {
+          pageNum: 1,
+          pageSize:6,
+          sfbccm : "0",
+          hzxm : this.nhvalue,
+        }
+        listNh(params).then((response) => {
+          this.nhlist = response.rows;
+          this.totalN = response.total;
+          if(response.rows.length>0&&response.rows.length<response.total){
+            this.countyhc++
+            this.loading2 = false
+            this.finished2 = false;
+          }else{
+            this.loading2 = false
+            this.finished2 = true
+          }
+        });
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        if(selection.checkbox){
+          this.nhlist.forEach(function(item){
+            if(item.id !== selection.id && item.checkbox){
+              item.checkbox = false;
+            }
+          })
+          this.wcnhData = selection;
+        }
+      },
+      clearSelection(){
+        this.wcnhData = null;
+        this.nhlist.forEach(function(item){
+          if(item.checkbox){
+            item.checkbox = false;
+          }
+        })
+      },
+      // 户内成员列表
+      showPopuphncylist(item){
+        if(item.nhdm==null||item.nhdm==""){
+          this.$toast({
+            icon: 'error', // 找到自己需要的图标
+            message: '请先保存户主信息',
+            duration:"1000"
+          })
+        }else{
+          this.nhdm = item.nhdm
+          this.showhncylist =  true
+          let params = {
+            "nhdm":item.nhdm,
+            "deptId":this.item.deptId
+          }
+          this.$router.push({name:'hncyList2',query:{nhdm:item.nhdm}});
+        }
+
+      },
+      showPopupnh(item){
+        this.shownh = true
+        this.nhform = item
+        this.jzhcssfyzfOptions.map(res => {
+          if(res.dictValue == item.jzhcssfyzf){
+            this.nhform.jzhcssfyzfName = res.dictLabel
+          }
+        })
+        this.zjlxOptions.map(res => {
+          if(res.dictValue == item.hzzjlx){
+            this.nhform.hzzjlxName = res.dictLabel
+          }
+        })
+        this.occupationOptions.map(res => {
+          if(res.dictValue == item.occupation){
+            this.nhform.occupationName = res.dictLabel
+          }
+        })
+        this.jzqkOptions.map(res => {
+          if(res.dictValue == item.jzqk){
+            this.nhform.jzqkName = res.dictLabel
+          }
+        })
+        this.sjlyOptions.map(res => {
+          if(res.dictValue == item.sjly){
+            this.nhform.sjlyName = res.dictLabel
+          }
+        })
+        this.$router.push({name:'nhDetails',query:item});
+      },
+      getZjdList(){
+        // let params1 = {
+        //   "deptId" : this.item.deptId,
+        //   "houseDataConfirmStatus" : "CONFIRMED",
+        //   "pageNum": 1,
+        //   "pageSize":10,
+        // }
+        // listZjdzd(params1).then((response) => {
+        //   if (response.code == 200) {
+        //     this.yhcNums = response.total
+        //     this.list1 = response.rows
+        //   }
+        // });
+        // let params2 = {
+        //   "deptId" : this.item.deptId,
+        //   "houseDataConfirmStatus" : "UNCONFIRMED",
+        //   "pageNum": 1,
+        //   "pageSize":10,
+        // }
+        // listZjdzd(params2).then((response) => {
+        //   if (response.code == 200) {
+        //     this.whcNums = response.total
+        //     this.list2 = response.rows
+        //   }
+        // });
+      },
+      onConfirm(){},
+      /*onSubmithncy(){
+          if (this.form5.id != null) {
+            if (this.form5.zjlx=='01'&&parseInt(this.form5.zjhm.substr(16, 1)) % 2 == 1) {
+              if(this.form5.xb!='1'){
+                Dialog.confirm({
+                  title: '警告',
+                  message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+                })
+                  .then(() => {
+                    // on confirm
+                    updateNhhncy(this.form5).then(response => {
+                      let _this =this
+                      this.$toast({
+                        icon: 'success', // 找到自己需要的图标
+                        message: '修改成功',
+                        duration:"1000",
+                        onClose:function(){
+                          _this.showhncy = false
+                          let params = {
+                            "nhdm":_this.form5.nhdm,
+                            deptId:_this.form5.deptId
+                          }
+                          listNhhncy(params).then((response) => {
+                            _this.hncylist = response.rows
+                          })
+                        }
+                      })
+                    });
+                  })
+                  .catch(() => {
+                    // on cancel
+                  });
+              }else{
+                updateNhhncy(this.form5).then(response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '修改成功',
+                    duration:"1000",
+                    onClose:function(){
+                      _this.showhncy = false
+                      let params = {
+                        "nhdm":_this.form5.nhdm,
+                        deptId:_this.form5.deptId
+                      }
+                      listNhhncy(params).then((response) => {
+                        _this.hncylist = response.rows
+                      })
+                    }
+                  })
+                });
+              }
+
+            } else {
+              if(this.form5.xb=='1'){
+                Dialog.confirm({
+                  title: '警告',
+                  message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+                })
+                  .then(() => {
+                    // on confirm
+                    updateNhhncy(this.form5).then(response => {
+                      let _this =this
+                      this.$toast({
+                        icon: 'success', // 找到自己需要的图标
+                        message: '修改成功',
+                        duration:"1000",
+                        onClose:function(){
+                          _this.showhncy = false
+                          let params = {
+                            "nhdm":_this.form5.nhdm,
+                            deptId:_this.form5.deptId
+                          }
+                          listNhhncy(params).then((response) => {
+                            _this.hncylist = response.rows
+                          })
+                        }
+                      })
+                    });
+                  })
+                  .catch(() => {
+                    // on cancel
+                  });
+              }else{
+                updateNhhncy(this.form5).then(response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '修改成功',
+                    duration:"1000",
+                    onClose:function(){
+                      _this.showhncy = false
+                      let params = {
+                        "nhdm":_this.form5.nhdm,
+                        deptId:_this.form5.deptId
+                      }
+                      listNhhncy(params).then((response) => {
+                        _this.hncylist = response.rows
+                      })
+                    }
+                  })
+                });
+              }
+            }
+          } else {
+            if (this.form5.zjlx=='01'&&parseInt(this.form5.zjhm.substr(16, 1)) % 2 == 1) {
+              if(this.form5.xb!='1'){
+                Dialog.confirm({
+                  title: '警告',
+                  message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+                })
+                  .then(() => {
+                    // on confirm
+                    addNhhncy(this.form5).then(response => {
+                      let _this =this
+                      this.$toast({
+                        icon: 'success', // 找到自己需要的图标
+                        message: '保存成功',
+                        duration:"1000",
+                        onClose:function(){
+                          _this.showhncy = false
+                          _this.totalR+=1
+                          _this.totalH+=1
+                          let params = {
+                            "nhdm":_this.form5.nhdm,
+                            deptId:_this.form5.deptId
+                          }
+                          listNhhncy(params).then((response) => {
+                            _this.hncylist = response.rows
+                          })
+                        }
+                      })
+                    });
+                  })
+                  .catch(() => {
+                    // on cancel
+                  });
+              }else{
+                addNhhncy(this.form5).then(response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '保存成功',
+                    duration:"1000",
+                    onClose:function(){
+                      _this.showhncy = false
+                      _this.totalR+=1
+                      _this.totalH+=1
+                      let params = {
+                        "nhdm":_this.form5.nhdm,
+                        deptId:_this.form5.deptId
+                      }
+                      listNhhncy(params).then((response) => {
+                        _this.hncylist = response.rows
+                      })
+                    }
+                  })
+                });
+              }
+
+            } else {
+              if(this.form5.xb=='1'){
+                Dialog.confirm({
+                  title: '警告',
+                  message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+                })
+                  .then(() => {
+                    // on confirm
+                    addNhhncy(this.form5).then(response => {
+                      let _this =this
+                      this.$toast({
+                        icon: 'success', // 找到自己需要的图标
+                        message: '保存成功',
+                        duration:"1000",
+                        onClose:function(){
+                          _this.showhncy = false
+                          _this.totalR+=1
+                          _this.totalH+=1
+                          let params = {
+                            "nhdm":_this.form5.nhdm,
+                            deptId:_this.form5.deptId
+                          }
+                          listNhhncy(params).then((response) => {
+                            _this.hncylist = response.rows
+                          })
+                        }
+                      })
+                    });
+                  })
+                  .catch(() => {
+                    // on cancel
+                  });
+              }else{
+                addNhhncy(this.form5).then(response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '保存成功',
+                    duration:"1000",
+                    onClose:function(){
+                      _this.showhncy = false
+                      _this.totalR+=1
+                      _this.totalH+=1
+                      let params = {
+                        "nhdm":_this.form5.nhdm,
+                        deptId:_this.form5.deptId
+                      }
+                      listNhhncy(params).then((response) => {
+                        _this.hncylist = response.rows
+                      })
+                    }
+                  })
+                });
+              }
+            }
+
+          }
+        },*/
+      onSubmithncy(){
+        if (this.form5.id != null) {
+          if (this.form5.zjlx=='01'&&parseInt(this.form5.zjhm.substr(16, 1)) % 2 == 1) {
+            if(this.form5.xb!='1'){
+              Dialog.confirm({
+                title: '警告',
+                message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+              })
+                .then(() => {
+                  // on confirm
+                  updateNhhncy(this.form5).then(response => {
+                    let _this =this
+                    this.$toast({
+                      icon: 'success', // 找到自己需要的图标
+                      message: '修改成功',
+                      duration:"1000",
+                      onClose:function(){
+                        _this.showhncy = false
+                        let params = {
+                          "nhdm":_this.form5.nhdm,
+                          deptId:_this.form5.deptId
+                        }
+                        listNhhncy(params).then((response) => {
+                          _this.hncylist = response.rows
+                        })
+                      }
+                    })
+                  });
+                })
+                .catch(() => {
+                  // on cancel
+                });
+            }else{
+              updateNhhncy(this.form5).then(response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '修改成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.showhncy = false
+                    let params = {
+                      "nhdm":_this.form5.nhdm,
+                      deptId:_this.form5.deptId
+                    }
+                    listNhhncy(params).then((response) => {
+                      _this.hncylist = response.rows
+                    })
+                  }
+                })
+              });
+            }
+          } else if (this.form5.zjlx=='01'&&parseInt(this.form5.zjhm.substr(16, 1)) % 2 == 0){
+            if(this.form5.xb!='0'){
+              Dialog.confirm({
+                title: '警告',
+                message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+              })
+                .then(() => {
+                  // on confirm
+                  updateNhhncy(this.form5).then(response => {
+                    let _this =this
+                    this.$toast({
+                      icon: 'success', // 找到自己需要的图标
+                      message: '修改成功',
+                      duration:"1000",
+                      onClose:function(){
+                        _this.showhncy = false
+                        let params = {
+                          "nhdm":_this.form5.nhdm,
+                          deptId:_this.form5.deptId
+                        }
+                        listNhhncy(params).then((response) => {
+                          _this.hncylist = response.rows
+                        })
+                      }
+                    })
+                  });
+                })
+                .catch(() => {
+                  // on cancel
+                });
+            }else{
+              updateNhhncy(this.form5).then(response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '修改成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.showhncy = false
+                    let params = {
+                      "nhdm":_this.form5.nhdm,
+                      deptId:_this.form5.deptId
+                    }
+                    listNhhncy(params).then((response) => {
+                      _this.hncylist = response.rows
+                    })
+                  }
+                })
+              });
+            }
+          }else{
+            updateNhhncy(this.form5).then(response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '修改成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.showhncy = false
+                  let params = {
+                    "nhdm":_this.form5.nhdm,
+                    deptId:_this.form5.deptId
+                  }
+                  listNhhncy(params).then((response) => {
+                    _this.hncylist = response.rows
+                  })
+                }
+              })
+            });
+          }
+        } else {
+          if (this.form5.zjlx=='01'&&parseInt(this.form5.zjhm.substr(16, 1)) % 2 == 1) {
+            if(this.form5.xb!='1'){
+              Dialog.confirm({
+                title: '警告',
+                message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+              })
+                .then(() => {
+                  // on confirm
+                  addNhhncy(this.form5).then(response => {
+                    let _this =this
+                    this.$toast({
+                      icon: 'success', // 找到自己需要的图标
+                      message: '保存成功',
+                      duration:"1000",
+                      onClose:function(){
+                        _this.totalR+=1
+                        _this.showhncy = false
+                        let params = {
+                          "nhdm":_this.form5.nhdm,
+                          deptId:_this.form5.deptId
+                        }
+                        listNhhncy(params).then((response) => {
+                          _this.hncylist = response.rows
+                        })
+                      }
+                    })
+                  });
+                })
+                .catch(() => {
+                  // on cancel
+                });
+            }else{
+              addNhhncy(this.form5).then(response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.totalR+=1
+                    _this.showhncy = false
+                    let params = {
+                      "nhdm":_this.form5.nhdm,
+                      deptId:_this.form5.deptId
+                    }
+                    listNhhncy(params).then((response) => {
+                      _this.hncylist = response.rows
+                    })
+                  }
+                })
+              });
+            }
+          } else if (this.form5.zjlx=='01'&&parseInt(this.form5.zjhm.substr(16, 1)) % 2 == 0){
+            if(this.form5.xb!='0'){
+              Dialog.confirm({
+                title: '警告',
+                message: '成员性别与身份证号中性别信息不符，是否继续保存？',
+              })
+                .then(() => {
+                  // on confirm
+                  addNhhncy(this.form5).then(response => {
+                    let _this =this
+                    this.$toast({
+                      icon: 'success', // 找到自己需要的图标
+                      message: '保存成功',
+                      duration:"1000",
+                      onClose:function(){
+                        _this.totalR+=1
+                        _this.showhncy = false
+                        let params = {
+                          "nhdm":_this.form5.nhdm,
+                          deptId:_this.form5.deptId
+                        }
+                        listNhhncy(params).then((response) => {
+                          _this.hncylist = response.rows
+                        })
+                      }
+                    })
+                  });
+                })
+                .catch(() => {
+                  // on cancel
+                });
+            }else{
+              addNhhncy(this.form5).then(response => {
+                let _this =this
+                this.$toast({
+                  icon: 'success', // 找到自己需要的图标
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.totalR+=1
+                    _this.showhncy = false
+                    let params = {
+                      "nhdm":_this.form5.nhdm,
+                      deptId:_this.form5.deptId
+                    }
+                    listNhhncy(params).then((response) => {
+                      _this.hncylist = response.rows
+                    })
+                  }
+                })
+              });
+            }
+          }else{
+            addNhhncy(this.form5).then(response => {
+              let _this =this
+              this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.totalR+=1
+                  _this.showhncy = false
+                  let params = {
+                    "nhdm":_this.form5.nhdm,
+                    deptId:_this.form5.deptId
+                  }
+                  listNhhncy(params).then((response) => {
+                    _this.hncylist = response.rows
+                  })
+                }
+              })
+            });
+          }
+
+        }
+      },
+      mapShow() {
+        //删除地图选中状态
+        $("#deleteHistoryMap").trigger("click");
+        //通过数据直接查询方式--------加载较慢 start
+        //镇边界获取
+        // listTown().then(response => {
+        //   if (response.code == 200) {
+        //     this.mapTownList = response.rows;
+        //     //村边界获取
+        //     listVillage(this.queryParams).then(response => {
+        //       this.mapVillageList = response.rows;
+        //       listZjdzd().then((response) => {
+        //         if (response.code == 200) {
+        //           this.mapTheGeomZjdId= response.rows;
+        //           listZrz().then((response) => {
+        //             if (response.code == 200) {
+        //               this.mapTheGeomZrzId = response.rows;
+        //               listFsss().then((response) => {
+        //                 if (response.code == 200) {
+        //                   this.mapTheGeomFsssId = response.rows;
+        //                 }
+        //                 setTimeout(() => {
+        //                   this.GetMapsInit();
+        //                 }, 300);
+        //               });
+        //             }
+        //           });
+        //         }
+        //       });
+        //     });
+        //   }
+        // });
+        //通过数据直接查询方式--------加载较慢 end
+        getGeoServerConfigKey().then(response => {
+          this.mapGeoServerUrl = response.msg;
+          setTimeout(() => {
+            this.GetMapsInit();
+          }, 300);
+        });
+        var that = this;
+        setTimeout(function () {
+          var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
+          that.bottomHeight = -height+'px'
+        },500)
+      },
+      //地图加载 -----start
+      GetMapsInit() {
+
+        //加载地图编辑
+        var that = this;
+        var map;
+        //点击事件添加样式
+        var hc_land_on;
+        document.getElementById("mapWrapAll").innerHTML = '';
+        var hc_land;
+        var projection = new ol.proj.Projection({
+          //地图投影类型
+          code: "EPSG:3857",
+          units: "degrees",
+          //extent:extent
+        });
+
+        var aerial = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            // url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
+            //   "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+            //   "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+            url: "http://t{0-7}.tianditu.com/img_w/wmts?" +
+              "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
+              "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
+          }),
+          isGroup: true,
+          name: "卫星影像图",
+        });
+
+        var yingxzi = new ol.layer.Tile({
+          source: new ol.source.XYZ({
+            url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk= ",
+          }),
+          isGroup: true,
+          name: "天地图文字标注--卫星影像图",
+        });
+
+        //加载地图
+        map = new ol.Map({
+          controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
+          layers: [aerial, yingxzi],
+          projection: projection,
+          target: "mapWrapAll",
+          view: new ol.View({
+            //center: ol.proj.fromLonLat([115.452752, 31.789033]),
+            //center: ol.proj.fromLonLat([115.452752, 31.789033]),
+            zoom: 10,
+            minZoom: 5, //地图缩小限制
+            maxZoom: 18.3, //地图放大限制
+            resolution: Math.random() * 0.00000001,
+          }),
+          interactions: ol.interaction.defaults({
+            pinchRotate: false // 移动端禁止地图旋转
+          }),
+        });
+        //使用geoserver服务查询开始 -------------------start
+        //镇边界查询开始 ------------------------------start
+        // var zhenTc= new ol.layer.Tile({
+        //   source: new ol.source.TileWMS({
+        //     url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+        //     params: {
+        //       LAYERS: 'zjd_dc:t_house_survey_border_town',
+        //       TILED: true,
+        //       //cql_filter: cql_filter,
+        //       SRID: 3857,
+        //     },
+        //   }),
+        // });
+        // map.addLayer(zhenTc);
+        //镇边界查询开始 ------------------------------end
+        //村边界查询开始 ------------------------------start
+        var cql_filter = "dept_id='" + that.$cookies.get("item").deptId + "'";
+        var cunTc = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: 'zjd_dc:t_house_survey_border_village',
+              TILED: true,
+              cql_filter: cql_filter,
+              SRID: 3857,
+              TIMESTAMP: new Date().getTime(),
+            },
+            resolution: Math.random() * 0.00000001,
+          }),
+        });
+        // //定位查询位置
+        // let param_dw = {
+        //   srsName: "EPSG:3857",
+        //   service: "WFS",
+        //   version: "1.0.0",
+        //   request: "GetFeature",
+        //   typename: "zjd_dc:t_house_survey_border_village",
+        //   //featureNS: 'nsgk_hc',//命名空间 URI
+        //   cql_filter: cql_filter,
+        //   //featurePrefix: 'nationalwater',//工作区名称
+        //   //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
+        //   outputFormat: "application/json",
+        //   //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
+        // };
+        // let url_dw = that.mapGeoServerUrl + "/geoserver/zjd_dc/wfs"; //wfsurl;
+        // url_dw = url_dw + "?";
+        // for (let key in param_dw) {
+        //   url_dw = url_dw + key + "=" + param_dw[key] + "&";
+        // }
+        // url_dw = url_dw.substr(0, url_dw.length - 1);
+        // fetch(url_dw, {
+        //   method: "POST", // *GET, POST, PUT, DELETE, etc.
+        // })
+        //   .then((res) => {
+        //     var geojsonmap = res.json();
+        //     return geojsonmap;
+        //   })
+        //   .then((data) => {
+        //     if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "{") {
+        //       //自然幢图层查询开始 ------------------start
+        //       var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'";
+        //       zrzTc = new ol.layer.Image({
+        //         source: new ol.source.ImageWMS({
+        //           url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+        //           params: {
+        //             LAYERS: 'zjd_dc:t_house_survey_zrz',
+        //             TILED: true,
+        //             cql_filter: cql_filter_map,
+        //             SRID: 3857,
+        //             TIMESTAMP: new Date().getTime(),
+        //           },
+        //         }),
+        //       });
+        //       map.addLayer(zrzTc);
+        //       //自然幢图层查询开始 ------------------start
+        //       //附属设施图层查询开始 ------------------start
+        //       //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+        //       fsssTc = new ol.layer.Image({
+        //         source: new ol.source.ImageWMS({
+        //           url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+        //           params: {
+        //             LAYERS: 'zjd_dc:t_house_survey_fsss',
+        //             TILED: true,
+        //             cql_filter: cql_filter_map,
+        //             SRID: 3857,
+        //             TIMESTAMP: new Date().getTime(),
+        //           },
+        //         }),
+        //       });
+        //       map.addLayer(fsssTc);
+        //       //附属设施图层查询开始 ------------------end
+        //       hc_land_on = new ol.layer.Vector({
+        //         title: "add Layer",
+        //         source: new ol.source.Vector({
+        //           projection: projection,
+        //           features: new ol.format.GeoJSON().readFeatures(that.backTheGeom),
+        //         }),
+        //         style: new ol.style.Style({
+        //           stroke: new ol.style.Stroke({
+        //             //边界样式
+        //             color: "#CCFF66",
+        //             width: 6,
+        //           }),
+        //         }),
+        //       });
+        //       map.addLayer(hc_land_on);
+        //       var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+        //       var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+        //       var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+        //       var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+        //       //定位查询位置
+        //       var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+        //       that.clickBbox = center;
+        //       console.log(that.mapZjdData);
+        //       that.textMjAll = that.mapZjdData.zdmj;
+        //       map.getView().animate({
+        //         // 只设置需要的属性即可
+        //         center: center, // 中心点
+        //         zoom: 17.9, // 缩放级别
+        //         rotation: undefined, // 缩放完成view视图旋转弧度
+        //         duration: 1000, // 缩放持续时间，默认不需要设置
+        //         resolution: Math.random() * 0.00000001,
+        //       });
+        //       //this.backMap =1;
+        //     } else if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "[") {
+        //       //that.newHt ="1";
+        //       var zbNew = JSON.stringify({
+        //         "type": "MultiPolygon",
+        //         "coordinates": [that.backTheGeom.replaceAll("\"", "")]
+        //       });
+        //       var leftJoin = zbNew.replace("\"[", "[");
+        //       var rightJoin = leftJoin.replace("\"]", "]");
+        //       hc_land_on = new ol.layer.Vector({
+        //         title: "add Layer",
+        //         source: new ol.source.Vector({
+        //           projection: projection,
+        //           features: new ol.format.GeoJSON().readFeatures("{\n" +
+        //             "    \"type\": \"Feature\",\n" +
+        //             "    \"geometry\":" + rightJoin + "}"),
+        //         }),
+        //         style: new ol.style.Style({
+        //           fill: new ol.style.Fill({
+        //             //矢量图层填充颜色，以及透明度
+        //             color: "rgba(204, 255, 204,0.3)",
+        //           }),
+        //           stroke: new ol.style.Stroke({
+        //             //边界样式
+        //             color: "#CCFF66",
+        //             width: 3,
+        //           }),
+        //         }),
+        //       });
+        //       map.addLayer(hc_land_on);
+        //       var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+        //       var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+        //       var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+        //       var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+        //       //定位查询位置
+        //       var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+        //       that.clickBbox = center;
+        //       that.textMjAll = that.mapZjdData.zdmj;
+        //       map.getView().animate({
+        //         // 只设置需要的属性即可
+        //         center: center, // 中心点
+        //         zoom: 16.9, // 缩放级别
+        //         rotation: undefined, // 缩放完成view视图旋转弧度
+        //         duration: 1000, // 缩放持续时间，默认不需要设置
+        //         resolution: Math.random() * 0.00000001,
+        //       });
+        //       //this.backMap =1;
+        //     } else {
+        //       //通过村界大小视图显示
+        //       // let resolution = map.getView().getResolutionForExtent(data.bbox, map.getSize());
+        //       // resolution:resolution + Math.random() * 0.00000001,
+        //       // map.getView().fit(data.bbox);
+        //       // map.getView().setResolution(resolution);
+        //       // //初始视图大小控制
+        //       // map.getView().setZoom(16.0);
+        //       console.log(data);
+        //       console.log(data.features[0].geometry.coordinates[0][0][0]);
+        //       map.getView().animate({
+        //         // 只设置需要的属性即可
+        //         center: data.features[0].geometry.coordinates[0][0][0], // 中心点
+        //         zoom: 16.9, // 缩放级别
+        //         rotation: undefined, // 缩放完成view视图旋转弧度
+        //         duration: 1000, // 缩放持续时间，默认不需要设置
+        //         resolution: Math.random() * 0.00000001,
+        //       });
+        //     }
+        //   })
+        //   .catch((error) => {
+        //     console.log("【异常】", error);
+        //   });
+        map.addLayer(cunTc);
+        //村边界查询开始 ------------------------------end
+        //国有数据加载-----------------------------------start
+        deptGetId(that.$cookies.get("item").deptId).then((res) => {
+          var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
+          var guoyouTc = new ol.layer.Image({
+            source: new ol.source.ImageWMS({
+              url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
+              params: {
+                LAYERS: 'zjd_gydl:DLTB',
+                TILED: true,
+                cql_filter: cql_filter_guoyou,
+                SRID: 3857,
+                TIMESTAMP: new Date().getTime(),
+              },
+            }),
+          });
+          map.addLayer(guoyouTc);
+        });
+        //国有数据加载----------------------------------end
+        //宅基地图层查询开始 ------------------start
+        //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
+        var zjdTc = new ol.layer.Image({
+          source: new ol.source.ImageWMS({
+            url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: 'zjd_dc:t_house_survey_zjdzd',
+              TILED: true,
+              cql_filter: cql_filter,
+              SRID: 3857,
+              TIMESTAMP: new Date().getTime(),
+            },
+          }),
+        });
+        //定位查询位置
+        let param_zjdzd = {
+          srsName: "EPSG:3857",
+          service: "WFS",
+          version: "1.0.0",
+          request: "GetFeature",
+          typename: "zjd_dc:t_house_survey_zjdzd",
+          //featureNS: 'nsgk_hc',//命名空间 URI
+          cql_filter: cql_filter,
+          //featurePrefix: 'nationalwater',//工作区名称
+          //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
+          outputFormat: "application/json",
+          maxFeatures:1,
+          //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
+        };
+        let url_zjdzd = that.mapGeoServerUrl + "/geoserver/zjd_dc/wfs"; //wfsurl;
+        url_zjdzd = url_zjdzd + "?";
+        for (let key in param_zjdzd) {
+          url_zjdzd = url_zjdzd + key + "=" + param_zjdzd[key] + "&";
+        }
+        url_zjdzd = url_zjdzd.substr(0, url_zjdzd.length - 1);
+        fetch(url_zjdzd, {
+          method: "POST", // *GET, POST, PUT, DELETE, etc.
+        })
+          .then((res) => {
+            var geojsonmap = res.json();
+            return geojsonmap;
+          })
+          .then((data) => {
+            if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "{") {
+              //自然幢图层查询开始 ------------------start
+              var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.mapZjdData.zjddm + "'";
+              zrzTc = new ol.layer.Image({
+                source: new ol.source.ImageWMS({
+                  url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                  params: {
+                    LAYERS: 'zjd_dc:t_house_survey_zrz',
+                    TILED: true,
+                    cql_filter: cql_filter_map,
+                    SRID: 3857,
+                    TIMESTAMP: new Date().getTime(),
+                  },
+                }),
+              });
+              map.addLayer(zrzTc);
+              //自然幢图层查询开始 ------------------start
+              //附属设施图层查询开始 ------------------start
+              //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+              fsssTc = new ol.layer.Image({
+                source: new ol.source.ImageWMS({
+                  url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                  params: {
+                    LAYERS: 'zjd_dc:t_house_survey_fsss',
+                    TILED: true,
+                    cql_filter: cql_filter_map,
+                    SRID: 3857,
+                    TIMESTAMP: new Date().getTime(),
+                  },
+                }),
+              });
+              map.addLayer(fsssTc);
+              //附属设施图层查询开始 ------------------end
+              hc_land_on = new ol.layer.Vector({
+                title: "add Layer",
+                source: new ol.source.Vector({
+                  projection: projection,
+                  features: new ol.format.GeoJSON().readFeatures(that.backTheGeom),
+                }),
+                style: new ol.style.Style({
+                  stroke: new ol.style.Stroke({
+                    //边界样式
+                    color: "#CCFF66",
+                    width: 6,
+                  }),
+                }),
+              });
+              map.addLayer(hc_land_on);
+              var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+              var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+              var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+              var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+              //定位查询位置
+              var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+              that.clickBbox = center;
+              console.log(that.mapZjdData);
+              that.textMjAll = that.mapZjdData.zdmj;
+              map.getView().animate({
+                // 只设置需要的属性即可
+                center: center, // 中心点
+                zoom: 17.9, // 缩放级别
+                rotation: undefined, // 缩放完成view视图旋转弧度
+                duration: 1000, // 缩放持续时间，默认不需要设置
+                resolution: Math.random() * 0.00000001,
+              });
+              //this.backMap =1;
+            } else if (that.backTheGeom != "" && that.backTheGeom != undefined && that.backTheGeom.substring(0, 1) == "[") {
+              //that.newHt ="1";
+              var zbNew = JSON.stringify({
+                "type": "MultiPolygon",
+                "coordinates": [that.backTheGeom.replaceAll("\"", "")]
+              });
+              var leftJoin = zbNew.replace("\"[", "[");
+              var rightJoin = leftJoin.replace("\"]", "]");
+              hc_land_on = new ol.layer.Vector({
+                title: "add Layer",
+                source: new ol.source.Vector({
+                  projection: projection,
+                  features: new ol.format.GeoJSON().readFeatures("{\n" +
+                    "    \"type\": \"Feature\",\n" +
+                    "    \"geometry\":" + rightJoin + "}"),
+                }),
+                style: new ol.style.Style({
+                  fill: new ol.style.Fill({
+                    //矢量图层填充颜色，以及透明度
+                    color: "rgba(204, 255, 204,0.3)",
+                  }),
+                  stroke: new ol.style.Stroke({
+                    //边界样式
+                    color: "#CCFF66",
+                    width: 3,
+                  }),
+                }),
+              });
+              map.addLayer(hc_land_on);
+              var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+              var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+              var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+              var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+              //定位查询位置
+              var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+              that.clickBbox = center;
+              that.textMjAll = that.mapZjdData.zdmj;
+              map.getView().animate({
+                // 只设置需要的属性即可
+                center: center, // 中心点
+                zoom: 16.9, // 缩放级别
+                rotation: undefined, // 缩放完成view视图旋转弧度
+                duration: 1000, // 缩放持续时间，默认不需要设置
+                resolution: Math.random() * 0.00000001,
+              });
+              //this.backMap =1;
+            } else {
+              //通过村界大小视图显示
+              // let resolution = map.getView().getResolutionForExtent(data.bbox, map.getSize());
+              // resolution:resolution + Math.random() * 0.00000001,
+              // map.getView().fit(data.bbox);
+              // map.getView().setResolution(resolution);
+              // //初始视图大小控制
+              // map.getView().setZoom(16.0);
+              map.getView().animate({
+                // 只设置需要的属性即可
+                center: data.features[0].geometry.coordinates[0][0][0], // 中心点
+                zoom: 15.9, // 缩放级别
+                rotation: undefined, // 缩放完成view视图旋转弧度
+                duration: 1000, // 缩放持续时间，默认不需要设置
+                resolution: Math.random() * 0.00000001,
+              });
+            }
+          })
+          .catch((error) => {
+            console.log("【异常】", error);
+          });
+        map.addLayer(zjdTc);
+        //宅基地图层查询开始 ------------------start
+        var zrzTc;
+        // //自然幢图层查询开始 ------------------start
+        // var zrzTc = new ol.layer.Image({
+        //   source: new ol.source.ImageWMS({
+        //     url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+        //     params: {
+        //       LAYERS: 'zjd_dc:t_house_survey_zrz',
+        //       TILED: true,
+        //       cql_filter: cql_filter,
+        //       SRID: 3857,
+        //       TIMESTAMP: new Date().getTime(),
+        //     },
+        //   }),
+        // });
+        // map.addLayer(zrzTc);
+        // //自然幢图层查询开始 ------------------start
+        //
+        var fsssTc;
+        // //附属设施图层查询开始 ------------------start
+        // var fsssTc = new ol.layer.Image({
+        //   source: new ol.source.ImageWMS({
+        //     url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+        //     params: {
+        //       LAYERS: 'zjd_dc:t_house_survey_fsss',
+        //       TILED: true,
+        //       cql_filter: cql_filter,
+        //       SRID: 3857,
+        //       TIMESTAMP: new Date().getTime(),
+        //     },
+        //   }),
+        // });
+        // map.addLayer(fsssTc);
+        // //附属设施图层查询开始 ------------------start
+        //使用geoserver服务查询开始 -------------------end
+        //   if(this.backMap ==1){
+        //   var cql = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + this.mapZjdTeAll.mapZjdAData.zjddm + "'";
+        //   var wmsSourceBack = new ol.source.ImageWMS({
+        //     crossOrigin: 'anonymous',
+        //     params: {
+        //       LAYERS: 'zjd_dc:t_house_survey_all',
+        //       'VERSION': '1.1.0',
+        //       'FORMAT': "image/png",
+        //       'CQL_FILTER': cql
+        //     },
+        //     serverType: 'geoserver',
+        //     url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+        //   });
+        //   zjdTc.setSource(wmsSourceBack);
+        //   ol.view.setResolution(ol.view.getResolution() + Math.random() * 0.00000001);//随机数缩放实现刷新
+        // }
+        //数据库直接加载数据渲染方式---------------------------------------------------start
+        //判断当前账套是否有数据
+        // var mapTalkAbout = true;
+        // //获取镇界线----start
+        // if(this.mapTownList.length >0){
+        //   for (var i = 0; this.mapTownList.length > i; i++) {
+        //     if (this.mapTownList[i] != null && this.mapTownList[i].theGeom != null && this.mapTownList[i].theGeom != "") {
+        //       mapTalkAbout =false;
+        //       this.mapTownList[i].createBy = 'mapTownList';
+        //       var theGeomLine= this.mapTownList[i].theGeom.replaceAll("MultiPolygon","LineString");
+        //       theGeomLine = theGeomLine.replaceAll("[[[[","[[");
+        //       theGeomLine = theGeomLine.replaceAll("]]]]","]]");
+        //       hc_land = new ol.layer.Vector({
+        //         title: "add Layer",
+        //         source: new ol.source.Vector({
+        //           projection: projection,
+        //           features: new ol.format.GeoJSON().readFeatures("{\n" +
+        //             "    \"type\": \"Feature\",\n" +
+        //             "    \"geometry\":" + theGeomLine + ",    \"properties\":" + JSON.stringify(this.mapTownList[i]) + "}"),
+        //         }),
+        //         style: new ol.style.Style({
+        //           fill: new ol.style.Fill({
+        //             //矢量图层填充颜色，以及透明度
+        //             color: "#AE57A4",
+        //           }),
+        //           stroke: new ol.style.Stroke({
+        //             //边界样式
+        //             color: "#FF0000",
+        //             width: 3,
+        //           }),
+        //           // text: new ol.style.Text({
+        //           //   text: this.mapTownList[i].xzqmc,
+        //           //   font: '30px sans-serif',
+        //           //   textAlign: "center",
+        //           //   textBaseline: "middle",
+        //           //   //font: 'verdana',
+        //           //   fill: new ol.style.Fill({
+        //           //     color: "#ff0000"
+        //           //   }),
+        //           //   // backgroundFill: new ol.style.Fill({
+        //           //   //   color: "#ff0000"
+        //           //   // }),
+        //           //   font: "30px sans-serif",
+        //           //   stroke: new ol.style.Stroke({
+        //           //     color: "#ffffff"
+        //           //     // width: 3
+        //           //   }),
+        //           //   offsetX: parseInt(0, 10),
+        //           //   offsetY: parseInt(0, 10),
+        //           //   placement: "line", //point 则自动计算面的中心k点然后标注  line 则根据面要素的边进行标注
+        //           //   overflow: false //超出面的部分不显示
+        //           //}),
+        //         }),
+        //       });
+        //       map.addLayer(hc_land);
+        //       //console.log(hc_land.values_.source.featuresRtree_.rbush_.data);
+        //       var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
+        //       var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
+        //       var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
+        //       var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
+        //       // //定位查询位置
+        //       var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+        //       // console.log(center);
+        //       map.getView().animate({
+        //         // 只设置需要的属性即可
+        //         center: center, // 中心点
+        //         zoom: 9.8, // 缩放级别
+        //         rotation: undefined, // 缩放完成view视图旋转弧度
+        //         duration: 1000, // 缩放持续时间，默认不需要设置
+        //       });
+        //     }
+        //   }
+        // }
+        // //获取镇界线----end
+        // //获取村界线----start
+        // if(this.mapVillageList.length >0){
+        //   for (var i = 0; this.mapVillageList.length > i; i++) {
+        //     if (this.mapVillageList[i] != null && this.mapVillageList[i].theGeom != null && this.mapVillageList[i].theGeom != "") {
+        //       mapTalkAbout =false;
+        //       this.mapVillageList[i].createBy = 'mapVillageList';
+        //       var theGeomLine= this.mapVillageList[i].theGeom.replaceAll("MultiPolygon","LineString");
+        //       theGeomLine = theGeomLine.replaceAll("[[[[","[[");
+        //       theGeomLine = theGeomLine.replaceAll("]]]]","]]");
+        //       hc_land = new ol.layer.Vector({
+        //         title: "add Layer",
+        //         source: new ol.source.Vector({
+        //           projection: projection,
+        //           features: new ol.format.GeoJSON().readFeatures("{\n" +
+        //             "    \"type\": \"Feature\",\n" +
+        //             "    \"geometry\":" + theGeomLine + ",    \"properties\":" + JSON.stringify(this.mapVillageList[i]) + "}"),
+        //         }),
+        //         style: new ol.style.Style({
+        //           fill: new ol.style.Fill({
+        //             //矢量图层填充颜色，以及透明度
+        //             color: "#AE57A4",
+        //           }),
+        //           stroke: new ol.style.Stroke({
+        //             //边界样式
+        //             color: "#ff00ff",
+        //             width: 3,
+        //           }),
+        //           // text: new ol.style.Text({
+        //           //   text: this.mapVillageList[i].dcmj,
+        //           //   font: '30px sans-serif',
+        //           //   textAlign: "center",
+        //           //   textBaseline: "middle",
+        //           //   //font: 'verdana',
+        //           //   fill: new ol.style.Fill({
+        //           //     color: "#ff00ff"
+        //           //   }),
+        //           //   // backgroundFill: new ol.style.Fill({
+        //           //   //   color: "#ff0000"
+        //           //   // }),
+        //           //   font: "30px sans-serif",
+        //           //   stroke: new ol.style.Stroke({
+        //           //     color: "#ffffff"
+        //           //     // width: 3
+        //           //   }),
+        //           //   offsetX: parseInt(0, 10),
+        //           //   offsetY: parseInt(0, 10),
+        //           //   placement: "line", //point 则自动计算面的中心k点然后标注  line 则根据面要素的边进行标注
+        //           //   overflow: false //超出面的部分不显示
+        //           // }),
+        //         }),
+        //       });
+        //       map.addLayer(hc_land);
+        //     }
+        //   }
+        // }
+        // // //获取村界线----end
+        // //宅基地定位开始 ---------start
+        // if(this.mapTheGeomZjdId.length >0) {
+        //   for (var i = 0; this.mapTheGeomZjdId.length > i; i++) {
+        //     if (this.mapTheGeomZjdId[i] !=null && this.mapTheGeomZjdId[i].theGeom != null && this.mapTheGeomZjdId[i].theGeom != "") {
+        //       mapTalkAbout =false;
+        //       this.mapTheGeomZjdId[i].createBy = 'mapTheGeomZjdId';
+        //       var styleYqr = "";
+        //       if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){
+        //         styleYqr = new ol.style.Style({
+        //           fill: new ol.style.Fill({
+        //             //矢量图层填充颜色，以及透明度
+        //             color: "#AE57A4",
+        //           }),
+        //           stroke: new ol.style.Stroke({
+        //             //边界样式
+        //             color: "#28FF28",
+        //             width: 3,
+        //           }),
+        //         });
+        //       } else {
+        //         styleYqr = new ol.style.Style({
+        //           fill: new ol.style.Fill({
+        //             //矢量图层填充颜色，以及透明度
+        //             color: "#AE57A4",
+        //           }),
+        //           stroke: new ol.style.Stroke({
+        //             //边界样式
+        //             color: "rgba(255, 45, 45,1)",
+        //             width: 3,
+        //           }),
+        //         });
+        //       }
+        //       hc_land = new ol.layer.Vector({
+        //         title: "add Layer",
+        //         source: new ol.source.Vector({
+        //           projection: projection,
+        //           features: new ol.format.GeoJSON().readFeatures("{\n" +
+        //             "    \"type\": \"Feature\",\n" +
+        //             "    \"geometry\":" + this.mapTheGeomZjdId[i].theGeom + ",    \"properties\":" + JSON.stringify(this.mapTheGeomZjdId[i]) + "}"),
+        //         }),
+        //         style: styleYqr
+        //       });
+        //       map.addLayer(hc_land);
+        //       // var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
+        //       // var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
+        //       // var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
+        //       // var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
+        //       // //定位查询位置
+        //       // var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+        //       // map.getView().animate({
+        //       //   // 只设置需要的属性即可
+        //       //   center: center, // 中心点
+        //       //   zoom: 15.8, // 缩放级别
+        //       //   rotation: undefined, // 缩放完成view视图旋转弧度
+        //       //   duration: 1000, // 缩放持续时间，默认不需要设置
+        //       // });
+        //       //自然幢定位开始 ---------start
+        //       getZrzZjdDmList(this.mapTheGeomZjdId[i].zjddm).then((response) => {
+        //         if (response.code == 200) {
+        //           this.mapTheGeomZrzId = response.data;
+        //           if(this.mapTheGeomZrzId.length >0) {
+        //             for (var i = 0; this.mapTheGeomZrzId.length > i; i++) {
+        //               if (this.mapTheGeomZrzId[i] !=null && this.mapTheGeomZrzId[i].theGeom != null && this.mapTheGeomZrzId[i].theGeom != "") {
+        //                 this.mapTheGeomZrzId[i].createBy = 'mapTheGeomZrzId';
+        //                 var styleZrz = "";
+        //                 if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){
+        //                   styleZrz = new ol.style.Style({
+        //                     fill: new ol.style.Fill({
+        //                       //矢量图层填充颜色，以及透明度
+        //                       color: "#FFD306",
+        //                     }),
+        //                     stroke: new ol.style.Stroke({
+        //                       //边界样式
+        //                       color: "#28FF28",
+        //                       width: 3,
+        //                     }),
+        //                   });
+        //                 } else {
+        //                   styleZrz = new ol.style.Style({
+        //                     fill: new ol.style.Fill({
+        //                       //矢量图层填充颜色，以及透明度
+        //                       color: "#FFD306",
+        //                     }),
+        //                     stroke: new ol.style.Stroke({
+        //                       //边界样式
+        //                       color: "rgba(255, 45, 45,1)",
+        //                       width: 3,
+        //                     }),
+        //                   });
+        //                 }
+        //                 hc_land = new ol.layer.Vector({
+        //                   title: "add Layer",
+        //                   source: new ol.source.Vector({
+        //                     projection: projection,
+        //                     features: new ol.format.GeoJSON().readFeatures("{\n" +
+        //                       "    \"type\": \"Feature\",\n" +
+        //                       "    \"geometry\":" + this.mapTheGeomZrzId[i].theGeom + ",    \"properties\":" + JSON.stringify(this.mapTheGeomZrzId[i]) + "}"),
+        //                   }),
+        //                   style: styleZrz
+        //                 });
+        //                 map.addLayer(hc_land);
+        //               }
+        //             }
+        //           }
+        //         }
+        //       });
+        //       //自然幢定位结束 ---------end
+        //
+        //       //附属设施定位开始 ---------start
+        //       getFsssZjdDmList(this.mapTheGeomZjdId[i].zjddm).then((response) => {
+        //         if (response.code == 200) {
+        //           this.mapTheGeomFsssId = response.data;
+        //           if(this.mapTheGeomFsssId.length >0) {
+        //             for (var i = 0; this.mapTheGeomFsssId.length > i; i++) {
+        //               if (this.mapTheGeomFsssId[i] !=null && this.mapTheGeomFsssId[i].theGeom != null && this.mapTheGeomFsssId[i].theGeom != "") {
+        //                 this.mapTheGeomFsssId[i].createBy = 'mapTheGeomFsssId';
+        //                 var styleFsss = "";
+        //                 if(this.mapTheGeomZjdId[i].houseDataConfirmStatus == "CONFIRMED"){
+        //                   styleFsss = new ol.style.Style({
+        //                     fill: new ol.style.Fill({
+        //                       //矢量图层填充颜色，以及透明度
+        //                       color: "#00FFFF",
+        //                     }),
+        //                     stroke: new ol.style.Stroke({
+        //                       //边界样式
+        //                       color: "#28FF28",
+        //                       width: 3,
+        //                     }),
+        //                   });
+        //                 } else {
+        //                   styleFsss = new ol.style.Style({
+        //                     fill: new ol.style.Fill({
+        //                       //矢量图层填充颜色，以及透明度
+        //                       color: "#00FFFF",
+        //                     }),
+        //                     stroke: new ol.style.Stroke({
+        //                       //边界样式
+        //                       color: "rgba(255, 45, 45,1)",
+        //                       width: 3,
+        //                     }),
+        //                   });
+        //                 }
+        //                 hc_land = new ol.layer.Vector({
+        //                   title: "add Layer",
+        //                   source: new ol.source.Vector({
+        //                     projection: projection,
+        //                     features: new ol.format.GeoJSON().readFeatures("{\n" +
+        //                       "    \"type\": \"Feature\",\n" +
+        //                       "    \"geometry\":" + this.mapTheGeomFsssId[i].theGeom + ",    \"properties\":" + JSON.stringify(this.mapTheGeomFsssId[i]) + "}"),
+        //                   }),
+        //                   style: styleFsss
+        //                 });
+        //                 map.addLayer(hc_land);
+        //               }
+        //             }
+        //           }
+        //         }
+        //       });
+        //       //附属设施定位结束 ---------end
+        //     }
+        //   }
+        // }
+        // //宅基地定位结束 ---------end
+        //数据库直接加载数据渲染方式---------------------------------------------------end
+
+        //地图操作定义------------start
+        //定位定义------------start
+        var Zb;
+        var latitude;
+        var longitude;
+        var vector_drawing;
+        //定位定义------------end
+
+        //绘图定义---------------start
+        var drawing;
+        var draw_map;
+        //绘图定义---------------end
+
+        //测面绘图定义------------start
+        var draw_cm;
+        //定义矢量图层
+        var vector;
+        //创建一个帮助提示信息对象
+        var helpTooltip;
+        //创建一个测量提示信息对象
+        var measureTooltip;
+        //创建一个帮助提示框对象
+        var helpTooltipElement;
+        //测出距离
+        var measureTooltipElement;
+        //测面绘图定义-----------end
+
+        //地图操作定义------------end
+        //定位当前位置 ------start
+        $("#dwMapAll").on("click", function () {
+          //删除测量记录操作--------start
+          //将矢量图层从图中删除
+          //map.removeLayer(helpTooltip);
+          map.removeLayer(vector);
+          map.removeInteraction(draw_cm);
+          //map.removeOverlay(helpTooltipElement);
+          //map.removeLayer(measureTooltip);
+          //删除测量记录操作--------end
+          //删除绘制图层画图操作-------start
+          map.removeInteraction(draw_map);
+          map.removeLayer(drawing);
+          //删除绘制图层画图操作-------end
+
+          //开始定位当前位置
+          navigator.geolocation.getCurrentPosition(function(position) {
+            latitude = position.coords.latitude;// 获取纬度
+            longitude = position.coords.longitude;// 获取经度
+          });
+          if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){
+            Zb = [longitude,latitude];
+          }else {
+            Zb =[115.452752, 31.789033];
+          }
+          //获取坐标点LocationManager
+          // geoGps().then(response => {
+          //
+          // });
+          //矢量标注样式设置函数，设置image为图标ol.style.Icon
+          function createLabelStyle() {
+            return new ol.style.Style({
+              image: new ol.style.Icon({
+                //设置图标偏移
+                anchor: [0.5, 1],
+                //标注样式的起点位置
+                anchorOrigin: "top-right",
+                //X方向单位：分数
+                anchorXUnits: "fraction",
+                //Y方向单位：像素
+                anchorYUnits: "pixels",
+                //偏移起点位置的方向
+                offsetOrigin: "top-right",
+                //透明度
+                opacity: 0.9,
+                //图片路径
+                src: require("../../assets/images/housesteadSurvey/mark.png"),
+              }),
+              text: new ol.style.Text({
+                textAlign: "center", //位置
+                textBaseline: "middle", //基准线
+                font: "normal 12px 微软雅黑", //文字样式
+                //text: "标注点", //文本内容
+                fill: new ol.style.Fill({
+                  //文本填充样式（即文字颜色)
+                  color: "#ff0000",
+                }),
+              }),
+              zIndex: 9999,
+            });
+          }
+          var newcenterFeature = new ol.Feature({
+            geometry: new ol.geom.Point(ol.proj.fromLonLat(Zb)), //几何信息
+            name: "标注点",
+          });
+          var sourceMapLook = new ol.source.Vector({wrapX: false});
+          vector_drawing = new ol.layer.Vector({
+            source: sourceMapLook,
+          });
+          map.addLayer(vector_drawing);
+          newcenterFeature.setStyle(createLabelStyle()); //设置要素样式
+          sourceMapLook.addFeature(newcenterFeature);
+          map.getView().animate({
+            // 只设置需要的属性即可
+            center: ol.proj.fromLonLat(Zb), // 中心点
+            zoom: 17.8, // 缩放级别
+            rotation: undefined, // 缩放完成view视图旋转弧度
+            duration: 1000, // 缩放持续时间，默认不需要设置
+            resolution:Math.random() * 0.00000001,
+          });
+        });
+        //定位当前位置 ------end
+
+        //开始绘制图层- -----start
+        $("#htMapAll").on("click", function () {
+          if(that.drawingClick) {
+            that.drawingClick=false;
+            //删除之前 测距操作添加map中的绘图  --------start
+            //map.removeLayer(helpTooltip);
+            map.removeLayer(vector);
+            map.removeInteraction(draw_cm);
+            //map.removeOverlay(helpTooltipElement);
+            map.removeLayer(measureTooltipElement);
+            //删除之前 测距操作添加map中的绘图  --------end
+
+            //删除之前画图图层,重新绘制图层
+            map.removeInteraction(draw_map);
+            map.removeLayer(drawing);
+            //var source = new ol.source.Vector({wrapX: false});
+            drawing = new ol.layer.Vector({
+              source: new ol.source.Vector(),
+            });
+            map.addLayer(drawing);
+
+            function addInteraction() {
+              draw_map = new ol.interaction.Draw({
+                source: drawing.getSource(),
+                type: "Polygon",
+              });
+              draw_map.on("drawend", function (evt) {
+                var feature = evt.feature;
+                var geometry = feature.getGeometry();
+                that.coordinate = geometry.getCoordinates();
+                //_this.coordinateList = coordinate.toString();
+                //提示当前坐标是否绘制完成
+                if (that.coordinate != "" && that.coordinate != null) {
+                  that.showhzht = true;
+                  that.htZjdZrzFsss = JSON.stringify(that.coordinate);
+                  console.log(that.mapZjdData);
+                  // htMapAllFu();
+                } else {
+                  $("#htMapAll").trigger("click");
+                }
+              });
+              map.addInteraction(draw_map);
+            }
+
+            function htMapAllFu() {
+              //that.drawMapPolygonFun();
+              //绘制多边形地图
+              that.$dialog
+                .confirm({
+                  title: "提示",
+                  message: "是否重新绘制画图",
+                })
+                .then(() => {
+                  //$("#drawRemove").trigger("click");
+                  map.removeInteraction(draw_map);
+                  that.coordinate = "";
+                })
+                .catch(() => {
+                  //删除画图点
+                  map.removeInteraction(draw_map);
+                });
+            }
+
+            addInteraction();
+          } else {
+            that.drawingClick=true;
+            //删除之前 测距操作添加map中的绘图  --------start
+            //map.removeLayer(helpTooltip);
+            map.removeLayer(vector);
+            map.removeInteraction(draw_cm);
+            //map.removeOverlay(helpTooltipElement);
+            map.removeLayer(measureTooltipElement);
+            //删除之前 测距操作添加map中的绘图  --------end
+
+            //删除之前画图图层,重新绘制图层
+            map.removeInteraction(draw_map);
+            map.removeLayer(drawing);
+            //var source = new ol.source.Vector({wrapX: false});
+          }
+        });
+        //删除之前绘制图层
+        $("#deleteHistory").on("click", function () {
+          map.removeLayer(drawing);
+          that.showhzht = false;
+        });
+        //开始绘制图层- -----end
+
+        //切换功能删除之前选中状态
+        $("#deleteHistoryMap").on("click", function () {
+          map.removeLayer(hc_land_on);
+          that.mapZjdData = "";
+          that.mapZrzData = "";
+          that.mapFsssData = "";
+          //that.mapZjdTeAll.active ="1";
+          that.mapZjdTeAll.mapZjdAData = {};
+          that.mapZjdTeAll.mapZrzAData = {};
+          that.mapZjdTeAll.mapFsssAData = {};
+          that.mapZjdDataTure = "";
+        });
+        //清除画图鼠标点击事件
+        // $("#drawRemove").click(function () {
+        //   map.removeLayer(drawing);
+        // });
+        //
+
+        //地图定义
+        var delete_map = ["mapZjd", "mapZrz","mapFsss"];
+        var hc_land_queryList =[];
+        var texiao_layer_zjd;
+        var texiao_layer_zrz;
+        var texiao_layer_fsss;
+        //按照查询条件人名  定位地图-----------------start
+        $("#query").on("click", function () {
+          //数据库查询数据------------------------------------------------------start
+          $("#deleteHistoryMap").trigger("click");
+          var val = that.seachText;
+          //删除之前查询图层
+          for(var i=0;hc_land_queryList.length>i;i++){
+            map.removeLayer(hc_land_queryList[i]);
+          }
+          hc_land_queryList = [];
+          that.mapDataAll =[];
+          if (val == "") {
+            that.$toast('请填写查询条件再查询');
+          } else {
+            var styleZjd = new ol.style.Style({
+              stroke: new ol.style.Stroke({
+                //边界样式
+                color: "#CCFF66",
+                width: 6,
+              }),
+            });
+            let params;
+            if(that.mapAddJumpNum == 1){
+              params = {
+                "deptId" : that.mapAddJump,
+                "syqr" : val
+              }
+            } else {
+              params = {
+                "deptId" : that.$cookies.get("item").deptId,
+                "syqr" : val
+              }
+            }
+            listZjdzd(params).then((response) => {
+              if(response.rows.length != 0){
+                that.mapDataAll = response.rows;
+                for(var hg=0; hg < that.mapDataAll.length; hg++){
+                  var mapNum = that.mapDataAll[hg].houseDataConfirmStatus;
+                  if(mapNum == "UNCONFIRMED"){
+                    that.mapDataAll[hg].paceType = "未核查";
+                  } else if (mapNum == "CONFIRMED"){
+                    that.mapDataAll[hg].paceType = "已核查";
+                  }else{
+
+                  }
+                  that.mapDataAll[hg].typeTc="宅基地";
+                  if (that.mapDataAll[hg] !=null && that.mapDataAll[hg].theGeom != null && that.mapDataAll[hg].theGeom != "") {
+                    that.mapDataAll[hg].createBy = 'mapTheGeomZjdId';
+                    hc_land_queryList[hg] =new ol.layer.Vector({
+                      title: "add Layer",
+                      source: new ol.source.Vector({
+                        projection: projection,
+                        features: new ol.format.GeoJSON().readFeatures("{\n" +
+                          "    \"type\": \"Feature\",\n" +
+                          "    \"geometry\":" + that.mapDataAll[hg].theGeom + ",    \"properties\":" + JSON.stringify(that.mapDataAll[hg]) + "}"),
+                      }),
+                      style: styleZjd
+                    });
+                    map.addLayer(hc_land_queryList[hg]);
+                    var maxXMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.maxX;
+                    var maxYMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.maxY;
+                    var minXMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.minX;
+                    var minYMap = hc_land_queryList[hg].values_.source.featuresRtree_.rbush_.data.minY;
+                    //定位查询位置
+                    var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+                    map.getView().animate({
+                      // 只设置需要的属性即可
+                      center: center, // 中心点
+                      zoom: 15.8, // 缩放级别
+                      rotation: undefined, // 缩放完成view视图旋转弧度
+                      duration: 1000, // 缩放持续时间，默认不需要设置
+                      resolution:Math.random() * 0.00000001,
+                    });
+                  }
+                  // listFsss(paramsZrz).then((response) => {
+                  //   that.mapDataAll.push(response.rows);
+                  // });
+                }
+                // for(var queryFor=0; hc_land_queryList > queryFor; queryFor++ ){
+                //   map.addLayer(hc_land_queryList[queryFor]);
+                // }
+                // var mapZrzFor = that.mapDataAll[0].length+1;
+                // console.log(mapZrzFor);
+                // for(var mapFor=0;mapZrzFor>mapFor;mapFor++){
+                //   //查询自然幢
+                //   let paramsZrz = {
+                //     "deptId" : that.$cookies.get("item").deptId,
+                //     "zjddm" : that.mapDataAll[0][mapFor].zjddm,
+                //     "pageSize":20,
+                //   }
+                //   listZrz(paramsZrz).then((response) => {
+                //     console.log(response);
+                //     that.mapDataAll[0].
+                //     that.mapDataAll[0].push(response.rows);
+                //   });
+                // }
+                setTimeout(function () {
+                  that.showSearch = true ;
+                  $('.searchBox').css('display','block')
+                  var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
+                  document.styleSheets[0].insertRule(
+                    "@keyframes test" +
+                    "{" +
+                    "0%{bottom: -" + height + "px;}" +
+                    "100%{bottom: 0px;}" +
+                    "}"
+                  )
+                  $('.searchBar_wrap').css({'animation':'test 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test 0.5s ease-in-out 0s 1 alternate forwards'});
+                  //}
+                },500);
+              } else {
+                that.$toast("暂无数据")
+              }
+            });
+
+          }
+          //数据库查询数据------------------------------------------------------end
+          //地图查询------------------------------------------------------------start
+          /**
+           * @api wfs服务空间查询
+           * @param {*} wfsurl
+           * @param {*} srsName
+           * @param {*} typeName
+           * @param {*} drawType
+           * @param {option 可选} geometryField
+           */
+          // var val = that.seachText;
+          // if (val == "") {
+          //   that.$toast('请填写查询条件再查询');
+          // } else {
+          //   //清除之前查询数据
+          //   that.mapDataAll =[];
+          //   //分类查询查询农地、农房
+          //   var difang;
+          //   //查询条件
+          //   var cql_filter_cun;
+          //   var cun = that.$cookies.get("item").deptId;
+          //   difang = ["zjd_dc:t_house_survey_zjdzd", "zjd_dc:t_house_survey_zrz","zjd_dc:t_house_survey_fsss"];
+          //   var tach = 0;
+          //   var once = 0;
+          //   for (var i = 0; i < difang.length; i++) {
+          //     map.removeLayer(delete_map[i]);
+          //     // 数字验证！
+          //     var reg = /\d/;
+          //     //验证汉子
+          //     //var han = /^[\u4e00-\u9fa5]+$/;
+          //     if (reg.test(val)) {
+          //       //循环判断查询条件
+          //       cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
+          //     } else {
+          //       //循环判断查询条件
+          //       if (difang[i] == "zjd_dc:t_house_survey_zjdzd") {
+          //         cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
+          //       } else if(difang[i] == "zjd_dc:t_house_survey_zrz") {
+          //         cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
+          //       } else if(difang[i] == "zjd_dc:t_house_survey_fsss") {
+          //         cql_filter_cun = "zjddm='" + val + "'" + "and dept_id='" + cun + "'";
+          //       }
+          //     }
+          //     //for(var i=0; i< difang.length; i++){
+          //     //cql_filter = "CM='"+cun +"'"+ "and XZQK='待流转待盘活'";
+          //
+          //     //图层加载
+          //
+          //     //业务图层  wms服务
+          //     delete_map[i] = new ol.layer.Tile({
+          //       source: new ol.source.TileWMS({
+          //         url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+          //         params: {
+          //           LAYERS: difang[i],
+          //           //'LAYERS': 'new_shp:new_shp_all',
+          //           TILED: true,
+          //           cql_filter: cql_filter_cun,
+          //           SRID: 3857,
+          //         },
+          //       }),
+          //     });
+          //
+          //     //}
+          //     //定位查询位置
+          //     let param_dw = {
+          //       srsName: "EPSG:3857",
+          //       service: "WFS",
+          //       version: "1.0.0",
+          //       request: "GetFeature",
+          //       typename: difang[i],
+          //       //featureNS: 'nsgk_hc',//命名空间 URI
+          //       cql_filter: cql_filter_cun,
+          //       //featurePrefix: 'nationalwater',//工作区名称
+          //       //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
+          //       outputFormat: "application/json",
+          //       //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
+          //     };
+          //     let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl;
+          //     url_dw = url_dw + "?";
+          //     for (let key in param_dw) {
+          //       url_dw = url_dw + key + "=" + param_dw[key] + "&";
+          //     }
+          //     url_dw = url_dw.substr(0, url_dw.length - 1);
+          //     fetch(url_dw, {
+          //       method: "POST", // *GET, POST, PUT, DELETE, etc.
+          //     })
+          //       .then((res) => {
+          //         var geojsonmap = res.json();
+          //         return geojsonmap;
+          //       })
+          //       .then((data) => {
+          //         tach = tach + 1;
+          //         if (data.features != null && data.features != "") {
+          //           for(var i=0; data.features.length >i; i++) {
+          //             //特效动画实现 -----------------------------start
+          //             console.log(tach,"++++++++++++++++++",once)
+          //             var datamap = data.features[0].bbox;
+          //             if (tach == 1 && once == 0) {
+          //               console.log("zrz")
+          //               texiao_layer_zjd = new ol.layer.Vector({
+          //                 source: new ol.source.Vector(),
+          //               });
+          //               map.addLayer(texiao_layer_zjd);
+          //               var center = ol.extent.getCenter(datamap); //获取边界区域的中心位置
+          //               var circle = new ol.Feature({
+          //                 geometry: new ol.geom.Point(center), //ol.proj.transform([104, 30], 'EPSG:4326', 'EPSG:3857') //投影坐标转为地理坐标
+          //               });
+          //
+          //               circle.setStyle(
+          //                 new ol.style.Style({
+          //                   image: new ol.style.Circle({
+          //                     radius: 0,
+          //                     stroke: new ol.style.Stroke({
+          //                       color: "yellow",
+          //                       size: 1,
+          //                     }),
+          //                   }),
+          //                 })
+          //               );
+          //               texiao_layer_zjd.getSource().addFeature(circle);
+          //
+          //               // 关键的地方在此：监听postcompose事件，在里面重新设置circle的样式
+          //               var radius = 0;
+          //               map.on("postcompose", function () {
+          //                 // 增大半径，最大20
+          //                 radius++;
+          //                 radius = radius % 10;
+          //                 // 设置样式
+          //                 circle.setStyle(
+          //                   new ol.style.Style({
+          //                     image: new ol.style.Circle({
+          //                       radius: radius,
+          //                       stroke: new ol.style.Stroke({
+          //                         color: "yellow",
+          //                         size: 1,
+          //                       }),
+          //                     }),
+          //                   })
+          //                 );
+          //               });
+          //             } else if(tach == 2) {
+          //               console.log("zrz")
+          //               texiao_layer_zrz = new ol.layer.Vector({
+          //                 source: new ol.source.Vector(),
+          //               });
+          //               map.addLayer(texiao_layer_zrz);
+          //               var center = ol.extent.getCenter(datamap); //获取边界区域的中心位置
+          //               var circle = new ol.Feature({
+          //                 geometry: new ol.geom.Point(center), //ol.proj.transform([104, 30], 'EPSG:4326', 'EPSG:3857') //投影坐标转为地理坐标
+          //               });
+          //
+          //               circle.setStyle(
+          //                 new ol.style.Style({
+          //                   image: new ol.style.Circle({
+          //                     radius: 0,
+          //                     stroke: new ol.style.Stroke({
+          //                       color: "yellow",
+          //                       size: 1,
+          //                     }),
+          //                   }),
+          //                 })
+          //               );
+          //               texiao_layer_zrz.getSource().addFeature(circle);
+          //
+          //               // 关键的地方在此：监听postcompose事件，在里面重新设置circle的样式
+          //               var radius = 0;
+          //               map.on("postcompose", function () {
+          //                 // 增大半径，最大20
+          //                 radius++;
+          //                 radius = radius % 10;
+          //                 // 设置样式
+          //                 circle.setStyle(
+          //                   new ol.style.Style({
+          //                     image: new ol.style.Circle({
+          //                       radius: radius,
+          //                       stroke: new ol.style.Stroke({
+          //                         color: "yellow",
+          //                         size: 1,
+          //                       }),
+          //                     }),
+          //                   })
+          //                 );
+          //               });
+          //             } else {
+          //               console.log("fsss")
+          //               texiao_layer_fsss = new ol.layer.Vector({
+          //                 source: new ol.source.Vector(),
+          //               });
+          //               map.addLayer(texiao_layer_fsss);
+          //               var center = ol.extent.getCenter(datamap); //获取边界区域的中心位置
+          //               var circle = new ol.Feature({
+          //                 geometry: new ol.geom.Point(center), //ol.proj.transform([104, 30], 'EPSG:4326', 'EPSG:3857') //投影坐标转为地理坐标
+          //               });
+          //
+          //               circle.setStyle(
+          //                 new ol.style.Style({
+          //                   image: new ol.style.Circle({
+          //                     radius: 0,
+          //                     stroke: new ol.style.Stroke({
+          //                       color: "yellow",
+          //                       size: 1,
+          //                     }),
+          //                   }),
+          //                 })
+          //               );
+          //               texiao_layer_fsss.getSource().addFeature(circle);
+          //
+          //               // 关键的地方在此：监听postcompose事件，在里面重新设置circle的样式
+          //               var radius = 0;
+          //               map.on("postcompose", function () {
+          //                 // 增大半径，最大20
+          //                 radius++;
+          //                 radius = radius % 10;
+          //                 // 设置样式
+          //                 circle.setStyle(
+          //                   new ol.style.Style({
+          //                     image: new ol.style.Circle({
+          //                       radius: radius,
+          //                       stroke: new ol.style.Stroke({
+          //                         color: "yellow",
+          //                         size: 1,
+          //                       }),
+          //                     }),
+          //                   })
+          //                 );
+          //               });
+          //             }
+          //             //特效动画实现 -----------------------------end
+          //             that.mapDataAll.push(JSON.parse(JSON.stringify(data.features[i].properties)));
+          //           }
+          //           //定位实现
+          //           let resolution = map.getView().getResolutionForExtent(data.bbox, map.getSize());
+          //           map.getView().fit(data.bbox);
+          //           map.getView().setResolution(resolution);
+          //           console.log(that.mapDataAll);
+          //         } else if (tach == 1) {
+          //           once = once + 1;
+          //         } else {
+          //           if (once == 1 && tach == 3) {
+          //             that.$toast("没有找到相关人员信息");
+          //             //that.showSearch = false ;
+          //           }else {
+          //
+          //           }
+          //         }
+          //       })
+          //       .catch((error) => {
+          //         console.log("【异常】", error);
+          //       });
+          //     map.addLayer(delete_map[i]);
+          //   }
+          //地图查询------------------------------------------------------------end
+        });
+        //按照查询  定位地图-----------------end
+
+        //筛选附属设施-----------------------------------start
+        $("#fsssSx").click(function () {
+          if(!that.fsssSx){
+            map.addLayer(fsssTc);
+          }else {
+            map.removeLayer(fsssTc);
+          }
+        });
+        $("#zrzSx").click(function () {
+          if(!that.zrzSx){
+            map.addLayer(zrzTc);
+          }else {
+            map.removeLayer(zrzTc);
+          }
+        });
+        $("#zjdSx").click(function () {
+          if(!that.zjdSx){
+            map.addLayer(zjdTc);
+          }else {
+            map.removeLayer(zjdTc);
+          }
+        });
+        $("#checkAll").click(function () {
+          if(!that.fsssSx && !that.zjdSx && !that.zrzSx){
+            map.addLayer(zjdTc);
+            map.addLayer(zrzTc);
+            map.addLayer(fsssTc);
+          }else {
+            map.removeLayer(zrzTc);
+            map.removeLayer(zjdTc);
+            map.removeLayer(fsssTc);
+          }
+        });
+        //筛选附属设施-----------------------------------end
+        // //获取类型开始  侧面-----------------------------------------------------------------start
+        //样式加载定义
+        var vector_drawing_delete;
+        $("#area").click(function () {
+          console.log(that.textMjAll);
+          console.log(that.clickBbox);
+          if(that.textMjAll ==null || that.textMjAll ==""){
+            that.textMjAll =0;
+          }
+          if((that.textMjAll != "" && that.clickBbox !="") || (that.textMjAll == 0 && that.clickBbox !="")){
+            map.removeLayer(vector_drawing_delete);
+            function createLabelStyle() {
+              return new ol.style.Style({
+                text: new ol.style.Text({
+                  text: that.textMjAll+"㎡",
+                  textAlign: "center", //位置
+                  textBaseline: "middle", //基准线
+                  font: "normal 12px 微软雅黑", //文字样式
+                  //text: "标注点", //文本内容
+                  fill: new ol.style.Fill({
+                    //文本填充样式（即文字颜色)
+                    color: "#FFFFFF",
+                    width: 10,
+                  }),
+                  overflow: false //超出面的部分不显示
+                }),
+                zIndex: 9999,
+              });
+            }
+            var newcenterFeature = new ol.Feature({
+              geometry: new ol.geom.Point(that.clickBbox), //几何信息
+              //name: "标注点",
+            });
+            var sourceMapLook = new ol.source.Vector({wrapX: false});
+            vector_drawing_delete = new ol.layer.Vector({
+              source: sourceMapLook,
+            });
+            map.addLayer(vector_drawing_delete);
+            newcenterFeature.setStyle(createLabelStyle()); //设置要素样式
+            sourceMapLook.addFeature(newcenterFeature);
+            //map.addLayer(styleFsss);
+          } else if(that.textMjAllNum == "1"){
+            that.$toast("该图层面积暂无信息");
+          } else {
+            that.$toast("选择图层进行面积显示");
+          }
+        });
+        // $("#area").click(function () {
+        //   console.log("进入测面")
+        //   //删除绘制图层画图操作-------start
+        //   map.removeInteraction(draw_map);
+        //   map.removeLayer(drawing);
+        //   //删除绘制图层画图操作-------end
+        //   //开始绘制 测面--------------------------------------------------------------start
+        //   //定义矢量数据源
+        //   var source = new ol.source.Vector();
+        //
+        //   vector = new ol.layer.Vector({
+        //     source: source,
+        //     style: new ol.style.Style({
+        //       fill: new ol.style.Fill({
+        //         color: "rgba(255,255,255,0.2)",
+        //       }),
+        //       stroke: new ol.style.Stroke({
+        //         color: "#e21e0a",
+        //         width: 2,
+        //       }),
+        //       //image: new ol.style.Circle({
+        //       // radius: 7,
+        //       // fill: new ol.style.Fill({
+        //       //  color:'#ffcc33'
+        //       // })
+        //       //})
+        //     }),
+        //   });
+        //
+        //   //将矢量图层添加到地图中   线的颜色加入map中
+        //   map.addLayer(vector);
+        //
+        //   var sketch;
+        //
+        //   var continuePolygonMsg = "单击以继续绘制多边形";
+        //
+        //   /**
+        //    * Message to show when the user is drawing a line.
+        //    * @type {string}
+        //    */
+        //     //var continueLineMsg = '单击继续绘制直线';
+        //
+        //     //鼠标移动触发的函数
+        //   var pointerMoveHandler = function (evt) {
+        //       //Indicates if the map is currently being dragged.
+        //       //Only set for POINTERDRAG and POINTERMOVE events. Default is false.
+        //       //如果是平移地图则直接结束
+        //       if (evt.dragging) {
+        //         return;
+        //       }
+        //       //帮助提示信息
+        //       var helpMsg = "单击开始绘图";
+        //
+        //       if (sketch) {
+        //         //Get the feature's default geometry.
+        //         //A feature may have any number of named geometries.
+        //         //获取绘图对象的几何要素
+        //         var geom = sketch.getGeometry();
+        //         //如果当前绘制的几何要素是多边形，则将绘制提示信息设置为多边形绘制提示信息
+        //         //如果当前绘制的几何要素是多线段，则将绘制提示信息设置为多线段绘制提示信息
+        //         helpMsg = continuePolygonMsg;
+        //       }
+        //       //设置帮助提示要素的内标签为帮助提示信息
+        //       helpTooltipElement.innerHTML = helpMsg;
+        //       //设置帮助提示信息的位置
+        //       //The coordinate in view projection corresponding to the original browser event.
+        //       helpTooltip.setPosition(evt.coordinate);
+        //       //移除帮助提示要素的隐藏样式
+        //       $(helpTooltipElement).removeClass("hidden");
+        //     };
+        //
+        //   map.on("pointermove", pointerMoveHandler);
+        //
+        //   map.getViewport().addEventListener("mouseout", function () {
+        //     helpTooltipElement.classList.add("hidden");
+        //   });
+        //
+        //   //添加交互式绘图对象的函数
+        //   function addInteraction() {
+        //     // 获取当前选择的绘制类型
+        //     //var type = typeSelect.value == 'length' ? 'Polygon' : 'LineString';
+        //     //创建一个交互式绘图对象
+        //     var type = "Polygon";
+        //     draw_cm = new ol.interaction.Draw({
+        //       //绘制的数据源
+        //       source: source,
+        //       //绘制类型
+        //       type: type,
+        //       //样式
+        //       style: new ol.style.Style({
+        //         fill: new ol.style.Fill({
+        //           color: "rgba(255,255,255,0.2)",
+        //         }),
+        //         stroke: new ol.style.Stroke({
+        //           color: "rgba(0,0,0,0.5)",
+        //           lineDash: [10, 10],
+        //           width: 2,
+        //         }),
+        //         //  image: new ol.style.Circle({
+        //         //   radius: 5,
+        //         //   stroke: new ol.style.Stroke({
+        //         //	color:'rgba(0,0,0,0.7)'
+        //         // }),
+        //         // fill: new ol.style.Fill({
+        //         //color: 'rgba(255,255,255,0.2)'
+        //         // })
+        //         //})
+        //       }),
+        //     });
+        //     //将交互绘图对象添加到地图中
+        //     map.addInteraction(draw_cm);
+        //
+        //     //创建测量提示框
+        //     createMeasureTooltip();
+        //     //创建帮助提示框
+        //     createHelpTooltip();
+        //
+        //     //定义一个事件监听
+        //     var listener;
+        //     //定义一个控制鼠标点击次数的变量
+        //     var count = 0;
+        //     //绘制开始事件
+        //     draw_cm.on(
+        //       "drawstart",
+        //       function (evt) {
+        //         //The feature being drawn.
+        //         sketch = evt.feature;
+        //         //提示框的坐标
+        //         var tooltipCoord = evt.coordinate;
+        //         //监听几何要素的change事件
+        //         //Increases the revision counter and dispatches a 'change' event.
+        //
+        //         listener = sketch.getGeometry().on("change", function (evt) {
+        //           //The event target.
+        //           //获取绘制的几何对象
+        //           var geom = evt.target;
+        //           //定义一个输出对象，用于记录面积和长度
+        //           var output;
+        //           map.removeEventListener("singleclick");
+        //           map.removeEventListener("dblclick");
+        //           //输出多边形的面积
+        //           output = formatArea(geom);
+        //           //Return an interior point of the polygon.
+        //           //获取多变形内部点的坐标
+        //           tooltipCoord = geom.getInteriorPoint().getCoordinates();
+        //
+        //           //设置测量提示框的内标签为最终输出结果
+        //           measureTooltipElement.innerHTML = output;
+        //           //设置测量提示信息的位置坐标
+        //           measureTooltip.setPosition(tooltipCoord);
+        //         });
+        //
+        //         //地图单击事件
+        //         map.on("singleclick", function (evt) {
+        //           //设置测量提示信息的位置坐标，用来确定鼠标点击后测量提示框的位置
+        //           measureTooltip.setPosition(evt.coordinate);
+        //           //如果是第一次点击，则设置测量提示框的文本内容为起点
+        //           if (count == 0) {
+        //             measureTooltipElement.innerHTML = "起点";
+        //           }
+        //           //根据鼠标点击位置生成一个点
+        //           var point = new ol.geom.Point(evt.coordinate);
+        //           //将该点要素添加到矢量数据源中
+        //           source.addFeature(new ol.Feature(point));
+        //           //更改测量提示框的样式，使测量提示框可见
+        //           measureTooltipElement.className = "tooltip tooltip-static";
+        //           //创建测量提示框
+        //           createMeasureTooltip();
+        //           //点击次数增加
+        //           count++;
+        //         });
+        //
+        //         //地图双击事件
+        //         map.on("dblclick", function (evt) {
+        //           //根据
+        //           var point = new ol.geom.Point(evt.coordinate);
+        //           source.addFeature(new ol.Feature(point));
+        //         });
+        //       },
+        //       this
+        //     );
+        //     //绘制结束事件
+        //     draw_cm.on(
+        //       "drawend",
+        //       function (evt) {
+        //         count = 0;
+        //         //设置测量提示框的样式
+        //         measureTooltipElement.className = "tooltip tooltip-static";
+        //         //Set the offset for this overlay.
+        //         //设置偏移量
+        //         measureTooltip.setOffset([0, -7]);
+        //         //清空绘制要素
+        //         sketch = null;
+        //         //清空测量提示要素
+        //         measureTooltipElement = null;
+        //         //创建测量提示框
+        //         createMeasureTooltip();
+        //         //Removes an event listener using the key returned by on() or once().
+        //         //移除事件监听
+        //         ol.Observable.unByKey(listener);
+        //         //移除地图单击事件
+        //         map.removeEventListener("singleclick");
+        //       },
+        //       this
+        //     );
+        //   }
+        //   /**
+        //    * Creates a new help tooltip
+        //    */
+        //   function createHelpTooltip() {
+        //     if (helpTooltipElement) {
+        //       helpTooltipElement.parentNode.removeChild(helpTooltipElement);
+        //     }
+        //     helpTooltipElement = document.createElement("div");
+        //     helpTooltipElement.className = "ol-tooltip hidden";
+        //     helpTooltip = new ol.Overlay({
+        //       element: helpTooltipElement,
+        //       offset: [15, 0],
+        //       positioning: "center-left",
+        //     });
+        //     map.addOverlay(helpTooltip);
+        //   }
+        //
+        //   /**
+        //    * Creates a new measure tooltip
+        //    */
+        //   function createMeasureTooltip() {
+        //     if (measureTooltipElement) {
+        //       measureTooltipElement.parentNode.removeChild(measureTooltipElement);
+        //     }
+        //     measureTooltipElement = document.createElement("div");
+        //     measureTooltipElement.className = "ol-tooltip ol-tooltip-measure";
+        //     measureTooltip = new ol.Overlay({
+        //       element: measureTooltipElement,
+        //       offset: [0, -15],
+        //       positioning: "bottom-center",
+        //     });
+        //     map.addOverlay(measureTooltip);
+        //   }
+        //
+        //   //格式化测量面积
+        //   var formatArea = function (polygon) {
+        //     //定义面积变量
+        //     var area;
+        //     //获取平面面积
+        //     area = polygon.getArea();
+        //     //定义输出变量
+        //     var output;
+        //     //当面积大于10000时，转换为平方千米，否则为平方米
+        //     if (area > 10000) {
+        //       output =
+        //         Math.round((area / 1000000) * 100) / 100 + " " + "km<sup>2</sup>";
+        //     } else {
+        //       output = Math.round(area * 100) / 100 + " " + "m<sup>2</sup>";
+        //     }
+        //     return output;
+        //   };
+        //
+        //   addInteraction();
+        // });
+        // //侧面结束-----------------------------------------------------------------end
+
+        //全图展示-----------------start
+        $("#mapAllQt").click(function (){
+          //定位查询位置
+          let param_dw = {
+            srsName: "EPSG:3857",
+            service: "WFS",
+            version: "1.0.0",
+            request: "GetFeature",
+            typename: "zjd_dc:t_house_survey_border_village",
+            //featureNS: 'nsgk_hc',//命名空间 URI
+            cql_filter: cql_filter,
+            //featurePrefix: 'nationalwater',//工作区名称
+            //featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
+            outputFormat: "application/json",
+            //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
+          };
+          let url_dw = that.mapGeoServerUrl+"/geoserver/zjd_dc/wfs"; //wfsurl;
+          url_dw = url_dw + "?";
+          for (let key in param_dw) {
+            url_dw = url_dw + key + "=" + param_dw[key] + "&";
+          }
+          url_dw = url_dw.substr(0, url_dw.length - 1);
+          fetch(url_dw, {
+            method: "POST", // *GET, POST, PUT, DELETE, etc.
+          })
+            .then((res) => {
+              var geojsonmap = res.json();
+              return geojsonmap;
+            })
+            .then((data) => {
+              let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize());
+              resolution:resolution + Math.random() * 0.00000001,
+                map.getView().fit(data.bbox);
+              map.getView().setResolution(resolution);
+              // var datamap = data.bbox;
+              // var center = ol.extent.getCenter(datamap);
+              // map.getView().animate({
+              //   // 只设置需要的属性即可
+              //   center: center, // 中心点
+              //   rotation: undefined, // 缩放完成view视图旋转弧度
+              // });
+            })
+            .catch((error) => {
+              console.log("【异常】", error);
+            });
+        });
+
+        //业务图层  wfs服务  属性查询开始 ------------------start
+        /**
+         * @api wfs服务空间查询
+         * @param {*} wfsurl
+         * @param {*} srsName
+         * @param {*} typeName
+         * @param {*} drawType
+         * @param {option 可选} geometryField
+         */
+
+          //查询全部图层  -------查询叠加图层出现覆盖问题
+        var wmsSource = new ol.source.TileWMS({
+            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            params: {
+              LAYERS: "zjd_dc:t_house_survey_all",
+              TILED: true,
+              SRID: 3857,
+              serverType: "geoserver",
+              crossOrigin: "anonymous",
+            },
+            resolution:Math.random() * 0.00000001,
+          });
+
+        //查询宅基地图层
+        var ZjdwmsSource = new ol.source.TileWMS({
+          url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+          params: {
+            LAYERS: "zjd_dc:t_house_survey_zjdzd",
+            TILED: true,
+            SRID: 3857,
+            serverType: "geoserver",
+            crossOrigin: "anonymous",
+          },
+          resolution:Math.random() * 0.00000001,
+        });
+
+        //查询自然幢图层
+        var ZrzwmsSource = new ol.source.TileWMS({
+          url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+          params: {
+            LAYERS: "zjd_dc:t_house_survey_zrz",
+            TILED: true,
+            SRID: 3857,
+            serverType: "geoserver",
+            crossOrigin: "anonymous",
+          },
+          resolution:Math.random() * 0.00000001,
+        });
+
+        //查询附属设施图层
+        var FssswmsSource = new ol.source.TileWMS({
+          url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+          params: {
+            LAYERS: "zjd_dc:t_house_survey_fsss",
+            TILED: true,
+            SRID: 3857,
+            serverType: "geoserver",
+            crossOrigin: "anonymous",
+          },
+          resolution:Math.random() * 0.00000001,
+        });
+
+
+        map.on("pointermove", function (evt) {
+          if (evt.dragging) {
+            return;
+          }
+          var pixel = map.getEventPixel(evt.originalEvent);
+          var hit = map.forEachLayerAtPixel(pixel, function () {
+            return true;
+          });
+          map.getTargetElement().style.cursor = hit ? "pointer" : "";
+        });
+        //属性查询结束 ------------------end
+        //点击查询详细信息
+        map.on("singleclick", function (evt) {
+          console.log(evt);
+          let feature = map.forEachFeatureAtPixel(
+            evt.pixel,
+            (feature) => feature
+          );
+          var viewResolution = map.getView().getResolution(); ///** @type {number} */ (view.getResolution());
+          var zb = evt.coordinate;
+          var url;
+          var url_bbox;
+          that.clickBbox ="";
+          that.textMjAll = "";
+          if(that.drawingClick) {
+            //点击空白删除之前图层
+            map.removeLayer(hc_land_on);
+            //map.removeLayer(hc_land_query);
+            //for(var i=0;hc_land_query>i;i++){
+            //map.removeLayer(hc_land_query);
+            for(var i=0;hc_land_queryList.length>i;i++){
+              map.removeLayer(hc_land_queryList[i]);
+            }
+            //}c
+            if (that.fsssSx && that.zjdSx && that.zrzSx) {
+              url = wmsSource.getFeatureInfoUrl(
+                evt.coordinate,
+                viewResolution,
+                "EPSG:3857",
+                {INFO_FORMAT: "text/html"}
+              );
+              url_bbox = wmsSource.getFeatureInfoUrl(
+                evt.coordinate,
+                viewResolution,
+                "EPSG:3857",
+                {INFO_FORMAT: "application/json"}
+              );
+            } else {
+              if (that.zjdSx) {
+                url = ZjdwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "text/html"}
+                );
+                url_bbox = ZjdwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "application/json"}
+                );
+              } else if (that.fsssSx) {
+                url = FssswmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "text/html"}
+                );
+                url_bbox = FssswmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "application/json"}
+                );
+              } else if (that.zrzSx) {
+                url = ZrzwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "text/html"}
+                );
+                url_bbox = ZrzwmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "application/json"}
+                );
+              } else {
+                url = wmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "text/html"}
+                );
+                url_bbox = wmsSource.getFeatureInfoUrl(
+                  evt.coordinate,
+                  viewResolution,
+                  "EPSG:3857",
+                  {INFO_FORMAT: "application/json"}
+                );
+              }
+            }
+            if (url_bbox) {
+              fetch(url_bbox).then((res) => {
+                var geojsonmap = res.json();
+                return geojsonmap;
+              })
+                .then((data) => {
+                  var center = ol.extent.getCenter(data.bbox); //获取边界区域的中心位置
+                  center = [center[0], center[1] - 16];
+                  that.clickBbox = center;
+                })
+                .catch((error) => {
+                  that.mapZjdData = "";
+                  that.mapZrzData = "";
+                  that.mapFsssData = "";
+                  //that.mapZjdTeAll.active ="1";
+                  that.mapZjdTeAll.mapZjdAData = {};
+                  that.mapZjdTeAll.mapZrzAData = {};
+                  that.mapZjdTeAll.mapFsssAData = {};
+                  that.mapZjdDataTure = "";
+                  that.mapXs =false;
+                  that.mapClick ="";
+                  console.log("【异常】", error);
+                });
+            }
+            if (url) {
+              fetch(url)
+                .then(function (response) {
+                  return response.text();
+                })
+                .then(function (html) {
+                  document.getElementById("info").innerHTML = html;
+                  if (html.indexOf("<table") != -1) {
+                    that.mapZjdData = "";
+                    that.mapZrzData = "";
+                    that.mapFsssData = "";
+                    //that.mapZjdTeAll.active ="1";
+                    that.mapZjdTeAll.mapZjdAData = {};
+                    that.mapZjdTeAll.mapZrzAData = {};
+                    that.mapZjdTeAll.mapFsssAData = {};
+                    that.mapZjdDataTure = "";
+                    setTimeout(() => {
+                      if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {
+                        map.removeLayer(hc_land_on);
+                        that.mapHasDateStatus = 2;
+                        that.mapXs = true;
+                        let obj = {};
+                        let trs = $("#info .featureInfo").find("tr:eq(1)");
+                        let zjdXq = trs.find("td").eq(0).text();
+                        let zjdIdNum = zjdXq.replace("t_house_survey_zjdzd.", "");
+                        obj.id = zjdIdNum; //	主键id
+                        obj.deptName = trs.find("td").eq(3).text();//行政区划名称
+
+                        obj.zjddm = trs.find("td").eq(6).text();//宅基地代码
+
+                        obj.zdmj = trs.find("td").eq(11).text();//宗地面积
+
+                        obj.active = 1;
+
+                        var vector_drawing_map;
+                        let params = {
+                          "deptId": that.$cookies.get("item").deptId,
+                          "zjddm": obj.zjddm,
+                        }
+                        that.mapClick = obj.zjddm;
+                        //点击查看自然幢
+                        //自然幢图层查询开始 ------------------start
+                        var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                        zrzTc = new ol.layer.Image({
+                          source: new ol.source.ImageWMS({
+                            url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                            params: {
+                              LAYERS: 'zjd_dc:t_house_survey_zrz',
+                              TILED: true,
+                              cql_filter: cql_filter_map,
+                              SRID: 3857,
+                              TIMESTAMP: new Date().getTime(),
+                            },
+                          }),
+                        });
+                        map.addLayer(zrzTc);
+                        //自然幢图层查询开始 ------------------start
+                        //附属设施图层查询开始 ------------------start
+                        //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                        fsssTc = new ol.layer.Image({
+                          source: new ol.source.ImageWMS({
+                            url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                            params: {
+                              LAYERS: 'zjd_dc:t_house_survey_fsss',
+                              TILED: true,
+                              cql_filter: cql_filter_map,
+                              SRID: 3857,
+                              TIMESTAMP: new Date().getTime(),
+                            },
+                          }),
+                        });
+                        map.addLayer(fsssTc);
+                        //附属设施图层查询开始 ------------------end
+                        that.$cookies.set("search", "")
+                        //that.$cookies.set("map", "")
+                        console.log(document.cookie.split(';').length)
+                        console.log(params);
+                        listZjdzd(params).then((response) => {
+                          if (response.rows[0].zdmj != "") {
+                            that.textMjAll = response.rows[0].zdmj;
+                          } else {
+                            that.textMjAllNum = "1";
+                          }
+                          that.mapZjdData = response.rows[0];
+                          that.mapZjdData.active = 1;
+                          that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+                          that.mapZjdDataTure = 1;
+                          that.zjdHcDy = obj.zjddm;
+                          var styleZjd = new ol.style.Style({
+                            stroke: new ol.style.Stroke({
+                              //边界样式
+                              color: "#CCFF66",
+                              width: 6,
+                            }),
+                          });
+                          hc_land_on = new ol.layer.Vector({
+                            title: "add Layer",
+                            source: new ol.source.Vector({
+                              projection: projection,
+                              features: new ol.format.GeoJSON().readFeatures("{\n" +
+                                "    \"type\": \"Feature\",\n" +
+                                "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+                            }),
+                            style: styleZjd
+                          });
+                          map.addLayer(hc_land_on);
+                          var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+                          var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+                          var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+                          var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+                          //定位查询位置
+                          var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+                          map.getView().animate({
+                            // 只设置需要的属性即可
+                            center: center, // 中心点
+                            zoom: 17.8, // 缩放级别
+                            rotation: undefined, // 缩放完成view视图旋转弧度
+                            duration: 1000, // 缩放持续时间，默认不需要设置
+                            resolution:Math.random() * 0.00000001,
+                          });
+
+                          function createLabelStyleMap() {
+                            return new ol.style.Style({
+                              text: new ol.style.Text({
+                                text: that.mapZjdData.syqr,
+                                textAlign: "center", //位置
+                                textBaseline: "middle", //基准线
+                                font: "normal 16px 微软雅黑", //文字样式
+                                //text: "标注点", //文本内容
+                                fill: new ol.style.Fill({
+                                  //文本填充样式（即文字颜色)
+                                  color: "#09DDCE",
+                                  width: 10,
+                                }),
+                                overflow: false //超出面的部分不显示
+                              }),
+                              zIndex: 9999,
+                            });
+                          }
+
+                          var newcenterFeatureMap = new ol.Feature({
+                            geometry: new ol.geom.Point(center), //几何信息
+                            //name: "标注点",
+                          });
+                          var sourceMapLookMap = new ol.source.Vector({wrapX: false});
+                          vector_drawing_map = new ol.layer.Vector({
+                            source: sourceMapLookMap,
+                          });
+                          map.addLayer(vector_drawing_map);
+                          newcenterFeatureMap.setStyle(createLabelStyleMap()); //设置要素样式
+                          sourceMapLookMap.addFeature(newcenterFeatureMap);
+                        });
+                        //let cloneObj = JSON.parse(JSON.stringify(obj));
+                        //that.mapZjdData = cloneObj;
+                      } else if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz") {
+                        //that.mapZjdTeAll.mapZjdAData ={};
+                        that.mapZjdDataTure = "";
+                        that.mapZjdTeAll.mapFsssAData = {};
+                        map.removeLayer(hc_land_on);
+                        let obj = {};
+                        that.mapHasDateStatus = 1;
+                        let trs = $("#info .featureInfo").find("tr:eq(1)");
+                        let zrzXq = trs.find("td").eq(0).text();
+                        let zrzIdNum = zrzXq.replace("t_house_survey_zrz.", "");
+                        obj.id = zrzIdNum; //	主键id
+                        obj.deptName = trs.find("td").eq(3).text();//行政区划名称
+                        obj.zjddm = trs.find("td").eq(4).text();//宅基地代码
+                        obj.scjzmj = trs.find("td").eq(12).text();//实测建筑面积
+                        let params = {
+                          "deptId": that.$cookies.get("item").deptId,
+                          "zjddm": obj.zjddm,
+                        }
+                        that.$cookies.set("search", "")
+                        //that.$cookies.set("map", "")
+                        console.log(that.mapZjdData);
+                        //if (that.mapZjdData !="" && that.mapZjdData !=null && that.mapZjdData !=undefined) {
+                        console.log(that.mapClick);
+                        console.log(obj.zjddm);
+                        if(that.mapXs && that.mapClick == obj.zjddm){
+                          listZjdzd(params).then((response) => {
+                            that.mapZjdData = response.rows[0];
+                            //that.mapZjdAData.active = 1;
+                            that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+                            getZrz(obj.id).then((response) => {
+                              if (response.data.scjzmj != "") {
+                                that.textMjAll = response.data.scjzmj;
+                              } else {
+                                that.textMjAllNum = "1";
+                              }
+                              that.mapZrzData = response.data;
+                              that.mapZrzData.active = 3;
+                              that.mapZjdTeAll.mapZrzAData = that.mapZrzData;
+                              that.zjdHcDy = obj.zjddm;
+                              var styleZjd = new ol.style.Style({
+                                stroke: new ol.style.Stroke({
+                                  //边界样式
+                                  color: "#CCFF66",
+                                  width: 6,
+                                }),
+                              });
+                              hc_land_on = new ol.layer.Vector({
+                                title: "add Layer",
+                                source: new ol.source.Vector({
+                                  projection: projection,
+                                  features: new ol.format.GeoJSON().readFeatures("{\n" +
+                                    "    \"type\": \"Feature\",\n" +
+                                    "    \"geometry\":" + that.mapZrzData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZrzData) + "}"),
+                                }),
+                                style: styleZjd
+                              });
+                              map.addLayer(hc_land_on);
+                              var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+                              var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+                              var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+                              var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+                              //定位查询位置
+                              var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+                              map.getView().animate({
+                                // 只设置需要的属性即可
+                                center: center, // 中心点
+                                zoom: 17.8, // 缩放级别
+                                rotation: undefined, // 缩放完成view视图旋转弧度
+                                duration: 1000, // 缩放持续时间，默认不需要设置
+                                resolution: Math.random() * 0.00000001,
+                              });
+                            });
+                          });
+                        } else {
+                          //自然幢图层查询开始 ------------------start
+                          var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                          zrzTc = new ol.layer.Image({
+                            source: new ol.source.ImageWMS({
+                              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                              params: {
+                                LAYERS: 'zjd_dc:t_house_survey_zrz',
+                                TILED: true,
+                                cql_filter: cql_filter_map,
+                                SRID: 3857,
+                                TIMESTAMP: new Date().getTime(),
+                              },
+                            }),
+                          });
+                          map.addLayer(zrzTc);
+                          //自然幢图层查询开始 ------------------start
+                          //附属设施图层查询开始 ------------------start
+                          //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                          fsssTc = new ol.layer.Image({
+                            source: new ol.source.ImageWMS({
+                              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                              params: {
+                                LAYERS: 'zjd_dc:t_house_survey_fsss',
+                                TILED: true,
+                                cql_filter: cql_filter_map,
+                                SRID: 3857,
+                                TIMESTAMP: new Date().getTime(),
+                              },
+                            }),
+                          });
+                          map.addLayer(fsssTc);
+                          //附属设施图层查询开始 ------------------end
+                          listZjdzd(params).then((response) => {
+                            if (response.rows[0].zdmj != "") {
+                              that.textMjAll = response.rows[0].zdmj;
+                            } else {
+                              that.textMjAllNum = "1";
+                            }
+                            that.mapZjdData = response.rows[0];
+                            that.mapZjdData.active = 1;
+                            that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+                            that.mapZjdDataTure = 1;
+                            that.zjdHcDy = obj.zjddm;
+                            that.mapClick = obj.zjddm;
+                            that.mapXs = true;
+                            var styleZjd = new ol.style.Style({
+                              stroke: new ol.style.Stroke({
+                                //边界样式
+                                color: "#CCFF66",
+                                width: 6,
+                              }),
+                            });
+                            hc_land_on = new ol.layer.Vector({
+                              title: "add Layer",
+                              source: new ol.source.Vector({
+                                projection: projection,
+                                features: new ol.format.GeoJSON().readFeatures("{\n" +
+                                  "    \"type\": \"Feature\",\n" +
+                                  "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+                              }),
+                              style: styleZjd
+                            });
+                            map.addLayer(hc_land_on);
+                            var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+                            var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+                            var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+                            var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+                            //定位查询位置
+                            var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+                            map.getView().animate({
+                              // 只设置需要的属性即可
+                              center: center, // 中心点
+                              zoom: 17.8, // 缩放级别
+                              rotation: undefined, // 缩放完成view视图旋转弧度
+                              duration: 1000, // 缩放持续时间，默认不需要设置
+                              resolution:Math.random() * 0.00000001,
+                            });
+
+                            function createLabelStyleMap() {
+                              return new ol.style.Style({
+                                text: new ol.style.Text({
+                                  text: that.mapZjdData.syqr,
+                                  textAlign: "center", //位置
+                                  textBaseline: "middle", //基准线
+                                  font: "normal 16px 微软雅黑", //文字样式
+                                  //text: "标注点", //文本内容
+                                  fill: new ol.style.Fill({
+                                    //文本填充样式（即文字颜色)
+                                    color: "#09DDCE",
+                                    width: 10,
+                                  }),
+                                  overflow: false //超出面的部分不显示
+                                }),
+                                zIndex: 9999,
+                              });
+                            }
+
+                            var newcenterFeatureMap = new ol.Feature({
+                              geometry: new ol.geom.Point(center), //几何信息
+                              //name: "标注点",
+                            });
+                            var sourceMapLookMap = new ol.source.Vector({wrapX: false});
+                            vector_drawing_map = new ol.layer.Vector({
+                              source: sourceMapLookMap,
+                            });
+                            map.addLayer(vector_drawing_map);
+                            newcenterFeatureMap.setStyle(createLabelStyleMap()); //设置要素样式
+                            sourceMapLookMap.addFeature(newcenterFeatureMap);
+                          });
+                        }
+                      } else if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss") {
+                        that.mapZjdTeAll.mapZrzAData = {};
+                        that.mapZjdDataTure = "";
+                        //that.mapZjdTeAll.mapZjdAData ={};
+                        map.removeLayer(hc_land_on);
+                        let obj = {};
+                        that.mapHasDateStatus = 0;
+                        let trs = $("#info .featureInfo").find("tr:eq(1)");
+                        let fsssXq = trs.find("td").eq(0).text();
+                        let fsssIdNum = fsssXq.replace("t_house_survey_fsss.", "");
+                        obj.id = fsssIdNum; //	主键id
+                        obj.deptName = trs.find("td").eq(4).text();//行政区划名称
+                        obj.zjddm = trs.find("td").eq(1).text();//宅基地代码
+                        // obj.houseDataConfirmStatus = trs.find("td").eq(6).text(); //状态
+                        // obj.fssslx = trs.find("td").eq(7).text(); //附属设施类型
+                        obj.jzmj = trs.find("td").eq(8).text(); //建筑面积
+
+                        let params = {
+                          "deptId": that.$cookies.get("item").deptId,
+                          "zjddm": obj.zjddm,
+                          "pageSize": 20,
+                        }
+                        that.$cookies.remove("search")
+                        //if (that.mapZjdData !="" && that.mapZjdData !=null && that.mapZjdData !=undefined) {
+                        if(that.mapXs && that.mapClick == obj.zjddm){
+                          listZjdzd(params).then((response) => {
+                            that.mapZjdData = response.rows[0];
+                            that.mapZjdData.active = 1;
+                            that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+                            getFsss(obj.id).then((response) => {
+                              if (response.data.jzmj != "") {
+                                that.textMjAll = response.data.jzmj;
+                              } else {
+                                that.textMjAllNum = "1";
+                              }
+                              //that.mapfsssData.active = 4;
+                              that.mapfsssData = response.data;
+                              console.log(that.mapfsssData);
+                              that.mapZjdTeAll.mapFsssAData = that.mapfsssData;
+                              that.zjdHcDy = obj.zjddm;
+                              var styleZjd = new ol.style.Style({
+                                stroke: new ol.style.Stroke({
+                                  //边界样式
+                                  color: "#CCFF66",
+                                  width: 6,
+                                }),
+                              });
+                              hc_land_on = new ol.layer.Vector({
+                                title: "add Layer",
+                                source: new ol.source.Vector({
+                                  projection: projection,
+                                  features: new ol.format.GeoJSON().readFeatures("{\n" +
+                                    "    \"type\": \"Feature\",\n" +
+                                    "    \"geometry\":" + that.mapfsssData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapfsssData) + "}"),
+                                }),
+                                style: styleZjd
+                              });
+                              map.addLayer(hc_land_on);
+                              var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+                              var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+                              var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+                              var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+                              //定位查询位置
+                              var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+                              map.getView().animate({
+                                // 只设置需要的属性即可
+                                center: center, // 中心点
+                                zoom: 17.8, // 缩放级别
+                                rotation: undefined, // 缩放完成view视图旋转弧度
+                                duration: 1000, // 缩放持续时间，默认不需要设置
+                                resolution: Math.random() * 0.00000001,
+                              });
+                            });
+                          });
+                        } else {
+                          //自然幢图层查询开始 ------------------start
+                          var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                          zrzTc = new ol.layer.Image({
+                            source: new ol.source.ImageWMS({
+                              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                              params: {
+                                LAYERS: 'zjd_dc:t_house_survey_zrz',
+                                TILED: true,
+                                cql_filter: cql_filter_map,
+                                SRID: 3857,
+                                TIMESTAMP: new Date().getTime(),
+                              },
+                            }),
+                          });
+                          map.addLayer(zrzTc);
+                          //自然幢图层查询开始 ------------------start
+                          //附属设施图层查询开始 ------------------start
+                          //var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
+                          fsssTc = new ol.layer.Image({
+                            source: new ol.source.ImageWMS({
+                              url: that.mapGeoServerUrl + "/geoserver/zjd_dc/wms",
+                              params: {
+                                LAYERS: 'zjd_dc:t_house_survey_fsss',
+                                TILED: true,
+                                cql_filter: cql_filter_map,
+                                SRID: 3857,
+                                TIMESTAMP: new Date().getTime(),
+                              },
+                            }),
+                          });
+                          map.addLayer(fsssTc);
+                          //附属设施图层查询开始 ------------------end
+                          listZjdzd(params).then((response) => {
+                            if (response.rows[0].zdmj != "") {
+                              that.textMjAll = response.rows[0].zdmj;
+                            } else {
+                              that.textMjAllNum = "1";
+                            }
+                            that.mapZjdData = response.rows[0];
+                            that.mapZjdData.active = 1;
+                            that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
+                            that.mapZjdDataTure = 1;
+                            that.zjdHcDy = obj.zjddm;
+                            that.mapClick = obj.zjddm;
+                            that.mapXs = true;
+                            var styleZjd = new ol.style.Style({
+                              stroke: new ol.style.Stroke({
+                                //边界样式
+                                color: "#CCFF66",
+                                width: 6,
+                              }),
+                            });
+                            hc_land_on = new ol.layer.Vector({
+                              title: "add Layer",
+                              source: new ol.source.Vector({
+                                projection: projection,
+                                features: new ol.format.GeoJSON().readFeatures("{\n" +
+                                  "    \"type\": \"Feature\",\n" +
+                                  "    \"geometry\":" + that.mapZjdData.theGeom + ",    \"properties\":" + JSON.stringify(that.mapZjdData) + "}"),
+                              }),
+                              style: styleZjd
+                            });
+                            map.addLayer(hc_land_on);
+                            var maxXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxX;
+                            var maxYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.maxY;
+                            var minXMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minX;
+                            var minYMap = hc_land_on.values_.source.featuresRtree_.rbush_.data.minY;
+                            //定位查询位置
+                            var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
+                            map.getView().animate({
+                              // 只设置需要的属性即可
+                              center: center, // 中心点
+                              zoom: 17.8, // 缩放级别
+                              rotation: undefined, // 缩放完成view视图旋转弧度
+                              duration: 1000, // 缩放持续时间，默认不需要设置
+                              resolution:Math.random() * 0.00000001,
+                            });
+
+                            function createLabelStyleMap() {
+                              return new ol.style.Style({
+                                text: new ol.style.Text({
+                                  text: that.mapZjdData.syqr,
+                                  textAlign: "center", //位置
+                                  textBaseline: "middle", //基准线
+                                  font: "normal 16px 微软雅黑", //文字样式
+                                  //text: "标注点", //文本内容
+                                  fill: new ol.style.Fill({
+                                    //文本填充样式（即文字颜色)
+                                    color: "#09DDCE",
+                                    width: 10,
+                                  }),
+                                  overflow: false //超出面的部分不显示
+                                }),
+                                zIndex: 9999,
+                              });
+                            }
+
+                            var newcenterFeatureMap = new ol.Feature({
+                              geometry: new ol.geom.Point(center), //几何信息
+                              //name: "标注点",
+                            });
+                            var sourceMapLookMap = new ol.source.Vector({wrapX: false});
+                            vector_drawing_map = new ol.layer.Vector({
+                              source: sourceMapLookMap,
+                            });
+                            map.addLayer(vector_drawing_map);
+                            newcenterFeatureMap.setStyle(createLabelStyleMap()); //设置要素样式
+                            sourceMapLookMap.addFeature(newcenterFeatureMap);
+                          });
+                        }
+                        // if(obj.jzmj != ""){
+                        //   that.textMjAll = obj.jzmj;
+                        // } else {
+                        //   that.textMjAllNum = "1";
+                        // }
+                      } else {
+
+                      }
+                    }, 300);
+                  } else {
+
+                  }
+                });
+            }
+          }
+          //数据库查询详情时使用----------------------------------------start
+          // if(feature) {
+          //   //document.getElementById("info").innerHTML = "";
+          //   that.mapHaDataValue = true;
+          //   var ifConsole = feature.values_.createBy;
+          //   if (ifConsole =="mapTheGeomFsssId") {
+          //     let obj = {};
+          //     that.mapHasDateStatus = 0;
+          //     obj.deptName = feature.values_.deptName;//行政区划名称
+          //     obj.zjddm = feature.values_.zjddm;//宅基地代码
+          //     obj.houseDataConfirmStatus = feature.values_.houseDataConfirmStatus; //状态
+          //     obj.fssslx = feature.values_.fssslx; //附属设施类型
+          //     obj.jzmj = feature.values_.jzmj; //建筑面积
+          //     obj.qsly = feature.values_.qsly;//权属来源
+          //     obj.fwzt = feature.values_.fwzt; //房屋状态
+          //     obj.sfsp = feature.values_.sfsp; //是否审批
+          //     obj.sffz = feature.values_.sffz; //是否发证
+          //     obj.jglx = feature.values_.jglx; //结构类型
+          //     obj.sfzzsy = feature.values_.sfzzsy; //是否正在使用
+          //     obj.jzwqk = feature.values_.jzwqk; //建筑物情况
+          //     obj.tdzk = feature.values_.tdzk; //审批或建设前土地状况
+          //     obj.sfsgcf = feature.values_.sfsgcf; //是否受过处罚
+          //     obj.sysNormalDisable = feature.values_.sysNormalDisable; //是否停用
+          //     //附属设施类型字典项
+          //     that.getDicts("fsss_type").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.fssslx !=null && obj.fssslx !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.fssslx == assetTypeOptions[i].dictValue) {
+          //             obj.fssslx = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //权属类型字典项
+          //     that.getDicts("acquisition_method").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.qsly !=null && obj.qsly !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.qsly == assetTypeOptions[i].dictValue) {
+          //             obj.qsly = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //房屋状态字典项
+          //     that.getDicts("fwzt").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.fwzt !=null && obj.fwzt !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.fwzt == assetTypeOptions[i].dictValue) {
+          //             obj.fwzt = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //是否审批字典项
+          //     that.getDicts("sys_yes_no").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sfsp !=null && obj.sfsp !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sfsp == assetTypeOptions[i].dictValue) {
+          //             obj.sfsp = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //是否发证字典项
+          //     that.getDicts("sys_yes_no").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sffz !=null && obj.sffz !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sffz == assetTypeOptions[i].dictValue) {
+          //             obj.sffz = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //结构类型字典项
+          //     that.getDicts("house_jglx").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.jglx !=null && obj.jglx !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.jglx == assetTypeOptions[i].dictValue) {
+          //             obj.jglx = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //是否正在使用字典项
+          //     that.getDicts("sys_yes_no").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sfzzsy !=null && obj.sfzzsy !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sfzzsy == assetTypeOptions[i].dictValue) {
+          //             obj.sfzzsy = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //房屋状态字典项
+          //     that.getDicts("fwzt").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.fwzt !=null && obj.fwzt !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.fwzt == assetTypeOptions[i].dictValue) {
+          //             obj.fwzt = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //土地状况字典项
+          //     that.getDicts("land_state").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.tdzk !=null && obj.tdzk !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.tdzk == assetTypeOptions[i].dictValue) {
+          //             obj.tdzk = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //是否受过处罚字典项
+          //     that.getDicts("land_state").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sfsgcf !=null && obj.sfsgcf !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sfsgcf == assetTypeOptions[i].dictValue) {
+          //             obj.sfsgcf = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     that.mapFsssData = obj;
+          //   } else if(ifConsole =="mapTheGeomZrzId"){
+          //     let obj = {};
+          //     that.mapHasDateStatus = 1;
+          //     obj.deptName = feature.values_.deptName;//部门名称
+          //     obj.zjddm = feature.values_.zjddm;//宅基地代码
+          //     obj.nmfwzh = feature.values_.nmfwzh;//农民房屋幢号
+          //     obj.zrzh = feature.values_.zrzh;//自然幢号
+          //     obj.jgrq = feature.values_.jgrq;//竣工日期
+          //     obj.jzwgd = feature.values_.jzwgd;//建筑物高度
+          //     obj.zzdmj = feature.values_.zzdmj;//幢占地面积
+          //     obj.zydmj = feature.values_.zydmj;//幢用地面积
+          //     obj.scjzmj = feature.values_.scjzmj;//实测建筑面积
+          //     obj.zcs = feature.values_.zcs;//总层数
+          //     obj.dscs = feature.values_.dscs;//地上层数
+          //     obj.dxcs = feature.values_.dxcs;//地下层数
+          //     obj.fwjg = feature.values_.fwjg;//房屋结构
+          //     obj.sjly = feature.values_.sjly;//数据来源
+          //     obj.status = feature.values_.status;//状态
+          //     obj.houseDataConfirmStatus = feature.values_.houseDataConfirmStatus;//数据调查确认状态
+          //     //字典项转化
+          //     //房屋结构字典项
+          //     that.getDicts("housing_structure").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.fwjg !=null && obj.fwjg !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.fwjg == assetTypeOptions[i].dictValue) {
+          //             obj.fwjg = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //房屋结构字典项
+          //     that.getDicts("sjly").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sjly !=null && obj.sjly !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sjly == assetTypeOptions[i].dictValue) {
+          //             obj.sjly = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     that.mapZrzData = obj;
+          //   } else if(ifConsole =="mapTheGeomZjdId"){
+          //     let obj = {};
+          //     that.mapHasDateStatus = 2;
+          //     obj.deptName = feature.values_.deptName;//行政区划名称
+          //     obj.suyqrdm = feature.values_.suyqrdm;//所有权人代码
+          //     obj.nhdm = feature.values_.nhdm;//农户代码
+          //     obj.zjddm = feature.values_.zjddm;//宅基地代码
+          //     obj.zdbh = feature.values_.zdbh;//宗地编号
+          //     obj.zddm = feature.values_.zddm;//宗地代码
+          //     obj.zl = feature.values_.zl;//坐落
+          //     obj.zldwdm = feature.values_.zldwdm;//坐落单位代码
+          //     obj.zdmj = feature.values_.zdmj;//宗地面积
+          //     obj.yt = feature.values_.yt;//用途
+          //     obj.ytmc = feature.values_.ytmc;//用途名称
+          //     obj.dj = feature.values_.dj;//宗地编号
+          //     obj.jg = feature.values_.jg;//价格万元
+          //     obj.qllx = feature.values_.qllx;//权利类型
+          //     obj.qlxz = feature.values_.qlxz;//权利性质
+          //     obj.qlsdfs = feature.values_.qlsdfs;//权利设定方式
+          //     obj.rjl = feature.values_.rjl;//容积率
+          //     obj.jzmd = feature.values_.jzmd;//建筑密度
+          //     obj.jzxg = feature.values_.jzxg;//建筑限高
+          //     obj.zdszd = feature.values_.zdszd;//宗地四至-东
+          //     obj.zdszn = feature.values_.zdszn;//宗地四至-南
+          //     obj.zdszx = feature.values_.zdszx;//宗地四至-西
+          //     obj.zdszb = feature.values_.zdszb;//宗地四至-北
+          //     obj.zdt = feature.values_.zdt;//宗地图
+          //     obj.tfh = feature.values_.tfh;//图幅号
+          //     obj.djh = feature.values_.djh;//地籍号
+          //     obj.sjly = feature.values_.sjly;//数据来源
+          //     obj.lyzk = feature.values_.lyzk;//当前利用状况
+          //     obj.xzkssj = feature.values_.xzkssj;//闲置开始时间
+          //     obj.sffz = feature.values_.sffz;//是否发证
+          //     obj.zjdzsh = feature.values_.zjdzsh;//宅基地证书号
+          //     obj.zjdxctp = feature.values_.zjdxctp;//宅基地现场图片
+          //     obj.zjdqdfs = feature.values_.zjdqdfs;//宅基地取得方式
+          //     obj.bccjl = feature.values_.bccjl;//被惩处经历
+          //     obj.bccbz = feature.values_.bccbz;//被惩处备注
+          //     obj.yctcyx = feature.values_.yctcyx;//有偿退出意向
+          //     obj.zjdpzmj = feature.values_.zjdpzmj;//宅基地批准面积
+          //     obj.zjdxzyy = feature.values_.zjdxzyy;//宅基地闲置原因
+          //     obj.lzyx = feature.values_.lzyx;//流转意向
+          //     obj.sysNormalDisable = feature.values_.sysNormalDisable;//是否停用
+          //     obj.active = 1;
+          //     //字典项转化
+          //     //是否发证字典项
+          //     that.getDicts("sys_yes_no").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sffz !=null && obj.sffz !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sffz == assetTypeOptions[i].dictValue) {
+          //             obj.sffz = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //利用状态字典项
+          //     that.getDicts("zjdlyzk").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.lyzk !=null && obj.lyzk !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.lyzk == assetTypeOptions[i].dictValue) {
+          //             obj.lyzk = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //流转意向字典项
+          //     that.getDicts("is_have").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.lzyx !=null && obj.lzyx !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.lzyx == assetTypeOptions[i].dictValue) {
+          //             obj.lzyx = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //有偿退出意向字典项
+          //     that.getDicts("is_have").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.yctcyx !=null && obj.yctcyx !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.yctcyx == assetTypeOptions[i].dictValue) {
+          //             obj.yctcyx = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //被惩处经历字典项
+          //     that.getDicts("is_have").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.bccjl !=null && obj.bccjl !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.bccjl == assetTypeOptions[i].dictValue) {
+          //             obj.bccjl = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //宅基地取得方式字典项
+          //     that.getDicts("acquisition_method").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.zjdqdfs !=null && obj.zjdqdfs !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.zjdqdfs == assetTypeOptions[i].dictValue) {
+          //             obj.zjdqdfs = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //权利设定方式字典项
+          //     that.getDicts("right_setting_mode").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.qlsdfs !=null && obj.qlsdfs !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.qlsdfs == assetTypeOptions[i].dictValue) {
+          //             obj.qlsdfs = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     //数据来源字典项
+          //     that.getDicts("sjly").then((response) => {
+          //       var assetTypeOptions = response.data;
+          //       if(obj.sjly !=null && obj.sjly !=""){
+          //         for(var i=0;assetTypeOptions.length >i; i++){
+          //           if(obj.sjly == assetTypeOptions[i].dictValue) {
+          //             obj.sjly = assetTypeOptions[i].dictLabel;
+          //             break;
+          //           }
+          //         }
+          //       }
+          //     });
+          //     that.mapZjdData = obj;
+          //     console.log(obj.zjddm);
+          //     that.zjdHcDy = obj.zjddm;
+          //   } else {
+          //     that.mapHaDataValue = false;
+          //   }
+          // }else {
+          //   that.mapHaDataValue = false;
+          // }
+          //数据库查询详情时使用----------------------------------------end
+        });
+        //数据库循环加载时使用 --------------------加载较慢 ------start
+        //当前账套没有任何空间数据
+        // if(mapTalkAbout){
+        //   let deptName = this.$store.state.user.loginDeptId + "";
+        //   getQueryLand(deptName).then((response) => {
+        //     if (response.code == 200) {
+        //       let InsertCode = response.data;
+        //       if (InsertCode != null) {
+        //         var lat = InsertCode.lat;
+        //         var lng = InsertCode.lng;
+        //         var center;
+        //         if(lat !=null && lng !=null && lat !="" && lng !=""){
+        //           center = [lng,lat];
+        //         }else {
+        //           center =[115.452752, 31.789033];
+        //         }
+        //         map.getView().animate({
+        //           // 只设置需要的属性即可
+        //           center: ol.proj.fromLonLat(center), // 中心点
+        //           zoom: 17.9, // 缩放级别
+        //           rotation: undefined, // 缩放完成view视图旋转弧度
+        //           duration: 1000, // 缩放持续时间，默认不需要设置
+        //         });
+        //       }
+        //     }
+        //   });
+        // }
+        //数据库循环加载时使用 --------------------加载较慢 ------start
+      },
+
+      /*右侧列表 --展开收缩*/
+      selectionPushMap() {
+        this.selectionIconShow = true;
+        this.homesteadListStatus = true;
+        $(".homesteadList_wrap").animate(
+          {
+            right: "0",
+          },
+          300
+        );
+      },
+      homesteadListShrink() {
+        this.selectionIconShow = false;
+        // this.checked =["zjdSx","zrzSx","fsssSx"];
+        $(".homesteadList_wrap").animate(
+          {
+            right: "-300px",
+          },
+          300
+        );
+        setTimeout(() => {
+          this.homesteadListStatus = false;
+        }, 300);
+      },
+      checkClick(res){
+        // 1、全选与不全选模块
+        $(".checkall").change(function() {
+          $(".item-list-checkbox .checkitem").prop("checked", $(this).prop("checked"));
+          if($(this).prop("checked")){
+
+          }else {
+
+          }
+        });
+        // 2、小复选框模块
+        $(".checkitem").change(function() {
+          if ($(".checkitem:checked").length === $(".checkitem").length) {
+            $(".checkall").prop("checked", true);
+          } else {
+            $(".checkall").prop("checked", false);
+          }
+        })
+      },
+      //绘制多边形地图
+      drawMapPolygonFun() {
+
+      },
+      guidProduct(){
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          var r = Math.random() * 16 | 0,
+            v = c == 'x' ? r : (r & 0x3 | 0x8);
+          return v.toString(16);
+        });
+      },
+
+      //宅基地点击地图核查
+      zjdHc(){
+        if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
+          if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
+            this.mapZjdTeAll.active =1;
+            //this.$cookies.set("search",this.mapZjdTeAll);
+            this.$cookies.set("search","")
+            this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            //this.$router.push({path:'/homesteadSurvey/add'});
+          }else if(this.mapZrzData !=undefined && this.mapZrzData !=""){
+            if(this.mapZjdTeAll.mapZjdAData !=""){
+              this.mapZjdTeAll.active = 3;
+              //this.$cookies.set("search",this.mapZjdTeAll);
+              this.$cookies.set("search","")
+              this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            } else {
+              this.$toast("必须有宅基地数据才能进入自然幢核查");
+            }
+          }else {
+            if(this.mapZjdTeAll.mapZjdAData !="") {
+              this.mapZjdTeAll.active = 4;
+              //this.$cookies.set("search", this.mapZjdTeAll);
+              this.$cookies.set("search","")
+              this.$router.push({path: '/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            } else {
+              this.$toast("必须有宅基地数据才能进入附属设施核查");
+            }
+          }
+        } else {
+          this.$dialog.alert({
+            title: '宅基地核查',
+            message: "请从地图中选择图层并点击核查",
+            theme: 'round-button',
+          }).then(() => {
+            // on close
+          });
+        }
+      },
+      //搜索详情跳转
+      zjdSs(item){
+        this.mapZjdTeAll.mapZjdAData ={};
+        this.mapZjdTeAll.mapZrzAData ={};
+        this.mapZjdTeAll.mapFsssAData ={};
+        //this.mapZjdTeAll.active =1;
+        if(item.typeTc =="宅基地"){
+          getZjdzd(item.id).then((response) => {
+            this.mapZjdData = response.data;
+            this.mapZjdTeAll.active = 1;
+            this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
+            //this.$cookies.set("search",this.mapZjdTeAll);
+            this.$cookies.set("search","")
+            setTimeout(() => {
+              this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            }, 500);
+          });
+        }else if(item.typeTc =="自然幢"){
+          //let =
+          getZjdzd(item.id).then((response) => {
+            this.mapZrzData = response.data;
+            this.mapZjdTeAll.active = 3;
+            this.mapZjdTeAll.mapZrzAData = this.mapZrzData;
+            //this.$cookies.set("search",this.mapZjdTeAll);
+            this.$cookies.set("search","")
+            setTimeout(() => {
+              this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            }, 500);
+          });
+        }else if(item.typeTc =="附属设施"){
+          getFsss(item.id).then((response) => {
+            this.mapFsssData = response.data;
+            this.mapZjdTeAll.active = 4;
+            this.mapZjdTeAll.mapFsssAData = this.mapFsssData;
+            //this.$cookies.set("search",this.mapZjdTeAll);
+            this.$cookies.set("search","")
+            setTimeout(() => {
+              this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+            }, 500);
+          });
+        }else{
+          this.$toast("无数据请检查后进入核查页面");
+        }
+      },
+      //地图查询
+      toggleSearch() {
+        $("#query").trigger("click");
+      },
+      //
+      checkAllArray(value){
+        if(this.checked.length<3){
+          this.$refs.checkboxGroup.toggleAll(true);
+        }else{
+          this.$refs.checkboxGroup.toggleAll(false);
+        }
+      },
+      //筛选//全选
+      checkAll(val) {
+        this.$refs.checkboxGroup.value.toggleAll(true);
+        return;
+        let checkedCount = this.CheckedAllArr.length
+        if (val) {
+          //全选
+          this.CheckedAllArr = this.dataList.map(item => item.id)
+        } else{
+          //取消全选
+          if (checkedCount === this.dataList.length) {
+            //如果不增加这个条件判断点击某一项时会全部取消
+            this.CheckedAllArr = []
+          }
+        }
+      },
+      //单选
+      handleChecked(value) {
+        // this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
+        if (value.length<3){
+          this.checkAllFlag = false;
+        }else{
+          this.checkAllFlag = true;
+        }
+        value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true;
+        value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
+        value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
+      },
+      /** 外村农户提交按钮 */
+      outsideSubmitForm() {
+        addOutsidenhhncy(this.outsideForm).then(response => {
+          if(response.code != 200) throw response.msg;
+          this.$toast("新增成功");
+          this.outsideOpen = false;
+          this.getList();
+          this.outDiglogStatus = true;
+        }).catch(() => this.outDiglogStatus = true);
+      },
+      closeSearchBox(){
+        this.showSearch = false ;
+        var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
+        document.styleSheets[0].insertRule(
+          "@keyframes test2" +
+          "{" +
+          "0%{bottom: 0px}" +
+          "100%{bottom: -" + height + "px;}" +
+          "}"
+        )
+        $('.searchBar_wrap').css({'animation':'test2 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test2 0.5s ease-in-out 0s 1 alternate forwards'});
+      },
+      zjdTz(){
+        if(this.mapZjdData =="" && this.mapZjdDataTure =="" && this.mapZjdData !=undefined){
+          this.mapZjdTeAll.active =1;
+          this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
+          this.mapZjdTeAll.mapZjdAData.theGeom =this.htZjdZrzFsss;
+          //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
+          //this.$cookies.set("search",this.mapZjdTeAll);
+          this.$cookies.set("search","")
+          this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+        }else {
+          this.$toast("已选择宅基地，请选择自然幢或附属设施按钮");
+        }
+      },
+      zrzTz(){
+        if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
+          this.mapZjdTeAll.active =3;
+          this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
+          this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
+          //this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
+          //this.$cookies.set("search",this.mapZjdTeAll);
+          this.$cookies.set("search","")
+          this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+        }else {
+          this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮");
+        }
+      },
+      fsssTz(){
+        if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
+          this.mapZjdTeAll.active =4;
+          this.mapZjdTeAll.mapFsssAData.theGeom =this.htZjdZrzFsss;
+          this.mapZjdTeAll.mapFsssAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
+          //this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
+          //this.$cookies.set("search",this.mapZjdTeAll);
+          this.$cookies.set("search","")
+          this.$router.push({path:'/homesteadSurvey/add',query: {res: this.mapZjdTeAll}});
+        }else {
+          this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮");
+        }
+      },
+      //绘图重置清除之前图层
+      deleteHistory(){
+        $("#deleteHistory").trigger("click");
+      }
+
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-swipe-cell__wrapper{
+    margin-right:-3px;
+  }
+  .hzlxBtn{
+    font-size: 0.3rem;
+    display: inline-block;
+    padding: 2% 0;
+    border-radius: 30PX;
+    color: #FFF;
+    margin-right: 2%;
+    width: 30%;
+  &:last-child{
+     margin: 0;
+   }
+  }
+  .van-cell__title{
+    flex:2
+  }
+  .bannerBg{
+    width: 100%;
+    color:#fff;
+    /*padding:10px;*/
+    background: linear-gradient(134deg,#7ac943 1%, #22b7f2);
+  }
+  .van-hairline--bottom::after {
+    border-bottom-width: 0;
+  }
+  .activeBtn{
+    background:#fff;
+    border-radius:25PX;
+    color:#7AC943;
+    line-height:30PX;
+    text-align:center;
+    font-size:14PX;
+    width: 25%;
+    margin:0 10px;
+    box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
+  }
+  .disactiveBtn{
+    background:rgba(255,255,255,.4);
+    border-radius:25PX;
+    color:#fff;
+    line-height:30PX;
+    text-align:center;
+    font-size:14PX;
+    width: 25%;
+    margin:0 10px;
+    box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
+  }
+  /*.van-cell__label{*/
+  /*  color: #969799;*/
+  /*  font-size: 12px;*/
+  /*  line-height: 20px;*/
+  /*  margin:0*/
+  /*}*/
+  .map_area {
+    width: 50vw;
+    height: 50vh;
+    z-index:1;
+    background:#000;
+    position: fixed;
+    left: 0;
+    top: 0;
+  }
+  .van-field__label{
+    width:50%;
+  }
+  .rightZoom_wrap {
+    position: absolute;
+    right: 3%;
+    top: 35%;
+    margin-top: -200px;
+    background: #fff;
+    margin-bottom: 16px;
+    border-radius: 10px;
+    text-align: center;
+    padding: 15px 20px;
+  img{
+    margin: 0 auto;
+  }
+  .amplification {
+    line-height: 1;
+    font-size: 18px;
+    text-align: center;
+    margin-top: 5px;
+  }
+  }
+  .mapZoom_wrap {
+    position: absolute;
+    right: 3%;
+    top: 50%;
+    margin-top: -200px;
+    background: #fff;
+    margin-bottom: 16px;
+    border-radius: 10px;
+    padding: 0px 20px;
+  div{
+    padding: 15px 0;
+    border-bottom: 1px solid #C9C9C9;
+  &:last-child{
+     border: none;
+   }
+  p{
+    margin-top: 5px;
+  }
+  }
+  .qtMap {
+    font-size: 18px;
+    text-align: center;
+    line-height: 1;
+  }
+
+  .clMap {
+    font-size: 18px;
+    text-align: center;
+    line-height: 1;
+  }
+
+  .hcMap {
+    font-size: 18px;
+    text-align: center;
+    line-height: 1;
+  }
+
+  .htMap {
+    font-size: 18px;
+    text-align: center;
+    line-height: 1;
+  }
+
+  .dwMap {
+    font-size: 18px;
+    text-align: center;
+    line-height: 1;
+  }
+  }
+  .rightIcon_wrap {
+    position: absolute;
+    right: 16px;
+    bottom: 160px;
+  .selectionIcon_wrap {
+    width: 74px;
+    background: #fff;
+    border-radius: 10px;
+    padding: 14px 0;
+
+  .icon {
+    width: 38px;
+    height: 38px;
+    background: url("../../assets/images/homestead/selection_icon.png")
+    no-repeat;
+    background-size: 100% 100%;
+    margin: 0 auto 4px;
+  }
+  .text {
+    font-size: 24px;
+    text-align: center;
+  }
+  }
+  .positioning_wrap {
+    width: 74px;
+    background: #fff;
+    margin-bottom: 16px;
+    border-radius: 10px;
+    height: 74px;
+    display: flex;
+    justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中*/
+  .icon {
+    width: 38px;
+    height: 38px;
+    background: url("../../assets/images/homestead/positioning_icon.png")
+    no-repeat;
+    background-size: 100% 100%;
+    margin: 0 auto;
+  }
+  }
+  }
+  .homesteadList_wrap {
+  // display: none;
+    display: flex;
+    position: absolute;
+    right: -200px;
+    top: 0px;
+    bottom: 0px;
+    width: 300px;
+    background: #fff;
+    z-index: 999;
+    border-top-left-radius: 15px;
+    border-bottom-left-radius: 15px;
+
+    flex-direction: column;
+  .noInfo_data {
+    font-size: 28px;
+    text-align: center;
+    height: 300px;
+    line-height: 300px;
+    color: #666;
+  }
+  .title_m {
+    color: #333;
+    line-height: 36px;
+    padding: 20px 40px 22px;
+  .name {
+    font-size: 36px;
+    line-height: 42px;
+    height: 42px;
+  }
+  .more_icon {
+    width: 38px;
+    height: 38px;
+    background: url("../../assets/images/homestead/selectionNext_icon.png")
+    no-repeat;
+    float: right;
+    margin-top: 2px;
+  }
+  }
+
+  .main_m {
+    overflow-y: auto;
+    padding: 10px 0;
+  // height: 300px;
+    flex: 1;
+  .flex_block {
+    height: 70px;
+    display: flex;
+  // justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中 */
+    padding: 0 40px;
+  &.active {
+     box-shadow: 0px 0px 10px rgba(24, 45, 51, 0.5);
+   }
+  .name_text {
+    font-size: 28px;
+    flex: 0.5;
+    overflow: hidden; /*超出部分隐藏*/
+    white-space: nowrap; /*不换行*/
+    text-overflow: ellipsis; /*超出部分文字以...显示*/
+  }
+  .square_text {
+    font-size: 28px;
+    flex: 0.4;
+  }
+  .operation_mian {
+    flex: 0 0 150px;
+
+  .describe {
+    font-size: 20px;
+    padding: 6px 5px;
+    float: right;
+    color: #fff;
+    border-radius: 30px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 150px;
+  &.yph {
+     background: #b026ff;
+   }
+  &.dlzdph {
+     background: #ff6f36;
+   }
+  &.ylz {
+     background: #7fff4c;
+   }
+  &.dlz {
+     background: rgb(255, 232, 76);
+   }
+  &.ylzdph {
+     background: #ff7dd0;
+   }
+  &.zy {
+     background: rgb(100, 30, 100);
+   }
+  &.xz {
+     background: rgb(60, 100, 180);
+   }
+  &.chdb {
+     background: #fe0303;
+   }
+  }
+  }
+  }
+  }
+  .footerBtn_wrap {
+    flex: 0 0 90px;
+    display: flex;
+    justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中 */
+
+  .options {
+    flex: 1;
+    font-size: 38px;
+    display: flex;
+    justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中 */
+    height: 90px;
+  &:first-child {
+     border-bottom-left-radius: 15px;
+   }
+  &.active {
+     background: #3cbf5b;
+     color: #fff;
+   }
+  }
+  }
+  }
+
+  .checkbox {
+    width: 200px;
+    margin: 30px auto;
+  }
+
+  .thead-checkbox {
+    background-color: lightgray;
+  }
+
+  .item-checkbox {
+    border: 1px solid darkgray;
+  }
+  .van-sticky{position: fixed;top: 0;right: 0; left: 0;z-index: 9999;}
+
+  .searchBar_wrap {
+  // display: none;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    padding: 0px 16px 0px 13px;
+    background: #fff;
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
+    z-index: 9;
+
+  .searchBox{
+    height: 40vh;
+    overflow-y: scroll;
+  .van-cell{
+    /*&:first-child{*/
+    /*  box-shadow: none;*/
+    /*  margin:0;*/
+    /*}*/
+    box-shadow: 0px 0px 5px #cccccc;
+    border-radius: 15PX;
+    width: 98%;
+    margin: 0 auto;
+    margin-bottom: 0.35rem;
+  &:first-child{
+     margin-top: 5px;
+   }
+  }
+  .van-cell__title{
+    flex: 0.8;
+  p{
+    color: rgb(34, 183, 242);
+  .van-icon{
+    vertical-align: middle;
+  }
+  span{
+    vertical-align: middle;
+  &:nth-child(2){
+     overflow: hidden;
+     white-space: nowrap;
+     text-overflow: ellipsis;
+     display: inline-block;
+     width: 60%;
+   }
+  &:nth-child(3){
+     font-size: 0.25rem;
+     border-radius: 5PX;
+     padding: 5PX 15PX;
+     margin-left: 5%;
+   }
+  }
+  }
+  }
+  .van-cell__value{
+    flex: 0.2;
+  p{
+    font-size: 0.25rem;
+    display: inline-block;
+    border-radius: 1rem;
+    line-height: 1;
+    padding: 10%;
+  }
+  }
+  }
+  .actionBar_wrap {
+    display: flex;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+
+    background: #fff;
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
+  .m_list {
+    flex: 1;
+    display: flex;
+    justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中 */
+
+  .tensile,
+  .positioning,
+  .spacing,
+  .scale {
+    width: 76px;
+    height: 72px;
+    background: #ffffff;
+    border-radius: 8px;
+    box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.16);
+  .icon {
+    width: 76px;
+    height: 72px;
+  }
+  &.active {
+     background: #333;
+  &.tensile {
+  .icon {
+    background: url("../../assets/images/homestead/operation/tensile_active.png")
+    center center no-repeat;
+    background-size: 38px 50px;
+  }
+  }
+  &.positioning {
+  .icon {
+    background: url("../../assets/images/homestead/operation/positioning_active.png")
+    center center no-repeat;
+    background-size: 38px 48px;
+  }
+  }
+  &.spacing {
+  .icon {
+    background: url("../../assets/images/homestead/operation/spacing_active.png")
+    center center no-repeat;
+    background-size: 46px 46px;
+  }
+  }
+  &.scale {
+  .icon {
+    background: url("../../assets/images/homestead/operation/scale_active.png")
+    center center no-repeat;
+    background-size: 48px 48px;
+  }
+  }
+  }
+  }
+  .tensile {
+  .icon {
+    background: url("../../assets/images/homestead/operation/tensile.png")
+    center center no-repeat;
+    background-size: 38px 50px;
+  }
+  }
+  .positioning {
+  .icon {
+    background: url("../../assets/images/homestead/operation/positioning.png")
+    center center no-repeat;
+    background-size: 38px 48px;
+  }
+  }
+  .spacing {
+  .icon {
+    background: url("../../assets/images/homestead/operation/spacing.png")
+    center center no-repeat;
+    background-size: 46px 46px;
+  }
+  }
+  .scale {
+  .icon {
+    background: url("../../assets/images/homestead/operation/scale.png")
+    center center no-repeat;
+    background-size: 48px 48px;
+  }
+  }
+  .closes {
+    background: url("../../assets/images/homestead/searchBar_close.png")
+    no-repeat;
+    background-size: 100% 100%;
+    width: 72px;
+    height: 72px;
+  &.gray {
+     background: url("../../assets/images/homestead/searchBar_close_gray.png")
+     no-repeat;
+     background-size: 100% 100%;
+   }
+  }
+  .correct {
+    background: url("../../assets/images/homestead/searchBar_save.png")
+    no-repeat;
+    background-size: 100% 100%;
+    width: 72px;
+    height: 72px;
+  }
+  }
+  }
+  .searchBar_area {
+    flex: 1;
+    height: 80px;
+    background: #f1f1f1;
+    border: 1px solid #dfdfdf;
+    border-radius: 10px;
+    padding: 0 28px;
+    display: flex;
+  .bar_icon {
+    width: 50px;
+    height: 50px;
+    background: url("../../assets/images/homestead/searchBar_bar.png")
+    center center no-repeat;
+    background-size: 100% 100%;
+    margin-top: 14px;
+    margin-right: 15px;
+  }
+  .bar_ipt {
+    flex: 1;
+  input {
+    width: 100%;
+    height: 100%;
+    background: none;
+    border: 0 none;
+    font-size: 32px;
+  }
+  }
+  .bar_text {
+    flex: 0 0 80px;
+    font-size: 32px;
+    color: #333333;
+    font-family: PingFang SC, PingFang SC-Regular;
+    font-weight: 400;
+    display: flex;
+    justify-content: center; /* 相对父元素水平居中 */
+    align-items: center; /*  子元素相对父元素垂直居中 */
+  }
+  }
+  .searchBar_more {
+    flex: 0 0 80px;
+    background: url("../../assets/images/homestead/searchBar_add.png") center
+    center no-repeat;
+    background-size: 80% 80%;
+    margin-left: 15px;
+  }
+  }
+</style>
diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue
index c090134f..9213441b 100644
--- a/src/views/homesteadSurvey/zrzAdd.vue
+++ b/src/views/homesteadSurvey/zrzAdd.vue
@@ -270,10 +270,17 @@ export default {
     submitzjd(){
       this.$refs.form.validate().then(() => {
       if(this.form.id == null){
-        this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
-        if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
-        this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
-        this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+        // this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson));
+        // if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
+        // this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
+        // this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          if(this.form.theGeomJson instanceof Array){
+            this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
+          }else if(typeof this.form.theGeomJson === 'string'){
+            let theGeometry  = JSON.parse( this.form.theGeomJson);
+            if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的
+              this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates));
+          }
         addZrz(this.form).then(response => {
           let _this =this
           this.$toast({
@@ -332,7 +339,7 @@ export default {
     onMapDrawFinished(data) {
       console.info(data);
      this.drawInsert = data;
-      this.form.theGeomJson = JSON.stringify(this.drawInsert);
+      this.form.theGeomJson = this.drawInsert;
     },
     // 当申请地图被重置时
     onMapDrawReseted() {
diff --git a/src/views/login.vue b/src/views/login.vue
index 97dd456c..2d280b99 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -149,7 +149,9 @@ export default {
       code:null,
       isSmsLogin: false, //是否手机验证码
       computeTime: 0,
-      height:0
+      height:0,
+      uuid:'',
+      uuidPhone:'',
     };
   },
   created() {
@@ -171,13 +173,13 @@ export default {
   methods: {
     getCode() {
       getCodeImg().then((res) => {
-        this.formData.uuid = res.uuid;
+        this.uuid = res.uuid;
         this.codeUrl = "data:image/gif;base64," + res.img;
       });
     },
     getCodePhone() {
       getCodeImg().then((res) => {
-        this.formData.uuid = res.uuid;
+        this.uuidPhone = res.uuid;
         this.codeUrlPhone = "data:image/gif;base64," + res.img;
       });
     },
@@ -242,6 +244,7 @@ export default {
         }
         this.loading = true;
         this.formData.code = this.mobileCode;
+        this.formData.uuid = this.uuidPhone
         this.$store
           .dispatch("SmsLogin", this.formData)
           .then(() => {
@@ -278,6 +281,7 @@ export default {
           return false;
         }
         this.formData.code = this.code;
+        this.formData.uuid = this.uuid;
         this.$store
           .dispatch("Login", this.formData)
           .then(() => {
diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue
index fd8a211a..b281a83d 100644
--- a/src/views/sunVillage_info/index.vue
+++ b/src/views/sunVillage_info/index.vue
@@ -13,7 +13,10 @@
               </van-popup>
 
             </div>
-            <van-popover v-model="showPopover" trigger="click" :actions="actions" placement="bottom-end" @select="selectChange">
+            <van-popover v-model="showPopover" trigger="click" placement="bottom-end" @select="selectChange">
+              <div style="width: 4rem;">
+                  <van-cell :title="item.text" @click="selectChange({index:index})" :border="false" :icon="item.icon" v-for="(item,index) in actions" :key="index" />
+              </div>
               <template #reference>
                 <div class="exit_btn">
                   <i class="icon"></i>
@@ -68,12 +71,12 @@
         actions: [
           { text: '个人信息', icon: 'manager-o' , index: 0 },
           { text: '修改密码', icon: 'edit' , index: 1 },
-          { text: '事项审批', icon: 'manager-o' , index: 2 },
-          { text: '宅基地调查', icon: 'manager-o' , index: 3 },
-          { text: '确权延包调查', icon: 'manager-o' , index: 4 },
-          { text: '农业行政执法', icon: 'manager-o' , index: 5 },
-          { text: '生产托管', icon: 'manager-o' , index: 6 },
-          { text: '产权交易', icon: 'manager-o' , index: 7 },
+          { text: '事项审批', icon: 'todo-list-o' , index: 2 },
+          { text: '宅基地调查', icon: 'newspaper-o' , index: 3 },
+          { text: '确权延包调查', icon: 'orders-o' , index: 4 },
+          { text: '农业行政执法', icon: 'label-o' , index: 5 },
+          { text: '生产托管', icon: 'notes-o' , index: 6 },
+          { text: '产权交易', icon: 'home-o' , index: 7 },
           { text: '退出登录', icon: 'revoke' , index: 8 },
         ],
         deptIdOptions:[],
@@ -262,6 +265,9 @@
           top: 64px;
           right: 36px;
         }
+        /deep/ .van-popover__action{
+          width: 4rem;
+        }
         .exit_btn{
             width: 61px;
             height: 61px;
diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue
index 896a7bd8..a882a5eb 100644
--- a/src/views/sunVillage_info/list_cbf.vue
+++ b/src/views/sunVillage_info/list_cbf.vue
@@ -22,15 +22,15 @@
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
-                <i class="icon_box" v-if="item.secondSigning==null"></i>
-                <i class="icon_box1" v-if="item.secondSigning!=null"></i>
-                <p class="news_title" :style="{'color': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.cbhtbm}}</p>
-                <p class="tips_mark" :style="{'color': item.secondSigning!=null?'#79bc29':'#f8a83d','background': item.secondSigning!=null?'#e8ffcd':'#ffedcd'}">{{item.signingMode}}</p>
-                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': item.secondSigning!=null?'#2bc30c':'#eb1616'}">{{item.signingStatus}}</p>
+                <i class="icon_box" v-if="item.signingStatus =='合同筹备' || item.signingStatus =='合同待签' ||item.signingStatus =='单方已签'"></i>
+                <i class="icon_box1" v-if="item.signingStatus =='签字完成' || item.signingStatus =='合同归档'"></i>
+                <p class="news_title" >{{item.cbhtbm}}</p>
+                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': formatDict(item)}">{{item.signingStatus}}</p>
+                <p class="tips_mark"   :style="{'background': item.signingMode === '线上'?'#F9BE0C':'#08BE4E'}">{{item.signingMode}}</p>
               </div>
               <div class="time">
-                <p style="color:#eb1616;">{{item.cbfmc}}</p>
-                <p style="color:#eb1616;font-weight: bold;">{{item.htzmjm.toFixed(2)}} 亩</p>
+                <p>{{item.cbfmc}}</p>
+                <p>{{item.htzmjm.toFixed(2)}} 亩</p>
               </div>
             </div>
           </div>
@@ -44,13 +44,22 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.cbfqszt =='2'"  @click="contractSign(item)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.cbfqszt !='2' && item.signingStatus !=='合同筹备'"  @click="contractSign(item)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>合同网签</p>
               </div>
-              <div class="opera_btn" @click="openPopupGsjg(item.cbfbm)">
+              <!-- <div class="opera_btn" @click="openPopupGsjg(item.cbfbm)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>公示结果签名</p>
+              </div> -->
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.signingStatus !=='合同筹备' && item.signingStatus !=='双方待签'" @click="contractView(item.id)">
+                <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
+                <p>合同预览</p>
+              </div>
+              <div class="opera_btn" v-if="item.signingMode === '线上' && item.signingStatus === '合同归档'"
+                   @click="handleDownload(item.id)">
+                <img src="../../assets/images/sunVillage_info/download.png" alt="" width="35">
+                <p>下载合同</p>
               </div>
               <!-- <div class="opera_btn">
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
@@ -102,7 +111,7 @@
 </template>
 
 <script>
-  import { getCbf, eqbCbfhtwq,getCbhtList, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
+  import { getCbf, eqbCbfhtwq,getCbhtList,signedContractDownload,viewSignedContract, cbhtSecondSign,updateGsjgSign, attachmentQuery, attachmentUpload, attachmentRemove } from "@/api/sunVillage_info/fixedAssets";
   import vueEsign from "vue-esign";
   import $ from "jquery";
   import Cookies from "js-cookie";
@@ -147,6 +156,9 @@
     created() {
       this.height = window.screen.height * 1.28 - 20;
       this.getCbfInfo();
+      this.houseGetDicts("signing_status").then((res) => {
+        this.signingStatusData = res.data;
+      });
       // this.queryParams.cbfbm = JSON.parse(Cookies.get('user')).idcard;
     },
     methods: {
@@ -251,6 +263,15 @@
           this.$notify({ type: 'success', message: '删除成功' });
         });
       },
+      formatDict(item){
+        let colorval = "";
+        this.signingStatusData.map(function (e){
+          if(item.signingStatus === e.dictLabel){
+            colorval =  e.remark;
+          }
+        })
+        return colorval;
+      },
       signaImgFun(url) {
         this.signatureImg = url;
       },
@@ -307,6 +328,29 @@
             this.$toast.fail('请签名后再保存签字');
           });
       },
+      contractView(id) {
+        viewSignedContract(id).then(response => {
+          if (response.code === 200) {
+            this.noticeUrl = response.data;
+            this.htqsShow = true;
+          }
+        });
+      },
+      // 签署合同下载
+      handleDownload(id) {
+        this.$dialog.confirm({
+          message: '是否下载承包合同？',
+        }).then(() => {
+          // on confirm
+          signedContractDownload(id).then(res => {
+            if (res.code === 200) {
+              window.location.href = res.data;
+            }
+          });
+        }).catch(() => {
+          // on cancel
+        });
+      },
       dataURLtoBlob(dataurl, filename = 'file') {
         let arr = dataurl.split(',')
         let mime = arr[0].match(/:(.*?);/)[1]
@@ -479,7 +523,7 @@
               background: #ffedcd;
               border-radius: 8px;
               font-size: 24px;
-              color: #f8a83d;
+              color: #ffffff;
               text-align: center;
               line-height: 34px;
               flex-shrink: 0;
diff --git a/src/views/sunVillage_info/list_cbfsq.vue b/src/views/sunVillage_info/list_cbfsq.vue
index a7304985..d5381eae 100644
--- a/src/views/sunVillage_info/list_cbfsq.vue
+++ b/src/views/sunVillage_info/list_cbfsq.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main" >
-      承包方授权
+      {{this.$route.query.shStatus?'承包方审核':'承包方授权'}}
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div class="list_main">
@@ -9,112 +9,214 @@
         <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
         <p class="tit">承包方授权</p>
       </div>
-      <van-field readonly v-model="cbfTypeName" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfbm" label="承包方代码" placeholder="承包方代码" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfmc" label="承包方名称" placeholder="承包方名称" input-align="right" :border="false" />
-      <van-field readonly v-model="zjlxName" label="承包方证件类型" placeholder="承包方证件类型" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfzjhm" label="承包方证件号码" placeholder="承包方证件号码" input-align="right" :border="false" />
-      <van-field readonly v-model="form.lxdh" label="联系电话" placeholder="联系电话" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfcysl" label="承包方成员数量" placeholder="承包方成员数量" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfdcy" label="承包方调查员" placeholder="承包方调查员" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfdcrq" label="承包方调查日期" placeholder="承包方调查日期" input-align="right" :border="false" />
-      <van-field readonly v-model="form.cbfdcjs" label="承包方调查记事" placeholder="承包方调查记事" input-align="right" :border="false" />
-      <van-cell title="承包方调查签字" style="color: #646566;">
-        <van-field style="padding: 0 0;" readonly input-align="right" :border="false" >
-          <template #label>
-            <img :src="'/api'+form.cbfdcqz" width="10%" alt="" v-if="form.cbfdcqz" >
-          </template>
-        </van-field>
-      </van-cell>
-      <van-field readonly v-model="form.gsjs" label="公示记事" placeholder="公示记事" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsjsr" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
-      <van-cell title="公示记事人签字" style="color: #646566;">
-        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
-          <template #label>
-            <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
-          </template>
-        </van-field>
-      </van-cell>
-      <van-field readonly v-model="form.gsjsrq" label="公示记事日期" placeholder="公示记事日期" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsjgyj" label="公示结果意见" placeholder="公示结果意见" input-align="right" :border="false" />
-      <van-cell title="公示结果签字" style="color: #646566;">
-        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
-          <template #label>
-            <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
-          </template>
-        </van-field>
-      </van-cell>
-      <van-field readonly v-model="form.gsjgqzrq" label="公示结果签字日期" placeholder="公示结果签字日期" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsshr" label="公示审核人" placeholder="公示审核人" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsshrq" label="公示审核日期" placeholder="公示审核日期" input-align="right" :border="false" />
-      <van-field readonly v-model="form.gsshyj" label="公示审核意见" placeholder="公示审核意见" input-align="right" :border="false" />
-      <van-cell title="公示审核签字" style="color: #646566;">
-        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
-          <template #label>
-            <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
-          </template>
-        </van-field>
-      </van-cell>
-      <van-field readonly v-model="form.yzbm" label="邮政编码" placeholder="	邮政编码" input-align="right" :border="false" />
-      <van-field readonly v-model="form.fbfdcy" label="发包方调查员" placeholder="发包方调查员" input-align="right" :border="false" />
-      <van-field readonly v-model="form.fbfdcrq" label="发包方调查日期" placeholder="发包方调查日期" input-align="right" :border="false" />
-      <van-field readonly v-model="form.fbfdcjs" label="发包方调查记事" placeholder="发包方调查记事" input-align="right" :border="false" />
-      <van-cell title="发包方调查签字" style="color: #646566;">
-        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
-          <template #label>
-            <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >
-          </template>
-        </van-field>
-      </van-cell>
-      <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
-      <van-field readonly v-model="form.shrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />
-      <van-cell title="审核人签字" style="color: #646566;">
-        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
-          <template #label>
-            <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >
-          </template>
-        </van-field>
-      </van-cell>
-      <van-field readonly v-model="form.hcgfsl	" label="户持股份(份额)数量" placeholder="户持股份(份额)数量	" input-align="right" :border="false" />
-      <van-field readonly v-model="form.hcgfzjtqqtdbl	" label="户持股份(份额)比例" placeholder="户持股份(份额)比例	" input-align="right" :border="false" />
-      <van-field readonly v-model="form.hcgfzjtqqtdmj	" label="户持股份(份额)面积" placeholder="户持股份(份额)面积" input-align="right" :border="false" />
-      <van-field readonly v-model="surveyStatusName" label="确权调查状态" placeholder="确权调查状态" input-align="right" :border="false" />
-      <van-field readonly v-model="form.surveyRemark" label="确权调查备注" placeholder="确权调查备注" input-align="right" :border="false" />
-      <van-field readonly v-model="isDepositName" label="是否纳入托管" placeholder="是否纳入托管" input-align="right" :border="false" />
-      <van-field readonly v-model="form.tgmj" label="托管面积(亩)" placeholder="托管面积(亩)" input-align="right" :border="false" />
-      <div style="margin: 30px auto 0;width: 50%;">
-        <van-button round block type="primary" v-if="sqbutShow"  @click="cbfsq">
-          授权
-        </van-button>
-        <!-- <van-button round block type="primary" v-if="!sqbutShow"  >
-          授权完成
-        </van-button> -->
-      </div>
-      <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_authorized.png" alt="" v-if="!sqbutShow" />
+
+      <van-tabs v-model="active" animated>
+        <van-tab title="承包方">
+          <van-field readonly v-model="cbfTypeName" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfbm" label="承包方代码" placeholder="承包方代码" input-align="right" :border="false" />
+          <van-cell title="承包方名称" style="color: #646566;">
+            <div style="color:#000000; ">{{form.cbfmc}}</div>
+          </van-cell>
+          <van-field readonly v-model="zjlxName" label="承包方证件类型" placeholder="承包方证件类型" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfzjhm" label="承包方证件号码" placeholder="承包方证件号码" input-align="right" :border="false" />
+          <van-field readonly v-model="form.lxdh" label="联系电话" placeholder="联系电话" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfcysl" label="承包方成员数量" placeholder="承包方成员数量" input-align="right" :border="false" />
+          <van-field readonly v-model="form.yzbm" label="邮政编码" placeholder="	邮政编码" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfdcy" label="承包方调查员" placeholder="承包方调查员" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfdcrq" label="承包方调查日期" placeholder="承包方调查日期" input-align="right" :border="false" />
+          <van-cell title="承包方调查记事" style="color: #646566;">
+            <div style="color:#000000; ">{{form.cbfdcjs}}</div>
+          </van-cell>
+          <van-cell title="承包方调查签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.cbfdcqz" width="10%" alt="" v-if="form.cbfdcqz" >
+              </template>
+            </van-field>
+          </van-cell>
+          <van-cell title="公示记事" style="color: #646566;">
+            <div style="color:#000000; ">{{form.gsjs}}</div>
+          </van-cell>
+          <van-field readonly v-model="form.gsjsr" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
+          <van-cell title="公示记事人签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+              </template>
+            </van-field>
+          </van-cell>
+          <van-field readonly v-model="form.gsjsrq" label="公示记事日期" placeholder="公示记事日期" input-align="right" :border="false" />
+          <van-cell title="公示结果意见" style="color: #646566;">
+            <div style="color:#000000; ">{{form.gsjgyj}}</div>
+          </van-cell>
+          <van-cell title="公示结果签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
+              </template>
+            </van-field>
+          </van-cell>
+          <van-field readonly v-model="form.gsjgqzrq" label="公示结果签字日期" placeholder="公示结果签字日期" input-align="right" :border="false" />
+          <van-field readonly v-model="form.gsshr" label="公示审核人" placeholder="公示审核人" input-align="right" :border="false" />
+          <van-field readonly v-model="form.gsshrq" label="公示审核日期" placeholder="公示审核日期" input-align="right" :border="false" />
+          <van-cell title="公示审核意见" style="color: #646566;">
+            <div style="color:#000000; ">{{form.gsshyj}}</div>
+          </van-cell>
+          <van-cell title="公示审核签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+              </template>
+            </van-field>
+          </van-cell>
+        </van-tab>
+        <van-tab title="家庭成员">
+          <van-cell v-for="(item, index) in memberList" :key="item.id">
+            <div class="member_item">
+              <div class="item_left">
+                <div class="item_left_tt">
+                  <p class="name">
+                    <img src="../../../static/images/contracted/family_icon_01.png" alt="">
+                    {{ item.cyxm }}
+                  </p>
+                  <p>{{ item.yhzgx }}</p>
+                  <p class="sex">
+                    {{ item. cyxb }}
+                    <img v-if="item.cyxb === '男'" src="../../../static/images/contracted/family_icon_man.png" alt="">
+                    <img v-else-if="item.cyxb === '女'" src="../../../static/images/contracted/family_icon_wman.png" alt="">
+                  </p>
+                </div>
+                <p class="id_card">
+                  <img src="../../../static/images/contracted/family_icon_02.png" alt="">
+                  {{ item.cyzjhm }}
+                </p>
+              </div>
+              <p class="item_right">{{ item.sfgyr }}</p>
+            </div>
+          </van-cell>
+        </van-tab>
+        <van-tab title="承包合同">
+          <van-field v-model="contractDetail.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbflx" label="承包方类型：" placeholder="请选择承包方类型" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbfs" label="承包方式：" placeholder="请选择承包方式" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.qdsj" label="签订时间：" placeholder="请选择签订时间" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbqxq" label="承包起始时间：" placeholder="请选择起始时间" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbqxz" label="承包结束时间：" placeholder="请选择结束时间" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" :border="false" input-align="right" readonly />
+        </van-tab>
+        <van-tab title="承包地块">
+          <van-cell v-for="(item,index) in landList" :key="item.id">
+            <div class="land_item" >
+              <div class="item_tt">
+                <p>{{ item.dkmc }}</p>
+                <p>{{ item.dkbm }}</p>
+              </div>
+              <div class="item_type">
+                <p>{{ item.htmjm }}亩</p>
+                <!--            <p>{{ item.tdlylx }}</p>-->
+                <p>{{ item.dldj }}</p>
+                <p>{{ item.tdyt }}</p>
+                <p>基本农田:{{ item.sfjbnt }}</p>
+              </div>
+              <div class="item_direction">
+                <!--            <p>{{ item.zjrxm }}指界</p>-->
+                <p>东:{{ item.dkdz }}</p>
+                <p>西:{{ item. dkxz }}</p>
+                <p>南:{{ item.dknz }}</p>
+                <p>北:{{ item.dkbz }}</p>
+              </div>
+            </div>
+          </van-cell>
+
+        </van-tab>
+      </van-tabs>
+<!--      <van-field readonly v-model="form.fbfdcy" label="发包方调查员" placeholder="发包方调查员" input-align="right" :border="false" />-->
+<!--      <van-field readonly v-model="form.fbfdcrq" label="发包方调查日期" placeholder="发包方调查日期" input-align="right" :border="false" />-->
+<!--      <van-cell title="发包方调查记事" style="color: #646566;">-->
+<!--        <div style="color:#000000; ">{{form.fbfdcjs}}</div>-->
+<!--      </van-cell>-->
+<!--      <van-cell title="发包方调查签字" style="color: #646566;">-->
+<!--        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >-->
+<!--          <template #label>-->
+<!--            <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >-->
+<!--          </template>-->
+<!--        </van-field>-->
+<!--      </van-cell>-->
+<!--      <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />-->
+<!--      <van-field readonly v-model="form.shrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />-->
+<!--      <van-cell title="审核人签字" style="color: #646566;">-->
+<!--        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >-->
+<!--          <template #label>-->
+<!--            <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >-->
+<!--          </template>-->
+<!--        </van-field>-->
+<!--      </van-cell>-->
+    </div>
+    <div style="margin: 30px auto 0;width: 50%;">
+      <van-button round block type="primary" v-if="showSignBtn" @click="openEsignPopup">
+        公示结果签字
+      </van-button>
+      <van-button round block type="primary" v-if="showAuthBtn"  @click="cbfsq">
+        授权
+      </van-button>
     </div>
+<!--    <img class="bottomImg" v-if="sqbutShow && cbfsqShow" src="../../assets/images/sunVillage_info/cbfwsq.png" alt=""  />-->
+<!--    <img class="bottomImg" v-if="sqbutShow && cbfshShow" src="../../assets/images/sunVillage_info/cbfwsh.png" alt=""  />-->
+    <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_authorized.png" alt="" v-if="showAuthPic" />
+
+
+    <van-popup v-model="showEsignPopup" closeable position="right" :style="{ height: '100%' }" >
+      <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
+        <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
+          <vue-esign
+            ref="esign"
+            class="mySign"
+            :width="500"
+            :height="height"
+            :isCrop="signature.isCrop"
+            :lineWidth="signature.lineWidth"
+            :lineColor="signature.lineColor"
+            :bgColor.sync="signature.bgColor"
+          />
+        </div>
+        <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT" style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
+        <div class="signature-footer">
+          <van-button @click="handleGenerate" type="info" size="small">保存签字</van-button>
+          <van-button @click="handleReset" class="clearBtn" type="info" plain  size="small">清空画板</van-button>
+        </div>
+      </van-cell-group>
+    </van-popup>
   </div>
 </template>
 
 <script>
-  import { getCbfList,eqbEmpower} from "@/api/sunVillage_info/sysCbf";
+  import { getCbfList,getCbfById,eqbEmpower, listFamilyMember, getContractByCode, listContractedLand } from "@/api/sunVillage_info/sysCbf";
+  import { updateGsjgSign } from "@/api/sunVillage_info/fixedAssets";
   import FieldSelect from "@/components/form/FieldSelect";
+  import vueEsign from "vue-esign";
   import Cookies from "js-cookie";
   import $ from "jquery";
   export default {
     name: "certificateList",
-    components: {FieldSelect},
+    components: {FieldSelect, vueEsign},
     data() {
       return {
         form:{},
         showForm2:false,
         showesign:false,
-        sqbutShow:false,
-        sysFarmer:JSON.parse(Cookies.get('user')),
+        sqbutShow:true,
+        cbfsqShow:false,
+        cbfshShow:false,
+        sysFarmer:null,
         zjlxName:"",
         cbfTypeName:"",
         surveyStatusName:"",
         isDepositName:"",
-        height:0,
         options: {
           cert_type: [],
         },
@@ -126,10 +228,46 @@
           resultImg: "", // 最终画布生成的base64图片
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
+        showSignBtn: false,       // 是否显示公示结果签字按钮
+        showAuthBtn: false,       // 是否显示授权按钮
+        showAuthPic: false,       // 是否显示授权图片
+        active: 0,                // 控制 van-tabs 的标签
+        showEsignPopup: false,    // 是否显示签字板
+        height: null,
+        memberList: [],           // 承包方家庭成员信息
+        contractDetail: {},       // 承包合同信息
+        landList: [],             // 承包地块列表
       };
     },
     created() {
-      this.getSysCfb();
+      this.height = window.screen.height * 1.28 - 20;
+      if(this.$route.query.sqStatus){
+        getCbfById(this.$route.query.id).then(response => {
+          this.form = response.data;
+          if(this.form.accountId != null && this.form.accountId !== ""){
+            this.sqbutShow = false;
+          }else{
+            this.cbfsqShow = true;
+            this.sqbutShow = true;
+          }
+          this.getDictValue();
+        });
+
+      }else if(this.$route.query.shStatus){
+        getCbfById(this.$route.query.id).then(response => {
+          this.form = response.data;
+          if(this.form.gsshqz != null && this.form.gsshqz !== ""){
+            this.sqbutShow = false;
+          }else{
+            this.cbfshShow = true;
+            this.sqbutShow = true;
+          }
+          this.getDictValue();
+        });
+      }else{
+       this.sysFarmer = JSON.parse(Cookies.get('user'));
+        this.getSysCfb();
+      }
     },
     methods: {
       InitOptions() {
@@ -140,53 +278,147 @@
       },
       /*承包方授权*/
       cbfsq(){
-        console.info(3333333333);
         eqbEmpower(this.form).then(response => {
           if(response.code === 200 ){
-            this.sqbutShow = false;
+            // this.sqbutShow = false;
+            this.$notify({type: 'success', message: '授权成功'});
+            this.showSignBtn = false;
+            this.showAuthBtn = false;
+            this.showAuthPic = true;
           }
         });
       },
       getSysCfb(){
         getCbfList({deptId:this.sysFarmer.deptId,cbfzjhm:this.sysFarmer.idcard}).then(response => {
-          this.sqbutShow = true;
-          let _this = this;
+          // this.sqbutShow = true;
           if(response.rows.length > 0){
             this.form = response.rows[0];
-            if(this.form.accountId != null && this.form.accountId !== ""){
+            if (!this.form.gsjgqz) {
+              this.showSignBtn = true;
+              this.showAuthBtn = false;
+              this.showAuthPic = false;
+            } else if (!this.form.accountId) {
+              this.showSignBtn = false;
+              this.showAuthBtn = true;
+              this.showAuthPic = false;
+            } else {
+              this.showSignBtn = false;
+              this.showAuthBtn = false;
+              this.showAuthPic = true;
+            }
+            /* if(this.form.accountId != null && this.form.accountId !== ""){
               this.sqbutShow = false;
+            }else{
+              this.sqbutShow = true;
+            } */
+            this.getDictValue();
+            this.getFamilyMemberList(this.form.cbfbm);
+            this.getContractDetail(this.form.cbfbm);
+            this.getContractedLandList(this.form.cbfbm);
+          }
+        });
+      },
+      getDictValue(){
+        let _this = this;
+        this.getDicts("cert_type").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.cbfzjlx) {
+              _this.zjlxName = item.dictLabel;
             }
-            this.getDicts("zjlx").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.cbfzjlx) {
-                  _this.zjlxName = item.dictLabel;
-                }
-              })
-            });
-            this.getDicts("cbf_type").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.cbflx) {
-                  _this.cbfTypeName = item.dictLabel;
-                }
-              })
-            });
-            this.getDicts("confirmed_survey_status").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.surveyStatus) {
-                  _this.surveyStatusName = item.dictLabel;
-                }
-              })
-            });
-            this.getDicts("sys_yes_no").then(response => {
-              response.data.forEach(function (item) {
-                if (item.dictValue ===  _this.form.isDeposit) {
-                  _this.isDepositName = item.dictLabel;
-                }
-              })
+          })
+        });
+        this.getDicts("cbf_type").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.cbflx) {
+              _this.cbfTypeName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("confirmed_survey_status").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.surveyStatus) {
+              _this.surveyStatusName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("sys_yes_no").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.isDeposit) {
+              _this.isDepositName = item.dictLabel;
+            }
+          })
+        });
+      },
+      getFamilyMemberList(cbfbm) {
+        listFamilyMember({cbfbm: cbfbm, translate_dict: 1}).then(response => {
+          this.memberList = response.rows;
+        });
+      },
+      getContractDetail(cbfbm) {
+        getContractByCode({cbfbm: cbfbm, translate_dict: 1}).then(response => {
+          this.contractDetail = response.data;
+        });
+      },
+      getContractedLandList(cbfbm) {
+        listContractedLand({cbfbm: cbfbm, translate_dict: 1}).then(response => {
+          this.landList = response.rows;
+        });
+      },
+      openEsignPopup() {
+        if (!this.form.cbfbm) {
+          this.$toast({
+            icon: 'fail',
+            message: '承包方编码不存在',
+            duration: '1000'
+          })
+          return;
+        }
+        this.showEsignPopup = true;
+        this.$nextTick(() => {
+          this.handleReset();
+        });
+      },
+      canvasTTdown() {
+        $('#canvasTT').css('display', 'none');
+      },
+      handleReset() {
+        this.$refs.esign.reset();
+        $('#canvasTT').css('display', 'block')
+      },
+      handleGenerate(){
+        this.$refs.esign
+          .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
+          .then((res) => {
+            this.signature.resultImg = res;
+            let wj = this.dataURLtoBlob(res);
+            let param = new FormData();  // 创建form对象
+            param.append('file', wj);  // 通过append向form对象添加数据
+            param.append('cbfbm', this.form.cbfbm);
+            updateGsjgSign(param).then(response => {
+              this.$notify({type: 'success', message: '签字成功'});
+              this.showEsignPopup = false;
+              this.getSysCfb();
             });
-          }
 
-        });
+          })
+          .catch((err) => {
+            // 画布没有签字时会执行这里提示一下
+            this.$toast.fail('请签名后再保存签字');
+          });
+      },
+      dataURLtoBlob(dataurl, filename = 'file') {
+        let arr = dataurl.split(',')
+        let mime = arr[0].match(/:(.*?);/)[1]
+        let suffix = mime.split('/')[1]
+        let bstr = atob(arr[1])
+        let n = bstr.length
+        let u8arr = new Uint8Array(n)
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new File([u8arr], `${filename}.${suffix}`, {
+          type: mime
+        })
       },
     },
   }
@@ -400,4 +632,128 @@
     width: 50vw;
     transform: translate(-50%,10%);
   }
+  .signature-box {
+    border: 1px dashed #666;
+    margin: 2px 20px;
+    height: 100%;
+    /*canvas{*/
+    /*  height: 100%!important;*/
+    /*}*/
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0PX;
+
+    .clearBtn {
+      margin-left: 15px;
+    }
+  }
+  .member_item{
+    border-radius: 30px;
+    background: #fff;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    padding:25px 32px;
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .item_left{
+      flex: 1;
+      .item_left_tt{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 14PX;
+        .name{
+          display: flex;
+          align-items: center;
+          font-size: 16PX;
+          img{
+            width: 5vw;
+            margin-right: 2vw;
+          }
+        }
+        .sex{
+          display: flex;
+          align-items: center;
+          img{
+            width: 3vw;
+            margin-left: 1vw;
+          }
+        }
+      }
+      .id_card{
+        display: flex;
+        align-items: center;
+        font-size: 14PX;
+        margin-top: 1vh;
+        img{
+          width: 5vw;
+          margin-right: 2vw;
+        }
+      }
+    }
+    .item_right{
+      margin-left: 15vw;
+      padding: 2PX 15PX;
+      background: #d0f4e5;
+      color: #2ecb8a;
+      border: 1px solid #8be3be;
+      border-radius: 30PX;
+    }
+  }
+  .land_item{
+    border-radius: 30px;
+    background: #fff;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    padding:25px 32px;
+    margin-bottom: 20px;
+    font-size: 14PX;
+    .item_tt{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      p:first-child{
+        font-size: 16PX;
+        color: #333333;
+      }
+      p:last-child{
+        color: #44e4a3;
+      }
+    }
+    .item_type{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      color:#5f5f5f;
+      margin-top: 1vh;
+      p:nth-child(1){
+        color: #fb9627;
+        border: 1px solid #fb9627;
+        padding: 0 10PX;
+        border-radius: 50PX;
+      }
+      span{
+        color: #ffffff;
+        background: #fb9627;
+        border-radius: 100%;
+        display: inline-block;
+        width: 15PX;
+        height: 15PX;
+        line-height: 15PX;
+        font-size: 12PX;
+        margin-right: 5PX;
+      }
+    }
+    .item_direction{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      color:#5f5f5f;
+      margin-top: 1vh;
+    }
+  }
 </style>
diff --git a/src/views/sunVillage_info/list_cbfsq_view.vue b/src/views/sunVillage_info/list_cbfsq_view.vue
new file mode 100644
index 00000000..a901162e
--- /dev/null
+++ b/src/views/sunVillage_info/list_cbfsq_view.vue
@@ -0,0 +1,637 @@
+<template>
+  <div class="home_wrapper">
+    <div class="header_main" >
+      {{this.$route.query.shStatus?'承包方审核':'承包方授权'}}
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+    <div class="list_main">
+      <div class="titBox">
+        <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
+        <p class="tit">{{this.$route.query.shStatus?'承包方审核':'承包方授权'}}</p>
+      </div>
+
+
+      <van-tabs v-model="active" animated>
+        <van-tab title="承包方">
+          <van-field readonly v-model="cbfTypeName" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfbm" label="承包方代码" placeholder="承包方代码" input-align="right" :border="false" />
+          <van-cell title="承包方名称" style="color: #646566;">
+            <div style="color:#000000; ">{{form.cbfmc}}</div>
+          </van-cell>
+          <van-field readonly v-model="zjlxName" label="承包方证件类型" placeholder="承包方证件类型" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfzjhm" label="承包方证件号码" placeholder="承包方证件号码" input-align="right" :border="false" />
+          <van-field readonly v-model="form.lxdh" label="联系电话" placeholder="联系电话" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfcysl" label="承包方成员数量" placeholder="承包方成员数量" input-align="right" :border="false" />
+          <van-field readonly v-model="form.yzbm" label="邮政编码" placeholder="	邮政编码" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfdcy" label="承包方调查员" placeholder="承包方调查员" input-align="right" :border="false" />
+          <van-field readonly v-model="form.cbfdcrq" label="承包方调查日期" placeholder="承包方调查日期" input-align="right" :border="false" />
+          <van-cell title="承包方调查记事" style="color: #646566;">
+            <div style="color:#000000; ">{{form.cbfdcjs}}</div>
+          </van-cell>
+          <van-cell title="承包方调查签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.cbfdcqz" width="10%" alt="" v-if="form.cbfdcqz" >
+              </template>
+            </van-field>
+          </van-cell>
+          <van-cell title="公示记事" style="color: #646566;">
+            <div style="color:#000000; ">{{form.gsjs}}</div>
+          </van-cell>
+          <van-field readonly v-model="form.gsjsr" label="公示记事人" placeholder="公示记事人" input-align="right" :border="false" />
+          <van-cell title="公示记事人签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.gsjsrqz" width="10%" alt="" v-if="form.gsjsrqz" >
+              </template>
+            </van-field>
+          </van-cell>
+          <van-field readonly v-model="form.gsjsrq" label="公示记事日期" placeholder="公示记事日期" input-align="right" :border="false" />
+          <van-cell title="公示结果意见" style="color: #646566;">
+            <div style="color:#000000; ">{{form.gsjgyj}}</div>
+          </van-cell>
+          <van-cell title="公示结果签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.gsjgqz" width="10%" alt="" v-if="form.gsjgqz" >
+              </template>
+            </van-field>
+          </van-cell>
+          <van-field readonly v-model="form.gsjgqzrq" label="公示结果签字日期" placeholder="公示结果签字日期" input-align="right" :border="false" />
+          <van-field readonly v-model="form.gsshr" label="公示审核人" placeholder="公示审核人" input-align="right" :border="false" />
+          <van-field readonly v-model="form.gsshrq" label="公示审核日期" placeholder="公示审核日期" input-align="right" :border="false" />
+          <van-cell title="公示审核意见" style="color: #646566;">
+            <div style="color:#000000; ">{{form.gsshyj}}</div>
+          </van-cell>
+          <van-cell title="公示审核签字" style="color: #646566;">
+            <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >
+              <template #label>
+                <img :src="'/api'+form.gsshqz" width="10%" alt="" v-if="form.gsshqz" >
+              </template>
+            </van-field>
+          </van-cell>
+        </van-tab>
+        <van-tab title="家庭成员">
+          <van-cell v-for="(item, index) in memberList" :key="item.id">
+            <div class="member_item">
+              <div class="item_left">
+                <div class="item_left_tt">
+                  <p class="name">
+                    <img src="../../../static/images/contracted/family_icon_01.png" alt="">
+                    {{ item.cyxm }}
+                  </p>
+                  <p>{{ item.yhzgx }}</p>
+                  <p class="sex">
+                    {{ item. cyxb }}
+                    <img v-if="item.cyxb === '男'" src="../../../static/images/contracted/family_icon_man.png" alt="">
+                    <img v-else-if="item.cyxb === '女'" src="../../../static/images/contracted/family_icon_wman.png" alt="">
+                  </p>
+                </div>
+                <p class="id_card">
+                  <img src="../../../static/images/contracted/family_icon_02.png" alt="">
+                  {{ item.cyzjhm }}
+                </p>
+              </div>
+              <p class="item_right">{{ item.sfgyr }}</p>
+            </div>
+          </van-cell>
+        </van-tab>
+        <van-tab title="承包合同">
+          <van-field v-model="contractDetail.cbhtbm" label="承包合同代码：" placeholder="请输入承包合同代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.ycbhtbm" label="原承包合同代码：" placeholder="请输入原承包合同代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.fbfbm" label="发包方代码：" placeholder="请输入发包方代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbflx" label="承包方类型：" placeholder="请选择承包方类型" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbfs" label="承包方式：" placeholder="请选择承包方式" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.qdsj" label="签订时间：" placeholder="请选择签订时间" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbqxq" label="承包起始时间：" placeholder="请选择起始时间" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbqxz" label="承包结束时间：" placeholder="请选择结束时间" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.cbdkzs" label="承包地块数：" placeholder="请输入承包地块数" :border="false" input-align="right" readonly />
+          <van-field v-model="contractDetail.htzmjm" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" :border="false" input-align="right" readonly />
+        </van-tab>
+        <van-tab title="承包地块">
+          <van-cell v-for="(item,index) in landList" :key="item.id">
+            <div class="land_item" >
+              <div class="item_tt">
+                <p>{{ item.dkmc }}</p>
+                <p>{{ item.dkbm }}</p>
+              </div>
+              <div class="item_type">
+                <p>{{ item.htmjm }}亩</p>
+                <!--            <p>{{ item.tdlylx }}</p>-->
+                <p>{{ item.dldj }}</p>
+                <p>{{ item.tdyt }}</p>
+                <p>基本农田:{{ item.sfjbnt }}</p>
+              </div>
+              <div class="item_direction">
+                <!--            <p>{{ item.zjrxm }}指界</p>-->
+                <p>东:{{ item.dkdz }}</p>
+                <p>西:{{ item. dkxz }}</p>
+                <p>南:{{ item.dknz }}</p>
+                <p>北:{{ item.dkbz }}</p>
+              </div>
+            </div>
+          </van-cell>
+
+        </van-tab>
+      </van-tabs>
+      <!--      <van-field readonly v-model="form.fbfdcy" label="发包方调查员" placeholder="发包方调查员" input-align="right" :border="false" />-->
+      <!--      <van-field readonly v-model="form.fbfdcrq" label="发包方调查日期" placeholder="发包方调查日期" input-align="right" :border="false" />-->
+      <!--      <van-cell title="发包方调查记事" style="color: #646566;">-->
+      <!--        <div style="color:#000000; ">{{form.fbfdcjs}}</div>-->
+      <!--      </van-cell>-->
+      <!--      <van-cell title="发包方调查签字" style="color: #646566;">-->
+      <!--        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >-->
+      <!--          <template #label>-->
+      <!--            <img :src="'/api'+form.fbfdcqz" width="10%" alt="" v-if="form.fbfdcqz" >-->
+      <!--          </template>-->
+      <!--        </van-field>-->
+      <!--      </van-cell>-->
+      <!--      <van-field readonly v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />-->
+      <!--      <van-field readonly v-model="form.shrq" label="审核日期" placeholder="审核日期" input-align="right" :border="false" />-->
+      <!--      <van-cell title="审核人签字" style="color: #646566;">-->
+      <!--        <van-field style="padding: 0 0;" readonly  input-align="right" :border="false" >-->
+      <!--          <template #label>-->
+      <!--            <img :src="'/api'+form.shrqz" width="10%" alt="" v-if="form.shrqz" >-->
+      <!--          </template>-->
+      <!--        </van-field>-->
+      <!--      </van-cell>-->
+    </div>
+    <img class="bottomImg" v-if="sqbutShow && cbfsqShow" src="../../assets/images/sunVillage_info/cbfwsq.png" alt=""  />
+    <img class="bottomImg" v-if="sqbutShow && cbfshShow" src="../../assets/images/sunVillage_info/cbfwsh.png" alt=""  />
+    <img class="bottomImg" src="../../assets/images/sunVillage_info/contractor_authorized.png" alt="" v-if="!sqbutShow" />
+  </div>
+</template>
+
+<script>
+  import { getCbfList,getCbfById,eqbEmpower, listFamilyMember, getContractByCode, listContractedLand} from "@/api/sunVillage_info/sysCbf";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import Cookies from "js-cookie";
+  import $ from "jquery";
+  export default {
+    name: "certificateList",
+    components: {FieldSelect},
+    data() {
+      return {
+        form:{},
+        showForm2:false,
+        showesign:false,
+        sqbutShow:true,
+        cbfsqShow:false,
+        cbfshShow:false,
+        sysFarmer:null,
+        zjlxName:"",
+        cbfTypeName:"",
+        surveyStatusName:"",
+        isDepositName:"",
+        height:0,
+        options: {
+          cert_type: [],
+        },
+        //电子签名
+        signature: {
+          lineWidth: 6, // 画笔的线条粗细
+          lineColor: "#000000", // 画笔的颜色
+          bgColor: "", // 画布的背景颜色
+          resultImg: "", // 最终画布生成的base64图片
+          isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        },
+        active: 0,                // 控制 van-tabs 的标签
+        memberList: [],           // 承包方家庭成员信息
+        contractDetail: {},       // 承包合同信息
+        landList: [],             // 承包地块列表
+      };
+    },
+    created() {
+      if(this.$route.query.sqStatus){
+        getCbfById(this.$route.query.id).then(response => {
+          this.form = response.data;
+          if(this.form.accountId != null && this.form.accountId !== ""){
+            this.sqbutShow = false;
+          }else{
+            this.cbfsqShow = true;
+            this.sqbutShow = true;
+          }
+          this.getDictValue();
+          this.getFamilyMemberList(this.form.cbfbm);
+          this.getContractDetail(this.form.cbfbm);
+          this.getContractedLandList(this.form.cbfbm);
+        });
+
+      }else if(this.$route.query.shStatus){
+        getCbfById(this.$route.query.id).then(response => {
+          this.form = response.data;
+          if(this.form.gsshqz != null && this.form.gsshqz !== ""){
+            this.sqbutShow = false;
+          }else{
+            this.cbfshShow = true;
+            this.sqbutShow = true;
+          }
+          this.getDictValue();
+          this.getFamilyMemberList(this.form.cbfbm);
+          this.getContractDetail(this.form.cbfbm);
+          this.getContractedLandList(this.form.cbfbm);
+        });
+      }else{
+        this.sysFarmer = JSON.parse(Cookies.get('user'));
+        this.getSysCfb();
+      }
+    },
+    methods: {
+      InitOptions() {
+        for(let k in this.options)
+        {
+          this.getDicts(k).then((resp) => this.options[k] = resp.data);
+        }
+      },
+      /*承包方授权*/
+      cbfsq(){
+        eqbEmpower(this.form).then(response => {
+          if(response.code === 200 ){
+            this.sqbutShow = false;
+          }
+        });
+      },
+      getSysCfb(){
+        getCbfList({deptId:this.sysFarmer.deptId,cbfzjhm:this.sysFarmer.idcard}).then(response => {
+          this.sqbutShow = true;
+          if(response.rows.length > 0){
+            this.form = response.rows[0];
+            if(this.form.accountId != null && this.form.accountId !== ""){
+              this.sqbutShow = false;
+            }else{
+              this.sqbutShow = true;
+            }
+            this.getDictValue();
+            this.getFamilyMemberList(this.form.cbfbm);
+            this.getContractDetail(this.form.cbfbm);
+            this.getContractedLandList(this.form.cbfbm);
+          }
+
+        });
+      },
+      getDictValue(){
+        let _this = this;
+        this.getDicts("cert_type").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.cbfzjlx) {
+              _this.zjlxName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("cbf_type").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.cbflx) {
+              _this.cbfTypeName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("confirmed_survey_status").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.surveyStatus) {
+              _this.surveyStatusName = item.dictLabel;
+            }
+          })
+        });
+        this.getDicts("sys_yes_no").then(response => {
+          response.data.forEach(function (item) {
+            if (item.dictValue ===  _this.form.isDeposit) {
+              _this.isDepositName = item.dictLabel;
+            }
+          })
+        });
+      },
+      getFamilyMemberList(cbfbm) {
+        listFamilyMember({cbfbm: cbfbm, translate_dict: 1}).then(response => {
+          this.memberList = response.rows;
+        });
+      },
+      getContractDetail(cbfbm) {
+        getContractByCode({cbfbm: cbfbm, translate_dict: 1}).then(response => {
+          this.contractDetail = response.data;
+        });
+      },
+      getContractedLandList(cbfbm) {
+        listContractedLand({cbfbm: cbfbm, translate_dict: 1}).then(response => {
+          this.landList = response.rows;
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  /deep/ .van-button--primary{
+    background: url("../../assets/images/sunVillage_info/btn_bg.png") no-repeat;
+    background-size: 100% 100%;
+    border: none;
+  }
+  .van-cell::after {
+    position: absolute;
+    box-sizing: border-box;
+    content: ' ';
+    pointer-events: none;
+    right: 0.426667rem;
+    bottom: 0;
+    left: 0.426667rem;
+    border:none;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+  }
+  .signature-footer {
+    transform: rotate(90deg);
+    width: auto;
+    position: absolute;
+    top: 50%;
+    left: 0px;
+
+  }
+  .home_wrapper{
+    background: #e9e9e9;
+    min-height: 100vh;
+    width: 100vw;
+    .header_main {
+      height: 116px;
+      background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+
+      .return_btn {
+        width: 24px;
+        height: 43.2px;
+        background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+    }
+    .release_head{
+      height: 90px;
+      padding:0 23px;
+      display: flex;
+      align-items: center;
+      font-size: 26px;
+      color: #929292;
+      .people{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        .icon{
+          width: 24px;
+          height: 21px;
+          background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+      .time{
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content:flex-end;
+        .icon{
+          width: 25px;
+          height: 25px;
+          background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat;
+          background-size: 100% 100%;
+          display: block;
+          margin-right: 8px;
+        }
+      }
+    }
+    .release_conetnt{
+      padding:0 22px;
+      font-size: 32px;
+      color: #252525;
+      line-height: 44px;
+      img{
+        max-width: 100%;
+        margin-bottom: 16px;
+      }
+      p{
+        margin-bottom: 16px;
+      }
+    }
+    .list_main{
+      padding:25px;
+      background: #ffffff;
+      width: 94%;
+      margin: 25px auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    }
+    .subForm{
+      padding:25px;
+      background-image: linear-gradient(#2884ec,#68b2ee);
+      width: 94%;
+      margin: 50PX auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      position: relative;
+      padding-top: 10vw;
+      img{
+        position: absolute;
+        left: 50%;
+        width: 15vw;
+        transform: translate(-50%,calc(-50% - 10vw));
+        border: 5PX solid #e9e9e9;
+        border-radius: 100%;
+      }
+      /deep/ .van-field__label{
+        /*padding-left: 10PX;*/
+        width: auto;
+        display: flex;
+        align-items: start;
+        color: #ffffff;
+        margin-right: 6vw;
+      }
+      /deep/ .van-cell{
+        background-color: transparent;
+      }
+      .textarea{
+        /deep/ .van-field__value{
+          background-color: #ffffff;
+          border-radius: 10PX;
+        }
+        /deep/ .van-field__control{
+          padding: 12PX;
+          color: #666666;
+        }
+      }
+      /deep/ .van-field__value{
+        background-color: transparent;
+        border-radius: 10PX;
+      }
+      /deep/ .van-field__control{
+        padding: 0PX;
+        color: #ffffff;
+      }
+      /deep/ .van-cell--required::before{
+        left: 60PX;
+      }
+    }
+    .subForm2{
+      padding:25px;
+      background:#ffffff;
+      width: 94%;
+      margin: 50PX auto 0;
+      border-radius: 15PX;
+      box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+      position: relative;
+      padding-top: 10vw;
+      .topImg{
+        position: absolute;
+        left: 50%;
+        width: 15vw;
+        transform: translate(-50%,calc(-50% - 10vw));
+        border: 5PX solid #e9e9e9;
+        border-radius: 100%;
+      }
+    }
+    .titBox{
+      display: flex;
+      align-items: center;
+    }
+    .tit{
+      font-size: 36px;
+      font-weight: bold;
+    }
+    /deep/ .van-cell{
+      padding-left: 0!important;
+      padding-right: 0!important;
+      padding-bottom: 0!important;
+    }
+    /deep/ .van-field__label{
+      /*padding-left: 10PX;*/
+      width: auto;
+      display: flex;
+      align-items: center;
+    }
+    /deep/ .van-cell--required::before{
+      left: 85PX;
+    }
+  }
+  .bottomImg{
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    width: 50vw;
+    transform: translate(-50%,10%);
+  }
+  .member_item{
+    border-radius: 30px;
+    background: #fff;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    padding:25px 32px;
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .item_left{
+      flex: 1;
+      .item_left_tt{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 14PX;
+        .name{
+          display: flex;
+          align-items: center;
+          font-size: 16PX;
+          img{
+            width: 5vw;
+            margin-right: 2vw;
+          }
+        }
+        .sex{
+          display: flex;
+          align-items: center;
+          img{
+            width: 3vw;
+            margin-left: 1vw;
+          }
+        }
+      }
+      .id_card{
+        display: flex;
+        align-items: center;
+        font-size: 14PX;
+        margin-top: 1vh;
+        img{
+          width: 5vw;
+          margin-right: 2vw;
+        }
+      }
+    }
+    .item_right{
+      margin-left: 15vw;
+      padding: 2PX 15PX;
+      background: #d0f4e5;
+      color: #2ecb8a;
+      border: 1px solid #8be3be;
+      border-radius: 30PX;
+    }
+  }
+  .land_item{
+    border-radius: 30px;
+    background: #fff;
+    box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1);
+    padding:25px 32px;
+    margin-bottom: 20px;
+    font-size: 14PX;
+    .item_tt{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      p:first-child{
+        font-size: 16PX;
+        color: #333333;
+      }
+      p:last-child{
+        color: #44e4a3;
+      }
+    }
+    .item_type{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      color:#5f5f5f;
+      margin-top: 1vh;
+      p:nth-child(1){
+        color: #fb9627;
+        border: 1px solid #fb9627;
+        padding: 0 10PX;
+        border-radius: 50PX;
+      }
+      span{
+        color: #ffffff;
+        background: #fb9627;
+        border-radius: 100%;
+        display: inline-block;
+        width: 15PX;
+        height: 15PX;
+        line-height: 15PX;
+        font-size: 12PX;
+        margin-right: 5PX;
+      }
+    }
+    .item_direction{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      color:#5f5f5f;
+      margin-top: 1vh;
+    }
+  }
+</style>
diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue
index 62783886..3f876469 100644
--- a/src/views/sunVillage_info/list_cbht.vue
+++ b/src/views/sunVillage_info/list_cbht.vue
@@ -30,18 +30,18 @@
           <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
-                <i class="icon_box" v-if="item.firstSigning == null"></i>
-                <i class="icon_box1" v-if="item.firstSigning != null"></i>
-                <p class="news_title" :style="{'color': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.cbhtbm}}</p>
+                <i class="icon_box" v-if="item.signingStatus =='合同筹备' || item.signingStatus =='合同待签' ||item.signingStatus =='单方已签'"></i>
+                <i class="icon_box1" v-if="item.signingStatus =='签字完成' || item.signingStatus =='合同归档'"></i>
+                <p class="news_title" >{{item.cbhtbm}}</p>
+                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': formatDict(item)}">{{item.signingStatus}}</p>
                 <p class="tips_mark"
-                   :style="{'color': item.firstSigning != null ? '#79bc29' : '#f8a83d','background': item.firstSigning != null ? '#e8ffcd' : '#ffedcd'}">
+                   :style="{'background': item.signingMode === '线上'?'#F9BE0C':'#08BE4E'}">
                   {{item.signingMode}}</p>
-                <p class="tips_mark2" v-if="item.signingMode === '线上'" :style="{'background': item.firstSigning != null ? '#2bc30c' : '#eb1616'}">{{item.signingStatus}}</p>
               </div>
               <div class="time">
-                <p style="color:#eb1616;">{{item.cbfmc}}</p>
+                <p >{{item.cbfmc}}</p>
 <!--                <p>{{item.cbhtmc}}</p>-->
-                <p style="color:#eb1616;font-weight: bold;">{{item.htzmjm.toFixed(2)}} 亩</p>
+                <p>{{item.htzmjm.toFixed(2)}} 亩</p>
               </div>
             </div>
           </div>
@@ -84,10 +84,7 @@
       </van-list>
     </div>
     <van-dialog v-model="htqsShow" title="合同签署" confirmButtonText="关闭" @confirm="confirmn">
-<!--      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>-->
-      <object width="100%" height="600" :data="noticeUrl" type="text/html">
-             Alternative Content-->
-        </object>
+      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>
             </van-dialog>
             <!-- 签字弹出层 -->
     <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }">
@@ -141,6 +138,7 @@
         htqsShow:false,
         noticeUrl:"",
         fileList: [],
+        signingStatusData:[],
         listLength: '0',
         queryParams: {
           pageNum: 1,
@@ -172,6 +170,9 @@
       if (this.$route.query.type == 'code') {
         this.showBtn = false;
       }
+      this.houseGetDicts("signing_status").then((res) => {
+        this.signingStatusData = res.data;
+      });
       this.height = window.screen.height * 1.28 - 20;
     },
     methods: {
@@ -181,7 +182,7 @@
       getList() {
         this.loading = true;
         let wcStatus  = this.$route.query.wcStatus;
-        if(wcStatus){
+        if(wcStatus === 'true'){
           this.$set(this.queryParams, 'signingStatus',"3");
         }else{
           this.$set(this.queryParams, 'signingStatus',null);
@@ -200,6 +201,15 @@
 
         });
       },
+      formatDict(item){
+        let colorval = "";
+       this.signingStatusData.map(function (e){
+          if(item.signingStatus === e.dictLabel){
+            colorval =  e.remark;
+          }
+        })
+        return colorval;
+      },
       goDetail(id) {
         this.$router.push({
           path: '/sunVillage_info/list_cbht_detail',
@@ -340,7 +350,7 @@
       // 签署合同下载
       handleDownload(id) {
         this.$dialog.confirm({
-          message: '是否确认下载签署合同？',
+          message: '是否下载承包合同？',
         }).then(() => {
           // on confirm
           signedContractDownload(id).then(res => {
@@ -533,7 +543,7 @@
               background: #ffedcd;
               border-radius: 8px;
               font-size: 24px;
-              color: #f8a83d;
+              color: #ffffff;
               text-align: center;
               line-height: 34px;
               flex-shrink: 0;
diff --git a/src/views/sunVillage_info/list_cbht_detail.vue b/src/views/sunVillage_info/list_cbht_detail.vue
index 84ff7675..e945c33b 100644
--- a/src/views/sunVillage_info/list_cbht_detail.vue
+++ b/src/views/sunVillage_info/list_cbht_detail.vue
@@ -5,7 +5,7 @@
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <div class="list_main">
-      <van-divider>承包合同合同信息</van-divider>
+      <van-divider>承包合同信息</van-divider>
       <van-field v-model="form.cbhtbm" label="承包合同编码" placeholder="承包合同编码" input-align="right" :border="false"/>
       <van-field v-model="form.ycbhtbm" label="原承包合同编码" placeholder="原承包合同编码" input-align="right" :border="false"/>
       <van-field v-model="form.cbflx" label="承包方类型" placeholder="承包方类型" input-align="right" :border="false"/>
@@ -23,19 +23,19 @@
       <van-field v-model="form.signingStatus" label="签订状态" placeholder="签订状态" input-align="right" :border="false"/>
 <!--      <van-field v-model="form.contractRemark" label="合同备注" placeholder="合同备注" input-align="right" :border="false"/>-->
 
-      <van-divider>甲方信息</van-divider>
-      <van-field v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false"/>
-      <van-field v-model="form.firstPartyAt" label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false"/>
-      <van-field label="甲方签字" input-align="right" :border="false" />
-      <img :src="'/api'+form.firstSigning" width="100%" alt="" v-if="form.firstSigning" />
-      <van-field label="村级公章" input-align="right" :border="false" />
-      <img :src="'/api'+form.firstSeal" width="100%" alt="" v-if="form.firstSeal" />
-
-      <van-divider>乙方信息</van-divider>
-      <van-field v-model="form.secondIsSign" label="乙方已签" placeholder="乙方已签" input-align="right" :border="false" />
-      <van-field v-model="form.secondPartyAt" label="乙方签字日期" placeholder="乙方签字日期" input-align="right" :border="false" />
-      <van-field label="乙方签字" input-align="right" :border="false" />
-      <img :src="'/api'+form.secondSigning" width="100%" alt="" v-if="form.secondSigning">
+<!--      <van-divider>甲方信息</van-divider>-->
+<!--      <van-field v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false"/>-->
+<!--      <van-field v-model="form.firstPartyAt" label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false"/>-->
+<!--      <van-field label="甲方签字" input-align="right" :border="false" />-->
+<!--      <img :src="'/api'+form.firstSigning" width="100%" alt="" v-if="form.firstSigning" />-->
+<!--      <van-field label="村级公章" input-align="right" :border="false" />-->
+<!--      <img :src="'/api'+form.firstSeal" width="100%" alt="" v-if="form.firstSeal" />-->
+
+<!--      <van-divider>乙方信息</van-divider>-->
+<!--      <van-field v-model="form.secondIsSign" label="乙方已签" placeholder="乙方已签" input-align="right" :border="false" />-->
+<!--      <van-field v-model="form.secondPartyAt" label="乙方签字日期" placeholder="乙方签字日期" input-align="right" :border="false" />-->
+<!--      <van-field label="乙方签字" input-align="right" :border="false" />-->
+<!--      <img :src="'/api'+form.secondSigning" width="100%" alt="" v-if="form.secondSigning">-->
     </div>
   </div>
 </template>
diff --git a/src/views/sunVillage_info/list_chronicles_process.vue b/src/views/sunVillage_info/list_chronicles_process.vue
index 9b9ac602..46648fba 100644
--- a/src/views/sunVillage_info/list_chronicles_process.vue
+++ b/src/views/sunVillage_info/list_chronicles_process.vue
@@ -37,7 +37,9 @@
 
       <div class="subForm2" v-if="showJsxx">
         <img class="topImg" src="../../assets/images/sunVillage_info/list_employer_process_icon_03.png" alt="">
-        <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
+        <van-cell title="记事内容" style="color: #646566;">
+          <div style="color:#000000; ">{{form.gsjs}}</div>
+        </van-cell>
         <van-cell title="记事人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
             <template #label>
@@ -146,7 +148,11 @@
         $('#canvasTT').css('display', 'none');
       },
       onSign(){
-        this.showesign = true;
+        if(this.form.gsjs != null && this.form.gsjs !== ""){
+          this.showesign = true;
+        }else{
+          this.$toast.fail('请填写记事内容！');
+        }
       },
       // 清空画板
       handleReset() {
diff --git a/src/views/sunVillage_info/list_contract_signature.vue b/src/views/sunVillage_info/list_contract_signature.vue
index af2c17b9..ae7f763a 100644
--- a/src/views/sunVillage_info/list_contract_signature.vue
+++ b/src/views/sunVillage_info/list_contract_signature.vue
@@ -59,7 +59,7 @@
         <div class="titBox">
           <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_03.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">承包合同</p>
-          <p class="tt_num" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:false}})">进入合同 ></p>
+          <p class="tt_num" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:'false'}})">进入合同 ></p>
         </div>
         <div class="list_main_content">
           <div class="list_main_block">
@@ -91,11 +91,23 @@
               <div class="list_main_block_icon">
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_08.png" style="width:12PX;height:12PX;"/>
               </div>
-              <p>已完成</p>
+              <p>签字完成</p>
+              <p style="background-color: #0CF708;color: #30bf2c;">{{form.signCompletedRatio}}</p>
+            </div>
+            <p class="list_main_block_num"><span>{{form.signCompletedCount}}</span>份</p>
+            <p class="list_main_block_btn" v-if="form.signCompletedCount > 0" @click="">批量归档 ></p>
+          </div>
+
+          <div class="list_main_block">
+            <div class="list_main_block_tt">
+              <div class="list_main_block_icon">
+                <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_08.png" style="width:12PX;height:12PX;"/>
+              </div>
+              <p>归档完成</p>
               <p style="background-color: #d2f1d1;color: #30bf2c;">{{form.htywcfsbfb}}</p>
             </div>
             <p class="list_main_block_num"><span>{{form.htywcfs}}</span>份</p>
-            <p class="list_main_block_btn" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:true}})">进入查看 ></p>
+            <p class="list_main_block_btn" @click="$router.push({name:'sunVillageInfoListCbht',query:{wcStatus:'true'}})">进入查看 ></p>
           </div>
         </div>
       </div>
@@ -147,7 +159,7 @@
         });
         batchEqbContractSignProcess(val).then(response => {
           this.$toast.clear();
-          this.$toast.success('转入待签完成');
+          this.$toast.success(response.data);
           let _this = this;
           setTimeout(function(){
             _this.getData();
diff --git a/src/views/sunVillage_info/list_contractor.vue b/src/views/sunVillage_info/list_contractor.vue
index cfd22a09..164d724a 100644
--- a/src/views/sunVillage_info/list_contractor.vue
+++ b/src/views/sunVillage_info/list_contractor.vue
@@ -1,7 +1,7 @@
  <template>
      <div class="home_wrapper">
        <div class="header_main">
-           承包方审核
+            {{ this.$route.query.sqStatus?'承包方授权':'承包方审核'}}
            <div class="return_btn" @click="onClickLeft"></div>
        </div>
        <div class="search_info">
@@ -19,7 +19,7 @@
            @load="onRefreshContractor"
          >
            <van-swipe-cell v-for="(item,index) in cbfList" :key="'cbf'+index">
-             <div class="item"  @click="$router.push({path:'/sunVillage_info/list_contractor_single_process',query:{item:item,status:false}})">
+             <div class="item"  @click="detailsClick(item)">
                <div class="info">
                  <div class="title">
                    <i class="icon_box"></i>
@@ -34,7 +34,7 @@
                  <img  :src="'/api'+item.gsshqz" width="100%" alt="" v-if="item.gsshqz" >
                </div>
              </div>
-             <template #right>
+             <template #right v-if="!$route.query.sqStatus">
                <div class="operation">
                  <div class="opera_btn" @click="$router.push({path:'/sunVillage_info/list_contractor_single_process',query:{item:item,status:true}})">
                    <img src="../../assets/images/sunVillage_info/contractor_icon_07.png" alt="" width="25">
@@ -93,6 +93,13 @@
            }
          });
        },
+       detailsClick(item){
+         if(this.$route.query.sqStatus){
+           this.$router.push({path:'/sunVillage_info/list_cbfsq_view',query:{id:item.id,sqStatus:true}})
+         }else{
+           this.$router.push({path:'/sunVillage_info/list_cbfsq_view',query:{id:item.id,shStatus:true}})
+         }
+       },
        onRefreshContractor(){
         if(this.loading){
           let params = {
diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue
index 75966858..2d956cec 100644
--- a/src/views/sunVillage_info/list_contractor_process.vue
+++ b/src/views/sunVillage_info/list_contractor_process.vue
@@ -33,7 +33,9 @@
           <img src="../../assets/images/sunVillage_info/list_employer_process_icon_02.png" style="width:22PX;height:22PX;margin-right: 10px;"/>
           <p class="tit">信息核对</p>
         </div>
-        <van-field readonly v-model="form.gsjs" label="记事内容" placeholder="记事内容" input-align="right" :border="false" />
+        <van-cell title="记事内容" style="color: #646566;">
+          <div style="color:#000000; ">{{form.gsjs}}</div>
+        </van-cell>
         <van-cell title="记事人" style="border: none;color: #646566;" >
           <van-field readonly style="padding: 0 0;height: 30px;" label="记事人" input-align="right" :border="false" >
             <template #label>
@@ -174,7 +176,17 @@
         $('#canvasTT').css('display', 'none');
       },
       onSign(){
-        this.showesign = true;
+        if(this.form.gsjsrqz == null || this.form.gsjsrqz === ""){
+          this.$toast.fail('请先完成承包方记事！');
+        }else{
+          if(this.form.gsshyj != null && this.form.gsshyj !== ""){
+            this.showesign = true;
+          }else{
+            this.$toast.fail('请填写审核意见！');
+          }
+
+        }
+
       },
       // 清空画板
       handleReset() {
diff --git a/src/views/sunVillage_info/list_employer_process.vue b/src/views/sunVillage_info/list_employer_process.vue
index 0f28772c..cc1c1c7f 100644
--- a/src/views/sunVillage_info/list_employer_process.vue
+++ b/src/views/sunVillage_info/list_employer_process.vue
@@ -14,7 +14,9 @@
         <van-field readonly v-model="form.fbffzrxm" label="负责人" placeholder="负责人" input-align="right" :border="false" />
         <van-field readonly v-model="form.fzrzjlx" label="证件类型" placeholder="证件类型" input-align="right" :border="false" />
         <van-field readonly v-model="form.fzrzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
-        <van-field readonly v-model="form.fbfdcjs" label="调查记事" placeholder="调查记事" input-align="right" :border="false" />
+        <van-cell title="调查记事" style="color: #646566;">
+            <div style="color:#000000; ">{{form.fbfdcjs}}</div>
+        </van-cell>
         <van-field readonly v-model="form.fbfdcy" label="调查员" placeholder="调查员" input-align="right" :border="false" />
         <van-field readonly v-model="form.fbfdcrq" label="调查日期" placeholder="调查日期" input-align="right" :border="false" />
         <van-cell title="调查签名" style="color: #646566;">
@@ -138,7 +140,11 @@
         $('#canvasTT').css('display', 'none');
       },
       onSign(){
-        this.showesign = true;
+        if(this.form.shyj != null && this.form.shyj !== ""){
+          this.showesign = true;
+        }else{
+          this.$toast.fail('请填写审核意见！');
+        }
       },
       // 清空画板
       handleReset() {
diff --git a/src/views/sunVillage_info/list_fbfsq.vue b/src/views/sunVillage_info/list_fbfsq.vue
index 3ececca4..3fc24b41 100644
--- a/src/views/sunVillage_info/list_fbfsq.vue
+++ b/src/views/sunVillage_info/list_fbfsq.vue
@@ -10,7 +10,9 @@
         <p class="tit">发包方授权</p>
       </div>
       <van-field v-model="form.fbfbm" label="发包方代码" placeholder="发包方代码" input-align="right" :border="false" />
-      <van-field v-model="form.fbfmc" label="发包方名称" placeholder="发包方名称" input-align="right" :border="false" />
+      <van-cell title="发包方名称" style="color: #646566;">
+        <div style="color:#000000; ">{{form.fbfmc}}</div>
+      </van-cell>
       <van-field v-model="form.fbffzrxm" label="负责人名称" placeholder="负责人名称" input-align="right" :border="false" />
       <van-field v-model="form.fzrzjlx" label="证件类型" placeholder="证件类型" input-align="right" :border="false" />
       <van-field v-model="form.fzrzjhm" label="证件号码" placeholder="证件号码" input-align="right" :border="false" />
@@ -21,7 +23,9 @@
       <van-field v-model="form.yzbm" label="邮政编码" placeholder="	邮政编码" input-align="right" :border="false" />
       <van-field v-model="form.fbfdcy" label="发包方调查员" placeholder="发包方调查员" input-align="right" :border="false" />
       <van-field v-model="form.fbfdcrq" label="发包方调查日期" placeholder="发包方调查日期" input-align="right" :border="false" />
-      <van-field v-model="form.fbfdcjs" label="发包方调查记事" placeholder="发包方调查记事" input-align="right" :border="false" />
+      <van-cell title="发包方调查记事" style="color: #646566;">
+        <div style="color:#000000; ">{{form.fbfdcjs}}</div>
+      </van-cell>
       <van-field readonly label="发包方调查签字" input-align="right" :border="false" />
       <img :src="'/api'+form.fbfdcqz" width="100%" alt="" v-if="form.fbfdcqz" />
       <van-field v-model="form.shyj" label="审核意见" placeholder="审核意见" input-align="right" :border="false" />
diff --git a/src/views/user/accountSetting/userInformation/companyInformation.vue b/src/views/user/accountSetting/userInformation/companyInformation.vue
index f604432c..a1a0fbe8 100644
--- a/src/views/user/accountSetting/userInformation/companyInformation.vue
+++ b/src/views/user/accountSetting/userInformation/companyInformation.vue
@@ -9,9 +9,9 @@
     />
     <van-form @submit="submitForm">
       <van-field v-model="tel" readonly type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" >
-        <template #extra >
-          <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>
-        </template>
+<!--        <template #extra >-->
+<!--          <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>-->
+<!--        </template>-->
       </van-field>
 <!--      <van-field value="15314031621" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>-->
       <van-field v-model="userForm.companyName" label="公司名称" placeholder="请输入公司名称" required :rules="[{ required:true }]"/>
@@ -262,14 +262,14 @@ export default {
   methods: {
     searchBankAddress(){
       let data = {
-        sheng:this.form.sheng,
-        shi:this.form.shi,
-        bankType:this.form.bankType,
-        bankDeposit:this.form.bankDeposit,
+        sheng:this.userForm.sheng,
+        shi:this.userForm.shi,
+        bankType:this.userForm.bankType,
+        bankDeposit:this.userForm.bankDeposit,
       }
       depositList(data).then(response => {
         if (response.rows.length<1){
-          if (this.form.sheng==''||this.form.shi==''){
+          if (this.userForm.sheng==''||this.userForm.shi==''){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '请选择省市',
@@ -277,7 +277,7 @@ export default {
             })
             return;
           }
-          if (this.form.bankDeposit==''){
+          if (this.userForm.bankDeposit==''){
             this.$toast({
               icon: 'fail', // 找到自己需要的图标
               message: '请输入关键词',
@@ -423,14 +423,14 @@ export default {
         file:file.content
       }
       base64Upload(params1).then((r1) => {
-        this.form.companyLicense = r1.fileName;
+        this.userForm.companyLicense = r1.fileName;
       })
     },
     deleteFileYYZZ(elIndex){
       return (file, name) => {
         let fileIndex = name.index
         this.fileListYYZZ[elIndex].splice(fileIndex, 1)
-        this.form.companyLicense = '';
+        this.userForm.companyLicense = '';
       }
     },
     submitForm(){
@@ -469,27 +469,27 @@ export default {
     },
     onConfirmBankType(value){
       this.showBankType = false;
-      this.form.bankAddress = '';
-      this.form.payeePaymentLines = '';
+      this.userForm.bankAddress = '';
+      this.userForm.payeePaymentLines = '';
       this.bankType = value.dictLabel;
-      this.form.bankType = value.dictValue;
+      this.userForm.bankType = value.dictValue;
     },
     onConfirmSheng(value){
       console.log(value)
       this.showSheng = false;
-      this.form.sheng = value[0];
-      this.form.shi = value[1];
+      this.userForm.sheng = value[0];
+      this.userForm.shi = value[1];
       this.sheng = value.join('/');
     },
     onConfirmBankAddress(value){
       console.log(value)
-      this.form.bankAddress = value.bankDeposit;
-      this.form.payeePaymentLines = value.payeePaymentLines;
+      this.userForm.bankAddress = value.bankDeposit;
+      this.userForm.payeePaymentLines = value.payeePaymentLines;
       this.showBankAddress = false;
     },
     onConfirmAccountType(value){
       console.log(value)
-      this.form.accountType = value.dictValue;
+      this.userForm.accountType = value.dictValue;
       this.accountType = value.dictLabel;
       this.showAccountType = false;
     },
diff --git a/src/views/user/accountSetting/userInformation/userInformation.vue b/src/views/user/accountSetting/userInformation/userInformation.vue
index 403095e9..fdd0a810 100644
--- a/src/views/user/accountSetting/userInformation/userInformation.vue
+++ b/src/views/user/accountSetting/userInformation/userInformation.vue
@@ -9,9 +9,9 @@
     />
     <van-form @submit="submitForm">
       <van-field v-model="tel" readonly type="tel" label="手机号" placeholder="请输入手机号" readonly required :rules="[{ required:true }]" >
-        <template #extra >
-            <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>
-        </template>
+<!--        <template #extra >-->
+<!--            <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>-->
+<!--        </template>-->
       </van-field>
       <van-field v-model="userForm.realname" label="姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
       <van-field v-model="userForm.idCardNum" label="身份证号" placeholder="请输入身份证号" required :rules="[{ required:true }]"/>
@@ -128,7 +128,7 @@
 import { getInfo } from "@/api/login/index";
 import {getMember, base64Attach, userUpdate, showUserImg, deleteUserImg, options} from "@/api/user/index";
 import {Dialog} from "vant";
-import {base64Upload} from "@/api/register";
+import {base64Upload, depositList, realtimeBackList} from "@/api/register";
 export default {
   name: "userInformation",
   data() {
@@ -183,6 +183,40 @@ export default {
     this.getInfo();
   },
   methods: {
+    searchBankAddress(){
+      let data = {
+        sheng:this.userForm.sheng,
+        shi:this.userForm.shi,
+        bankType:this.userForm.bankType,
+        bankDeposit:this.userForm.bankDeposit,
+      }
+      depositList(data).then(response => {
+        if (response.rows.length<1){
+          if (this.userForm.sheng==''||this.userForm.shi==''){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '请选择省市',
+              duration:"1000",
+            })
+            return;
+          }
+          if (this.userForm.bankDeposit==''){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '请输入关键词',
+              duration:"1000",
+            })
+            return;
+          }
+          realtimeBackList(data).then(response2 => {
+            console.log(response2)
+            this.bankAddressOption = response2.data;
+          });
+        }else{
+          this.bankAddressOption = response.rows;
+        }
+      });
+    },
     getInfo(){
       getInfo().then(response => {
         getMember(response.user.userId).then(response => {
@@ -296,27 +330,27 @@ export default {
     },
     onConfirmBankType(value){
       this.showBankType = false;
-      this.form.bankAddress = '';
-      this.form.payeePaymentLines = '';
+      this.userForm.bankAddress = '';
+      this.userForm.payeePaymentLines = '';
       this.bankType = value.dictLabel;
-      this.form.bankType = value.dictValue;
+      this.userForm.bankType = value.dictValue;
     },
     onConfirmSheng(value){
       console.log(value)
       this.showSheng = false;
-      this.form.sheng = value[0];
-      this.form.shi = value[1];
+      this.userForm.sheng = value[0];
+      this.userForm.shi = value[1];
       this.sheng = value.join('/');
     },
     onConfirmBankAddress(value){
       console.log(value)
-      this.form.bankAddress = value.bankDeposit;
-      this.form.payeePaymentLines = value.payeePaymentLines;
+      this.userForm.bankAddress = value.bankDeposit;
+      this.userForm.payeePaymentLines = value.payeePaymentLines;
       this.showBankAddress = false;
     },
     onConfirmAccountType(value){
       console.log(value)
-      this.form.accountType = value.dictValue;
+      this.userForm.accountType = value.dictValue;
       this.accountType = value.dictLabel;
       this.showAccountType = false;
     },