From 9161020eb066d9e3ce123eb94de81ea3050da464 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 22:00:06 +0800
Subject: [PATCH] 美化企业文字展示，增加临时测试页面。
---
src/assets/css/map/map-panel-style.less | 7 +++
package.json | 2 +
src/views/Temp.vue | 46 ++++++++++++++++++++++-
src/router/index.js | 8 ++-
4 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index abf1a54..40e1977 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"dayjs": "^1.9.6",
"echarts": "^4.2.1",
"element-ui": "^2.14.1",
+ "esri-leaflet": "^3.0.1",
"fullscreen": "^1.1.1",
"jquery": "^3.5.1",
"js-cookie": "^2.2.0",
@@ -28,6 +29,7 @@
"leaflet.markercluster": "^1.4.1",
"lodash": "^4.17.10",
"nprogress": "^0.2.0",
+ "proj4": "^2.7.2",
"qs": "^6.10.1",
"rbush": "^3.0.1",
"screenfull": "^3.3.3",
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 3a72b11..fad0be8 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -242,13 +242,18 @@
/***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
.company-bindTooltip {
- background: none;
+ background: @background-color-split;
border: none;
color: red;
font-size: 16px;
font-weight: 900 !important;
text-shadow: 0 0 5px #fff;
+ //filter:Dropshadow(offx=1,offy=0,color=white)
+ //Dropshadow(offx=0,offy=1,color=white)
+ //Dropshadow(offx=0,offy=-1,color=white)
+ //Dropshadow(offx=-1,offy=0,color=white);
box-shadow: none;
+ -webkit-text-stroke: .5px #fff;
}
.company-bindTooltip-hover h3 {
diff --git a/src/router/index.js b/src/router/index.js
index ac9cb58..b95bcd3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,9 +35,11 @@
console.log(homeRouterName)
next()
} else if (!token) {
- next({
- name: LOGIN_PAGE_ROUTE_NAME // 璺宠浆鍒扮櫥褰曢〉
- })
+ // next({
+ // name: LOGIN_PAGE_ROUTE_NAME // 璺宠浆鍒扮櫥褰曢〉
+ // })
+ console.log(LOGIN_PAGE_ROUTE_NAME)
+ next()
} else {
next()
}
diff --git a/src/views/Temp.vue b/src/views/Temp.vue
index 4e3accf..130740e 100644
--- a/src/views/Temp.vue
+++ b/src/views/Temp.vue
@@ -35,7 +35,11 @@
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
-
+const esri = require('esri-leaflet')
+// const proj4 = require('proj4')
+const proj4 = require('proj4')
+window.proj4 = proj4
+const Proj = require('../components/plugin/proj4leaflet')
export default {
name: 'Temp',
components: {
@@ -82,6 +86,35 @@
},
init () {
const mapcontainer = this.$refs.rootmap
+ const CRS_4490 = new Proj.CRS('EPSG:4490', '+proj=longlat +ellps=GRS80 +no_defs', {
+ resolutions: [
+ 1.40625,
+ 0.703125,
+ 0.3515625,
+ 0.17578125,
+ 0.087890625,
+ 0.0439453125,
+ 0.02197265625,
+ 0.010986328125,
+ 0.0054931640625,
+ 0.00274658203125,
+ 0.001373291015625,
+ 6.866455078125E-4,
+ 3.4332275390625E-4,
+ 1.71661376953125E-4,
+ 8.58306884765625E-5,
+ 4.291534423828125E-5,
+ 2.1457672119140625E-5,
+ 1.0728836059570312E-5,
+ 5.364418029785156E-6,
+ 2.682209064925356E-6,
+ 1.3411045324626732E-6
+ ],
+ origin: [-180, 90]
+ })
+ console.log(mapcontainer)
+ console.log(CRS_4490)
+ debugger
this.map = Sgis.initMap(mapcontainer)
this.$refs.toolBox.map = this.map
@@ -94,7 +127,7 @@
window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
- this.basemapHelper.initBasemap(this.config, true) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
+ this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
// this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
// this.vectorLayerHelper.initVectorLayers(this.config)
@@ -106,6 +139,15 @@
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
+ this.loadArcgisImg()
+ },
+ loadArcgisImg () {
+ // const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer/tile/{z}/{y}/{x}'
+ const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer'
+ // const arcgisTileLayer = this.L.tileLayer(url, {
+ const arcgisTileLayer = esri.tiledMapLayer({ url: url })
+ // const arcgisTileLayer = esri.dynamicMapLayer({ url: url })
+ arcgisTileLayer.addTo(this.map)
},
onLayerClick () {
this.$refs.popup.setShow()
--
Gitblit v1.8.0