diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 037db5c..c40f2aa 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: 123456 + password: A20040303ctw! # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index c674cc9..7b6e554 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -948,15 +948,17 @@ export default { // 关键:使用 CallbackProperty 动态计算半径(半长轴和半短轴) semiMajorAxis: new Cesium.CallbackProperty(() => { if (centerPoint && activeCursorPosition) { - return Cesium.Cartesian3.distance(centerPoint, activeCursorPosition); + const distance = Cesium.Cartesian3.distance(centerPoint, activeCursorPosition); + return Math.max(distance, 1); // 最小半径为1米,避免0值错误 } - return 0; + return 1; }, false), semiMinorAxis: new Cesium.CallbackProperty(() => { if (centerPoint && activeCursorPosition) { - return Cesium.Cartesian3.distance(centerPoint, activeCursorPosition); + const distance = Cesium.Cartesian3.distance(centerPoint, activeCursorPosition); + return Math.max(distance, 1); // 最小半径为1米,避免0值错误 } - return 0; + return 1; }, false), // 样式设置 material: Cesium.Color.fromCssColorString(this.defaultStyles.polygon.color).withAlpha(0.5), @@ -989,7 +991,8 @@ export default { const centerPoint = this.drawingPoints[0]; // 1. 计算最终半径 - const radius = Cesium.Cartesian3.distance(centerPoint, edgePosition); + let radius = Cesium.Cartesian3.distance(centerPoint, edgePosition); + radius = Math.max(radius, 1); // 最小半径为1米,避免0值错误 // 2. 移除动态预览实体 if (this.tempEntity) { @@ -1585,11 +1588,12 @@ export default { case 'circle': // 检查半径是否有效 - const radius = entityData.data.radius || 1000 + let radius = entityData.data.radius || 1000 if (radius <= 0) { this.$message.error('圆形半径必须大于0') return } + radius = Math.max(radius, 1); // 最小半径为1米,避免0值错误 entity = this.viewer.entities.add({ position: Cesium.Cartesian3.fromDegrees(entityData.data.center.lng, entityData.data.center.lat), ellipse: { diff --git a/ruoyi-ui/src/views/childRoom/LeftMenu.vue b/ruoyi-ui/src/views/childRoom/LeftMenu.vue index 60706fe..a70a304 100644 --- a/ruoyi-ui/src/views/childRoom/LeftMenu.vue +++ b/ruoyi-ui/src/views/childRoom/LeftMenu.vue @@ -2,7 +2,7 @@
@@ -12,29 +12,33 @@
- + diff --git a/ruoyi-ui/src/views/dialogs/PageLayoutDialog.vue b/ruoyi-ui/src/views/dialogs/PageLayoutDialog.vue new file mode 100644 index 0000000..0d85718 --- /dev/null +++ b/ruoyi-ui/src/views/dialogs/PageLayoutDialog.vue @@ -0,0 +1,197 @@ + + + + +