From 5dc1eb8074f52b2fdc03216b62ae4e2d82acbe0f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 03 Nov 2025 08:45:21 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v7.0/7.0.4' into 图层管理
---
src/views/layerManagement/components/utils.js | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/views/layerManagement/components/utils.js b/src/views/layerManagement/components/utils.js
index fbcb033..65ee603 100644
--- a/src/views/layerManagement/components/utils.js
+++ b/src/views/layerManagement/components/utils.js
@@ -14,6 +14,8 @@
*/
export class DrawPolygon {
constructor() {
+ // 是否绘制
+ this.whetherToDraw =false
// 图斑预览模式标记
this.isPureSpotPreview = false
// 是否删除测区
@@ -61,6 +63,7 @@
this.delPoint = this.delPoint.bind(this)
// 外部订阅者
this.listeners = []
+
}
// 实体命名常量
@@ -96,6 +99,10 @@
editThePatch(data) {
this.isPreviewMode = data
}
+ // 绘制
+ drawTheArea(data){
+ this.whetherToDraw = data
+ }
// 删除测区
deleteTheArea(data) {
this.isDeleteTheArea = data
@@ -103,6 +110,12 @@
// 开始绘制
startDrawing() {
+ if (!this.whetherToDraw) {
+
+ return;
+ }
+
+
this.drawingMode = true
this.curPolygon = new Cesium.PolygonHierarchy()
@@ -277,7 +290,7 @@
// 编辑模式下，拖拽点实时更新
if (this.editingMode && this.draggedEntity?.customData) {
this.draggedEntity.position = cartesian
- this.curPolygon.positions[this.draggedEntity?.customData.ind] = cartesian
+ this.curPolygon.positions[this.draggedEntity?.customData.ind] = cartesian
}
// 绘制模式下，实时更新最后一个点
@@ -308,23 +321,25 @@
// 鼠标左键点击
handleLeftClick(click) {
this.removeMenuPopup()
-
const pickedAllEntity = this.viewer.scene.drillPick(click.position).filter(i => i.id)
-
const isPolygonPoint = pickedAllEntity.find(i => i.id.name === DrawPolygon.ENTITY_NAMES.POINT)
const isPolygon = pickedAllEntity.find(i => i.id.name === DrawPolygon.ENTITY_NAMES.POLYGON)
-
-
-
+ if (this.drawingMode && !this.whetherToDraw) {
+
+ return; // 阻断后续绘制逻辑
+ }
// 如果不是绘制模式
if (!this.drawingMode) {
if (!isPolygon) {
+
+
this.editingMode = false
this.editPolygonPointDataSource.entities.show = false
return
}
if (isPolygon) {
+
this.editingMode = true
this.editPolygonPointDataSource.entities.show = true
}
@@ -544,16 +559,19 @@
// 初始化已有多边形
initPolygon(viewer, positions, isPurePreview = false) {
this.initHandler(viewer)
- this.isPureSpotPreview = isPurePreview
- this.startDrawing()
+
+ if (this.whetherToDraw) {
+ this.startDrawing();
+ } else {
+ // 新增：不允许绘制时，确保绘制模式为 false，避免误触发
+ this.drawingMode = false;
+
+ }
let newPosition = positions.map(item => {
return Cesium.Cartesian3.fromDegrees(Number(item.lng), Number(item.lat), Number(item.height))
})
- // 预览航线的时候调用
- if (!this.isPureSpotPreview) {
- this.notify('getPolygonPositions', newPosition)
- }
+
newPosition.forEach(item => {
this.addPosition(item, false)
@@ -577,7 +595,10 @@
// 初始化事件处理器
initHandler(viewer) {
this.viewer = viewer
- this.startDrawing()
+
+ if(this.whetherToDraw){
+ this.startDrawing()
+ }
if (!this.handler) {
this.handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas)
--
Gitblit v1.9.3