| @@ -1414,7 +1414,7 @@ | |||||
| if(this.$cookies.get("item").activeBtn !=null){ | if(this.$cookies.get("item").activeBtn !=null){ | ||||
| if(this.$cookies.get("item").activeBtn == 4){ | if(this.$cookies.get("item").activeBtn == 4){ | ||||
| this.activeBtn = this.$cookies.get("item").activeBtn; | this.activeBtn = this.$cookies.get("item").activeBtn; | ||||
| this.item = this.$cookies.get("item"); | |||||
| this.item = this.$cookies.get("item").backMapZjdAData; | |||||
| this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId; | this.mapAddJump = this.$cookies.get("item").backMapZjdAData.deptId; | ||||
| this.backTheGeom = this.$cookies.get("item").backMapZjdAData.theGeom; | this.backTheGeom = this.$cookies.get("item").backMapZjdAData.theGeom; | ||||
| this.mapAddJumpNum =1; | this.mapAddJumpNum =1; | ||||
| @@ -4562,6 +4562,11 @@ | |||||
| "zjddm" : obj.zjddm, | "zjddm" : obj.zjddm, | ||||
| } | } | ||||
| listZjdzd(params).then((response) => { | 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 = response.rows[0]; | ||||
| that.mapZjdData.active = 1; | that.mapZjdData.active = 1; | ||||
| that.mapZjdTeAll.mapZjdAData =that.mapZjdData; | that.mapZjdTeAll.mapZjdAData =that.mapZjdData; | ||||
| @@ -4630,11 +4635,6 @@ | |||||
| sourceMapLookMap.addFeature(newcenterFeatureMap); | sourceMapLookMap.addFeature(newcenterFeatureMap); | ||||
| }); | }); | ||||
| //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; | ||||
| } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){ | } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_zrz"){ | ||||
| //that.mapZjdTeAll.mapZjdAData ={}; | //that.mapZjdTeAll.mapZjdAData ={}; | ||||
| @@ -4700,6 +4700,11 @@ | |||||
| //that.mapZjdAData.active = 1; | //that.mapZjdAData.active = 1; | ||||
| that.mapZjdTeAll.mapZjdAData = that.mapZjdData; | that.mapZjdTeAll.mapZjdAData = that.mapZjdData; | ||||
| getZrz(obj.id).then((response) => { | getZrz(obj.id).then((response) => { | ||||
| if(response.data.scjzmj != ""){ | |||||
| that.textMjAll = response.data.scjzmj; | |||||
| } else { | |||||
| that.textMjAllNum = "1"; | |||||
| } | |||||
| that.mapZrzData = response.data; | that.mapZrzData = response.data; | ||||
| that.mapZrzData.active = 3; | that.mapZrzData.active = 3; | ||||
| that.mapZjdTeAll.mapZrzAData =that.mapZrzData; | that.mapZjdTeAll.mapZrzAData =that.mapZrzData; | ||||
| @@ -4737,11 +4742,6 @@ | |||||
| }); | }); | ||||
| }); | }); | ||||
| }); | }); | ||||
| if(obj.scjzmj != ""){ | |||||
| that.textMjAll = obj.scjzmj; | |||||
| } else { | |||||
| that.textMjAllNum = "1"; | |||||
| } | |||||
| } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){ | } else if($("#info .featureInfo .featureInfo").text() == "t_house_survey_fsss"){ | ||||
| that.mapZjdTeAll.mapZrzAData ={}; | that.mapZjdTeAll.mapZrzAData ={}; | ||||
| that.mapZjdDataTure=""; | that.mapZjdDataTure=""; | ||||
| @@ -4901,6 +4901,11 @@ | |||||
| that.mapZjdData.active = 1; | that.mapZjdData.active = 1; | ||||
| that.mapZjdTeAll.mapZjdAData = that.mapZjdData; | that.mapZjdTeAll.mapZjdAData = that.mapZjdData; | ||||
| getFsss(obj.id).then((response) => { | getFsss(obj.id).then((response) => { | ||||
| if(response.data.jzmj != ""){ | |||||
| that.textMjAll = response.data.jzmj; | |||||
| } else { | |||||
| that.textMjAllNum = "1"; | |||||
| } | |||||
| //that.mapfsssData.active = 4; | //that.mapfsssData.active = 4; | ||||
| that.mapfsssData = response.data; | that.mapfsssData = response.data; | ||||
| that.mapZjdTeAll.mapFsssAData = that.mapfsssData; | that.mapZjdTeAll.mapFsssAData = that.mapfsssData; | ||||
| @@ -4938,11 +4943,11 @@ | |||||
| }); | }); | ||||
| }); | }); | ||||
| }); | }); | ||||
| if(obj.jzmj != ""){ | |||||
| that.textMjAll = obj.jzmj; | |||||
| } else { | |||||
| that.textMjAllNum = "1"; | |||||
| } | |||||
| // if(obj.jzmj != ""){ | |||||
| // that.textMjAll = obj.jzmj; | |||||
| // } else { | |||||
| // that.textMjAllNum = "1"; | |||||
| // } | |||||
| } else { | } else { | ||||
| } | } | ||||