From 93a730e178c17e2f32cc41d2f619de9c74391501 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Nov 2024 09:38:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
public/images/pro-bg.png | 0
src/assets/images/login-bg.png | 0
src/pages/layout/components/scomponents/layersControl.vue | 134 +++++++++++++++++++++++++++-----------------
src/pages/layout/components/scomponents/baseMap.vue | 6 +-
src/hooks/initMap.js | 10 +-
vite.config.js | 9 ++
6 files changed, 99 insertions(+), 60 deletions(-)
diff --git a/public/images/pro-bg.png b/public/images/pro-bg.png
index f446224..650f46a 100644
--- a/public/images/pro-bg.png
+++ b/public/images/pro-bg.png
Binary files differ
diff --git a/src/assets/images/login-bg.png b/src/assets/images/login-bg.png
index 23760dc..34d5ae7 100644
--- a/src/assets/images/login-bg.png
+++ b/src/assets/images/login-bg.png
Binary files differ
diff --git a/src/hooks/initMap.js b/src/hooks/initMap.js
index b0ee407..aea487c 100644
--- a/src/hooks/initMap.js
+++ b/src/hooks/initMap.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 15:09:55
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-22 14:54:14
+ * @LastEditTime: 2024-11-23 21:44:24
* @FilePath: \bigScreen\src\hooks\initMap.js
* @Description:
*
@@ -33,11 +33,11 @@
window.$viewer.locationBar.enable = true
window.$viewer.zoomToPosition(new DC.Position(
- 115.1048036679409,
- 27.276835758787513,
- 4000,
+ 115.1021,
+ 27.2360,
+ 5000,
0,
- -90,
+ -45,
0
), () => {
store.setLoadMap(true)
diff --git a/src/pages/layout/components/scomponents/baseMap.vue b/src/pages/layout/components/scomponents/baseMap.vue
index c430c55..13e0f57 100644
--- a/src/pages/layout/components/scomponents/baseMap.vue
+++ b/src/pages/layout/components/scomponents/baseMap.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-28 11:44:45
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-20 17:24:02
+ * @LastEditTime: 2024-11-24 00:12:05
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\baseMap.vue
* @Description:
*
@@ -211,8 +211,8 @@
mode: '3',
name: '高德影像',
layers: [
- { key: 'imageryProvider_ammap', layer: imageryProvider_ammap },
{ key: 'imageryProvider_ammapBz', layer: imageryProvider_ammapBz },
+ { key: 'imageryProvider_ammap', layer: imageryProvider_ammap },
]
}
]
@@ -276,7 +276,7 @@
curMode.value = mode
}
-loadLAYER(1, 1)
+loadLAYER(3, 3)
const showTerrainFlag = ref(true)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 9ab5d49..eb9270a 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-31 10:47:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-23 17:09:04
+ * @LastEditTime: 2024-11-24 03:30:37
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -79,8 +79,6 @@
const treeRef = ref(null)
const Cesium = DC.getLib('Cesium')
-console.log(Cesium, 45646465)
-
const treeProps = {
indent: 16,
showLabelLine: true,
@@ -102,9 +100,29 @@
type: 'layer',
subType: '3Dtile',
urlData: [
+ // {
+ // url: VITE_APP_BASE + 'mx/tileset.json',
+ // label: 'tile_01'
+ // },
{
- url: VITE_APP_BASE + 'mx/tile_01/Data/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
label: 'tile_01'
+ },
+ {
+ url: VITE_APP_BASE + 'newMx/mx/tile_02/tileset.json',
+ label: 'tile_02'
+ },
+ {
+ url: VITE_APP_BASE + 'newMx/mx/tile_03/tileset.json',
+ label: 'tile_03'
+ },
+ {
+ url: VITE_APP_BASE + 'newMx/mx/tile_04/tileset.json',
+ label: 'tile_04'
+ },
+ {
+ url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
+ label: 'tile_05'
}
],
layerName: 'hgyq'
@@ -153,7 +171,7 @@
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
+ <div>${attrParams.fullName}</div>
<img src="${attrParams.imageUrl}" />
</div>`
let divIcon = new DC.DivIcon(
@@ -571,6 +589,8 @@
},
]
+console.log(data, 12112213213)
+
const defaultProps = {
children: 'children',
label: 'label',
@@ -613,9 +633,9 @@
}
}
-window.addTileLayers = {}
-window.tileLayers = new DC.TilesetLayer('tileLayers')
-window.$viewer.addLayer(window.tileLayers)
+let addTileLayers = {}
+let tileLayers = new DC.TilesetLayer('tileLayers')
+window.$viewer.addLayer(tileLayers)
const handleCheckChange = (data) => {
let options = treeRef.value?.getCheckedNodes()
@@ -627,8 +647,8 @@
// const Cesium = DC
if (item.subType == '3Dtile') {
- if (!window.addTileLayers[item.layerName]) {
- // window.addTileLayers[item.layerName] = []
+ if (!addTileLayers[item.layerName]) {
+ // addTileLayers[item.layerName] = []
// let tile = window.$viewer.delegate.scene.primitives.add(new Cesium.Cesium3DTileset({
// url: '/zhyq/mx/tile_01/tileset.json',
// }))
@@ -640,27 +660,28 @@
// })
-
-
- window.addTileLayers[item.layerName] = item.urlData.map(i => {
- let tile = new DC.Tileset(i.url, {
- maximumMemoryUsage: 256,
- maximumScreenSpaceError: 4,
- skipLevels: 5,
+ addTileLayers[item.layerName] = item.urlData.map(m => {
+ let tile = new DC.Tileset(m.url, {
+ maximumMemoryUsage: 512,
+ maximumScreenSpaceError: 8,
+ skipLevels: 6,
skipLevelOfDetail: true,
- skipScreenSpaceErrorFactor: 128
+ skipScreenSpaceErrorFactor: 256,
+ progressiveResolutionHeightFraction: 0.5,
+ baseScreenSpaceError: 1024
})
- window.tileLayers.addOverlay(tile)
- return tile
+ tileLayers.addOverlay(tile)
+
+ return tile
})
} else {
- window.addTileLayers[item.layerName].forEach(i => i.show = true)
+ addTileLayers[item.layerName].forEach(m => m.show = true)
}
} else if (item.subType == 'labelPoint') {
- if (!window.addTileLayers[item.layerName]) {
- window.addTileLayers[item.layerName] = new DC.HtmlLayer(item.layerName)
- window.$viewer.addLayer(window.addTileLayers[item.layerName])
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.HtmlLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
item.method(item.params).then(res => {
let data = res.data.data.records
@@ -699,16 +720,16 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
- window.addTileLayers[item.layerName].addOverlay(divIcon)
+ addTileLayers[item.layerName].addOverlay(divIcon)
})
})
} else {
- window.addTileLayers[item.layerName].show = true
+ addTileLayers[item.layerName].show = true
}
} else if (item.subType == 'geojsonWall') {
- if (!window.addTileLayers[item.layerName]) {
- window.addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
- window.$viewer.addLayer(window.addTileLayers[item.layerName])
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
item.source.features.forEach(i => {
let wall = new DC.Wall(
@@ -721,18 +742,15 @@
speed: 8
})
})
- window.addTileLayers[item.layerName].addOverlay(wall)
+ addTileLayers[item.layerName].addOverlay(wall)
})
} else {
- window.addTileLayers[item.layerName].show = true
+ addTileLayers[item.layerName].show = true
}
- // 飞到园区范围
- window.$viewer.flyTo(addTileLayers[item.layerName])
- // console.log('flyToyqfw********2222222222*******************************', addTileLayers[item.layerName])
} else if (item.subType == 'geojsonPipe') {
- if (!window.addTileLayers[item.layerName]) {
- window.addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
- window.$viewer.addLayer(window.addTileLayers[item.layerName])
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
function computeCircle(radius) {
var positions = []
@@ -755,22 +773,22 @@
polylineVolume.setStyle({
material: item.color
})
- window.addTileLayers[item.layerName].addOverlay(polylineVolume)
+ addTileLayers[item.layerName].addOverlay(polylineVolume)
})
} else {
- window.addTileLayers[item.layerName].show = true
+ addTileLayers[item.layerName].show = true
}
}
} else {
- if (window.addTileLayers[item.layerName]) {
+ if (addTileLayers[item.layerName]) {
if (item.subType == '3Dtile') {
- window.addTileLayers[item.layerName].forEach(i => i.show = false)
+ addTileLayers[item.layerName].forEach(m => m.show = false)
} else if (item.subType == 'labelPoint') {
- window.addTileLayers[item.layerName].show = false
+ addTileLayers[item.layerName].show = false
} else if (item.subType == 'geojsonWall') {
- window.addTileLayers[item.layerName].show = false
+ addTileLayers[item.layerName].show = false
} else if (item.subType == 'geojsonPipe') {
- window.addTileLayers[item.layerName].show = false
+ addTileLayers[item.layerName].show = false
}
}
}
@@ -826,8 +844,15 @@
// 飞到园区范围
const flyToyqfw = () => {
- // console.log('flyToyqfw***************************************', addTileLayers['yqfw'])
- window.$viewer.flyTo(addTileLayers['yqfw'])
+ window.$viewer.zoomToPosition(new DC.Position(
+ 115.1021,
+ 27.2360,
+ 5000,
+ 0,
+ -45,
+ 0
+ ), () => {
+ })
}
EventBus.on('restHandleCheckChange', restHandleCheckChange)
@@ -835,7 +860,9 @@
EventBus.on('flyToyqfw', flyToyqfw)
onMounted(() => {
- handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
+ setTimeout(() => {
+ handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
+ }, 2000)
})
// const sharedData = computed(() => pointStore.sharedData);
@@ -852,17 +879,22 @@
}
onUnmounted(() => {
- window.tileLayers && window.$viewer.removeLayer(window.tileLayers)
- delete window.tileLayers
- let arr = Object.keys(window.addTileLayers)
+ if (tileLayers) {
+ tileLayers.clear()
+ window.$viewer.removeLayer(tileLayers)
+ tileLayers = null
+ }
+
+ let arr = Object.keys(addTileLayers)
arr.filter(i => i != 'hgyq').forEach(i => {
- addTileLwindow.addTileLayersayers[i] && window.$viewer.removeLayer(window.addTileLayers[i])
+ addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
})
// 弹窗销毁
destroy()
EventBus.off('restHandleCheckChange', restHandleCheckChange)
EventBus.off('restHandleDelChange', restHandleDelChange)
+ EventBus.off('flyToyqfw', flyToyqfw)
})
</script>
diff --git a/vite.config.js b/vite.config.js
index ee27ecf..aae870f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-25 10:56:27
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-13 19:15:01
+ * @LastEditTime: 2024-11-24 03:04:27
* @FilePath: \bigScreen\vite.config.js
* @Description:
*
@@ -99,6 +99,13 @@
rewrite: path => path.replace(/^\/panorama/, ''),
},
+ '/zhyq/newMx': {
+ // target: 'http://localhost',
+ target: 'https://wrj.shuixiongit.com/zhyq/newMx',
+ changeOrigin: true,
+ rewrite: path => path.replace(/^\/zhyq\/newMx/, ''),
+ },
+
'/zhyq/mx': {
// target: 'http://localhost',
target: 'https://wrj.shuixiongit.com/zhyq/mx',
--
Gitblit v1.9.3