优化地图

src/components/Map/MapGisDrawing.vue

@@ -140,7 +140,7 @@ export default {
         //     zjddmNew = that.$cookies.get("item").zjddm;
         //   }
         // }
-        var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + that.$cookies.get("item").zjddm + "'";
+        var cql_filter_all = "dept_id='" + that.$cookies.get("map").deptId + "'" + "and zjddm='" + that.$cookies.get("map").zjddm + "'";
         console.log(cql_filter_all);
         console.log(that.$cookies.get("item"));
         console.log(that.$cookies.get("search"));

src/views/homesteadSurvey/add.vue

@@ -3159,12 +3159,12 @@
     },
     created(){
       console.log(this.$cookies.get("search"));
-      this.itemBc = this.$cookies.get("item");
-      this.$cookies.set("item","");
+      //this.itemBc = this.$cookies.get("map");
+      //this.$cookies.set("item","");
       if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
         this.ztMap =false;
-        this.$cookies.set("item",this.$cookies.get("search"));
-        console.log(this.$cookies.get("item"));
+        this.$cookies.set("map",this.$cookies.get("search"));
+        console.log(this.$cookies.get("map"));
       }else {
         this.ztMap =true;
       }
@@ -3179,7 +3179,7 @@
           this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId;
           this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm;
           if(this.ztMap){
-            this.$cookies.set("item",this.backMap);
+            this.$cookies.set("map",this.backMap);
           }
           this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom;
           //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm;
@@ -4245,15 +4245,12 @@
         //   this.$router.push({name:'homesteadList'});
         // } else {
         //this.enterMap="";
-        this.$cookies.set("item","");
+        //this.$cookies.set("item","");
         if(this.ztMap && this.enterMap ==1){
-          this.itemBc.activeBtn = 4;
-          this.itemBc.backMapZjdAData = this.backMap.backMapZjdAData;
-          console.log(this.itemBc);
-          this.$cookies.set("item",this.itemBc);
+          this.$cookies.set("map",this.backMap);
         } else {
           console.log(this.itemBc);
-          this.$cookies.set("item",this.itemBc);
+          this.$cookies.set("map",this.itemBc);
         }
         this.$router.push({name:'homesteadList'});
         // }

src/views/homesteadSurvey/list.vue

@@ -67,13 +67,13 @@
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                  <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >查看详情</van-button>
-                  <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >开始调查</van-button>
+                  <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                  <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
                   <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
                 <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
             </template>
@@ -151,13 +151,13 @@
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
                 <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;">开始调查</van-button>
                 <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
             </template>
@@ -1427,12 +1427,12 @@
           });
           if(this.$cookies.get("item").activeBtn !=null){
             if(this.$cookies.get("item").activeBtn == 4){
-              this.activeBtn = this.$cookies.get("item").activeBtn;
-              this.item = this.$cookies.get("item");
-              this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId;
-              this.backTheGeom = this.$cookies.get("item").backMapZjdAData.theGeom;
-              this.mapZjdData = this.$cookies.get("item").backMapZjdAData;
-              this.mapZjdTeAll.mapZjdAData = this.$cookies.get("item").backMapZjdAData;
+              this.activeBtn = this.$cookies.get("map").activeBtn;
+              this.item = this.$cookies.get("map");
+              this.mapAddJump = this.$cookies.get("map").backMapZjdAData.deptId;
+              this.backTheGeom = this.$cookies.get("map").backMapZjdAData.theGeom;
+              this.mapZjdData = this.$cookies.get("map").backMapZjdAData;
+              this.mapZjdTeAll.mapZjdAData = this.$cookies.get("map").backMapZjdAData;
               this.zjdHcDy = 1;
               this.mapZjdDataTure = 1;
               this.mapAddJumpNum =1;
@@ -1785,7 +1785,9 @@
           });
         },
         setCookies(item){
+          console.log(item);
           this.$cookies.set("search",JSON.stringify(item));
+          this.$router.push({path:'/homesteadSurvey/add'});
         },
         // 入户核查搜索框新增。
         onClickzjd(){
@@ -4602,7 +4604,9 @@
                             "zjddm": obj.zjddm,
                           }
                           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;
@@ -4698,6 +4702,7 @@
                             "zjddm": obj.zjddm,
                           }
                           that.$cookies.set("search", "")
+                          that.$cookies.set("map", "")
                           listZjdzd(params).then((response) => {
                             that.mapZjdData = response.rows[0];
                             //that.mapZjdAData.active = 1;
@@ -4768,6 +4773,7 @@
                             "pageSize": 20,
                           }
                           that.$cookies.remove("search")
+                          that.$cookies.set("map", "")
                           listZjdzd(params).then((response) => {
                             that.mapZjdData = response.rows[0];
                             that.mapZjdData.active = 1;
@@ -5260,6 +5266,7 @@
           console.log(this.mapZjdTeAll);
           if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
             if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
+              console.log("ggggggggg")
               this.mapZjdTeAll.active =1;
               this.$cookies.set("search",this.mapZjdTeAll);
               this.$router.push({path:'/homesteadSurvey/add'});