From a1cc55b0ad4372c987a4212df1df405163531ff7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 05 Jan 2022 14:20:37 +0800
Subject: [PATCH] 地图逻辑调整
---
src/router/page/index.js | 19 ++++
src/components/map/components/dimension.vue | 51 ++++++++++++
src/pcLayout/index.vue | 6 +
src/pcviews/specialmap/celebrate.vue | 57 ++++++++++++++
src/pcviews/specialmap/index.vue | 5 -
src/pcviews/specialmap/welcome.vue | 57 ++++++++++++++
src/components/map/index.vue | 34 ++++----
7 files changed, 204 insertions(+), 25 deletions(-)
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 1bb6d61..0940f19 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -20,6 +20,8 @@
DC: null,
dimensionValue: '3 维',
newLayer: null,
+ vecLayer: null,
+ cvaLayer: null,
provider: null,
wallLayer: null,
tileset: null,
@@ -81,6 +83,28 @@
handler (newCode, oldCode) {
if (this.titlesetLayerFlag == false && newCode != null) {
var that = this
+ that.vecLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
+ type: 'wmts',
+ layer: 'vec',
+ style: 'default',
+ format: 'tiles',
+ tileMatrixSetID: 'w',
+ show: true,
+ maximumLevel: 18
+ }))
+
+ that.cvaLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
+ type: 'wmts',
+ layer: 'cva',
+ style: 'default',
+ format: 'tiles',
+ tileMatrixSetID: 'w',
+ show: true,
+ maximumLevel: 18
+ }))
+
that.tilesetLayer = new that.DC.TilesetLayer('tilesetLayer')
that.viewer.addLayer(that.tilesetLayer)
that.tileset = new that.DC.Tileset(
@@ -295,6 +319,27 @@
that.wallLayer.show = false
that.viewer.imageryLayers.remove(that.newLayer)
that.newLayer = null
+ that.vecLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
+ type: 'wmts',
+ layer: 'vec',
+ style: 'default',
+ format: 'tiles',
+ tileMatrixSetID: 'w',
+ show: true,
+ maximumLevel: 18
+ }))
+
+ that.cvaLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
+ type: 'wmts',
+ layer: 'cva',
+ style: 'default',
+ format: 'tiles',
+ tileMatrixSetID: 'w',
+ show: true,
+ maximumLevel: 18
+ }))
that.silhouetteBlue.selected = []
that.tilesetLayer.show = true
that.viewer.camera.setView({
@@ -319,8 +364,12 @@
that.viewer.scene.screenSpaceCameraController.enableTilt = true
} else {
that.tilesetLayer.show = false
+ that.viewer.imageryLayers.remove(that.vecLayer)
+ that.vecLayer = null
+ that.viewer.imageryLayers.remove(that.cvaLayer)
+ that.cvaLayer = null
var provider = new that.DC.Namespace.Cesium.ArcGisMapServerImageryProvider({
- url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/PingXiang25DMapDN/MapServer'
+ url: 'http://arcgis.jxpskj.com:6080/arcgis/rest/services/PingXiang25DMapQP/MapServer'
})
that.newLayer = that.viewer.imageryLayers.addImageryProvider(provider)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index b2b0db8..a4b4b5b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -159,15 +159,15 @@
that.$refs.leftNav.initialize(viewer)
- const key = '0f7c1d161d7352116a21aacf0e9f44c1'
- const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
- key
- })
- const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
- key,
- style: 'cva'
- })
- viewer.addBaseLayer([vec, cva])
+ // const key = '0f7c1d161d7352116a21aacf0e9f44c1'
+ // const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+ // key
+ // })
+ // const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+ // key,
+ // style: 'cva'
+ // })
+ // viewer.addBaseLayer([vec, cva])
// const areaLayer = new that.DC.VectorLayer('areaLayer')
@@ -288,14 +288,14 @@
viewer.compass.enable = true
viewer.zoomController.enable = true
// viewer.locationBar.enable = true
- viewer.hawkeyeMap.enable = true
- viewer.hawkeyeMap.addBaseLayer(
- that.DC.ImageryLayerFactory.createAmapImageryLayer(
- {
- crs: 'WGS84'
- }
- )
- )
+ // viewer.hawkeyeMap.enable = true
+ // viewer.hawkeyeMap.addBaseLayer(
+ // that.DC.ImageryLayerFactory.createAmapImageryLayer(
+ // {
+ // crs: 'WGS84'
+ // }
+ // )
+ // )
// viewer.distanceLegend.enable = true
}
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index b392b48..039de1a 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -56,7 +56,11 @@
<el-menu-item index="/pcLayout/default/campusnavi"> <i class='custom-icon menu-xydh'></i> 社区导航</el-menu-item>
- <el-menu-item index="/pcLayout/default/specialmap"> <i class='custom-icon menu-ztdt'></i> 专题地图</el-menu-item>
+ <!-- <el-submenu index="specialmap">
+ <template slot="title"> <i class='custom-icon menu-ztdt'></i> 专题地图</template>
+ <el-menu-item index="/pcLayout/default/specialmap/celebrate">社区庆</el-menu-item>
+ <el-menu-item index="/pcLayout/default/specialmap/welcome">社区迎新</el-menu-item>
+ </el-submenu> -->
<el-submenu index="tool">
<template slot="title"> <i class='custom-icon menu-tool'></i> 工具</template>
diff --git a/src/pcviews/specialmap/celebrate.vue b/src/pcviews/specialmap/celebrate.vue
new file mode 100644
index 0000000..0129c80
--- /dev/null
+++ b/src/pcviews/specialmap/celebrate.vue
@@ -0,0 +1,57 @@
+/*
+ * @Author: Morpheus
+ * @Name: 社区庆
+ * @Date: 2021-11-15 17:14:47
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2022-01-05 14:05:59
+ */
+<template>
+ <div>
+ <service-nav-bar :title="title"
+ :arcCode="code"
+ :headerLog="headerLog"></service-nav-bar>
+ </div>
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+
+export default {
+ data () {
+ return {
+ title: '圈存机',
+ code: 6,
+ headerLog: '/img/icon/service-qcj.png'
+ }
+ },
+ created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 社区内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
+ },
+ methods: {
+ closeModel () {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+ }
+}
+</script>
+
+<style>
+</style>
diff --git a/src/pcviews/specialmap/index.vue b/src/pcviews/specialmap/index.vue
index 209208f..3dce109 100644
--- a/src/pcviews/specialmap/index.vue
+++ b/src/pcviews/specialmap/index.vue
@@ -1,7 +1,5 @@
<template>
- <div>
- 专题地图
- </div>
+ <router-view></router-view>
</template>
<script>
@@ -11,5 +9,4 @@
</script>
<style>
-
</style>
diff --git a/src/pcviews/specialmap/welcome.vue b/src/pcviews/specialmap/welcome.vue
new file mode 100644
index 0000000..951006d
--- /dev/null
+++ b/src/pcviews/specialmap/welcome.vue
@@ -0,0 +1,57 @@
+/*
+ * @Author: Morpheus
+ * @Name: 社区迎新
+ * @Date: 2021-11-15 17:14:47
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2022-01-05 14:06:20
+ */
+<template>
+ <div>
+ <service-nav-bar :title="title"
+ :arcCode="code"
+ :headerLog="headerLog"></service-nav-bar>
+ </div>
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+
+export default {
+ data () {
+ return {
+ title: '圈存机',
+ code: 6,
+ headerLog: '/img/icon/service-qcj.png'
+ }
+ },
+ created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 社区内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
+ },
+ methods: {
+ closeModel () {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+ }
+}
+</script>
+
+<style>
+</style>
diff --git a/src/router/page/index.js b/src/router/page/index.js
index d224cfe..1bc006f 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-04-30 14:12:09
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-22 10:17:37
+ * @Last Modified time: 2022-01-05 14:04:28
*/
import Vue from 'vue'
@@ -241,7 +241,22 @@
component: resolve => require(['../../pcviews/specialmap/index.vue'], resolve),
meta: {
title: '专题地图'
- }
+ },
+ children: [{
+ path: 'celebrate',
+ component: resolve => require(['../../pcviews/specialmap/celebrate.vue'], resolve),
+ meta: {
+ title: '社区庆'
+ }
+ },
+ {
+ path: 'welcome',
+ component: resolve => require(['../../pcviews/specialmap/welcome.vue'], resolve),
+ meta: {
+ title: '社区迎新'
+ }
+ }
+ ]
},
{
path: 'tool',
--
Gitblit v1.9.3