diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 5d77a005..944cbd92 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1425,22 +1425,33 @@ this.getDicts("member_remark").then(response => { this.cybzOptions = response.data; }); - if(this.$cookies.get("map").activeBtn !=null){ - if(this.$cookies.get("map").activeBtn == 4){ - this.activeBtn = this.$cookies.get("map").activeBtn; + if(this.$cookies.get("map") != null && this.$cookies.get("map") !="" && this.$cookies.get("map")!=undefined){ + if(this.$cookies.get("map").activeBtn !=null){ + if(this.$cookies.get("map").activeBtn == 4){ + this.activeBtn = this.$cookies.get("map").activeBtn; + this.item = this.$cookies.get("item"); + 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; + this.mapShow(); + this.getZjdList(); + this.getTotalHR(); + if(this.item.taskStatus=="FINISHED"){ + this.isFinished = true + }else{ + this.isFinished = false + } + } + }else { this.item = this.$cookies.get("item"); - 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; - this.mapShow(); this.getZjdList(); this.getTotalHR(); if(this.item.taskStatus=="FINISHED"){ - this.isFinished = true + this.isFinished = true }else{ this.isFinished = false }