From 388242ed305b65cb23f9a1c2d3b0933eb173660d Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Sun, 27 Feb 2022 19:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/list.vue | 304 +++++++++++++++--------------
 1 file changed, 159 insertions(+), 145 deletions(-)

diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index a6a7639c..2a56ad26 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -1055,8 +1055,8 @@
         <h1 style="font-size: 0.35rem;font-weight: 400;border-bottom: 1px solid #ccc; line-height: 0.8rem;"><i style="display: inline-block;width: 1%;height: 0.4rem;background: #7ac943;vertical-align: middle;margin-right: 1%;"></i>是否完成绘制<van-icon name="cross" color="#666666" style="position: absolute;right: 2%;top: 0.1rem" @click="showhzht = false" /></h1>
 
         <div style="text-align: center;margin-top: 30PX">
-          <p style="font-size: 0.3rem;display: inline-block;background: #ccc;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 10%;" @click="showhzlx = true,showhzht = false">否</p>
-          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;" @click="showhzht = false">是</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #ccc;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 10%;" @click="showhzht = false,deleteHistory" >否</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;" @click="showhzlx = true,showhzht = false">是</p>
         </div>
       </div>
     </van-popup>
@@ -1068,9 +1068,9 @@
         <h1 style="font-size: 0.35rem;font-weight: 400;border-bottom: 1px solid #ccc; line-height: 0.8rem;"><i style="display: inline-block;width: 1%;height: 0.4rem;background: #7ac943;vertical-align: middle;margin-right: 1%;"></i>请选择绘制类型<van-icon name="cross" color="#666666" style="position: absolute;right: 2%;top: 0.1rem" @click="showhzlx = false,showhzht = true" /></h1>
 
         <div style="text-align: center;margin-top: 30PX">
-          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 2%;">宅基地</p>
-          <p style="font-size: 0.3rem;display: inline-block;background: #b026ff;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 2%;">自然幢</p>
-          <p style="font-size: 0.3rem;display: inline-block;background: #3ac2db;padding: 15PX 10%;border-radius: 30PX;color: #FFF;">附属设施</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #7ac943;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 2%;" @click="">宅基地</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #b026ff;padding: 15PX 10%;border-radius: 30PX;color: #FFF;margin-right: 2%;"  @click="">自然幢</p>
+          <p style="font-size: 0.3rem;display: inline-block;background: #3ac2db;padding: 15PX 10%;border-radius: 30PX;color: #FFF;"  @click="">附属设施</p>
         </div>
       </div>
     </van-popup>
@@ -1080,7 +1080,7 @@
 
 <script>
     import { currentLocation,} from "@/api/homestead/index";
-    import {listZjdzd,getQueryLand,geoGps} from "@/api/homesteadSurvey/zjdzd";
+    import {listZjdzd,getQueryLand,getZjdzd} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr} from "@/api/homesteadSurvey/shyqr";
@@ -1209,6 +1209,7 @@
           checked:[],
           checkAllFlag: false,//全选判断标识
           CheckedAllArr: [],//全选数组
+          sx:"",
           dataList:[],
           //搜索---start
           seachText: "",
@@ -1389,6 +1390,7 @@
         },
         setCookies(item){
           this.$cookies.set("search",JSON.stringify(item));
+          console.log(JSON.stringify(item));
         },
         // 入户核查搜索框新增。
         onClickzjd(){
@@ -2550,6 +2552,11 @@
 
             addInteraction();
           });
+          //删除之前绘制图层
+          $("#deleteHistory").on("click", function () {
+            console.log("否进入");
+            map.removeInteraction(draw_map);
+          });
           //开始绘制图层- -----end
 
           //清除画图鼠标点击事件
@@ -3372,152 +3379,157 @@
                         let zjdIdNum = zjdXq.replace("t_house_survey_zjdzd.", "");
                         obj.id = zjdIdNum; //	主键id
                         obj.deptName = trs.find("td").eq(3).text();//行政区划名称
