diff --git a/src/components/GdMap/index.vue b/src/components/GdMap/index.vue index 9a9a7cf..32ff62e 100644 --- a/src/components/GdMap/index.vue +++ b/src/components/GdMap/index.vue @@ -1,7 +1,8 @@ @@ -74,7 +74,7 @@ const props = defineProps({ }); try { const userInfo = getItem("deptId")[0].deptCode; -} catch (error) {} +} catch (error) { } let map; let mapLayer; let mapLayer1; @@ -88,64 +88,37 @@ onMounted(() => { map = new EliMap({ id: props.mapid, - crs: "EPSG:3857", + crs: "EPSG:4490", style: { glyphs: "./fonts/{fontstack}/{range}.pbf", - center: [94.36,29.65], - zoom: 10 + center: [94.36057012, 29.64276831], + zoom: 15 }, - transformRequest: (url) => { - if (url.indexOf("TileMatrix=") != -1) { - const arr = url.split("TileMatrix="); - const arr1 = arr[1].split("&"); - const nurl = `${arr[0]}&TileMatrix=${Number(arr1[0])}&${arr1[1]}&${arr1[2]}`; - - } - } + minZoom: 7, + maxZoom: 18, }); - window.map = map; map.mapboxGLMap.on("load", () => { - map.addGaudLayer({ - url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}', - }) + map.addWMTSLayer( + "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap" + , + { + Service: "getImage", + Type: "RGB", + ZoomOffset: "0", + V: "0.3", + Zoom: "{z}", + Row: "{y}", + Col: "{x}" + }, + { + tileSize: 300 + } + ); zoomTarget.value = map.mapboxGLMap.getZoom(); - // 地图加载完成后发出事件 - // emit('mapLoaded') }); mapUtil.value = new MapUtil(map); - // map = new EliMap({ - // id: props.mapid, - // crs: "EPSG:4490", - // style: { - // glyphs: "./fonts/{fontstack}/{range}.pbf", - // center: [94.36057012, 29.64276831], - // zoom: 15 - // }, - // minZoom: 7, - // maxZoom: 18, - // }); - // window.map = map; - // map.mapboxGLMap.on("load", () => { - // map.addWMTSLayer( - // "/PGIS_S_TileMapServer/Maps/XZDJ_SL/EzMap" - // , - // { - // Service: "getImage", - // Type: "RGB", - // ZoomOffset: "0", - // V: "0.3", - // Zoom: "{z}", - // Row: "{y}", - // Col: "{x}" - // }, - // { - // tileSize: 300 - // } - // ); - // zoomTarget.value = map.mapboxGLMap.getZoom(); - // }); - // mapUtil.value = new MapUtil(map); + mapUtil.value.Drawplot(); //初始化加载绘制工具 // 设置地图中心点及图层 @@ -286,7 +259,6 @@ const mapSetLayer = (id, source) => { //获取地图绘制的数据 const resFun = (coord, type, flag, data) => { - emitter.emit("coordString", { coord: coord, type: type, @@ -351,29 +323,35 @@ onUnmounted(() => { right: 398px; bottom: 4px; z-index: 9; + .mapImageItem { border: 1px solid #08aae8; background: rgb(9, 26, 70); - & > img { + + &>img { width: 100%; height: 50px; } - & > div { + + &>div { text-align: center; position: relative; top: -3px; } } + .zoomTargetBox { margin-top: 10px; margin-left: 23px; } + ::v-deep .el-input-number__decrease, ::v-deep .el-input-number__increase { background: #133362; color: #fff; border: none; } + ::v-deep .el-input__inner { background: #0c1641; } diff --git a/src/components/GdMap/indexnw.vue b/src/components/GdMap/indexnw.vue deleted file mode 100644 index 32ff62e..0000000 --- a/src/components/GdMap/indexnw.vue +++ /dev/null @@ -1,359 +0,0 @@ - - - - - diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/regulation.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/regulation.vue index 9a35f11..ecb3708 100644 --- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/regulation.vue +++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/components/regulation.vue @@ -23,7 +23,7 @@