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 | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index ea35086..4a27409 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -57,7 +57,7 @@
</template>
<script>
import store from "@/utils/store2.js";
-import { setClick, leftClick,touchClick } 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";
@@ -87,6 +87,7 @@
addHxLayer,
addYzLayer,
loadBaseMap,
+ loadGeoMap,
listenDirection,
getCurrentPosition
} from "@/utils/tool";
@@ -145,7 +146,7 @@
state: store.history,
};
},
- created() {},
+ created() { },
mounted() {
this.$nextTick(function () {
ol.Map.prototype.getLayerByName = function (name) {
@@ -162,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;
@@ -173,12 +174,12 @@
let origin = projectionExtent
? ol.extent.getTopLeft(projectionExtent)
: [-180, 90];
- let fromLonLat = ol.proj.getTransform("EPSG:4326", projection);
+ 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.applyTransform([-180.0, -90.0, 180.0, 90.0], fromLonLat)
+ );
let resolutions = [];
let matrixIds = [];
@@ -257,23 +258,23 @@
layers: layers,
target: "openlayerContainer",
view: new ol.View({
- center: [116.505348, 39.795592],
- projection: "EPSG:4326",
- zoom: 15,
- minZoom: 12,
- maxZoom: 18,
+ 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();
@@ -400,7 +401,7 @@
console.log(window.gisBaseUrl);
Axios.get(
window.gisBaseUrl +
- "/gisserver/wfsserver/qiyelianqiye?version=1.3.0&request=GetFeature&format=json&typename=浼佷笟閾句紒涓�"
+ "/gisserver/wfsserver/qiyelianqiye?version=1.3.0&request=GetFeature&format=json&typename=浼佷笟閾句紒涓�"
).then((res) => {
console.log(res);
});
--
Gitblit v1.9.3