From ead73b4e3a20d15d03ed662fe1850393a4decfa3 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Mar 2022 18:12:12 +0800
Subject: [PATCH] viewer更改
---
src/components/map/components/dimension.vue | 164 +++++++++++++-------------
src/components/campusNav/index.vue | 25 ++--
src/components/leftNav/index.vue | 43 +++---
src/components/map/components/mapPopup copy.vue | 14 +-
src/components/map/index.vue | 105 ++++++++--------
5 files changed, 173 insertions(+), 178 deletions(-)
diff --git a/src/components/campusNav/index.vue b/src/components/campusNav/index.vue
index db37070..242e268 100644
--- a/src/components/campusNav/index.vue
+++ b/src/components/campusNav/index.vue
@@ -101,7 +101,6 @@
},
computed: {
...mapGetters([
- 'viewer',
'twoOrThree',
// 起点
'startingPoint',
@@ -162,7 +161,7 @@
// 初始化图标图层
if (this.endLayer == null) {
this.endLayer = new global.DC.VectorLayer('endLayer')
- this.viewer.addLayer(this.endLayer)
+ global.viewer.addLayer(this.endLayer)
} else {
this.endLayer.clear()
}
@@ -181,7 +180,7 @@
// 初始化图标图层
if (this.startLayer == null) {
this.startLayer = new global.DC.VectorLayer('startLayer')
- this.viewer.addLayer(this.startLayer)
+ global.viewer.addLayer(this.startLayer)
} else {
this.startLayer.clear()
}
@@ -204,7 +203,7 @@
// 关闭其他地图事件
that.$store.commit('set_closeMapClick', true)
// 添加标记
- const tooltip = that.viewer.tooltip
+ const tooltip = global.viewer.tooltip
tooltip.enable = true
let title = ''
if (val == 'start') {
@@ -212,7 +211,7 @@
// 初始化图标图层
if (this.startLayer == null) {
this.startLayer = new global.DC.VectorLayer('startLayer')
- this.viewer.addLayer(this.startLayer)
+ global.viewer.addLayer(this.startLayer)
} else {
this.startLayer.clear()
}
@@ -221,14 +220,14 @@
// 初始化图标图层
if (this.endLayer == null) {
this.endLayer = new global.DC.VectorLayer('endLayer')
- this.viewer.addLayer(this.endLayer)
+ global.viewer.addLayer(this.endLayer)
} else {
this.endLayer.clear()
}
}
that.overChouse = false // 开启事件
// 地图选点
- that.clicks = that.viewer.on(global.DC.MouseEventType.CLICK, (e) => {
+ that.clicks = global.viewer.on(global.DC.MouseEventType.CLICK, (e) => {
if (that.overChouse) {
return
}
@@ -271,7 +270,7 @@
// 开启其他地图事件
that.$store.commit('set_closeMapClick', false)
})
- that.moves = that.viewer.on(global.DC.MouseEventType.MOUSE_MOVE, (e) => {
+ that.moves = global.viewer.on(global.DC.MouseEventType.MOUSE_MOVE, (e) => {
if (that.overChouse) {
return
}
@@ -331,7 +330,7 @@
if (this.routeLayer == null) {
this.routeLayer = new global.DC.VectorLayer('navigation')
- this.viewer.addLayer(this.routeLayer)
+ global.viewer.addLayer(this.routeLayer)
} else {
this.routeLayer.clear()
}
@@ -432,7 +431,7 @@
})
this.routeLayer.addOverlay(polyline)
if (this.twoOrThree == '真三维') {
- this.viewer.flyTo(this.routeLayer)
+ global.viewer.flyTo(this.routeLayer)
} else {
var longitude = null
var latitude = null
@@ -451,7 +450,7 @@
latitude = (endLat - startLat) / 2 + startLat
}
that.isOverRouter = true
- this.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -517,7 +516,7 @@
this.routeLayer.addOverlay(polyline)
if (this.twoOrThree == '真三维') {
- this.viewer.flyTo(this.routeLayer)
+ global.viewer.flyTo(this.routeLayer)
} else {
var longitude = null
var latitude = null
@@ -536,7 +535,7 @@
latitude = (endLat - startLat) / 2 + startLat
}
that.isOverRouter = true
- this.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index afbf3e1..9d8337d 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -26,7 +26,6 @@
name: 'leftNav',
computed: {
...mapGetters([
- 'viewer',
'closeMapClick', // 关闭地图点击，防止新增标签误触
'addIconsLayerIconPopup' // 传送关闭编辑窗口，刷新标签数据
])
@@ -99,7 +98,6 @@
layer: 'comeLayer'
}
],
- viewer: null,
tagLayer: null,
wayLayer: null,
sceneLayer: null,
@@ -114,7 +112,7 @@
},
mounted () {
// 初始化新增标签图层
- // this.$store.commit("createAddIconsLayerIconLayer", { viewer: this.viewer });
+ // this.$store.commit("createAddIconsLayerIconLayer", { viewer: global.viewer });
},
watch: {
addIconsLayerIconPopup () {
@@ -170,13 +168,13 @@
// 加标签
this.$store.dispatch('chouseAddIconsLayerIcon', {
// 新增标签 选定位置
- viewer: this.viewer,
+ viewer: global.viewer,
fn: (lnglat) => {
// 返回选定坐标
// 添加空白标签
this.$store.dispatch('addIconsLayerIcon', {
lnglat: lnglat,
- viewer: this.viewer
+ viewer: global.viewer
})
}
})
@@ -200,24 +198,23 @@
this[item.layer].show = false
}
},
- initialize (viewer) {
+ initialize () {
var that = this
- viewer.scene.globe.depthTestAgainstTerrain = false
- this.viewer = viewer
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
this.tagLayer = new global.DC.HtmlLayer('tagLayer')
- viewer.addLayer(this.tagLayer)
+ global.viewer.addLayer(this.tagLayer)
this.wayLayer = new global.DC.HtmlLayer('wayLayer')
- viewer.addLayer(this.wayLayer)
+ global.viewer.addLayer(this.wayLayer)
this.sceneLayer = new global.DC.HtmlLayer('sceneLayer')
- viewer.addLayer(this.sceneLayer)
+ global.viewer.addLayer(this.sceneLayer)
this.monitorLayer = new global.DC.HtmlLayer('monitorLayer')
- viewer.addLayer(this.monitorLayer)
+ global.viewer.addLayer(this.monitorLayer)
this.aedLayer = new global.DC.VectorLayer('aedLayer')
- viewer.addLayer(this.aedLayer)
+ global.viewer.addLayer(this.aedLayer)
this.parkLayer = new global.DC.HtmlLayer('parkLayer')
- viewer.addLayer(this.parkLayer)
+ global.viewer.addLayer(this.parkLayer)
this.comeLayer = new global.DC.VectorLayer('comeLayer')
- viewer.addLayer(this.comeLayer)
+ global.viewer.addLayer(this.comeLayer)
getTagList().then((res) => {
res.data.data.forEach((item) => {
@@ -286,7 +283,7 @@
this.monitorLayer.addOverlay(divIcon)
divIcon.on(global.DC.MouseEventType.CLICK, (e) => {
- that.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(Number(item.jd), Number(item.wd), Number(300), Number(0), Number(-90), Number(0)),
function () { },
2
@@ -311,9 +308,9 @@
0
])
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
- var monitor = new global.DC.PanoramaBox(this.viewer, {
+ var monitor = new global.DC.PanoramaBox(global.viewer, {
domId: 'MonitorBox',
position: [positions]
})
@@ -340,7 +337,7 @@
this.sceneLayer.addOverlay(divIcon)
divIcon.on(global.DC.MouseEventType.CLICK, (e) => {
- that.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(Number(item.jd), Number(item.wd), Number(300), Number(0), Number(-90), Number(0)),
function () { },
2
@@ -368,9 +365,9 @@
0
])
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
- var panorama = new global.DC.PanoramaBox(this.viewer, {
+ var panorama = new global.DC.PanoramaBox(global.viewer, {
domId: 'PanoramaBox',
position: [positions]
})
@@ -464,7 +461,7 @@
})
},
openPopups (value) {
- var popup = new global.DC.DivForms(this.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [
global.DC.Transform.transformWGS84ToCartesian(
@@ -481,7 +478,7 @@
this.$store.dispatch('pcFlyView', {
jd: value.lng,
wd: value.lat,
- viewer: this.viewer
+ viewer: global.viewer
})
}
}
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index c1cc72b..7cab4a4 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -63,7 +63,7 @@
props: ['areaLayer'],
computed: {
...mapGetters([
- 'viewer',
+ 'viewerExist',
// 校区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
@@ -74,14 +74,14 @@
created () {
},
watch: {
- viewer: {
+ viewerExist: {
immediate: true,
handler (newCode, oldCode) {
- if (this.titlesetLayerFlag == false && newCode != null) {
+ if (this.titlesetLayerFlag == false && newCode == true) {
var that = this
that.tilesetLayer = new global.DC.TilesetLayer('tilesetLayer')
- that.viewer.addLayer(that.tilesetLayer)
+ global.viewer.addLayer(that.tilesetLayer)
that.tileset = new global.DC.Tileset('/mx/tileset.json', {
luminanceAtZenith: 0.3,
shadows: global.DC.Namespace.Cesium.ShadowMode.DISABLED
@@ -96,13 +96,13 @@
that.silhouetteBlue.uniforms.length = 0.01
that.silhouetteBlue.selected = []
- that.viewer.scene.postProcessStages.add(
+ global.viewer.scene.postProcessStages.add(
global.DC.Namespace.Cesium.PostProcessStageLibrary.createSilhouetteStage(
[that.silhouetteBlue]
)
)
- that.viewer.imageryLayers.addImageryProvider(
+ global.viewer.imageryLayers.addImageryProvider(
new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
@@ -112,7 +112,7 @@
})
)
- that.viewer.imageryLayers.addImageryProvider(
+ global.viewer.imageryLayers.addImageryProvider(
new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
@@ -122,7 +122,7 @@
})
)
- // that.viewer.imageryLayers.addImageryProvider(
+ // global.viewer.imageryLayers.addImageryProvider(
// new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
// url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
// type: 'wmts',
@@ -135,7 +135,7 @@
// })
// )
- // that.viewer.imageryLayers.addImageryProvider(
+ // global.viewer.imageryLayers.addImageryProvider(
// new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
// url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
// type: 'wmts',
@@ -159,7 +159,7 @@
}
const videoLayer = new global.DC.CameraVideoLayer('video-layer').addTo(
- that.viewer
+ global.viewer
)
const cameraVideo = new global.DC.CameraVideo(
@@ -179,7 +179,7 @@
if (that.closeMapClick) {
return
}
- that.viewer.scene.globe.depthTestAgainstTerrain = false
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
if (e.overlay && e.overlay.attr.arcName != null) {
this.$store.commit('CLEAR_ALL', null)
@@ -225,7 +225,7 @@
// 定制化窗体
// eslint-disable-next-line no-unused-vars
- var popup = new global.DC.DivForms(that.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [
global.DC.Transform.transformWGS84ToCartesian(
@@ -244,7 +244,7 @@
}
})
- this.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(
Number(e.wgs84Position.lng + 0.00070806),
Number(e.wgs84Position.lat - 0.00261205),
@@ -323,12 +323,12 @@
fileExtension: 'png'
})
- // that.baseLayer = that.viewer.imageryLayers.addImageryProvider(baseProvider)
+ // that.baseLayer = global.viewer.imageryLayers.addImageryProvider(baseProvider)
that.newLayer =
- that.viewer.imageryLayers.addImageryProvider(provider)
+ global.viewer.imageryLayers.addImageryProvider(provider)
that.wallLayer = new global.DC.VectorLayer('wallLayer')
- // that.viewer.addLayer(that.wallLayer)
+ // global.viewer.addLayer(that.wallLayer)
that.wallArr.forEach((item) => {
item = item.join(',')
@@ -344,7 +344,7 @@
})
// that.wallLayer.addOverlay(wall)
- // that.viewer.camera.setView({
+ // global.viewer.camera.setView({
// // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// // fromDegrees()方法，将经纬度和高程转换为世界坐标
// destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.03928791, 27.62954732, 400.0),
@@ -358,13 +358,13 @@
// })
// setTimeout(() => {
- // that.viewer.camera.flyTo({
+ // global.viewer.camera.flyTo({
// // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// // fromDegrees()方法，将经纬度和高程转换为世界坐标
// destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.0351, 27.6314, 200.0),
// duration: 5,
// complete: () => {
- // that.viewer.camera.flyTo({
+ // global.viewer.camera.flyTo({
// // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// // fromDegrees()方法，将经纬度和高程转换为世界坐标
// destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.0351, 27.6314, 200.0),
@@ -381,7 +381,7 @@
// }, 400)
that.titlesetLayerFlag = true
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -399,20 +399,20 @@
})
// 最小
- that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 220
+ global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 220
// 最大
- that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 400
+ global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 400
// 设置相机缩小时的速率
- that.viewer.scene.screenSpaceCameraController._minimumZoomRate = 2000
+ global.viewer.scene.screenSpaceCameraController._minimumZoomRate = 2000
// 设置相机放大时的速率
- that.viewer.scene.screenSpaceCameraController._maximumZoomRate = 5906376272000
+ global.viewer.scene.screenSpaceCameraController._maximumZoomRate = 5906376272000
// 视角平移
- that.viewer.scene.screenSpaceCameraController.enableRotate = true
+ global.viewer.scene.screenSpaceCameraController.enableRotate = true
// 视角缩放
- that.viewer.scene.screenSpaceCameraController.enableZoom = true
+ global.viewer.scene.screenSpaceCameraController.enableZoom = true
// 视角旋转
- that.viewer.scene.screenSpaceCameraController.enableTilt = false
+ global.viewer.scene.screenSpaceCameraController.enableTilt = false
axios
.get(
@@ -449,7 +449,7 @@
color: undefined
}
- that.viewer.on(global.DC.MouseEventType.MOUSE_MOVE, (e) => {
+ global.viewer.on(global.DC.MouseEventType.MOUSE_MOVE, (e) => {
if (that.closeMapClick) {
return
}
@@ -501,7 +501,7 @@
}
})
- that.viewer.on(global.DC.MouseEventType.CLICK, (e) => {
+ global.viewer.on(global.DC.MouseEventType.CLICK, (e) => {
if (that.closeMapClick) {
return
}
@@ -514,7 +514,7 @@
: e.overlay.attr['楼栋号']
this.$store.commit('CLEAR_ALL', null)
getDetail({ mechanismname: '香琴湾' + rid }).then((res) => {
- that.viewer.scene.globe.depthTestAgainstTerrain = false
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
var result = res.data.data
var imgArr = result.tpurl.split(',')
@@ -553,7 +553,7 @@
// 定制化窗体
// eslint-disable-next-line no-unused-vars
- var popup = new global.DC.DivForms(that.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [
global.DC.Transform.transformWGS84ToCartesian(
@@ -571,7 +571,7 @@
this.$store.commit('SET_DETAILSPOPUP', true)
})
- this.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(
Number(e.wgs84Position.lng),
Number(e.wgs84Position.lat),
@@ -589,7 +589,7 @@
document.querySelector('.dc-zoom-controller').children[1].onclick =
function () {
if (that.dimensionValue == '真三维') {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -606,7 +606,7 @@
}
})
} else {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -632,15 +632,15 @@
that.dimensionValue != '真三维'
) {
const height = Math.ceil(
- that.viewer.camera.positionCartographic.height
+ global.viewer.camera.positionCartographic.height
)
if (height <= 250) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination:
global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
280
),
orientation: {
@@ -654,11 +654,11 @@
}
if (height > 250 && height <= 310) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination:
global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
340
),
orientation: {
@@ -672,11 +672,11 @@
}
if (height > 310 && height < 370) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination:
global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
400
),
orientation: {
@@ -698,15 +698,15 @@
that.dimensionValue != '真三维'
) {
const height = Math.ceil(
- that.viewer.camera.positionCartographic.height
+ global.viewer.camera.positionCartographic.height
)
if (height > 370) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination:
global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
340
),
orientation: {
@@ -722,11 +722,11 @@
}
if (height > 310) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination:
global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
280
),
orientation: {
@@ -742,11 +742,11 @@
}
if (height > 250) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination:
global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
220
),
orientation: {
@@ -761,16 +761,16 @@
}
}
- that.viewer.on(global.DC.SceneEventType.CAMERA_CHANGED, () => {
+ global.viewer.on(global.DC.SceneEventType.CAMERA_CHANGED, () => {
if (
that.dimensionValue != undefined &&
that.dimensionValue != '真三维'
) {
const height = Math.ceil(
- that.viewer.camera.positionCartographic.height
+ global.viewer.camera.positionCartographic.height
)
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
orientation: {
// 指向
heading: global.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -781,10 +781,10 @@
})
if (height <= 250) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
220
),
orientation: {
@@ -798,10 +798,10 @@
}
if (height > 250 && height <= 310) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
280
),
orientation: {
@@ -815,10 +815,10 @@
}
if (height > 310 && height <= 370) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
340
),
orientation: {
@@ -832,10 +832,10 @@
}
if (height > 370) {
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
destination: global.DC.Namespace.Cesium.Cartesian3.fromRadians(
- that.viewer.camera.positionCartographic.longitude,
- that.viewer.camera.positionCartographic.latitude,
+ global.viewer.camera.positionCartographic.longitude,
+ global.viewer.camera.positionCartographic.latitude,
400
),
orientation: {
@@ -855,7 +855,7 @@
},
methods: {
// openPopups(lng, lat, alt) {
- // var popup = new global.DC.DivForms(that.viewer, {
+ // var popup = new global.DC.DivForms(global.viewer, {
// domId: "divFormsDomBox",
// position: [
// global.DC.Transform.transformWGS84ToCartesian(
@@ -870,22 +870,22 @@
if (that.dimensionValue == '真三维') {
// that.wallLayer.show = false
that.areaLayer.show = false
- that.viewer.imageryLayers.remove(that.newLayer)
+ global.viewer.imageryLayers.remove(that.newLayer)
that.newLayer = null
- // that.viewer.imageryLayers.remove(that.baseLayer)
+ // global.viewer.imageryLayers.remove(that.baseLayer)
that.baseLayer = null
that.silhouetteBlue.selected = []
that.tilesetLayer.show = true
// 最小
- that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 1.0
+ global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 1.0
// 最大
- that.viewer.scene.screenSpaceCameraController.maximumZoomDistance =
+ global.viewer.scene.screenSpaceCameraController.maximumZoomDistance =
Number.POSITIVE_INFINITY
// 视角旋转
- that.viewer.scene.screenSpaceCameraController.enableTilt = true
+ global.viewer.scene.screenSpaceCameraController.enableTilt = true
// 115.877863,28.741661
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -921,12 +921,12 @@
fileExtension: 'png'
})
- // that.baseLayer = that.viewer.imageryLayers.addImageryProvider(baseProvider)
- that.newLayer = that.viewer.imageryLayers.addImageryProvider(provider)
+ // that.baseLayer = global.viewer.imageryLayers.addImageryProvider(baseProvider)
+ that.newLayer = global.viewer.imageryLayers.addImageryProvider(provider)
// that.wallLayer.show = true
- that.viewer.camera.setView({
+ global.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -943,11 +943,11 @@
}
})
// 最小
- that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 220
+ global.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 220
// 最大
- that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 400
+ global.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 400
// 视角旋转
- that.viewer.scene.screenSpaceCameraController.enableTilt = false
+ global.viewer.scene.screenSpaceCameraController.enableTilt = false
}
}
}
diff --git a/src/components/map/components/mapPopup copy.vue b/src/components/map/components/mapPopup copy.vue
index 32c3e79..70c8e85 100644
--- a/src/components/map/components/mapPopup copy.vue
+++ b/src/components/map/components/mapPopup copy.vue
@@ -1088,9 +1088,9 @@
// eslint-disable-next-line new-cap
new this.DC.Position.fromArray(this.pointPosition)
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
- var panorama = new this.DC.PanoramaBox(this.viewer, {
+ var panorama = new this.DC.PanoramaBox(global.viewer, {
domId: 'PanoramaBox',
position: [positions]
})
@@ -1111,9 +1111,9 @@
// eslint-disable-next-line new-cap
new this.DC.Position.fromArray(this.pointPosition)
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
- var monitor = new this.DC.PanoramaBox(this.viewer, {
+ var monitor = new this.DC.PanoramaBox(global.viewer, {
domId: 'MonitorBox',
position: [positions]
})
@@ -1154,7 +1154,7 @@
// if (this.addTagLayer == null) {
// this.addTagLayer = new this.DC.HtmlLayer("addTagLayer");
- // this.viewer.addLayer(this.addTagLayer);
+ // global.viewer.addLayer(this.addTagLayer);
// }
// 2022.3.2对接接口
@@ -1261,7 +1261,7 @@
}
this.newPopup(result)
- this.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new this.DC.Position(
Number(result.jd),
Number(result.wd),
@@ -1281,7 +1281,7 @@
new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
)
// eslint-disable-next-line no-unused-vars
- var popup = new this.DC.DivForms(this.viewer, {
+ var popup = new this.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 2afb835..6bab02a 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -131,7 +131,6 @@
},
computed: {
...mapGetters([
- 'viewer',
'popupBgUrl',
'pupupQRUrl',
// 终点
@@ -162,64 +161,64 @@
mounted () {
var that = this
- let viewer, eagleViewer
+ let eagleViewer
function distanceSurface () {
- viewer.measure.distanceSurface()
+ global.viewer.measure.distanceSurface()
}
function calcArea () {
- viewer.measure.area()
+ global.viewer.measure.area()
}
function areaSurface () {
- viewer.measure.areaSurface()
+ global.viewer.measure.areaSurface()
}
function calcAngle () {
- viewer.measure.angle()
+ global.viewer.measure.angle()
}
function calcModelAngle () {
- viewer.measure.angle({
+ global.viewer.measure.angle({
clampToModel: true
})
}
function calcHeight () {
- viewer.measure.height()
+ global.viewer.measure.height()
}
function calcModelHeight () {
- viewer.measure.height({
+ global.viewer.measure.height({
clampToModel: true
})
}
function calcHeading () {
- viewer.measure.heading()
+ global.viewer.measure.heading()
}
function areaHeight () {
- viewer.measure.areaHeight()
+ global.viewer.measure.areaHeight()
}
function calcTriangleHeight () {
- viewer.measure.triangleHeight()
+ global.viewer.measure.triangleHeight()
}
function calcModelTriangleHeight () {
- viewer.measure.triangleHeight({
+ global.viewer.measure.triangleHeight({
clampToModel: true
})
}
function deactivate () {
- viewer.measure.deactivate()
+ global.viewer.measure.deactivate()
}
function initViewer () {
- viewer = new global.DC.Viewer('viewer-container', {
+ global.viewer = new global.DC.Viewer('viewer-container', {
contextOptions: {
webgl: {
stencil: true,
@@ -227,6 +226,8 @@
}
}
})
+
+ that.$store.commit('SET_VIEWEREXIST', true)
eagleViewer = new global.DC.Viewer('eagleEyeMap', {
animation: false,
@@ -265,7 +266,7 @@
})
)
- var sceneL = viewer.scene
+ var sceneL = global.viewer.scene
var sceneR = eagleViewer.scene
var handlerL = new global.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneL.canvas)
@@ -289,7 +290,7 @@
var syncviewer = function () {
if (isLeftTrigger) {
- const position = global.DC.Transform.transformCartesianToWGS84(viewer.camera.position)
+ const position = global.DC.Transform.transformCartesianToWGS84(global.viewer.camera.position)
eagleViewer.camera.flyTo({
@@ -297,11 +298,11 @@
orientation: {
- heading: viewer.camera.heading,
+ heading: global.viewer.camera.heading,
- pitch: viewer.camera.pitch,
+ pitch: global.viewer.camera.pitch,
- roll: viewer.camera.roll
+ roll: global.viewer.camera.roll
},
@@ -311,13 +312,13 @@
}
}
- viewer.camera.changed.addEventListener(syncviewer)
+ global.viewer.camera.changed.addEventListener(syncviewer)
- viewer.scene.preRender.addEventListener(syncviewer)
+ global.viewer.scene.preRender.addEventListener(syncviewer)
var synceagleViewer = function () {
if (isRightTrigger && that.samllMapFlag) {
- viewer.camera.flyTo({
+ global.viewer.camera.flyTo({
destination: eagleViewer.camera.position,
@@ -356,23 +357,23 @@
eagleViewer.scene.preRender.addEventListener(synceagleViewer)
- // viewer.camera.percentageChanged = 0.01
+ // global.viewer.camera.percentageChanged = 0.01
// eagleViewer.camera.percentageChanged = 0.01
- // viewer.camera.changed.addEventListener((e) => {
+ // global.viewer.camera.changed.addEventListener((e) => {
// eagleViewer.camera.flyTo({
- // destination: viewer.camera.position,
+ // destination: global.viewer.camera.position,
// orientation: {
- // heading: viewer.camera.heading + 5000,
- // pitch: viewer.camera.pitch,
- // roll: viewer.camera.roll
+ // heading: global.viewer.camera.heading + 5000,
+ // pitch: global.viewer.camera.pitch,
+ // roll: global.viewer.camera.roll
// },
// duration: 0.0
// })
// })
// eagleViewer.camera.changed.addEventListener((e) => {
- // viewer.camera.flyTo({
+ // global.viewer.camera.flyTo({
// destination: eagleViewer.camera.position,
// orientation: {
// heading: eagleViewer.camera.heading - 5000,
@@ -383,11 +384,9 @@
// })
// })
- that.createdLayers(viewer)
+ that.createdLayers()
- that.$store.commit('SET_VIEWER', viewer)
-
- that.$refs.leftNav.initialize(viewer)
+ that.$refs.leftNav.initialize()
// const key = '0f7c1d161d7352116a21aacf0e9f44c1'
// const vec = global.DC.ImageryLayerFactory.createTdtImageryLayer({
@@ -397,11 +396,11 @@
// key,
// style: 'cva'
// })
- // viewer.addBaseLayer([vec, cva])
+ // global.viewer.addBaseLayer([vec, cva])
// const areaLayer = new global.DC.VectorLayer('areaLayer')
- // viewer.addLayer(areaLayer)
+ // global.viewer.addLayer(areaLayer)
// axios.get('http://59.55.128.156:6080/arcgis/rest/services/xiajiangfhgc/MapServer/4/query?where=1%3D1&text=&objectIds=&time=&geometry=&geometryType=esriGeometryEnvelope&inSR=&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&returnTrueCurves=false&resultOffset=&resultRecordCount=&f=pjson').then(resultData => {
// resultData.data.features.forEach(item => {
@@ -428,7 +427,7 @@
// color: undefined
// }
- // viewer.on(global.DC.MouseEventType.MOUSE_MOVE, e => {
+ // global.viewer.on(global.DC.MouseEventType.MOUSE_MOVE, e => {
// if (e.overlay != undefined) {
// if (select.overlay != undefined) {
// if (e.overlay != select.overlay) {
@@ -463,18 +462,18 @@
// }
// })
- // viewer.on(global.DC.MouseEventType.CLICK, e => {
+ // global.viewer.on(global.DC.MouseEventType.CLICK, e => {
// if (e.overlay != undefined) {
// console.log(e.overlay.attr)
// }
// })
- // viewer.addBaseLayer(baselayer, {
+ // global.viewer.addBaseLayer(baselayer, {
// iconUrl: 'examples/images/icon/img.png',
// name: '影像'
// })
- // viewer.addBaseLayer(wmtslayer, {
+ // global.viewer.addBaseLayer(wmtslayer, {
// iconUrl: 'examples/images/icon/img.png',
// name: '影像'
// })
@@ -484,7 +483,7 @@
// url:
// 'http://services.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer'
// })
- // viewer.addBaseLayer(baselayer_shaded, {
+ // global.viewer.addBaseLayer(baselayer_shaded, {
// iconUrl: 'examples/images/icon/elec.png',
// name: '电子'
// })
@@ -494,7 +493,7 @@
// url:
// 'http://services.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer'
// })
- // viewer.addBaseLayer(baselayer_street, {
+ // global.viewer.addBaseLayer(baselayer_street, {
// iconUrl: 'examples/images/icon/ter.png',
// name: '地形'
// })
@@ -504,29 +503,29 @@
// url:
// 'http://services.arcgisonline.com/arcgis/rest/services/World_Terrain_Base/MapServer'
// })
- // viewer.addBaseLayer(baselayer_ter, {
+ // global.viewer.addBaseLayer(baselayer_ter, {
// iconUrl: 'examples/images/icon/ter.png',
// name: '地形'
// })
- viewer.use(new global.DC.Measure())
+ global.viewer.use(new global.DC.Measure())
- // viewer.flyToPosition(
+ // global.viewer.flyToPosition(
// new global.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)
// )
- viewer.compass.enable = true
- viewer.zoomController.enable = true
- viewer.locationBar.enable = true
+ global.viewer.compass.enable = true
+ global.viewer.zoomController.enable = true
+ global.viewer.locationBar.enable = true
// DC的鹰眼地图
- // viewer.hawkeyeMap.enable = true
- // viewer.hawkeyeMap.addBaseLayer(
+ // global.viewer.hawkeyeMap.enable = true
+ // global.viewer.hawkeyeMap.addBaseLayer(
// global.DC.ImageryLayerFactory.createAmapImageryLayer({
// crs: 'WGS84'
// })
// )
- // viewer.distanceLegend.enable = true
+ // global.viewer.distanceLegend.enable = true
}
global.DC.ready(initViewer)
@@ -537,9 +536,9 @@
this.$refs.campusBuildingSearch.shortcutShow(e)
},
- createdLayers (viewer) {
+ createdLayers () {
const layerGroup = new global.DC.LayerGroup('modelBox')
- viewer.addLayerGroup(layerGroup)
+ global.viewer.addLayerGroup(layerGroup)
this.areaLayer = new global.DC.VectorLayer('areaLayer')
layerGroup.addLayer(this.areaLayer)
--
Gitblit v1.9.3