From 065669d31914a2f65c48d351417f48e49bd79c0c Mon Sep 17 00:00:00 2001 From: lixuliang <lixuliang_hd@126.com> Date: 星期三, 13 三月 2024 11:30:46 +0800 Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/PM20221203225_MobileWeb --- src/components/viewer2.vue | 206 ++++++++++++++++++--------------------------------- 1 files changed, 74 insertions(+), 132 deletions(-) diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue index f136701..4a27409 100644 --- a/src/components/viewer2.vue +++ b/src/components/viewer2.vue @@ -4,9 +4,9 @@ <div id="openlayerContainer" @click="clicktoclose"></div> <!-- 椤甸潰鏍囬 --> - <div class="titleBg"> + <!-- <div class="titleBg"> <img src="@/assets/img/title/title.png" /> - </div> + </div> --> <!-- 鍘嗗彶褰卞儚 --> <my-history v-if="state.show"></my-history> <!-- 鍘嗗彶褰卞儚鍏抽棴鎸夐挳 --> @@ -24,7 +24,7 @@ <!-- 鍘熷乏涓嬭彍鍗� --> <!-- <my-menu v-on:getshowsta="datafromchild" ref="menu"></my-menu> --> <!-- 宸︿笅蹇嵎鍖哄煙锛堝浣嶃�佹寚鍖楃瓑锛� --> - <my-left-bottom :test="childrendata"></my-left-bottom> + <!-- <my-left-bottom :test="childrendata"></my-left-bottom> --> <!-- 鍙充笅蹇嵎鍖哄煙锛堟斁澶х缉灏忥級 --> <my-right-bottom :test="childrendata"></my-right-bottom> @@ -34,7 +34,7 @@ <!-- 浣嶇疆闈㈡澘 --> <my-collection-panel></my-collection-panel> <!-- 鎸囧寳閽堥潰鏉� --> - <my-direction-panel></my-direction-panel> + <!-- <my-direction-panel></my-direction-panel> --> <!-- 鏂板鏀惰棌闈㈡澘 --> <my-add-collection-panel></my-add-collection-panel> <!-- 绐ㄤ簳銆佹憚鍍忓ご缁熻闈㈡澘 --> @@ -57,7 +57,7 @@ </template> <script> import store from "@/utils/store2.js"; -import { setClick, leftClick } from '@/utils/map2.js' +import { setClick, leftClick, touchClick } from "@/utils/map2.js"; import _GLOBAL from "@/assets/GLOBAL2"; // import { leftClick, loadLayer } from "@/utils/map.js"; import leftBottom from "@/components/leftMenu/bottom2.vue"; @@ -81,7 +81,16 @@ import mainPoplayer from "./poplayer/poplayer2.vue"; import sliderAlpha from "./sideMenu/sliderAlpha/main2.vue"; import Axios from "axios"; - +import { + addImageLayer, + addAnnotationLayer, + addHxLayer, + addYzLayer, + loadBaseMap, + loadGeoMap, + listenDirection, + getCurrentPosition +} from "@/utils/tool"; // import Map from "ol/Map.js"; // import TileLayer from "ol/layer/Tile.js"; // import View from "ol/View.js"; @@ -114,7 +123,7 @@ "my-history": history, "my-land-admin-info": landAdminInfo, "my-slider": sliderAlpha, - "my-poplayer": mainPoplayer + "my-poplayer": mainPoplayer, }, data() { return { @@ -140,8 +149,6 @@ created() { }, mounted() { this.$nextTick(function () { - console.log("openlayer init"); - ol.Map.prototype.getLayerByName = function (name) { var layer; this.getLayers().array_.forEach(function (lyr) { @@ -156,7 +163,7 @@ const TDTKey = "f234b950740b8c2e0d9959a51c169d21"; const tiandituUrl = "http://t0.tianditu.gov.cn"; - let options = { proj: "EPSG:4326", layer: "img", matrixSets: "c" }; + let options = { proj: "EPSG:3857", layer: "img", matrixSets: "c" }; let _proj = options.proj; let _layer = options.layer; let _key = TDTKey; @@ -164,11 +171,15 @@ let projection = ol.proj.get(_proj); let projectionExtent = projection.getExtent(); - let origin = projectionExtent ? ol.extent.getTopLeft(projectionExtent) : [-180, 90]; - let fromLonLat = ol.proj.getTransform("EPSG:4326", projection); + let origin = projectionExtent + ? ol.extent.getTopLeft(projectionExtent) + : [-180, 90]; + let fromLonLat = ol.proj.getTransform("EPSG:3857", projection); let width = projectionExtent ? ol.extent.getWidth(projectionExtent) - : ol.extent.getWidth(ol.extent.applyTransform([-180.0, -90.0, 180.0, 90.0], fromLonLat)); + : ol.extent.getWidth( + ol.extent.applyTransform([-180.0, -90.0, 180.0, 90.0], fromLonLat) + ); let resolutions = []; let matrixIds = []; @@ -236,10 +247,10 @@ source: wmtsSource2, }); // wmtsLayer2.setVisible(false); - ////鍗槦褰卞儚 - layers.push(wmtsLayer); ////浜岀淮鍦板浘 - layers.push(wmtsLayer2); + // layers.push(wmtsLayer2); + ////鍗槦褰卞儚 + // layers.push(wmtsLayer); ////璺綉 // layers.push(wmtsLayer1); @@ -247,101 +258,32 @@ layers: layers, target: "openlayerContainer", view: new ol.View({ - center: [116.505348, 39.795592], - projection: "EPSG:4326", - zoom: 12, - minZoom: 8.5 + center: ol.proj.fromLonLat([116.505348, 39.795592]), + projection: "EPSG:3857", + zoom: 11.5, + minZoom: 7, + maxZoom: 19.5, + enableRotation: false, + // constrainResolution: true, + smoothResolutionConstraint: false, }), }); window.mapapi = map; + // addImageLayer(); + // addAnnotationLayer(); + window.mapapi.getView().setZoom(14); + loadGeoMap(); + loadBaseMap(); + addHxLayer(); + addYzLayer(); - //鍔犺浇鑸媿褰卞儚 - window.ImageLayer = new ol.layer.Tile({ - id: 'C0698021', - visible: true, - source: new ol.source.XYZ({ - wrapX: true, - url: `${'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'}/tile/{z}/{y}/{x}`, - }), - projection: new ol.proj.get('EPSG:4326') - }); - window.mapapi.addLayer(window.ImageLayer); + setClick(true); + touchClick(); - //鍔犺浇楂樺痉鏍囨敞 - window.annotation = new ol.layer.Tile({ - id: '69EB42A8', - visible: true, - source: new ol.source.XYZ({ - wrapX: true, - url: `https://webst02.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}`, - }), - projection: new ol.proj.get('EPSG:4326') - }); - window.mapapi.addLayer(window.annotation); - - - window.hexin = new ol.layer.Tile({ - source: new ol.source.TileWMS({ - ratio: 3, - url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ60',//鍥惧眰鍦板潃 - params: { - 'VERSION': '1.1.1', - 'SRS': 'EPSG:4326', - 'FORMAT': 'image/png', - 'TILED': true, - "LAYERS": '' - } - }) - }) - window.mapapi.addLayer(window.hexin) - - - //浜﹀簞鏂板煄瑙勫垝鑼冨洿 - window.yizhuang = new ol.layer.Tile({ - source: new ol.source.TileWMS({ - ratio: 3, - url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ',//鍥惧眰鍦板潃 - params: { - 'VERSION': '1.1.1', - 'SRS': 'EPSG:4326', - 'FORMAT': 'image/png', - 'TILED': true, - "LAYERS": '' - } - }) - }) - window.mapapi.addLayer(window.yizhuang) - - - - - setClick(true) + getCurrentPosition(); + listenDirection(); // leftClick() - // var url = - // "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/"; - - // var tmslayer = new ol.layer.Tile({ - // source: new ol.source.XYZ({ - // projection: projection, - // tileGrid: ol.tilegrid.createXYZ({ - // extent: [50.731, -90, 180, 70.0478], - // }), - // tileUrlFunction: function (tileCoord, pixelRatio, proj) { - // // return url + (tileCoord[0] - 1) + '/' + tileCoord[1] + '/' + (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) + '.jpeg'; - // return ( - // url + - // (tileCoord[0] - 1) + - // "/" + - // tileCoord[1] + - // "/" + - // (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) + - // ".jpeg" - // ); - // }, - // }), - // }); - // window.mapapi.addLayer(tmslayer); window.layerOpen = function (name, options) { layuiLayer.close(SmartEarthPopupData.layerProp); @@ -399,34 +341,34 @@ }, methods: { clicktoclose() { - clearTimeout(this.timer); - this.timer = setTimeout(() => { - this.count++; - if (this.count == 2) { - // console.log("鍗曞嚮浜嬩欢"); - // 鍏抽棴鎵�鏈夊脊绐� - //this.$refs.menu.closeall(); - // 娓呴櫎瀹氫綅涓殑浣嶇疆鏍囪 - //this.$refs.menu.clearFlyPoint(); - } else { - // 鎵ц鏀惧ぇ鎿嶄綔 - // console.log("鍙屽嚮"); - // Viewer.camera.zoomIn(); - // console.log(window.clickPOI); - // let p = sgworld.Navigate.getDegrees(); - // console.log(p); - // Viewer.camera.flyTo({ - // destination: Cesium.Cartesian3.fromDegrees( - // window.clickPOI.lon, - // window.clickPOI.lat, - // p.height / 1.8 - // ), - // duration: 1.0, - // }); - } - this.count = 0; - }, 300); - this.count++; + // clearTimeout(this.timer); + // this.timer = setTimeout(() => { + // this.count++; + // if (this.count == 2) { + // // console.log("鍗曞嚮浜嬩欢"); + // // 鍏抽棴鎵�鏈夊脊绐� + // //this.$refs.menu.closeall(); + // // 娓呴櫎瀹氫綅涓殑浣嶇疆鏍囪 + // //this.$refs.menu.clearFlyPoint(); + // } else { + // // 鎵ц鏀惧ぇ鎿嶄綔 + // // console.log("鍙屽嚮"); + // // Viewer.camera.zoomIn(); + // // console.log(window.clickPOI); + // // let p = sgworld.Navigate.getDegrees(); + // // console.log(p); + // // Viewer.camera.flyTo({ + // // destination: Cesium.Cartesian3.fromDegrees( + // // window.clickPOI.lon, + // // window.clickPOI.lat, + // // p.height / 1.8 + // // ), + // // duration: 1.0, + // // }); + // } + // this.count = 0; + // }, 300); + // this.count++; }, datafromchild(data) { for (var i in data) { -- Gitblit v1.9.3