From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/components/map/components/dimension.vue | 219 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 132 insertions(+), 87 deletions(-)
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 9c443d4..3f97207 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -3,8 +3,8 @@
<el-radio-group v-model="dimensionValue"
size="medium"
@change="dimensionChange">
- <el-radio-button label="2.5维"></el-radio-button>
- <el-radio-button label="3 维"></el-radio-button>
+ <el-radio-button label="三 维"></el-radio-button>
+ <el-radio-button label="真三维"></el-radio-button>
</el-radio-group>
</div>
</template>
@@ -13,13 +13,14 @@
import axios from 'axios'
import { mapGetters } from 'vuex'
+import { getDetail } from '@/api/pc/public/arc'
export default {
name: 'dimension',
data () {
return {
DC: null,
- dimensionValue: '2.5维',
+ dimensionValue: '三 维',
// 建筑2.5D地图
newLayer: null,
baseLayer: null,
@@ -35,39 +36,34 @@
titlesetLayerFlag: false,
silhouetteBlue: null,
wallArr: [
- [116.41526036, 27.95352217, 100],
- [116.41128018, 27.95789328, 100],
- [116.40246486, 27.96397110, 100],
- [116.39728537, 27.96779573, 100],
- [116.39588026, 27.96862679, 100],
- [116.38903705, 27.97029865, 100],
- [116.38872398, 27.97051829, 100],
- [116.38892229, 27.97090120, 100],
- [116.38906721, 27.97190632, 100],
- [116.38706808, 27.97195638, 100],
- [116.38649076, 27.97114448, 100],
- [116.38214070, 27.97312735, 100],
- [116.37876213, 27.97582549, 100],
- [116.37851310, 27.97664153, 100],
- [116.37634915, 27.98039526, 100],
- [116.37439220, 27.98131916, 100],
- [116.36995935, 27.97936074, 100],
- [116.37217247, 27.97498147, 100],
- [116.35099819, 27.97539586, 100],
- [116.35103749, 27.98088050, 100],
- [116.33972460, 27.97987911, 100],
- [116.33950071, 27.97372028, 100],
- [116.32313266, 27.97004136, 100],
- [116.32606743, 27.95863979, 100],
- [116.34788837, 27.92538024, 100],
- [116.34566310, 27.92338627, 100],
- [116.34874490, 27.91718915, 100],
- [116.35311999, 27.91804451, 100],
- [116.35109257, 27.92284807, 100],
- [116.35975153, 27.92900526, 100],
- [116.35660704, 27.93816236, 100],
- [116.39585177, 27.93945304, 100],
- [116.41526036, 27.95352217, 100]
+ [114.04006133, 27.62803800, 100],
+ [114.04020623, 27.62809403, 100],
+ [114.04025389, 27.62819931, 100],
+ [114.04032823, 27.62827743, 100],
+ [114.04108710, 27.62918798, 100],
+ [114.04001425, 27.62986815, 100],
+ [114.04001615, 27.62986817, 100],
+ [114.03992451, 27.62998379, 100],
+ [114.03967878, 27.62999684, 100],
+ [114.03940001, 27.63008698, 100],
+ [114.03951075, 27.63047135, 100],
+ [114.03946107, 27.63056152, 100],
+ [114.03927571, 27.63072325, 100],
+ [114.03871751, 27.63128845, 100],
+ [114.03872079, 27.63135594, 100],
+ [114.03869211, 27.63139169, 100],
+ [114.03960653, 27.63200726, 100],
+ [114.03945732, 27.63215207, 100],
+ [114.03760837, 27.63092563, 100],
+ [114.03770336, 27.63078037, 100],
+ [114.03782957, 27.63072932, 100],
+ [114.03787347, 27.63068209, 100],
+ [114.03824591, 27.62887902, 100],
+ [114.03837943, 27.62891050, 100],
+ [114.03863853, 27.62868839, 100],
+ [114.03905656, 27.62843592, 100],
+ [114.03954722, 27.62819644, 100],
+ [114.04006133, 27.62803800, 100]
]
}
},
@@ -112,6 +108,28 @@
that.silhouetteBlue
])
)
+
+ 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
+ }))
var highlighted = {
feature: undefined,
@@ -207,6 +225,7 @@
var provider = new that.DC.Namespace.Cesium.UrlTemplateImageryProvider({
url: '/wp/{z}/{x}/{y}.png',
fileExtension: 'png'
+ // minimumLevel: 19
})
var baseProvider = new that.DC.Namespace.Cesium.UrlTemplateImageryProvider({
@@ -270,7 +289,7 @@
// })
// }
// })
- // }, 2400)
+ // }, 1000)
that.titlesetLayerFlag = true
that.viewer.camera.setView({
@@ -290,10 +309,10 @@
// 最小
that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200
// 最大
- that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 2400
+ that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 1000
// 设置相机缩小时的速率
- // that.viewer.scene.screenSpaceCameraController._minimumZoomRate = 24000
+ that.viewer.scene.screenSpaceCameraController._minimumZoomRate = 10000
// 设置相机放大时的速率
that.viewer.scene.screenSpaceCameraController._maximumZoomRate = 5906376272000
// 视角平移
@@ -369,36 +388,62 @@
})
that.viewer.on(that.DC.MouseEventType.CLICK, e => {
- if (e.overlay != undefined) {
- that.viewer.scene.globe.depthTestAgainstTerrain = false
+ if (e.overlay != undefined && e.layer.id == 'areaLayer') {
+ var rid = e.overlay.attr['楼栋号'] == '8栋' ? '9栋' : e.overlay.attr['楼栋号'] == '9栋' ? '8栋' : e.overlay.attr['楼栋号']
+ this.$store.commit('CLEAR_ALL', null)
+ getDetail({ mechanismname: '香琴湾' + rid }).then((res) => {
+ that.viewer.scene.globe.depthTestAgainstTerrain = false
+ var result = res.data.data
- that.$store.commit('CLEAR_ALL', null)
+ var imgArr = result.tpurl.split(',')
+ this.$store.commit('SET_POPUPBGURL', imgArr[0])
+ this.$store.commit('SET_POPUPQRURL', result.codeurl)
+ that.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
+ this.$store.commit('SET_STATENAME', result.mechanismname)
+ this.$store.commit('SET_SITENAME', result.address)
+ this.$store.commit('SET_TELEPHONE', result.telephone)
+ this.$store.commit('SET_INTRODUCETEXT', result.introduce)
+ this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
+ this.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ if (result.videourl && result.videourl != '') {
+ this.$store.commit('SET_MONITORURL', result.videourl)
+ }
+ if (result.jx != undefined && result.jx != '') {
+ var tabOne = res.data.data[0].jx.split(',')
+ this.$store.commit('SET_TEACHLIST', tabOne)
+ } else {
+ this.$store.commit('SET_TEACHLIST', [])
+ }
- var imgArr = ['http://223.82.109.183:2081/zhxy/upload/20220105/3c05dd70a9eac17b7e49afbfc7b1b68e.png']
+ if (result.sh != undefined && result.sh != '') {
+ var tabTwo = res.data.data[0].sh.split(',')
+ this.$store.commit('SET_LIVELIST', tabTwo)
+ } else {
+ this.$store.commit('SET_LIVELIST', [])
+ }
- that.$store.commit('SET_POPUPBGURL', imgArr[0])
- that.$store.commit('SET_POPUPQRURL', 'http://223.82.109.183:2081/zhxy/upload/20211222/9c324adea5d9e5b50cd8f874d5f780f4.png')
- that.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
- that.$store.commit('SET_STATENAME', e.overlay.attr['楼栋号'])
- that.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ // 定制化窗体
+ // eslint-disable-next-line no-unused-vars
+ var popup = new that.DC.DivForms(that.viewer, {
+ domId: 'divFormsDomBox',
+ position: [
+ that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt)))
+ ]
+ })
- // 定制化窗体
- // eslint-disable-next-line no-unused-vars
- var popup = new that.DC.DivForms(that.viewer, {
- domId: 'divFormsDomBox',
- position: [
- that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt)))
- ]
+ this.$store.commit('SET_PANORAMAPOPUP', false)
+ this.$store.commit('SET_MONITORPOPUP', false)
+ this.$store.commit('SET_DETAILSPOPUP', true)
})
- this.$store.commit('SET_PANORAMAPOPUP', false)
- this.$store.commit('SET_MONITORPOPUP', false)
- this.$store.commit('SET_DETAILSPOPUP', true)
+ this.viewer.flyToPosition(
+ new this.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), 300, Number(0), Number(-90), Number(0))
+ )
}
})
document.querySelector('.dc-zoom-controller').children[1].onclick = function () {
- if (that.dimensionValue == '3 维') {
+ if (that.dimensionValue == '真三维') {
that.viewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
@@ -434,34 +479,34 @@
dimensionChange () {
var that = this
that.$store.commit('SET_TWOORTHREE', that.dimensionValue)
- if (that.dimensionValue == '3 维') {
+ if (that.dimensionValue == '真三维') {
// that.wallLayer.show = false
that.areaLayer.show = false
that.viewer.imageryLayers.remove(that.newLayer)
that.newLayer = null
// that.viewer.imageryLayers.remove(that.baseLayer)
that.baseLayer = 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.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.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.off(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
@@ -487,10 +532,10 @@
})
} else {
that.tilesetLayer.show = false
- that.viewer.imageryLayers.remove(that.vecLayer)
- that.vecLayer = null
- that.viewer.imageryLayers.remove(that.cvaLayer)
- that.cvaLayer = null
+ // that.viewer.imageryLayers.remove(that.vecLayer)
+ // that.vecLayer = null
+ // that.viewer.imageryLayers.remove(that.cvaLayer)
+ // that.cvaLayer = null
that.areaLayer.show = true
// var provider = new that.DC.Namespace.Cesium.ArcGisMapServerImageryProvider({
@@ -529,7 +574,7 @@
// 最小
that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200
// 最大
- that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 2400
+ that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 1000
// 视角旋转
that.viewer.scene.screenSpaceCameraController.enableTilt = false
}
@@ -561,9 +606,9 @@
}
})
};
- if (height > 2400) {
+ if (height > 1000) {
that.viewer.camera.setView({
- destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 2400),
+ destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 1000),
orientation: {
// 指向
heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
--
Gitblit v1.9.3