不用管

# Conflicts:
#	ruoyi-ui/src/views/cesiumMap/index.vue

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: A20040303ctw!
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-ui/src/api/system/roomPlatformIcon.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+/** 按房间ID查询该房间下所有地图平台图标 */
+export function listByRoomId(roomId) {
+  return request({
+    url: '/system/roomPlatformIcon/list',
+    method: 'get',
+    params: { roomId }
+  })
+}
+
+/** 新增房间地图平台图标 */
+export function addRoomPlatformIcon(data) {
+  return request({
+    url: '/system/roomPlatformIcon',
+    method: 'post',
+    data
+  })
+}
+
+/** 修改房间地图平台图标（位置/朝向/缩放） */
+export function updateRoomPlatformIcon(data) {
+  return request({
+    url: '/system/roomPlatformIcon',
+    method: 'put',
+    data
+  })
+}
+
+/** 删除房间地图平台图标 */
+export function delRoomPlatformIcon(id) {
+  return request({
+    url: '/system/roomPlatformIcon/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/assets/icons/svg/screenshot.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1770597640836" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4973" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M835.3 250.9v522.3H188.7V250.9h646.6m49.8-49.8H138.9v621.8H885V201.1h0.1z" p-id="4974"></path><path d="M138.9 101.6v99.5H64.3v49.8H188.7V101.6zM885.1 922.4v-99.5h74.6v-49.8H835.3v149.3zM511 705.4H297.5c-7.8 0-20.4-2.9-23.3-7.8-2.9-4.9 1.9-16.5 5.8-23.3 26.2-39.8 53.4-79.6 79.6-119.4 8.7-12.6 17.5-13.6 31.1-7.8 44.6 21.4 90.3 42.7 135.9 64.1 12.6 5.8 28.1 1.9 35.9-9.7 24.3-37.9 49.5-74.7 75.7-111.6 4.9-6.8 13.6-17.5 20.4-17.5 7.8 0 13.6 12.6 16.5 20.4 24.3 60.2 47.6 121.3 70.9 181.5 9.7 25.2 5.8 31.1-23.3 31.1H511z m-78.6-298c0 29.1-25.2 52.4-54.4 51.4-29.1-1-51.4-23.3-51.4-51.4 0-29.1 24.3-52.4 54.4-51.4 27.1 0.9 51.4 24.2 51.4 51.4z" p-id="4975"></path></svg>

ruoyi-ui/src/views/cesiumMap/index.vue

@@ -2537,7 +2537,6 @@ export default {
             this.activeCursorPosition = position; // 初始化鼠标位置
             // 创建动态预览矩形
             this.tempEntity = this.viewer.entities.add({
-              // 填充部分
               rectangle: {
                 // 关键：使用 CallbackProperty 动态计算矩形范围
                 coordinates: new Cesium.CallbackProperty(() => {
@@ -2625,7 +2624,6 @@ export default {
       // 创建一个复合实体，包含填充和边框
       const finalEntity = this.viewer.entities.add({
         id: id,
-        // 填充部分
         rectangle: {
           coordinates: rect,
           material: Cesium.Color.fromCssColorString(this.defaultStyles.rectangle.color).withAlpha(this.defaultStyles.rectangle.opacity),
@@ -2854,7 +2852,6 @@ export default {
       const finalEntity = this.viewer.entities.add({
         id: id,
         position: centerPoint,
-        // 填充部分
         ellipse: {
           semiMajorAxis: radius,
           semiMinorAxis: radius,
@@ -2974,7 +2971,6 @@ export default {
             }
             // 创建动态预览扇形
             this.tempEntity = this.viewer.entities.add({
-              // 填充部分
               polygon: {
                 hierarchy: new Cesium.CallbackProperty(() => {
                   if (this.drawingPoints.length > 1 && this.activeCursorPosition) {
@@ -3046,7 +3042,6 @@ export default {
       const finalEntity = this.viewer.entities.add({
         id: 'sector-' + new Date().getTime(),
         name: `扇形 ${this.entityCounter}`,
-        // 填充部分
         polygon: {
           hierarchy: new Cesium.PolygonHierarchy(positions),
           // 设置填充颜色
@@ -3585,11 +3580,9 @@ export default {
       const id = `polygon_${this.entityCounter}`
       // 闭合多边形
       const polygonPositions = [...positions, positions[0]]
-      // 创建一个复合实体，包含填充和边框
       const entity = this.viewer.entities.add({
         id: id,
         name: `面 ${this.entityCounter}`,
-        // 填充部分
         polygon: {
           hierarchy: new Cesium.PolygonHierarchy(polygonPositions),
           // 初始无填充

ruoyi-ui/src/views/childRoom/index.vue

@@ -2413,8 +2413,8 @@ export default {
         ? { radius: this.addHoldForm.radius, clockwise: this.addHoldForm.clockwise }
         : { semiMajor: this.addHoldForm.semiMajor, semiMinor: this.addHoldForm.semiMinor, headingDeg: this.addHoldForm.headingDeg, clockwise: this.addHoldForm.clockwise };
       const startTime = this.addHoldForm.startTimeMinutes !== '' && this.addHoldForm.startTimeMinutes != null && !Number.isNaN(Number(this.addHoldForm.startTimeMinutes))
-          ? this.minutesToStartTime(Number(this.addHoldForm.startTimeMinutes))
+        ? this.minutesToStartTime(Number(this.addHoldForm.startTimeMinutes))
-          : (nextWp.startTime || 'K+01:00');
+        : (nextWp.startTime || 'K+01:00');
       try {
         await addWaypoints({
           routeId,