-                        obj.suyqrdm =  trs.find("td").eq(4).text();//所有权人代码
-                        obj.nhdm = trs.find("td").eq(5).text();//农户代码
+                        // obj.suyqrdm =  trs.find("td").eq(4).text();//所有权人代码
+                        // obj.nhdm = trs.find("td").eq(5).text();//农户代码
                         obj.zjddm =  trs.find("td").eq(6).text();//宅基地代码
-                        obj.zdbh = trs.find("td").eq(7).text();//宗地编号
-                        obj.zddm = trs.find("td").eq(8).text();//宗地代码
-                        obj.zl = trs.find("td").eq(9).text();//坐落
-                        obj.zldwdm = trs.find("td").eq(10).text();//坐落单位代码
+                        // obj.zdbh = trs.find("td").eq(7).text();//宗地编号
+                        // obj.zddm = trs.find("td").eq(8).text();//宗地代码
+                        // obj.zl = trs.find("td").eq(9).text();//坐落
+                        // obj.zldwdm = trs.find("td").eq(10).text();//坐落单位代码
                         obj.zdmj = trs.find("td").eq(11).text();//宗地面积
-                        obj.yt = trs.find("td").eq(12).text();//用途
-                        obj.ytmc = trs.find("td").eq(13).text();//用途名称
-                        obj.dj = trs.find("td").eq(14).text();//宗地编号
-                        obj.jg = trs.find("td").eq(15).text();//价格万元
-                        obj.qllx = trs.find("td").eq(16).text();//权利类型
-                        obj.qlxz = trs.find("td").eq(17).text();//权利性质
-                        obj.qlsdfs = trs.find("td").eq(18).text();//权利设定方式
-                        obj.rjl = trs.find("td").eq(19).text();//容积率
-                        obj.jzmd = trs.find("td").eq(20).text();//建筑密度
-                        obj.jzxg =  trs.find("td").eq(21).text();//建筑限高
-                        obj.zdszd = trs.find("td").eq(22).text();//宗地四至-东
-                        obj.zdszn = trs.find("td").eq(23).text();//宗地四至-南
-                        obj.zdszx = trs.find("td").eq(24).text();//宗地四至-西
-                        obj.zdszb = trs.find("td").eq(25).text();//宗地四至-北
-                        obj.zdt = trs.find("td").eq(26).text();//宗地图
-                        obj.tfh = trs.find("td").eq(27).text();//图幅号
-                        obj.djh = trs.find("td").eq(28).text();//地籍号
-                        obj.sjly = trs.find("td").eq(29).text();//数据来源
-                        obj.lyzk = trs.find("td").eq(30).text();//当前利用状况
-                        obj.xzkssj = trs.find("td").eq(31).text();//闲置开始时间
-                        obj.sffz = trs.find("td").eq(32).text();//是否发证
-                        obj.zjdzsh = trs.find("td").eq(33).text();//宅基地证书号
-                        obj.bz = trs.find("td").eq(34).text();//备注
-                        obj.houseDataConfirmStatus = trs.find("td").eq(40).text();//调查情况
-                        obj.zjdxctp =trs.find("td").eq(41).text();//宅基地现场图片
-                        obj.zjdqdfs = trs.find("td").eq(42).text();//宅基地取得方式
-                        obj.bccjl = trs.find("td").eq(43).text();//被惩处经历
-                        obj.bccbz = trs.find("td").eq(44).text();//被惩处备注
-                        obj.yctcyx = trs.find("td").eq(45).text();//有偿退出意向
-                        obj.zjdpzmj = trs.find("td").eq(46).text();//宅基地批准面积
-                        obj.zjdxzyy = trs.find("td").eq(47).text();//宅基地闲置原因
-                        obj.lzyx = trs.find("td").eq(48).text();//流转意向
-                        obj.sysNormalDisable = trs.find("td").eq(49).text();//是否停用
+                        // obj.yt = trs.find("td").eq(12).text();//用途
+                        // obj.ytmc = trs.find("td").eq(13).text();//用途名称
+                        // obj.dj = trs.find("td").eq(14).text();//宗地编号
+                        // obj.jg = trs.find("td").eq(15).text();//价格万元
+                        // obj.qllx = trs.find("td").eq(16).text();//权利类型
+                        // obj.qlxz = trs.find("td").eq(17).text();//权利性质
+                        // obj.qlsdfs = trs.find("td").eq(18).text();//权利设定方式
+                        // obj.rjl = trs.find("td").eq(19).text();//容积率
+                        // obj.jzmd = trs.find("td").eq(20).text();//建筑密度
+                        // obj.jzxg =  trs.find("td").eq(21).text();//建筑限高
+                        // obj.zdszd = trs.find("td").eq(22).text();//宗地四至-东
+                        // obj.zdszn = trs.find("td").eq(23).text();//宗地四至-南
+                        // obj.zdszx = trs.find("td").eq(24).text();//宗地四至-西
+                        // obj.zdszb = trs.find("td").eq(25).text();//宗地四至-北
+                        // obj.zdt = trs.find("td").eq(26).text();//宗地图
+                        // obj.tfh = trs.find("td").eq(27).text();//图幅号
+                        // obj.djh = trs.find("td").eq(28).text();//地籍号
+                        // obj.sjly = trs.find("td").eq(29).text();//数据来源
+                        // obj.lyzk = trs.find("td").eq(30).text();//当前利用状况
+                        // obj.xzkssj = trs.find("td").eq(31).text();//闲置开始时间
+                        // obj.sffz = trs.find("td").eq(32).text();//是否发证
+                        // obj.zjdzsh = trs.find("td").eq(33).text();//宅基地证书号
+                        // obj.bz = trs.find("td").eq(34).text();//备注
+                        // obj.houseDataConfirmStatus = trs.find("td").eq(40).text();//调查情况
+                        // obj.zjdxctp =trs.find("td").eq(41).text();//宅基地现场图片
+                        // obj.zjdqdfs = trs.find("td").eq(42).text();//宅基地取得方式
+                        // obj.bccjl = trs.find("td").eq(43).text();//被惩处经历
+                        // obj.bccbz = trs.find("td").eq(44).text();//被惩处备注
+                        // obj.yctcyx = trs.find("td").eq(45).text();//有偿退出意向
+                        // obj.zjdpzmj = trs.find("td").eq(46).text();//宅基地批准面积
+                        // obj.zjdxzyy = trs.find("td").eq(47).text();//宅基地闲置原因
+                        // obj.lzyx = trs.find("td").eq(48).text();//流转意向
+                        // obj.sysNormalDisable = trs.find("td").eq(49).text();//是否停用
                         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("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;
+                        //       }
+                        //     }
+                        //   }
+                        // });
+                        getZjdzd(669).then((response) => {
+                          console.log(response);
+                          that.mapZjdData = response.data;
+                          that.mapZjdData.active = 1;
                         });
-                        //有偿退出意向字典项
-                        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;
-                              }
-                            }
-                          }
-                        });
-                        let cloneObj = JSON.parse(JSON.stringify(obj));
+                        //let cloneObj = JSON.parse(JSON.stringify(obj));
                         if(obj.zdmj != ""){
                           that.textMjAll = obj.zdmj;
                         } else {
                           that.textMjAllNum = "1";
                         }
-                        that.mapZjdData = cloneObj;
+                        //that.mapZjdData = cloneObj;
                         that.zjdHcDy = obj.zjddm;
                       } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){
                         let obj = {};
@@ -4164,7 +4176,7 @@
         zjdHc(){
           console.log(this.zjdHcDy);
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
-            this.$cookies.set("search",JSON.stringify(this.mapZjdData));
+            this.$cookies.set("search",this.mapZjdData);
             this.$router.push({path:'/homesteadSurvey/add'});
           } else {
             this.$dialog.alert({
@@ -4243,7 +4255,9 @@
           )
           $('.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'});
         },
-
+        deleteHistory(){
+          console.log("进入aa");
+        },
       }
     }
 </script>