diff --git a/src/components/Map/MapGisDrawing.vue b/src/components/Map/MapGisDrawing.vue index 5ce4f4df..045e5f11 100644 --- a/src/components/Map/MapGisDrawing.vue +++ b/src/components/Map/MapGisDrawing.vue @@ -99,7 +99,7 @@ export default { source: new ol.source.XYZ({ 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", + "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067&TIMESTAMP="+ new Date().getTime(), }), isGroup: true, name: "卫星影像图", @@ -108,7 +108,7 @@ export default { 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=cc4aba6e967096098249efa069733067", + url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067&TIMESTAMP="+ new Date().getTime(), }), isGroup: true, name: "天地图文字标注--卫星影像图", @@ -125,7 +125,6 @@ export default { zoom: 15, minZoom: 5, //地图缩小限制 maxZoom: 18.3, //地图放大限制 - resolution:Math.random() * 0.00000001, }), interactions: ol.interaction.defaults({ pinchRotate: false // 移动端禁止地图旋转 @@ -152,8 +151,8 @@ export default { TILED: true, cql_filter: cql_filter_all, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, - resolution:Math.random() * 0.00000001, }), }); that.map.addLayer(zjdTc); @@ -167,8 +166,8 @@ export default { TILED: true, cql_filter: cql_filter_all, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, - resolution:Math.random() * 0.00000001, }), }); that.map.addLayer(zrzTc); @@ -183,6 +182,7 @@ export default { TILED: true, cql_filter: cql_filter_all, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, resolution:Math.random() * 0.00000001, }), @@ -558,7 +558,6 @@ export default { zoom: 16.9, minZoom: 5, //地图缩小限制 maxZoom: 18, //地图放大限制 - resolution:Math.random() * 0.00000001, }), interactions: ol.interaction.defaults({ pinchRotate: false // 移动端禁止地图旋转 @@ -578,6 +577,7 @@ export default { TILED: true, cql_filter: cql_filter, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, }), }); @@ -637,6 +637,7 @@ export default { TILED: true, cql_filter: cql_filter, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, }), }); diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index e43d5e8c..88c6f815 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -3223,6 +3223,7 @@ this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData; this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId; this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm; + this.$cookies.set("search",this.backMap.zjddm); this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom; this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm; //返回地图值记录----end @@ -4224,6 +4225,11 @@ //this.enterMap=""; //this.$cookies.set("item",""); if(this.ztMap && this.enterMap ==1){ + if(this.form.id == null){ + this.backMap.backMapZjdAData.theGeom= ""; + }else{ + this.backMap.backMapZjdAData = this.form; + } this.$cookies.set("search",this.backMap); } else { this.$cookies.set("search",""); @@ -5167,6 +5173,7 @@ if (this.form.id != null) { updateZjdzd(this.form).then(response => { this.$cookies.set("search",this.form); + console.log(this.$cookies.get("search")); let _this =this this.$toast({ icon: 'success', // 找到自己需要的图标 @@ -5180,8 +5187,8 @@ }); } else { addZjdzd(this.form).then(response => { - this.$cookies.set("search",this.form); this.form = response.data + this.$cookies.set("search",this.form); let _this =this this.$toast({ icon: 'success', // 找到自己需要的图标 diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index c133d4ba..ef5994b1 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -1441,10 +1441,10 @@ if(this.$cookies.get("search") != null && this.$cookies.get("search") !="" && this.$cookies.get("search")!=undefined){ if(this.$cookies.get("search").activeBtn !=null){ if(this.$cookies.get("search").activeBtn == 4){ - if(location.href.indexOf("#reloaded")==-1){ - location.href=location.href+"#reloaded"; - location.reload(); - } + // if(location.href.indexOf("#reloaded")==-1){ + // location.href=location.href+"#reloaded"; + // location.reload(); + // } this.activeBtn = this.$cookies.get("search").activeBtn; this.item = this.$cookies.get("item"); this.mapAddJump = this.$cookies.get("search").backMapZjdAData.deptId; @@ -2995,7 +2995,7 @@ var map; //点击事件添加样式 var hc_land_on; - // document.getElementById("mapAll").innerHTML = ''; + document.getElementById("mapWrapAll").innerHTML = ''; var hc_land; var projection = new ol.proj.Projection({ //地图投影类型 @@ -3011,7 +3011,7 @@ // "&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", + "&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067&TIMESTAMP="+ new Date().getTime(), }), isGroup: true, name: "卫星影像图", @@ -3019,7 +3019,7 @@ 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=cc4aba6e967096098249efa069733067", + url: "http://t{0-7}.tianditu.com/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067&TIMESTAMP="+ new Date().getTime(), }), isGroup: true, name: "天地图文字标注--卫星影像图", @@ -3068,6 +3068,7 @@ TILED: true, cql_filter: cql_filter, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, resolution: Math.random() * 0.00000001, }), @@ -3203,8 +3204,8 @@ TILED: true, cql_filter: cql_filter, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, - resolution: Math.random() * 0.00000001, }), }); map.addLayer(zjdTc); @@ -3219,8 +3220,8 @@ TILED: true, cql_filter: cql_filter, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, - resolution: Math.random() * 0.00000001, }), }); map.addLayer(zrzTc); @@ -3235,8 +3236,8 @@ TILED: true, cql_filter: cql_filter, SRID: 3857, + TIMESTAMP: new Date().getTime(), }, - resolution: Math.random() * 0.00000001, }), }); map.addLayer(fsssTc); @@ -4623,6 +4624,14 @@ var url_bbox; that.clickBbox =""; that.textMjAll = ""; + that.mapZjdData = ""; + that.mapZrzData = ""; + that.mapFsssData = ""; + //that.mapZjdTeAll.active ="1"; + that.mapZjdTeAll.mapZjdAData = {}; + that.mapZjdTeAll.mapZrzAData = {}; + that.mapZjdTeAll.mapFsssAData = {}; + that.mapZjdDataTure = ""; if(that.drawingClick) { //点击空白删除之前图层 map.removeLayer(hc_land_on); @@ -4723,14 +4732,6 @@ .then(function (html) { document.getElementById("info").innerHTML = html; if (html.indexOf("