From b86872dec25f7569b53085cb6da1ccbfe6e8a735 Mon Sep 17 00:00:00 2001
From: wangrui <zephyrs0894@163.com>
Date: 星期三, 16 十二月 2020 10:10:27 +0800
Subject: [PATCH] 基础图层加载，未实现
---
src/components/mapmodules/CommonLayerLoad.js | 12 +++---
src/store/app.js | 0
src/store/index.js | 4 +-
package.json | 2
src/App.vue | 13 +++++-
src/Sgis.js | 65 +++++++++++++++++---------------
6 files changed, 54 insertions(+), 42 deletions(-)
diff --git a/package.json b/package.json
index 0d7053e..4f30062 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "abc",
+ "name": "SewerAndRainNetwork",
"version": "0.1.0",
"private": true,
"scripts": {
diff --git a/src/App.vue b/src/App.vue
index 3061c15..66708b1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,14 +1,23 @@
<template>
- <div id="app">
+ <div id="app" ref="app">
<map-template></map-template>
</div>
</template>
<script>
import MapTemplate from './views/MapTemplate.vue'
+
export default {
name: 'App',
- components: {MapTemplate}
+ components: {MapTemplate},
+ mounted(){
+ this.$nextTick(()=>{
+ let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //娴忚鍣ㄩ珮搴�
+ let topH = this.$refs.app.offsetHeight;
+ console.log(h)
+ this.height = (h - topH) + "px"
+ })
+ }
}
</script>
diff --git a/src/Sgis.js b/src/Sgis.js
index 9bedeb6..7ade0f1 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -2,42 +2,45 @@
import BasemapHelper from '@components/helpers/BasemapHelper'
import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
-import Editable from '@components/plugin/Editable'
-import PathDrag from '@components/plugin/PathDrag'
-import CanvasIcon from '@components/plugin/CanvasMarkers'
-import MagicMarker from '@components/plugin/MagicMarker'
+// import Editable from '@components/plugin/Editable'
+// import PathDrag from '@components/plugin/PathDrag'
+// import CanvasIcon from '@components/plugin/CanvasMarkers'
+// import MagicMarker from '@components/plugin/MagicMarker'
import 'leaflet.markercluster'
import MapConfig from '@/conf/MapConfig'
import CommonLayerLoad from '@components/mapmodules/CommonLayerLoad'
-import DashFlow from '@components/plugin/PathDashFlow'
-import AjaxUtils from '@/utils/AjaxUtils'
+// import DashFlow from '@components/plugin/PathDashFlow'
+// import AjaxUtils from '@/utils/AjaxUtils'
let map = null
-let baseMapGroup = null
+// let baseMapGroup = null
let commonLayerLoad = null
const initMap = (div) => {
if (map != null) {
map.remove()
- baseMapGroup = null
+ // baseMapGroup = null
commonLayerLoad = null
}
- Editable.init(L)
- PathDrag.init(L)
- MagicMarker.init(L)
- CanvasIcon.init(L)
+ // Editable.init(L)
+ // PathDrag.init(L)
+ // MagicMarker.init(L)
+ // CanvasIcon.init(L)
// CustomPopup.init(L)
// DashFlow.DashFlow(L)
map = L.map(div, MapConfig.mapOptions)
- DashFlow.DashFlow(L, map)
+ // DashFlow.DashFlow(L, map)
commonLayerLoad = new CommonLayerLoad()
- const blueMap = commonLayerLoad.loadBlueMap()
- // const imgMapm = commonLayerLoad.loadImgMapm()
- // const imgMapa = commonLayerLoad.loadImgMapa()
- // L.layerGroup([normalMapm, normalMapa]).addTo(map)
- baseMapGroup = L.layerGroup([blueMap]).addTo(map)
- getToken()
+ // const blueMap = commonLayerLoad.loadBlueMap()
+ // baseMapGroup = L.layerGroup([blueMap]).addTo(map)
+
+ const imgMapm = commonLayerLoad.loadImgMapm()
+ const imgMapa = commonLayerLoad.loadImgMapa()
+
+ L.layerGroup([imgMapm, imgMapa]).addTo(map)
+
+ // getToken()
// L.control.scale({ maxWidth: 200, metric: true, imperial: false }).addTo(map)
// L.control.layers(SgisConfig.baseLayers, SgisConfig.overlayLayers, { position: 'bottomright' }).addTo(map)
// 鍔犺浇鍥界晫鍜岄搧璺�
@@ -52,18 +55,18 @@
return { map: map, L: L }
}
-let getToken = () => {
- let params = MapConfig.TokenConfig
- AjaxUtils.GetDataAsynByUrl(params.url, params.option, function(token) {
- showTdt(token)
- })
-}
-let showTdt = (token) => {
- const imgMapm = commonLayerLoad.loadIntranetImgMap(token)
- const imgMapa = commonLayerLoad.loadIntranetImgMapCia(token)
- baseMapGroup.addLayer(imgMapm)
- baseMapGroup.addLayer(imgMapa)
-}
+// let getToken = () => {
+// let params = MapConfig.TokenConfig
+// AjaxUtils.GetDataAsynByUrl(params.url, params.option, function(token) {
+// showTdt(token)
+// })
+// }
+// let showTdt = (token) => {
+// const imgMapm = commonLayerLoad.loadIntranetImgMap(token)
+// const imgMapa = commonLayerLoad.loadIntranetImgMapCia(token)
+// baseMapGroup.addLayer(imgMapm)
+// baseMapGroup.addLayer(imgMapa)
+// }
/**
* 鐡︾墖搴曞浘鍒濆鍖�
* @param map
diff --git a/src/components/mapmodules/CommonLayerLoad.js b/src/components/mapmodules/CommonLayerLoad.js
index d078640..851529b 100644
--- a/src/components/mapmodules/CommonLayerLoad.js
+++ b/src/components/mapmodules/CommonLayerLoad.js
@@ -19,7 +19,7 @@
return L.tileLayer('http://t0.tianditu.gov.cn/vec_c/wmts?' + tokenStr +
'layer=cva&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
maxZoom: 18,
- minZoom: 7,
+ minZoom: 1,
zoomOffset: 1
})
@@ -28,7 +28,7 @@
return L.tileLayer('http://t0.tianditu.gov.cn/cva_c/wmts?' + tokenStr +
'layer=cva&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
maxZoom: 18,
- minZoom: 7,
+ minZoom: 1,
zoomOffset: 1
})
@@ -37,7 +37,7 @@
return L.tileLayer('http://t0.tianditu.gov.cn/img_c/wmts?' + tokenStr +
'layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
maxZoom: 18,
- minZoom: 7,
+ minZoom: 1,
zoomOffset: 1
})
}
@@ -45,7 +45,7 @@
return L.tileLayer('http://t0.tianditu.gov.cn/cia_c/wmts?' + tokenStr +
'layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
maxZoom: 18,
- minZoom: 7,
+ minZoom: 1,
zoomOffset: 1
})
}
@@ -53,7 +53,7 @@
return L.tileLayer('http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-image-globe/WMTS?token=' + token + '&' +
'layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
maxZoom: 18,
- minZoom: 7,
+ minZoom: 1,
zoomOffset: 1
})
}
@@ -62,7 +62,7 @@
return L.tileLayer('http://10.246.132.249:8080/OneMapServer/rest/services/base-tdt-label-image/WMTS?token=' + token + '&' +
'layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}', {
maxZoom: 18,
- minZoom: 7,
+ minZoom: 1,
zoomOffset: 1
})
}
diff --git a/src/store/map.js b/src/store/app.js
similarity index 100%
rename from src/store/map.js
rename to src/store/app.js
diff --git a/src/store/index.js b/src/store/index.js
index 8c9e626..dad3e82 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import Vuex from 'vuex'
-import map from './map'
+import app from './app'
Vue.use(Vuex)
@@ -31,6 +31,6 @@
getters: {
},
modules: {
- map
+ app
}
})
\ No newline at end of file
--
Gitblit v1.8.0