From 464e77f3676271b53593131b1163b488e3ebcd39 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 14 Jan 2025 20:27:50 +0800
Subject: [PATCH] 园区范围更新
---
src/pages/map/components/scomponents/layersControl.vue | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index f515d9e..d1e5443 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/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-12-27 14:45:27
+ * @LastEditTime: 2025-01-14 20:24:37
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -73,7 +73,7 @@
import { getList, getGouQu, updateSpace } from "@/api/space/space"
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
-import yqfw from "@/assets/json/yqfw"
+import yqfw from "@/assets/json/shape"
// import gsgw from "@/assets/json/gsgw"
// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
@@ -120,9 +120,30 @@
url: '/3Dtile/lcmx/tile_01/tileset.json',
label: 'tile_01'
},
+
{
- url: '/3Dtile/lcmx/tile_02/tileset.json',
- label: 'tile_02'
+ url: '/3Dtile/lcmx/tile_03/tileset.json',
+ label: 'tile_03'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_04/tileset.json',
+ label: 'tile_04'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_05/tileset.json',
+ label: 'tile_05'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_06/tileset.json',
+ label: 'tile_06'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_07/tileset.json',
+ label: 'tile_07'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_08/tileset.json',
+ label: 'tile_08'
},
],
layerName: 'hgyq'
@@ -768,8 +789,11 @@
if (item.incident) incident = item.incident
divIcon.on(DC.MouseEventType.CLICK, (e) => {
- moveEntity = e
- return
+ if (mapStore.editPoint) {
+ moveEntity = e
+ return
+ }
+
incident(e)
})
@@ -784,11 +808,9 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- console.log(item.source.geometries, 906666)
-
- item.source.geometries.forEach(i => {
+ item.source.features.forEach(i => {
let wall = new DC.Wall(
- i.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
+ i.geometry.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
)
wall.setStyle({
@@ -982,7 +1004,8 @@
const viewerMouseMove = (e) => {
if (mapStore.editPoint) {
if (moveEntity != null) {
- if (e.wgs84Position) {
+
+ if (e.wgs84Position && e.wgs84Position.alt > 0) {
moveEntity.overlay.position = new DC.Position(e.wgs84Position.lng, e.wgs84Position.lat, e.wgs84Position.alt)
} else {
moveEntity.overlay.position = new DC.Position(e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat, e.wgs84SurfacePosition.alt)
@@ -1003,8 +1026,9 @@
let lng, lat, ele
const { attrParams } = moveEntity.overlay
+ console.log(e, 2222)
- if (e.wgs84Position) {
+ if (e.wgs84Position && e.wgs84Position.alt > 0) {
lng = e.wgs84Position.lng
lat = e.wgs84Position.lat
ele = e.wgs84Position.alt
--
Gitblit v1.9.3