From d83e909825b96eb1863e15daec9e335a10be8aa6 Mon Sep 17 00:00:00 2001 From: sd <1504629600@qq.com> Date: Tue, 10 Feb 2026 16:46:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 12 +++---- ruoyi-ui/src/views/cesiumMap/index.vue | 37 ++++++++++------------ 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index c40f2aa..0e75200 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,14 +8,14 @@ spring: master: url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: A20040303ctw! + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: false - url: - username: - password: + url: + username: + password: # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -39,7 +39,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true @@ -58,4 +58,4 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index c714722..5802ace 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -492,7 +492,7 @@ export default { }, false), width: 3, material: Cesium.Color.fromCssColorString('#800080'), - clampToGround: true + arcType: Cesium.ArcType.NONE } }); } @@ -700,7 +700,7 @@ export default { positions: linePositions, width: 3, material: Cesium.Color.fromCssColorString('#008aff'), - clampToGround: true, + arcType: Cesium.ArcType.NONE, disableDepthTestDistance: Number.POSITIVE_INFINITY } }); @@ -1110,7 +1110,7 @@ export default { finalPathPositions.push(exit); this.viewer.entities.add({ id: `hold-line-${routeId}-${i}`, - polyline: { positions: [entry, ...arcPoints.slice(1), exit], width: 8, material: Cesium.Color.ORANGE, clampToGround: true, zIndex: 20 }, + polyline: { positions: [entry, ...arcPoints.slice(1), exit], width: 8, material: Cesium.Color.ORANGE, arcType: Cesium.ArcType.NONE, zIndex: 20 }, properties: { routeId: routeId } }); lastPos = exit; @@ -1127,7 +1127,7 @@ export default { const arcPoints = this.computeArcPositions(lastPos, currPos, nextLogical, radius); this.viewer.entities.add({ id: `arc-line-${routeId}-${i}`, - polyline: { positions: arcPoints, width: lineWidth, material: lineMaterial, clampToGround: true, zIndex: 20 }, + polyline: { positions: arcPoints, width: lineWidth, material: lineMaterial, arcType: Cesium.ArcType.NONE, zIndex: 20 }, properties: { routeId: routeId } }); // 转弯半径两侧航点与航线整体航点风格一致，点击均打开原航点编辑（dbId 为当前 wp.id） @@ -1178,7 +1178,7 @@ export default { positions: finalPathPositions, width: lineWidth, material: lineMaterial, - clampToGround: true, + arcType: Cesium.ArcType.NONE, zIndex: 1 }, properties: {isMissionRouteLine: true, routeId: routeId} @@ -1735,7 +1735,7 @@ export default { console.log('Cesium离线二维地图已加载') // 1. 定义全局拾取处理器（含防抖，避免双击误触导致相机高度剧烈变化） - this.viewer.scene.postProcessStages.fxaa.enabled = true +this.viewer.scene.postProcessStages.fxaa.enabled = true this.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas); this.handler.setInputAction((click) => { // 隐藏右键菜单 @@ -2506,7 +2506,7 @@ export default { positions: this.drawingPoints, width: this.defaultStyles.line.width, material: Cesium.Color.fromCssColorString(this.defaultStyles.line.color), - clampToGround: true + arcType: Cesium.ArcType.NONE } }); } @@ -2524,7 +2524,7 @@ export default { color: Cesium.Color.fromCssColorString(this.defaultStyles.line.color), dashLength: 16 }), - clampToGround: true + arcType: Cesium.ArcType.NONE } }); } @@ -2707,9 +2707,7 @@ export default { } return Cesium.Rectangle.fromDegrees(0, 0, 0, 0); }, false), - // 设置填充颜色 - material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity), - clampToGround: true // 贴地 + material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity) }, // 边框部分 polyline: { @@ -2788,8 +2786,7 @@ export default { // 填充部分 rectangle: { coordinates: rect, - material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity), - clampToGround: true + material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity) }, // 边框部分 polyline: { @@ -3717,7 +3714,7 @@ export default { positions: positions, width: this.defaultStyles.line.width, material: Cesium.Color.fromCssColorString(this.defaultStyles.line.color), - clampToGround: true + arcType: Cesium.ArcType.NONE } }) const entityData = { @@ -3751,9 +3748,7 @@ export default { // 填充部分 polygon: { hierarchy: new Cesium.PolygonHierarchy(polygonPositions), - // 初始无填充 - material: Cesium.Color.TRANSPARENT, - clampToGround: true + material: Cesium.Color.TRANSPARENT }, // 边框部分 polyline: { @@ -4483,7 +4478,7 @@ export default { positions: linePositions, width: 3, material: Cesium.Color.fromCssColorString(color), - clampToGround: true + arcType: Cesium.ArcType.NONE }, label: { text: entityData.label || '线', @@ -4886,7 +4881,7 @@ export default { positions: newPositions, width: selectedLineEntity.width, material: Cesium.Color.fromCssColorString(selectedLineEntity.color), - clampToGround: true + arcType: Cesium.ArcType.NONE } }) // 更新线实体的引用和位置数组 @@ -5093,13 +5088,13 @@ export default { semiMinorAxis: radiusInMeters, semiMajorAxis: radiusInMeters, material: Cesium.Color.RED.withAlpha(0), - clampToGround: true + arcType: Cesium.ArcType.NONE }, polyline: { positions: circlePositions, width: 2, material: Cesium.Color.RED, - clampToGround: true + arcType: Cesium.ArcType.NONE } });