From 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Dec 2021 13:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/index.vue | 104 ++++++++++++++++++++++-----------------------------
1 files changed, 45 insertions(+), 59 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f313c22..416e290 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -140,15 +140,15 @@
name: '影像'
})
- // eslint-disable-next-line camelcase
- const baselayer_shaded = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
- url:
- 'http://services.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer'
- })
- viewer.addBaseLayer(baselayer_shaded, {
- iconUrl: 'examples/images/icon/elec.png',
- name: '电子'
- })
+ // // eslint-disable-next-line camelcase
+ // const baselayer_shaded = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+ // url:
+ // 'http://services.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer'
+ // })
+ // viewer.addBaseLayer(baselayer_shaded, {
+ // iconUrl: 'examples/images/icon/elec.png',
+ // name: '电子'
+ // })
// // eslint-disable-next-line camelcase
// const baselayer_street = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
@@ -170,56 +170,45 @@
// name: '地形'
// })
- // const tilesetLayer = new that.DC.TilesetLayer('tilesetLayer')
- // viewer.addLayer(tilesetLayer)
- // const tileset = new that.DC.Tileset(
- // 'http://resource.dvgis.cn/data/3dtiles/ljz/tileset.json'
- // )
- // const style = new that.DC.TilesetStyle()
- // style.color = {
- // conditions: [
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 300', 'rgba(45, 0, 75, 0.5)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 200', 'rgb(102, 71, 151)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 100', 'rgb(170, 162, 204)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 50', 'rgb(224, 226, 238)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 25', 'rgb(252, 230, 200)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 10', 'rgb(248, 176, 87)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['${Height} >= 5', 'rgb(198, 106, 11)'],
- // // eslint-disable-next-line no-template-curly-in-string
- // ['true', 'rgb(127, 59, 8)']
- // ]
- // }
- // tileset.setStyle(style)
- // tilesetLayer.addOverlay(tileset)
- // viewer.flyTo(tileset)
- // tileset.on(that.DC.MouseEventType.CLICK, e => {
- // // that.popupFlag = true
+ const tilesetLayer = new that.DC.TilesetLayer('tilesetLayer')
+ viewer.addLayer(tilesetLayer)
+ const tileset = new that.DC.Tileset(
+ 'http://data.mars3d.cn/3dtiles/max-shihua/tileset.json',
+ {
+ luminanceAtZenith: 0.5
+ }
+ )
+ tilesetLayer.addOverlay(tileset)
+ viewer.flyTo(tileset)
+ tileset.on(that.DC.MouseEventType.CLICK, e => {
+ viewer.scene.globe.depthTestAgainstTerrain = false
- // viewer.scene.globe.depthTestAgainstTerrain = false
+ that.$store.commit('CLEAR_ALL', null)
- // // 定制化窗体
- // // eslint-disable-next-line no-unused-vars
- // var popup = new that.DC.DivForms(that.viewer, {
- // domId: 'divFormsDomBox',
- // position: [
- // e.position
- // ]
- // })
+ var imgArr = ['http://223.82.109.183:2081/zhxy/upload/20211222/f66dc4527eb4cc1b2d33fa3a5b345ed0.jpg']
- // that.$store.commit('SET_PANORAMAPOPUP', false)
- // that.$store.commit('SET_DETAILSPOPUP', true)
- // })
+ 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.name)
+ that.$store.commit('SET_SITENAME', e.overlay.attr['地址'])
+ that.$store.commit('SET_POPUPIMGATLAS', imgArr)
+
+ // 定制化窗体
+ // eslint-disable-next-line no-unused-vars
+ var popup = new that.DC.DivForms(viewer, {
+ domId: 'divFormsDomBox',
+ position: [
+ that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)))
+ ]
+ })
+
+ that.$store.commit('SET_DETAILSPOPUP', true)
+ that.$store.commit('SET_PANORAMAPOPUP', false)
+ })
const wallLayer = new that.DC.VectorLayer('wallLayer')
viewer.addLayer(wallLayer)
-
var arr = [
[115.87597219, 28.74628526, 100],
[115.87556558, 28.74415792, 100],
@@ -234,13 +223,10 @@
[115.86609240, 28.74642593, 100],
[115.87597219, 28.74628526, 100]
]
-
arr.forEach(item => {
item = item.join(',')
})
-
arr = arr.join(';')
-
const wall = new that.DC.Wall(
arr
)
@@ -254,10 +240,10 @@
viewer.use(new that.DC.Measure())
- viewer.flyTo(wallLayer)
+ // viewer.flyTo(wallLayer)
- // viewer.zoomToPosition(
- // new that.DC.Position(115.87186406, 28.74449337, 1200, 0, -90)
+ // viewer.flyToPosition(
+ // new that.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)
// )
viewer.compass.enable = true
--
Gitblit v1.9.3