@@ -222,9 +222,9 @@ export default {
type: Array,
default: () => []
},
- selectedRouteId: {
- type: [String, Number],
- default: null
+ activeRouteIds: {
+ type: Array,
+ default: () => []
},
selectedRouteDetails: {
type: Object,
@@ -261,11 +261,7 @@ export default {
this.$emit('hide')
},
- handleSelectRoute(route) {
- this.$emit('select-route', route)
- },
-
- // 新增：新建航线事件
+ // 新建航线事件
handleCreateRoute() {
this.$emit('create-route')
},
@@ -432,7 +428,7 @@ export default {
box-shadow: 0 2px 8px rgba(0, 138, 255, 0.15);
}
-.route-item.selected {
+.route-item.active {
background: rgba(0, 138, 255, 0.15);
border-color: rgba(0, 138, 255, 0.3);
box-shadow: 0 2px 10px rgba(0, 138, 255, 0.25);
diff --git a/ruoyi-ui/src/views/childRoom/TopHeader.vue b/ruoyi-ui/src/views/childRoom/TopHeader.vue
index 6192637..29c5695 100644
--- a/ruoyi-ui/src/views/childRoom/TopHeader.vue
+++ b/ruoyi-ui/src/views/childRoom/TopHeader.vue
@@ -3,19 +3,19 @@
-
+
-
+
- 
网络化任务规划系统
-
+
网络化任务规划系统
@@ -233,7 +233,7 @@
{{ onlineCount }}人
@@ -242,7 +242,7 @@
-
+
{{ combatTime }}
@@ -252,31 +252,31 @@
-
+
-
+
+
+
+
+
+
@@ -30,7 +42,6 @@
:combat-time="combatTime"
:astro-time="astroTime"
:user-avatar="userAvatar"
- @select-nav="selectTopNav"
@save-plan="savePlan"
@import-plan-file="importPlanFile"
@import-acd="importACD"
@@ -88,7 +99,7 @@
:is-hidden="isRightPanelHidden"
:active-tab="activeRightTab"
:routes="routes"
- :selected-route-id="selectedRouteId"
+ :active-route-ids="activeRouteIds"
:selected-route-details="selectedRouteDetails"
:conflicts="conflicts"
:conflict-count="conflictCount"
@@ -208,6 +219,8 @@ import LeftMenu from './LeftMenu'
import RightPanel from './RightPanel'
import BottomLeftPanel from './BottomLeftPanel'
import TopHeader from './TopHeader'
+import { listRoutes, getRoutes, addRoutes } from "@/api/system/routes";
+import { updateWaypoints } from "@/api/system/waypoints";
export default {
name: 'MissionPlanningView',
components: {
@@ -233,6 +246,9 @@ export default {
selectedRoute: null,
showWaypointDialog: false,
selectedWaypoint: null,
+ showNameDialog: false,
+ newRouteName: '',
+ tempMapPoints: [],
// 作战信息
roomCode: 'JTF-7-ALPHA',
@@ -270,7 +286,7 @@ export default {
// 右侧面板
activeRightTab: 'plan',
- selectedRouteId: 101,
+ activeRouteIds: [], // 存储当前所有选中的航线ID
selectedRouteDetails: null,
// 冲突数据
@@ -314,11 +330,7 @@ export default {
],
// 航线数据
- routes: [
- { id: 101, name: 'Alpha进场航线', points: 8, conflict: true },
- { id: 102, name: 'Beta巡逻航线', points: 6, conflict: false },
- { id: 103, name: '侦察覆盖区', points: 4, conflict: false },
- ],
+ routes: [],
// 时间控制
timeProgress: 45,
@@ -332,11 +344,11 @@ export default {
};
},
mounted() {
+ this.getList();
// 初始化时左侧菜单隐藏
this.isMenuHidden = true;
// 初始化时右侧面板隐藏
this.isRightPanelHidden = true;
-
// 更新时间
this.updateTime();
setInterval(this.updateTime, 1000);
@@ -351,6 +363,25 @@ export default {
}
},
methods: {
+ // 处理从地图点击传来的编辑请求
+ handleOpenWaypointEdit(wpName) {
+ // 1. 确保当前有选中的航线详情
+ if (!this.selectedRouteDetails || !this.selectedRouteDetails.waypoints) {
+ this.$message.warning('请先在右侧列表选择一条航线');
+ return;
+ }
+ // 2. 根据点击的航点名称在数据列表中查找
+ const wpData = this.selectedRouteDetails.waypoints.find(item => item.name === wpName);
+ if (wpData) {
+ // 3. 深拷贝给编辑弹窗绑定的变量，防止直接修改原始数组
+ this.selectedWaypoint = JSON.parse(JSON.stringify(wpData));
+ // 4. 打开弹窗
+ this.showWaypointDialog = true;
+ }
+ else {
+ this.$message.info('未找到该航点的业务数据');
+ }
+ },
// 显示在线成员弹窗
showOnlineMembersDialog() {
this.showOnlineMembers = true;
@@ -385,41 +416,114 @@ export default {
this.$message.success('航线名称更新成功');
}
},
- // 新建航线（占位）
+ // 新建航线
createRoute() {
- this.$message.info('新建航线功能开发中...');
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.startMissionRouteDrawing();
+ this.$message.success('进入航线规划模式');
+ }
+
+ },
+ /** 从数据库拉取最新的航线列表数据 */
+ async getList() {
+ const query = { scenarioId: 1 };
+ try {
+ const response = await listRoutes(query);
+ if (response.code === 200) {
+ this.routes = response.rows.map(item => ({
+ id: item.id,
+ name: item.callSign,
+ points: item.waypoints ? item.waypoints.length : 0,
+ conflict: false
+ }));
+ }
+ } catch (error) {
+ this.$message.error("获取航线列表失败");
+ }
+ },
+ handleMapDrawComplete(points) {
+ if (!points || points.length < 2) {
+ this.$message.error('航点太少，无法生成航线');
+ this.drawDom = false;
+ return;
+ }
+ this.tempMapPoints = points; // 暂存坐标点
+ this.showNameDialog = true; // 弹出对话框起名
+ },
+ /** 弹窗点击“确定”：正式将数据保存到后端数据库 */
+ async confirmSaveNewRoute() {
+ // 严格校验起名逻辑
+ if (!this.newRouteName || this.newRouteName.trim() === '') {
+ this.$message.error('新增航线未命名，请输入名称后保存！');
+ return;
+ }
+ // 构造符合后端 Routes 实体类的数据结构
+ const routeData = {
+ callSign: this.newRouteName,
+ scenarioId: 1, // 示例：当前归属方案ID（实际应从全局状态获取）
+ platformId: 1,
+ attributes: "{}",
+ waypoints: this.tempMapPoints.map((p, index) => ({
+ name: `WP${index + 1}`,
+ lat: p.lat,
+ lng: p.lng,
+ alt: 5000.0,
+ speed: 800.0,
+ startTime: 'K+00:00:00',
+ turnAngle: 0.0
+ }))
+ };
+
+ try {
+ // 调用后端 API 保存到数据库
+ const response = await addRoutes(routeData);
+ if (response.code === 200) {
+ this.$message.success('航线及其航点已成功保存至数据库');
+ // 重置 UI 状态
+ this.showNameDialog = false;
+ this.drawDom = false;
+ this.newRouteName = '';
+ this.tempMapPoints = [];
+ // 重新拉取右侧航线列表以保持同步
+ await this.getList();
+ }
+ } catch (error) {
+ console.error("保存航线失败:", error);
+ this.$message.error('保存失败，请检查后端服务');
+ }
},
// 航点编辑弹窗相关方法
openWaypointDialog(waypoint) {
this.selectedWaypoint = waypoint;
this.showWaypointDialog = true;
},
- updateWaypoint(updatedWaypoint) {
- // 1. 检查是否有正在编辑的航线详情
- if (this.selectedRouteDetails && this.selectedRouteDetails.waypoints) {
-
- // 2. 找到当前被编辑的这个航点在数组中的位置
- const index = this.selectedRouteDetails.waypoints.indexOf(this.selectedWaypoint);
-
- if (index !== -1) {
- // 3. 使用 splice 方法替换数据
- this.selectedRouteDetails.waypoints.splice(index, 1, updatedWaypoint);
-
- // 4. 更新当前的选中引用，以便连续编辑
- this.selectedWaypoint = updatedWaypoint;
-
- this.$message.success('航点更新成功');
- } else {
- // 如果用 indexOf 没找到，尝试用名字匹配兜底
- const nameIndex = this.selectedRouteDetails.waypoints.findIndex(p => p.name === this.selectedWaypoint.name);
- if (nameIndex !== -1) {
- this.selectedRouteDetails.waypoints.splice(nameIndex, 1, updatedWaypoint);
- this.selectedWaypoint = updatedWaypoint;
- this.$message.success('航点更新成功');
- } else {
- this.$message.error('更新失败：未找到对应航点');
+ /** 航点编辑保存：更新数据库并同步地图显示 */
+ async updateWaypoint(updatedWaypoint) {
+ // 确保有选中的航线详情
+ if (!this.selectedRouteDetails || !this.selectedRouteDetails.waypoints) return;
+ try {
+ const response = await updateWaypoints(updatedWaypoint);
+ if (response.code === 200) {
+ // 找到当前编辑点在本地数组中的位置
+ const index = this.selectedRouteDetails.waypoints.findIndex(p => p.id === updatedWaypoint.id);
+ if (index !== -1) {
+ // 记录旧名称，用于地图组件定位 Entity
+ const oldName = this.selectedRouteDetails.waypoints[index].name;
+ const newName = updatedWaypoint.name;
+ // 使用 splice 触发 Vue 响应式更新右侧面板 UI
+ this.selectedRouteDetails.waypoints.splice(index, 1, { ...updatedWaypoint });
+ // 5. 同步更新地图上的图形
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.updateWaypointGraphic(oldName, newName);
+ }
+
+ this.showWaypointDialog = false;
+ this.$message.success('航点信息已持久化至数据库');
}
}
+ } catch (error) {
+ console.error("更新航点失败:", error);
+ this.$message.error('数据库更新失败，请重试');
}
},
updateTime() {
@@ -677,9 +781,9 @@ export default {
this.isRightPanelHidden = false;
}
} else if(item.id === 'modify'){
- this.drawDom = !this.drawDom
- console.log(this.drawDom,999999)
- }
+ this.drawDom = !this.drawDom
+ console.log(this.drawDom,999999)
+ }
if (item.id === 'deduction') {
// 点击推演按钮，显示/隐藏K时弹出框
this.showKTimePopup = !this.showKTimePopup;
@@ -774,23 +878,64 @@ export default {
const minutes = (val % 4) * 15;
return `K+${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
},
+ /** 切换航线：实现多选/开关逻辑 */
+ async selectRoute(route) {
+ const index = this.activeRouteIds.indexOf(route.id);
- // 航线操作
- selectRoute(route) {
- this.selectedRouteId = route.id;
- // 模拟获取航点数据
- this.selectedRouteDetails = {
- name: route.name,
- waypoints: [
- { name: 'WP1', altitude: 5000, speed: '800km/h', eta: 'K+00:40:00' },
- { name: 'WP2', altitude: 6000, speed: '850km/h', eta: 'K+00:55:00' },
- { name: 'WP3', altitude: 5500, speed: '820km/h', eta: 'K+01:10:00' },
- { name: 'WP4', altitude: 5800, speed: '830km/h', eta: 'K+01:25:00' },
- ]
- };
- // 移除原有的 this.openRouteDialog(route);
+ // 航线已在选中列表中
+ if (index > -1) {
+ this.activeRouteIds.splice(index, 1);
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.removeRouteById(route.id);
+ }
+ if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+ if (this.activeRouteIds.length > 0) {
+ const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
+ try {
+ const res = await getRoutes(lastId);
+ if (res.code === 200 && res.data) {
+ this.selectedRouteDetails = {
+ id: res.data.id,
+ name: res.data.callSign,
+ waypoints: res.data.waypoints || []
+ };
+ }
+ } catch (e) {
+ console.error("回显剩余航线失败", e);
+ }
+ } else {
+ this.selectedRouteDetails = null;
+ }
+ }
+ this.$message.info(`已移除航线: ${route.name}`);
+ return;
+ }
+ // 航线未被选中
+ try {
+ const response = await getRoutes(route.id);
+ if (response.code === 200 && response.data) {
+ const fullRouteData = response.data;
+ const waypoints = fullRouteData.waypoints || [];
+ this.activeRouteIds.push(route.id);
+ this.selectedRouteDetails = {
+ id: fullRouteData.id,
+ name: fullRouteData.callSign,
+ waypoints: waypoints
+ };
+ if (waypoints.length > 0) {
+ // 通知地图渲染
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.renderRouteWaypoints(waypoints, route.id);
+ }
+ } else {
+ this.$message.warning('该航线暂无坐标数据，无法在地图展示');
+ }
+ }
+ } catch (error) {
+ console.error("获取航线详情失败:", error);
+ this.$message.error('无法加载该航线的详细航点数据');
+ }
},
-
addWaypoint() {
if (this.selectedRouteDetails) {
const count = this.selectedRouteDetails.waypoints.length + 1;
@@ -805,9 +950,15 @@ export default {
},
cancelRoute() {
- this.selectedRouteId = null;
+ // 清空所有选中的航线
+ if (this.$refs.cesiumMap) {
+ this.activeRouteIds.forEach(id => {
+ this.$refs.cesiumMap.removeRouteById(id);
+ });
+ }
+ this.activeRouteIds = [];
this.selectedRouteDetails = null;
- this.$message.info('已取消选中');
+ this.$message.info('已清空所有选中航线');
},
// 冲突操作
@@ -857,7 +1008,7 @@ export default {
height: 100%;
background: linear-gradient(135deg, #1a2f4b 0%, #2c3e50 100%);
/* 正确的写法，直接复制这行替换 */
-background: url('~@/assets/map-background.png');
+ background: url('~@/assets/map-background.png');
background-size: cover;
background-position: center;
z-index: 1;
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index e2698e5..25854e2 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -10,7 +10,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
-const baseUrl = 'http://192.168.50.30:8080' // 后端接口
+const baseUrl = 'http://127.0.0.1:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口
// 定义 Cesium 源码路径
From 51015fea0c8c3e06c14bbcfc7dd6172291116ccb Mon Sep 17 00:00:00 2001
From: ctw <1051735452@qq.com>
Date: Mon, 26 Jan 2026 10:03:52 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=9C=AC?=
=?UTF-8?q?=EF=BC=8C=E5=9B=BE=E7=89=87=E6=8F=92=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/cesiumMap/index.vue | 26 ++++++++++++++++++++------
ruoyi-ui/src/views/childRoom/index.vue | 9 ++-------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 7bd8947..21e7bc9 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -89,8 +89,8 @@ export default {
circle: { color: '#800080', opacity: 0.4, width: 2 },
sector: { color: '#FF6347', opacity: 0.5, width: 2 },
arrow: { color: '#FF0000', width: 6 },
- text: { color: '#000000', font: '32px Microsoft YaHei, PingFang SC, sans-serif', backgroundColor: 'rgba(255, 255, 255, 0.8)' },
- image: { width: 100, height: 100 }
+ text: { color: '#000000', font: '48px Microsoft YaHei, PingFang SC, sans-serif', backgroundColor: 'rgba(255, 255, 255, 0.8)' },
+ image: { width: 150, height: 150 }
}
}
},
@@ -1728,8 +1728,15 @@ export default {
scaleByDistance: new Cesium.NearFarScalar(
1000, // 近距离（米）
1.0, // 近距离时的缩放比例
- 1000000, // 远距离（米）
- 0.0 // 远距离时的缩放比例
+ 500000, // 远距离（米）
+ 0.1 // 远距离时的缩放比例（不为0，保持可见）
+ ),
+ // 随地图缩放调整透明度
+ translucencyByDistance: new Cesium.NearFarScalar(
+ 1000, // 近距离（米）
+ 1.0, // 近距离时的透明度
+ 500000, // 远距离（米）
+ 0.3 // 远距离时的透明度
)
}
})
@@ -1870,8 +1877,15 @@ export default {
scaleByDistance: new Cesium.NearFarScalar(
1000, // 近距离（米）
1.0, // 近距离时的缩放比例
- 1000000, // 远距离（米）
- 0.0 // 远距离时的缩放比例
+ 500000, // 远距离（米）
+ 0.1 // 远距离时的缩放比例（不为0，保持可见）
+ ),
+ // 随地图缩放调整透明度
+ translucencyByDistance: new Cesium.NearFarScalar(
+ 1000, // 近距离（米）
+ 1.0, // 近距离时的透明度
+ 500000, // 远距离（米）
+ 0.3 // 远距离时的透明度
)
}
})
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 81eb37c..eaf2c72 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -392,7 +392,7 @@ export default {
// 右侧面板
activeRightTab: 'plan',
activeRouteIds: [], // 存储当前所有选中的航线ID
- selectedRouteDetails: null,
+
// 冲突数据
conflictCount: 2,
@@ -682,9 +682,7 @@ export default {
this.isMenuHidden = true;
},
- selectTopNav(item) {
- console.log('选中顶部导航:', item);
- },
+
// 右侧面板操作
showRightPanel() {
@@ -993,9 +991,6 @@ export default {
this.$message.success('航线收藏');
},
- showOnlineMembersDialog() {
- this.showOnlineMembers = true;
- },
hideRightPanel() {
this.isRightPanelHidden = true;
From 1dad49ca22e1903e8db9c39638e20aba988ad762 Mon Sep 17 00:00:00 2001
From: menghao <1584479611@qq.com>
Date: Mon, 26 Jan 2026 13:38:41 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application-druid.yml | 2 +-
.../ruoyi/system/mapper/RouteWaypointsMapper.java | 8 +++
.../system/service/IRouteWaypointsService.java | 8 +++
.../service/impl/MissionScenarioServiceImpl.java | 26 ++++++++-
.../service/impl/RouteWaypointsServiceImpl.java | 5 ++
.../system/service/impl/RoutesServiceImpl.java | 12 +++-
.../mapper/system/RouteWaypointsMapper.xml | 4 ++
ruoyi-ui/src/views/childRoom/RightPanel.vue | 9 ++-
ruoyi-ui/src/views/childRoom/index.vue | 65 ++++++++++++++++++++--
9 files changed, 129 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c40f2aa..037db5c 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: A20040303ctw!
+ password: 123456
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
index 2e77e10..07ff430 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RouteWaypointsMapper.java
@@ -55,6 +55,14 @@ public interface RouteWaypointsMapper
public int deleteRouteWaypointsById(Long id);
/**
+ * 删除航线具体航点明细
+ *
+ * @param routeId 航线主键
+ * @return 结果
+ */
+ public int deleteRouteWaypointsByRouteId(Long routeId);
+
+ /**
* 批量删除航线具体航点明细
*
* @param ids 需要删除的数据主键集合
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
index fc046e8..3e74e8d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRouteWaypointsService.java
@@ -58,4 +58,12 @@ public interface IRouteWaypointsService
* @return 结果
*/
public int deleteRouteWaypointsById(Long id);
+
+ /**
+ * 删除航线具体航点明细信息
+ *
+ * @param routeId 航线具体航点明细主键
+ * @return 结果
+ */
+ public int deleteRouteWaypointsByRouteId(Long routeId);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java
index 600effa..ed72252 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MissionScenarioServiceImpl.java
@@ -1,11 +1,15 @@
package com.ruoyi.system.service.impl;
import java.util.List;
+
+import com.ruoyi.system.domain.Routes;
+import com.ruoyi.system.service.IRoutesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.MissionScenarioMapper;
import com.ruoyi.system.domain.MissionScenario;
import com.ruoyi.system.service.IMissionScenarioService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 任务方案/沙箱Service业务层处理
@@ -19,6 +23,9 @@ public class MissionScenarioServiceImpl implements IMissionScenarioService
@Autowired
private MissionScenarioMapper missionScenarioMapper;
+ @Autowired
+ private IRoutesService routesService;
+
/**
* 查询任务方案/沙箱
*
@@ -74,9 +81,15 @@ public class MissionScenarioServiceImpl implements IMissionScenarioService
* @return 结果
*/
@Override
+ @Transactional
public int deleteMissionScenarioByIds(Long[] ids)
{
- return missionScenarioMapper.deleteMissionScenarioByIds(ids);
+ int rows = 0;
+ for (Long id : ids) {
+ // 循环调用单条删除逻辑，确保每套方案下的从属数据都被清理干净
+ rows += this.deleteMissionScenarioById(id);
+ }
+ return rows;
}
/**
@@ -86,8 +99,19 @@ public class MissionScenarioServiceImpl implements IMissionScenarioService
* @return 结果
*/
@Override
+ @Transactional
public int deleteMissionScenarioById(Long id)
{
+ // 查找属于该方案的所有航线
+ Routes queryRoute = new Routes();
+ queryRoute.setScenarioId(id);
+ List
+
@@ -103,7 +104,7 @@
-
+
@@ -251,6 +252,10 @@ export default {
type: String,
default: 'plan'
},
+ plans: {
+ type: Array,
+ default: () => []
+ },
routes: {
type: Array,
default: () => []
@@ -258,7 +263,7 @@ export default {
activeRouteIds: {
type: Array,
default: () => []
- },
+ },
selectedPlanId: {
type: [String, Number],
default: null
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 63e6ab0..b522d75 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -125,6 +125,7 @@
@select-route="selectRoute"
@create-plan="createPlan"
@create-route="createRoute"
+ @delete-route="handleDeleteRoute"
@open-plan-dialog="openPlanDialog"
@open-route-dialog="openRouteDialog"
@open-waypoint-dialog="openWaypointDialog"
@@ -270,7 +271,7 @@ import LeftMenu from './LeftMenu'
import RightPanel from './RightPanel'
import BottomLeftPanel from './BottomLeftPanel'
import TopHeader from './TopHeader'
-import { listRoutes, getRoutes, addRoutes } from "@/api/system/routes";
+import { listRoutes, getRoutes, addRoutes,delRoutes } from "@/api/system/routes";
import { updateWaypoints } from "@/api/system/waypoints";
export default {
name: 'MissionPlanningView',
@@ -546,7 +547,36 @@ export default {
this.$refs.cesiumMap.startMissionRouteDrawing();
this.$message.success('进入航线规划模式');
}
-
+ },
+ async handleDeleteRoute(route) {
+ try {
+ // 二次确认，防止误删
+ await this.$confirm(`确定要彻底删除航线 "${route.name}" 吗？`, '提示', {
+ type: 'warning'
+ });
+ if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+ this.selectedRouteDetails = null;
+ }
+ const res = await delRoutes(route.id);
+ if (res.code === 200) {
+ this.$message.success('删除成功');
+ // 同步地图：如果该航线正在显示，立即清除
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.removeRouteById(route.id);
+ }
+ // 同步状态：从选中列表中移除该 ID
+ const idx = this.activeRouteIds.indexOf(route.id);
+ if (idx > -1) {
+ this.activeRouteIds.splice(idx, 1);
+ }
+ await this.getList();
+ }
+ } catch (e) {
+ if (e !== 'cancel') {
+ console.error("删除航线失败:", e);
+ this.$message.error('删除操作失败');
+ }
+ }
},
/** 从数据库拉取最新的航线列表数据 */
async getList() {
@@ -581,10 +611,16 @@ export default {
this.$message.error('新增航线未命名，请输入名称后保存！');
return;
}
+ // 获取当前选中的方案 ID
+ const currentScenarioId = this.selectedPlanId;
+ if (!currentScenarioId) {
+ this.$message.warning('请先在左侧选择一个方案，再保存航线！');
+ return;
+ }
// 构造符合后端 Routes 实体类的数据结构
const routeData = {
callSign: this.newRouteName,
- scenarioId: 1, // 示例：当前归属方案ID（实际应从全局状态获取）
+ scenarioId: currentScenarioId,
platformId: 1,
attributes: "{}",
waypoints: this.tempMapPoints.map((p, index) => ({
@@ -602,7 +638,27 @@ export default {
// 调用后端 API 保存到数据库
const response = await addRoutes(routeData);
if (response.code === 200) {
- this.$message.success('航线及其航点已成功保存至数据库');
+ this.$message.success('航线及其航点已成功保存至当前方案');
+ // 获取后端生成的正式 ID
+ const savedRoute = response.data;
+ const newRouteId = savedRoute ? savedRoute.id : null;
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.clearRoute();
+ // 如果拿到了正式 ID，则按照“正式航线”的规则渲染一次
+ if (newRouteId) {
+ if (!this.activeRouteIds.includes(savedRoute.id)) {
+ this.activeRouteIds.push(savedRoute.id);
+ }
+ // 更新当前详情，确保右侧下方航点列表立刻显示
+ this.selectedRouteDetails = {
+ id: newRouteId,
+ name: this.newRouteName,
+ waypoints: routeData.waypoints
+ };
+ //使用正式 ID 渲染点和线
+ this.$refs.cesiumMap.renderRouteWaypoints(routeData.waypoints, newRouteId);
+ }
+ }
// 重置 UI 状态
this.showNameDialog = false;
this.drawDom = false;
@@ -1108,7 +1164,6 @@ export default {
/** 切换航线：实现多选/开关逻辑 */
async selectRoute(route) {
const index = this.activeRouteIds.indexOf(route.id);
-
// 航线已在选中列表中
if (index > -1) {
this.activeRouteIds.splice(index, 1);
From 1a4434d9f64700564f3bb07552b56ddddc40b66a Mon Sep 17 00:00:00 2001
From: ctw <1051735452@qq.com>
Date: Mon, 26 Jan 2026 13:39:42 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=A0=91=E5=BD=A2?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/childRoom/RightPanel.vue | 365 ++++++++++++++++------------
ruoyi-ui/src/views/childRoom/index.vue | 156 +++++++++---
2 files changed, 332 insertions(+), 189 deletions(-)
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index fe63cf0..d035038 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -26,98 +26,79 @@
新建方案
-
+
-
-
+
-
-
-
-
-
- {{ plan.name }}
-
-
-
-
-
-
-
-
-
- 新建航线
-
-
-
- 航线列表
-
-
-
-
-
- 冲突
-
-
-
-
- {{ route.name }}
-
-
-
-
-
-
-
@@ -187,7 +167,6 @@
-
-
selectRoutesList(Routes routes)
{
- return routesMapper.selectRoutesList(routes);
+ // 获取基础列表
+ List list = routesMapper.selectRoutesList(routes);
+ // 遍历列表，为每一条航线补全它的航点信息
+ for (Routes r : list) {
+ RouteWaypoints queryWp = new RouteWaypoints();
+ queryWp.setRouteId(r.getId());
+ List wpList = routeWaypointsService.selectRouteWaypointsList(queryWp);
+ r.setWaypoints(wpList);
+ }
+ return list;
}
/**
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 735b177..0e746b8 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -12,7 +12,6 @@
@import-data="importData"
@locate="handleLocate"
/>
-
-
+
+
diff --git a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
index 57e05d4..6bb0006 100644
--- a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
+++ b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue
@@ -14,9 +14,9 @@
+
-
+
@@ -78,7 +82,6 @@ export default {
}
},
data() {
- // 定义一个通用的数字校验函数，允许 0
const validateNumber = (rule, value, callback) => {
// 检查 value 是否为 undefined, null 或 空字符串
// 注意：这里不能简单用 !value，因为 !0 是 true
@@ -92,16 +95,19 @@ export default {
return {
formData: {
name: '',
- altitude: 0,
- speed: 0,
- turnBank: 0,
- startTime: ''
+ alt: 5000,
+ speed: 800,
+ turnAngle: 0,
+ startTime: '',
+ currentIndex: -1,
+ totalPoints: 0,
+ isBankDisabled: false
},
rules: {
name: [
{ required: true, message: '请输入航点名称', trigger: 'blur' }
],
- altitude: [
+ alt: [
// 使用自定义 validator 替代 type: 'number' 组合，确保 0 被接受
{ required: true, validator: validateNumber, message: '请输入有效高度', trigger: ['blur', 'change'] }
],
@@ -109,7 +115,7 @@ export default {
// 重点修改：使用自定义 validator，允许速度为 0
{ required: true, validator: validateNumber, message: '请输入有效速度', trigger: ['blur', 'change'] }
],
- turnBank: [
+ turnAngle: [
// 同样应用到转弯坡度
{ required: true, validator: validateNumber, message: '请输入有效转弯坡度', trigger: ['blur', 'change'] }
],
@@ -133,17 +139,21 @@ export default {
},
methods: {
initFormData() {
- // 保持数据类型正确，确保是 Number 类型
+ const index = this.waypoint.currentIndex !== undefined ? this.waypoint.currentIndex : -1;
+ const total = this.waypoint.totalPoints || 0;
+ const locked = (index === 0) || (total > 0 && index === total - 1);
+
this.formData = {
name: this.waypoint.name || '',
- // 确保初始化时也是数字类型
- altitude: this.waypoint.altitude !== undefined && this.waypoint.altitude !== null ? Number(this.waypoint.altitude) : 0,
+ alt: this.waypoint.alt !== undefined && this.waypoint.alt !== null ? Number(this.waypoint.alt) : 0,
speed: this.waypoint.speed !== undefined && this.waypoint.speed !== null ? Number(this.waypoint.speed) : 0,
- turnBank: this.waypoint.turnBank !== undefined && this.waypoint.turnBank !== null ? Number(this.waypoint.turnBank) : 0,
- startTime: this.waypoint.startTime || ''
+ startTime: this.waypoint.startTime || '',
+ currentIndex: index,
+ totalPoints: total,
+ isBankDisabled: locked,
+ turnAngle: locked ? 0 : (Number(this.waypoint.turnAngle) || 0)
};
- // 弹窗打开时，尝试清除之前的校验痕迹
this.$nextTick(() => {
if (this.$refs.formRef) {
this.$refs.formRef.clearValidate();
From d014acd87e15377113a9c0336b9efad70cebedbc Mon Sep 17 00:00:00 2001
From: ctw <1051735452@qq.com>
Date: Mon, 2 Feb 2026 15:10:02 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/.env.development | 2 +-
ruoyi-ui/package.json | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 4d098ba..ebae234 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -8,7 +8,7 @@ ENV = 'development'
VUE_APP_BASE_API = '/dev-api'
# 访问地址（绕过 /dev-api 代理，用于解决静态资源/图片访问 401 认证问题）
-VUE_APP_BACKEND_URL = 'http://localhost:8080'
+VUE_APP_BACKEND_URL = 'http://192.168.50.145:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index f0e65c5..4aa7fcd 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -38,6 +38,7 @@
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
+ "mammoth": "^1.11.0",
"nprogress": "0.2.0",
"quill": "2.0.2",
"screenfull": "5.0.2",
@@ -52,7 +53,6 @@
"vuex": "3.6.0"
},
"devDependencies": {
- "express": "^4.18.2",
"@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
"@babel/plugin-transform-optional-chaining": "^7.28.6",
"@open-wc/webpack-import-meta-loader": "^0.4.7",
@@ -62,6 +62,7 @@
"chalk": "4.1.0",
"compression-webpack-plugin": "6.1.2",
"connect": "3.6.6",
+ "express": "^4.18.2",
"sass": "1.32.13",
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
航点列表
-
-
-
-
-
-
-
-
{{ point.name }}
-
+
+
+
-
+
+ {{ plan.name }}
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+ 冲突
+
+
+
+
+
+ {{ route.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ point.name }}
+
+
+
+
+ -1) {
+ // 折叠方案时，取消选中该方案的所有航线
+ this.expandedPlans.splice(index, 1)
+ const planRoutes = this.routes.filter(r => r.scenarioId === planId)
+ planRoutes.forEach(route => {
+ if (this.activeRouteIds.includes(route.id)) {
+ // 触发航线隐藏
+ this.handleToggleRouteVisibility(route)
+ }
+ })
+ // 折叠方案时，取消选中方案
+ this.$emit('select-plan', { id: null })
+ } else {
+ // 展开方案时，选中该方案
+ this.expandedPlans.push(planId)
+ const plan = this.plans.find(p => p.id === planId)
+ if (plan) {
+ this.$emit('select-plan', plan)
+ }
+ // 选中该方案的所有航线
+ const planRoutes = this.routes.filter(r => r.scenarioId === planId)
+ planRoutes.forEach(route => {
+ if (!this.activeRouteIds.includes(route.id)) {
+ this.handleSelectRoute(route)
+ }
+ })
+ }
+ },
+
+ // 切换航线展开/折叠
+ toggleRoute(routeId) {
+ const route = this.routes.find(r => r.id === routeId)
+ if (!route) return
+
+ const isRouteSelected = this.activeRouteIds.includes(routeId)
+ const isRouteExpanded = this.expandedRoutes.includes(routeId)
+
+ if (isRouteSelected) {
+ // 航线已选中
+ if (isRouteExpanded) {
+ // 航线已展开，点击则收回航点
+ const index = this.expandedRoutes.indexOf(routeId)
+ this.expandedRoutes.splice(index, 1)
+ } else {
+ // 航线未展开，点击则展开航点
+ this.expandedRoutes.push(routeId)
+ }
+ } else {
+ // 航线未选中，点击则选中并显示航线和航点
+ this.handleSelectRoute(route)
+ // 选中后自动展开航点
+ this.$nextTick(() => {
+ if (!this.expandedRoutes.includes(routeId)) {
+ this.expandedRoutes.push(routeId)
+ }
+ })
+ }
+ },
+
handleHide() {
this.$emit('hide')
},
@@ -314,6 +364,7 @@ export default {
},
handleSelectRoute(route) {
+ // 确保航线有航点数据
this.$emit('select-route', route)
},
@@ -325,6 +376,14 @@ export default {
this.$emit('create-route')
},
+ handleCreateRouteForPlan(plan) {
+ this.$emit('create-route', plan)
+ },
+
+ handleDeletePlan(plan) {
+ // 暂时留空，后续实现
+ },
+
handleOpenPlanDialog(plan) {
this.$emit('open-plan-dialog', plan)
},
@@ -333,16 +392,27 @@ export default {
this.$emit('open-route-dialog', route)
},
- handleOpenWaypointDialog(point) {
- this.$emit('open-waypoint-dialog', point)
+ handleToggleRouteVisibility(route) {
+ this.$emit('toggle-route-visibility', route)
+ // 当隐藏航线时，自动收回航点列表
+ const routeIndex = this.expandedRoutes.indexOf(route.id)
+ if (routeIndex > -1) {
+ this.expandedRoutes.splice(routeIndex, 1)
+ }
},
- handleAddWaypoint() {
- this.$emit('add-waypoint')
+ getRouteClasses(routeId) {
+ return {
+ active: this.activeRouteIds.includes(routeId)
+ }
},
- handleCancelRoute() {
- this.$emit('cancel-route')
+ handleDeleteRoute(route) {
+ // 暂时留空，后续实现
+ },
+
+ handleOpenWaypointDialog(point) {
+ this.$emit('open-waypoint-dialog', point)
},
handleViewConflict(conflict) {
@@ -466,115 +536,90 @@ export default {
opacity: 0.9;
}
-.route-list {
+.tree-list {
display: flex;
flex-direction: column;
gap: 8px;
}
-.route-item {
+.tree-item {
+ border-radius: 6px;
+ transition: all 0.3s;
+ border: 1px solid rgba(0, 138, 255, 0.1);
+}
+
+.tree-item-header {
display: flex;
align-items: center;
gap: 10px;
padding: 10px;
background: rgba(255, 255, 255, 0.8);
- border-radius: 6px;
cursor: pointer;
transition: all 0.3s;
- border: 1px solid rgba(0, 138, 255, 0.1);
- position: relative;
+ border-radius: 6px;
}
-.route-item:hover {
+.tree-item-header:hover {
background: rgba(0, 138, 255, 0.1);
transform: translateX(-2px);
box-shadow: 0 2px 8px rgba(0, 138, 255, 0.15);
}
-.route-item.active {
- background: rgba(0, 138, 255, 0.15);
- border-color: rgba(0, 138, 255, 0.3);
- box-shadow: 0 2px 10px rgba(0, 138, 255, 0.25);
-}
-
-.route-info {
- flex: 1;
-}
-
-.route-name {
- font-size: 14px;
- font-weight: 500;
- color: #333;
-}
-
-.route-meta {
- font-size: 12px;
- color: #999;
+.tree-item.plan-item .tree-item-header {
+ background: rgba(255, 255, 255, 0.9) !important;
}
-.route-actions {
- display: flex;
- gap: 8px;
+.tree-item.route-item .tree-item-header {
+ background: rgba(255, 255, 255, 0.8) !important;
}
-.route-actions i {
- cursor: pointer;
- color: #008aff;
- font-size: 14px;
- padding: 4px;
- border-radius: 4px;
- transition: all 0.2s;
+.tree-item.route-item:not(.active) .tree-item-header {
+ background: rgba(255, 255, 255, 0.8) !important;
}
-.route-actions i:hover {
- background: rgba(0, 138, 255, 0.1);
- transform: scale(1.2);
+.tree-item.waypoint-item .tree-item-header {
+ background: rgba(224, 238, 255, 0.8);
}
-.waypoint-list {
- display: flex;
- flex-direction: column;
- gap: 8px;
+.tree-item.active .tree-item-header {
+ background: rgba(0, 138, 255, 0.15) !important;
+ border-color: rgba(0, 138, 255, 0.3);
+ box-shadow: 0 2px 10px rgba(0, 138, 255, 0.25);
}
-.waypoint-item {
- display: flex;
- align-items: center;
- gap: 10px;
- padding: 10px;
- background: rgba(255, 255, 255, 0.8);
- border-radius: 6px;
- transition: all 0.3s;
- border: 1px solid rgba(0, 138, 255, 0.1);
+.tree-item.selected .tree-item-header {
+ background: rgba(0, 138, 255, 0.1) !important;
+ border-color: rgba(0, 138, 255, 0.2);
}
-.waypoint-item:hover {
- background: rgba(0, 138, 255, 0.1);
- transform: translateX(-2px);
- box-shadow: 0 2px 8px rgba(0, 138, 255, 0.15);
+.tree-icon {
+ font-size: 16px;
+ color: #008aff;
+ flex-shrink: 0;
}
-.waypoint-info {
+.tree-item-info {
flex: 1;
}
-.waypoint-name {
+.tree-item-name {
font-size: 14px;
font-weight: 500;
color: #333;
}
-.waypoint-meta {
+.tree-item-meta {
font-size: 12px;
color: #999;
}
-.waypoint-actions {
+.tree-item-actions {
display: flex;
gap: 8px;
+ flex-shrink: 0;
}
-.waypoint-actions i {
+.tree-item-actions i {
cursor: pointer;
color: #008aff;
font-size: 14px;
@@ -583,11 +628,27 @@ export default {
transition: all 0.2s;
}
-.waypoint-actions i:hover {
+.tree-item-actions i:hover {
background: rgba(0, 138, 255, 0.1);
transform: scale(1.2);
}
+.tree-children {
+ margin-left: 20px;
+ margin-top: 4px;
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.route-children {
+ margin-left: 25px;
+}
+
+.waypoint-children {
+ margin-left: 50px;
+}
+
.action-buttons {
display: flex;
gap: 10px;
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index eaf2c72..72a0ef6 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -106,6 +106,7 @@
({
@@ -1139,56 +1147,92 @@ export default {
const minutes = (val % 4) * 15;
return `K+${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
},
+
+ createPlan() {
+ this.$message.success('创建方案');
+ },
+
+ openPlanDialog(plan) {
+ this.$message.success('打开方案编辑对话框');
+ },
+
selectPlan(plan) {
- this.selectedPlanId = plan.id;
- this.selectedPlanDetails = plan;
+ if (plan && plan.id) {
+ this.selectedPlanId = plan.id;
+ this.selectedPlanDetails = plan;
+ } else {
+ this.selectedPlanId = null;
+ this.selectedPlanDetails = null;
+ }
this.selectedRouteId = null;
this.selectedRouteDetails = null;
},
- /** 切换航线：实现多选/开关逻辑 */
+ /** 切换航线：实现复杂的交互逻辑 */
async selectRoute(route) {
const index = this.activeRouteIds.indexOf(route.id);
+ const isRouteExpanded = this.$refs.rightPanel ? this.$refs.rightPanel.expandedRoutes.includes(route.id) : false;
// 航线已在选中列表中
if (index > -1) {
- this.activeRouteIds.splice(index, 1);
- if (this.$refs.cesiumMap) {
- this.$refs.cesiumMap.removeRouteById(route.id);
- }
- if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
- if (this.activeRouteIds.length > 0) {
- const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
- try {
- const res = await getRoutes(lastId);
- if (res.code === 200 && res.data) {
- this.selectedRouteDetails = {
- id: res.data.id,
- name: res.data.callSign,
- waypoints: res.data.waypoints || []
- };
+ if (isRouteExpanded) {
+ // 航线已展开，点击则收回航点（不取消选中）
+ // 这个逻辑在 RightPanel 的 toggleRoute 中处理
+ return;
+ } else {
+ // 航线未展开，点击则取消选中（从地图移除）
+ this.activeRouteIds.splice(index, 1);
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.removeRouteById(route.id);
+ }
+ if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+ if (this.activeRouteIds.length > 0) {
+ const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
+ try {
+ const res = await getRoutes(lastId);
+ if (res.code === 200 && res.data) {
+ this.selectedRouteId = res.data.id;
+ this.selectedRouteDetails = {
+ id: res.data.id,
+ name: res.data.callSign,
+ waypoints: res.data.waypoints || []
+ };
+ }
+ } catch (e) {
+ console.error("回显剩余航线失败", e);
}
- } catch (e) {
- console.error("回显剩余航线失败", e);
+ } else {
+ this.selectedRouteId = null;
+ this.selectedRouteDetails = null;
}
- } else {
- this.selectedRouteDetails = null;
}
+ this.$message.info(`已取消航线: ${route.name}`);
+ return;
}
- this.$message.info(`已移除航线: ${route.name}`);
- return;
}
- // 航线未被选中
+
+ // 航线未被选中，点击则选中并显示航线和航点
try {
const response = await getRoutes(route.id);
if (response.code === 200 && response.data) {
const fullRouteData = response.data;
const waypoints = fullRouteData.waypoints || [];
this.activeRouteIds.push(route.id);
- this.selectedRouteDetails = {
- id: fullRouteData.id,
- name: fullRouteData.callSign,
- waypoints: waypoints
- };
+ this.selectedRouteId = fullRouteData.id;
+ this.selectedRouteDetails = {
+ id: fullRouteData.id,
+ name: fullRouteData.callSign,
+ waypoints: waypoints
+ };
+
+ // 更新 routes 数组中对应航线的 waypoints 字段
+ const routeIndex = this.routes.findIndex(r => r.id === route.id);
+ if (routeIndex > -1) {
+ this.$set(this.routes, routeIndex, {
+ ...this.routes[routeIndex],
+ waypoints: waypoints
+ });
+ }
+
if (waypoints.length > 0) {
// 通知地图渲染
if (this.$refs.cesiumMap) {
@@ -1229,6 +1273,44 @@ export default {
this.$message.info('已清空所有选中航线');
},
+ // 切换航线显示/隐藏
+ toggleRouteVisibility(route) {
+ const index = this.activeRouteIds.indexOf(route.id);
+
+ if (index > -1) {
+ // 航线已显示，隐藏它
+ // 使用过滤创建新数组，确保 Vue 能够检测到变化
+ this.activeRouteIds = this.activeRouteIds.filter(id => id !== route.id);
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.removeRouteById(route.id);
+ }
+ if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+ if (this.activeRouteIds.length > 0) {
+ const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
+ getRoutes(lastId).then(res => {
+ if (res.code === 200 && res.data) {
+ this.selectedRouteId = res.data.id;
+ this.selectedRouteDetails = {
+ id: res.data.id,
+ name: res.data.callSign,
+ waypoints: res.data.waypoints || []
+ };
+ }
+ }).catch(e => {
+ console.error("获取航线详情失败", e);
+ });
+ } else {
+ this.selectedRouteId = null;
+ this.selectedRouteDetails = null;
+ }
+ }
+ this.$message.info(`已隐藏航线: ${route.name}`);
+ } else {
+ // 航线已隐藏，显示它
+ this.selectRoute(route);
+ }
+ },
+
// 冲突操作
runConflictCheck() {
this.conflictCount = 2;
From c59b06d910301d24dcc9a1c2f942d6261be5cd4b Mon Sep 17 00:00:00 2001
From: ctw <1051735452@qq.com>
Date: Mon, 26 Jan 2026 15:31:48 +0800
Subject: [PATCH 09/22] 1
---
ruoyi-ui/src/views/childRoom/RightPanel.vue | 5 +-
ruoyi-ui/src/views/childRoom/index.vue | 213 +++++++++++++++++++---------
2 files changed, 148 insertions(+), 70 deletions(-)
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index d035038..3633faa 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -324,7 +324,7 @@ export default {
})
}
},
-
+
// 切换航线展开/折叠
toggleRoute(routeId) {
const route = this.routes.find(r => r.id === routeId)
@@ -354,11 +354,12 @@ export default {
})
}
},
-
+
handleHide() {
this.$emit('hide')
},
+ // 新建航线事件
handleSelectPlan(plan) {
this.$emit('select-plan', plan)
},
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 72a0ef6..2574340 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -114,7 +114,7 @@
:selected-plan-details="selectedPlanDetails"
:selected-route-id="selectedRouteId"
:routes="routes"
- :activeRouteIds="activeRouteIds"
+ :active-route-ids="activeRouteIds"
:selected-route-details="selectedRouteDetails"
:conflicts="conflicts"
:conflict-count="conflictCount"
@@ -272,7 +272,8 @@ import LeftMenu from './LeftMenu'
import RightPanel from './RightPanel'
import BottomLeftPanel from './BottomLeftPanel'
import TopHeader from './TopHeader'
-import { listRoutes, getRoutes, addRoutes } from "@/api/system/routes";
+import { listScenario} from "@/api/system/scenario";
+import { listRoutes, getRoutes, addRoutes,delRoutes } from "@/api/system/routes";
import { updateWaypoints } from "@/api/system/waypoints";
export default {
name: 'MissionPlanningView',
@@ -303,9 +304,6 @@ export default {
selectedRoute: null,
showWaypointDialog: false,
selectedWaypoint: null,
- showNameDialog: false,
- newRouteName: '',
- tempMapPoints: [],
// 威力区、比例尺、外部参数弹窗
showPowerZoneDialog: false,
currentPowerZone: {},
@@ -315,6 +313,9 @@ export default {
currentExternalParams: {},
showPageLayoutDialog: false,
menuPosition: 'left',
+ showNameDialog: false,
+ newRouteName: '',
+ tempMapPoints: [],
// 作战信息
roomCode: 'JTF-7-ALPHA',
@@ -395,7 +396,6 @@ export default {
activeRightTab: 'plan',
activeRouteIds: [], // 存储当前所有选中的航线ID
-
// 冲突数据
conflictCount: 2,
conflicts: [
@@ -437,20 +437,7 @@ export default {
],
// 航线数据 - 改为方案-航线-航点三级结构
- plans: [
- {
- id: 1,
- name: '方案A',
- routes: [
- ]
- },
- {
- id: 2,
- name: '方案B',
- routes: [
- ]
- }
- ],
+ plans: [],
// 时间控制
timeProgress: 45,
@@ -544,20 +531,60 @@ export default {
this.selectedPlanId = plan.id;
this.selectedPlanDetails = plan;
}
-
+
if (this.$refs.cesiumMap) {
this.$refs.cesiumMap.startMissionRouteDrawing();
this.$message.success('进入航线规划模式');
}
-
+ },
+ async handleDeleteRoute(route) {
+ try {
+ // 二次确认，防止误删
+ await this.$confirm(`确定要彻底删除航线 "${route.name}" 吗？`, '提示', {
+ type: 'warning'
+ });
+ if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
+ this.selectedRouteDetails = null;
+ }
+ const res = await delRoutes(route.id);
+ if (res.code === 200) {
+ this.$message.success('删除成功');
+ // 同步地图：如果该航线正在显示，立即清除
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.removeRouteById(route.id);
+ }
+ // 同步状态：从选中列表中移除该 ID
+ const idx = this.activeRouteIds.indexOf(route.id);
+ if (idx > -1) {
+ this.activeRouteIds.splice(idx, 1);
+ }
+ await this.getList();
+ }
+ } catch (e) {
+ if (e !== 'cancel') {
+ console.error("删除航线失败:", e);
+ this.$message.error('删除操作失败');
+ }
+ }
},
/** 从数据库拉取最新的航线列表数据 */
+ /** 从数据库拉取最新的数据 */
async getList() {
- const query = {}; // 移除固定的 scenarioId，获取所有航线
try {
- const response = await listRoutes(query);
- if (response.code === 200) {
- this.routes = response.rows.map(item => ({
+ // 1. 获取所有方案
+ const scenarioRes = await listScenario({});
+ if (scenarioRes.code === 200) {
+ this.plans = scenarioRes.rows.map(s => ({
+ id: s.id,
+ name: s.name,
+ routes: []
+ }));
+ }
+
+ // 2. 获取所有航线
+ const routeRes = await listRoutes({});
+ if (routeRes.code === 200) {
+ const allRoutes = routeRes.rows.map(item => ({
id: item.id,
name: item.callSign,
points: item.waypoints ? item.waypoints.length : 0,
@@ -565,9 +592,18 @@ export default {
conflict: false,
scenarioId: item.scenarioId
}));
+
+ // 3. 将航线分配到对应的方案中
+ this.plans.forEach(plan => {
+ plan.routes = allRoutes.filter(r => r.scenarioId === plan.id);
+ });
+
+ // 保存一份扁平的 routes 供搜索或其他组件使用
+ this.routes = allRoutes;
}
} catch (error) {
- this.$message.error("获取航线列表失败");
+ console.error("数据加载失败:", error);
+ this.$message.error("获取方案列表失败");
}
},
handleMapDrawComplete(points) {
@@ -586,10 +622,16 @@ export default {
this.$message.error('新增航线未命名，请输入名称后保存！');
return;
}
+ // 获取当前选中的方案 ID
+ const currentScenarioId = this.selectedPlanId;
+ if (!currentScenarioId) {
+ this.$message.warning('请先在左侧选择一个方案，再保存航线！');
+ return;
+ }
// 构造符合后端 Routes 实体类的数据结构
const routeData = {
callSign: this.newRouteName,
- scenarioId: this.selectedPlanId || 1, // 使用当前选中的方案ID，默认1
+ scenarioId: currentScenarioId || 1, // 使用当前选中的方案ID，默认1
platformId: 1,
attributes: "{}",
waypoints: this.tempMapPoints.map((p, index) => ({
@@ -607,7 +649,27 @@ export default {
// 调用后端 API 保存到数据库
const response = await addRoutes(routeData);
if (response.code === 200) {
- this.$message.success('航线及其航点已成功保存至数据库');
+ this.$message.success('航线及其航点已成功保存至当前方案');
+ // 获取后端生成的正式 ID
+ const savedRoute = response.data;
+ const newRouteId = savedRoute ? savedRoute.id : null;
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.clearRoute();
+ // 如果拿到了正式 ID，则按照“正式航线”的规则渲染一次
+ if (newRouteId) {
+ if (!this.activeRouteIds.includes(savedRoute.id)) {
+ this.activeRouteIds.push(savedRoute.id);
+ }
+ // 更新当前详情，确保右侧下方航点列表立刻显示
+ this.selectedRouteDetails = {
+ id: newRouteId,
+ name: this.newRouteName,
+ waypoints: routeData.waypoints
+ };
+ //使用正式 ID 渲染点和线
+ this.$refs.cesiumMap.renderRouteWaypoints(routeData.waypoints, newRouteId);
+ }
+ }
// 重置 UI 状态
this.showNameDialog = false;
this.drawDom = false;
@@ -1147,15 +1209,7 @@ export default {
const minutes = (val % 4) * 15;
return `K+${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:00`;
},
-
- createPlan() {
- this.$message.success('创建方案');
- },
-
- openPlanDialog(plan) {
- this.$message.success('打开方案编辑对话框');
- },
-
+ // 航线操作
selectPlan(plan) {
if (plan && plan.id) {
this.selectedPlanId = plan.id;
@@ -1167,11 +1221,10 @@ export default {
this.selectedRouteId = null;
this.selectedRouteDetails = null;
},
- /** 切换航线：实现复杂的交互逻辑 */
+ /** 切换航线：实现多选/开关逻辑 */
async selectRoute(route) {
const index = this.activeRouteIds.indexOf(route.id);
const isRouteExpanded = this.$refs.rightPanel ? this.$refs.rightPanel.expandedRoutes.includes(route.id) : false;
-
// 航线已在选中列表中
if (index > -1) {
if (isRouteExpanded) {
@@ -1209,7 +1262,7 @@ export default {
return;
}
}
-
+
// 航线未被选中，点击则选中并显示航线和航点
try {
const response = await getRoutes(route.id);
@@ -1217,13 +1270,13 @@ export default {
const fullRouteData = response.data;
const waypoints = fullRouteData.waypoints || [];
this.activeRouteIds.push(route.id);
- this.selectedRouteId = fullRouteData.id;
- this.selectedRouteDetails = {
- id: fullRouteData.id,
- name: fullRouteData.callSign,
- waypoints: waypoints
- };
-
+ this.selectedRouteId = fullRouteData.id;
+ this.selectedRouteDetails = {
+ id: fullRouteData.id,
+ name: fullRouteData.callSign,
+ waypoints: waypoints
+ };
+
// 更新 routes 数组中对应航线的 waypoints 字段
const routeIndex = this.routes.findIndex(r => r.id === route.id);
if (routeIndex > -1) {
@@ -1232,7 +1285,7 @@ export default {
waypoints: waypoints
});
}
-
+
if (waypoints.length > 0) {
// 通知地图渲染
if (this.$refs.cesiumMap) {
@@ -1248,6 +1301,25 @@ export default {
}
},
+ createPlan() {
+ const newId = Date.now();
+ const newPlan = {
+ id: newId,
+ name: `新方案${this.plans.length + 1}`,
+ routes: []
+ };
+ this.plans.push(newPlan);
+ this.selectPlan(newPlan);
+ },
+ openPlanDialog(plan) {
+ this.$prompt('请输入方案名称', '编辑方案', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ inputValue: plan.name
+ }).then(({ value }) => {
+ plan.name = value;
+ }).catch(() => {});
+ },
addWaypoint() {
if (this.selectedRouteDetails) {
const count = this.selectedRouteDetails.waypoints.length + 1;
@@ -1257,7 +1329,12 @@ export default {
speed: '800km/h',
eta: `K+01:${(count * 15).toString().padStart(2, '0')}:00`
});
- this.$message.success('添加航点成功');
+ if (this.selectedPlanDetails) {
+ const route = this.selectedPlanDetails.routes.find(r => r.id === this.selectedRouteId);
+ if (route) {
+ route.points = this.selectedRouteDetails.waypoints.length;
+ }
+ }
}
},
@@ -1276,7 +1353,7 @@ export default {
// 切换航线显示/隐藏
toggleRouteVisibility(route) {
const index = this.activeRouteIds.indexOf(route.id);
-
+
if (index > -1) {
// 航线已显示，隐藏它
// 使用过滤创建新数组，确保 Vue 能够检测到变化
@@ -1286,23 +1363,23 @@ export default {
}
if (this.selectedRouteDetails && this.selectedRouteDetails.id === route.id) {
if (this.activeRouteIds.length > 0) {
- const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
- getRoutes(lastId).then(res => {
- if (res.code === 200 && res.data) {
- this.selectedRouteId = res.data.id;
- this.selectedRouteDetails = {
- id: res.data.id,
- name: res.data.callSign,
- waypoints: res.data.waypoints || []
- };
- }
- }).catch(e => {
- console.error("获取航线详情失败", e);
- });
- } else {
- this.selectedRouteId = null;
- this.selectedRouteDetails = null;
+ const lastId = this.activeRouteIds[this.activeRouteIds.length - 1];
+ getRoutes(lastId).then(res => {
+ if (res.code === 200 && res.data) {
+ this.selectedRouteId = res.data.id;
+ this.selectedRouteDetails = {
+ id: res.data.id,
+ name: res.data.callSign,
+ waypoints: res.data.waypoints || []
+ };
}
+ }).catch(e => {
+ console.error("获取航线详情失败", e);
+ });
+ } else {
+ this.selectedRouteId = null;
+ this.selectedRouteDetails = null;
+ }
}
this.$message.info(`已隐藏航线: ${route.name}`);
} else {
@@ -1363,7 +1440,7 @@ export default {
background-position: center;
z-index: 1;
}
-
+/* ...其余样式省略，保持不变... */
.map-overlay-text {
position: absolute;
top: 50%;
From 6071fa04025c0edebdd7d58cb3f3e87581ec6c5d Mon Sep 17 00:00:00 2001
From: menghao <1584479611@qq.com>
Date: Mon, 26 Jan 2026 15:50:22 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/childRoom/RightPanel.vue | 8 +----
ruoyi-ui/src/views/childRoom/index.vue | 47 +++++++++++++++++------------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/childRoom/RightPanel.vue b/ruoyi-ui/src/views/childRoom/RightPanel.vue
index 3633faa..2b32a52 100644
--- a/ruoyi-ui/src/views/childRoom/RightPanel.vue
+++ b/ruoyi-ui/src/views/childRoom/RightPanel.vue
@@ -71,7 +71,7 @@
@@ -359,7 +359,6 @@ export default {
this.$emit('hide')
},
- // 新建航线事件
handleSelectPlan(plan) {
this.$emit('select-plan', plan)
},
@@ -407,11 +406,6 @@ export default {
active: this.activeRouteIds.includes(routeId)
}
},
-
- handleDeleteRoute(route) {
- // 暂时留空，后续实现
- },
-
handleOpenWaypointDialog(point) {
this.$emit('open-waypoint-dialog', point)
},
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index 84a2431..eae1084 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -125,6 +125,7 @@
@select-plan="selectPlan"
@select-route="selectRoute"
@create-route="createRoute"
+ @delete-route="handleDeleteRoute"
@create-plan="createPlan"
@open-plan-dialog="openPlanDialog"
@open-route-dialog="openRouteDialog"
@@ -272,6 +273,7 @@ import LeftMenu from './LeftMenu'
import RightPanel from './RightPanel'
import BottomLeftPanel from './BottomLeftPanel'
import TopHeader from './TopHeader'
+import { listScenario} from "@/api/system/scenario";
import { listRoutes, getRoutes, addRoutes,delRoutes } from "@/api/system/routes";
import { updateWaypoints } from "@/api/system/waypoints";
export default {
@@ -436,20 +438,7 @@ export default {
],
// 航线数据 - 改为方案-航线-航点三级结构
- plans: [
- {
- id: 1,
- name: '方案A',
- routes: [
- ]
- },
- {
- id: 2,
- name: '方案B',
- routes: [
- ]
- }
- ],
+ plans: [],
// 时间控制
timeProgress: 45,
@@ -580,12 +569,23 @@ export default {
}
},
/** 从数据库拉取最新的航线列表数据 */
+ /** 从数据库拉取最新的数据 */
async getList() {
- const query = {}; // 移除固定的 scenarioId，获取所有航线
try {
- const response = await listRoutes(query);
- if (response.code === 200) {
- this.routes = response.rows.map(item => ({
+ // 1. 获取所有方案
+ const scenarioRes = await listScenario({});
+ if (scenarioRes.code === 200) {
+ this.plans = scenarioRes.rows.map(s => ({
+ id: s.id,
+ name: s.name,
+ routes: []
+ }));
+ }
+
+ // 2. 获取所有航线
+ const routeRes = await listRoutes({});
+ if (routeRes.code === 200) {
+ const allRoutes = routeRes.rows.map(item => ({
id: item.id,
name: item.callSign,
points: item.waypoints ? item.waypoints.length : 0,
@@ -593,9 +593,18 @@ export default {
conflict: false,
scenarioId: item.scenarioId
}));
+
+ // 3. 将航线分配到对应的方案中
+ this.plans.forEach(plan => {
+ plan.routes = allRoutes.filter(r => r.scenarioId === plan.id);
+ });
+
+ // 保存一份扁平的 routes 供搜索或其他组件使用
+ this.routes = allRoutes;
}
} catch (error) {
- this.$message.error("获取航线列表失败");
+ console.error("数据加载失败:", error);
+ this.$message.error("获取方案列表失败");
}
},
handleMapDrawComplete(points) {
From 0dbc8ccb227a5082f19d689444cc3c57809200f5 Mon Sep 17 00:00:00 2001
From: menghao <1584479611@qq.com>
Date: Mon, 26 Jan 2026 19:52:33 +0800
Subject: [PATCH 11/22] =?UTF-8?q?1=E5=88=AB=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/views/cesiumMap/index.vue | 7 ++-
ruoyi-ui/src/views/childRoom/index.vue | 88 +++++++++++++++++++---------------
ruoyi-ui/vue.config.js | 2 +-
3 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue
index 21e7bc9..735b177 100644
--- a/ruoyi-ui/src/views/cesiumMap/index.vue
+++ b/ruoyi-ui/src/views/cesiumMap/index.vue
@@ -241,13 +241,18 @@ export default {
},
renderRouteWaypoints(waypoints, routeId = 'default') {
+ console.log('renderRouteWaypoints被调用，航点数据:', waypoints);
+ console.log('航点数量:', waypoints ? waypoints.length : 0);
if (!waypoints || waypoints.length < 1) return;
const positions = [];
// 1. 遍历并绘制航点标记
waypoints.forEach((wp, index) => {
+ console.log(`处理航点${index}:`, wp);
+ console.log(`航点${index}的字段:`, Object.keys(wp));
const lon = parseFloat(wp.lng);
const lat = parseFloat(wp.lat);
- const pos = Cesium.Cartesian3.fromDegrees(lon, lat, parseFloat(wp.alt || 500));
+ console.log(`航点${index}坐标:`, {lon, lat, alt: wp.altitude || wp.alt});
+ const pos = Cesium.Cartesian3.fromDegrees(lon, lat, parseFloat(wp.altitude || wp.alt || 500));
positions.push(pos);
this.viewer.entities.add({
diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue
index eae1084..333a82b 100644
--- a/ruoyi-ui/src/views/childRoom/index.vue
+++ b/ruoyi-ui/src/views/childRoom/index.vue
@@ -618,21 +618,21 @@ export default {
},
/** 弹窗点击“确定”：正式将数据保存到后端数据库 */
async confirmSaveNewRoute() {
- // 严格校验起名逻辑
+ // 1. 严格校验
if (!this.newRouteName || this.newRouteName.trim() === '') {
this.$message.error('新增航线未命名，请输入名称后保存！');
return;
}
- // 获取当前选中的方案 ID
const currentScenarioId = this.selectedPlanId;
if (!currentScenarioId) {
this.$message.warning('请先在左侧选择一个方案，再保存航线！');
return;
}
- // 构造符合后端 Routes 实体类的数据结构
+
+ // 2. 构造数据
const routeData = {
callSign: this.newRouteName,
- scenarioId: currentScenarioId || 1, // 使用当前选中的方案ID，默认1
+ scenarioId: currentScenarioId,
platformId: 1,
attributes: "{}",
waypoints: this.tempMapPoints.map((p, index) => ({
@@ -645,45 +645,55 @@ export default {
turnAngle: 0.0
}))
};
+ try {
+ const response = await addRoutes(routeData);
+ if (response.code === 200) {
+ this.$message.success('航线及其航点已成功保存至当前方案');
- try {
- // 调用后端 API 保存到数据库
- const response = await addRoutes(routeData);
- if (response.code === 200) {
- this.$message.success('航线及其航点已成功保存至当前方案');
- // 获取后端生成的正式 ID
- const savedRoute = response.data;
- const newRouteId = savedRoute ? savedRoute.id : null;
- if (this.$refs.cesiumMap) {
- this.$refs.cesiumMap.clearRoute();
- // 如果拿到了正式 ID，则按照“正式航线”的规则渲染一次
- if (newRouteId) {
- if (!this.activeRouteIds.includes(savedRoute.id)) {
- this.activeRouteIds.push(savedRoute.id);
- }
- // 更新当前详情，确保右侧下方航点列表立刻显示
- this.selectedRouteDetails = {
- id: newRouteId,
- name: this.newRouteName,
- waypoints: routeData.waypoints
- };
- //使用正式 ID 渲染点和线
- this.$refs.cesiumMap.renderRouteWaypoints(routeData.waypoints, newRouteId);
+ const savedRoute = response.data;
+ const newRouteId = savedRoute ? savedRoute.id : null;
+
+ // 1. 立即停止绘制并清除临时线（不要用 clearRoute）
+ if (this.$refs.cesiumMap) {
+ this.drawDom = false;
+ if (this.$refs.cesiumMap.clearTempRoute) this.$refs.cesiumMap.clearTempRoute();
}
+
+ // 2. 先执行刷新列表，同步后端数据库状态
+ await this.getList();
+
+ // 3. 在列表刷新后的“下一帧”执行选中和渲染逻辑
+ this.$nextTick(async () => {
+ if (newRouteId) {
+ // 确保新 ID 在激活列表中（触发右侧勾选 UI）
+ if (!this.activeRouteIds.includes(newRouteId)) {
+ this.activeRouteIds.push(newRouteId);
+ }
+
+ // 重新锁定选中详情，防止被 getList 重置为空
+ this.selectedRouteId = newRouteId;
+ this.selectedRouteDetails = {
+ id: newRouteId,
+ name: this.newRouteName,
+ waypoints: routeData.waypoints
+ };
+
+ // 显式执行连线渲染
+ if (this.$refs.cesiumMap) {
+ this.$refs.cesiumMap.renderRouteWaypoints(routeData.waypoints, newRouteId);
+ }
+ }
+ });
+
+ // 4. 重置弹窗 UI
+ this.showNameDialog = false;
+ this.newRouteName = '';
+ this.tempMapPoints = [];
}
- // 重置 UI 状态
- this.showNameDialog = false;
- this.drawDom = false;
- this.newRouteName = '';
- this.tempMapPoints = [];
- // 重新拉取右侧航线列表以保持同步
- await this.getList();
+ } catch (error) {
+ console.error("保存失败:", error);
}
- } catch (error) {
- console.error("保存航线失败:", error);
- this.$message.error('保存失败，请检查后端服务');
- }
- },
+ },
// 航点编辑弹窗相关方法
openWaypointDialog(waypoint) {
this.selectedWaypoint = waypoint;
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 0488a18..25854e2 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -10,7 +10,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
-const baseUrl = 'http://192.168.50.145:8080' // 后端接口
+const baseUrl = 'http://127.0.0.1:8080' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口
// 定义 Cesium 源码路径
From 7b003f8ec09528c8c1953c463700a1d2dd8ceab2 Mon Sep 17 00:00:00 2001
From: menghao <1584479611@qq.com>
Date: Thu, 29 Jan 2026 11:21:11 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E6=96=B9=E6=A1=88-=E8=88=AA=E7=BA=BF-?=
=?UTF-8?q?=E8=88=AA=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ruoyi/web/controller/RoutesController.java | 7 +-
.../system/service/impl/RoutesServiceImpl.java | 11 +-
ruoyi-ui/src/views/cesiumMap/index.vue | 610 ++++++---------------
ruoyi-ui/src/views/childRoom/RightPanel.vue | 59 +-
ruoyi-ui/src/views/childRoom/index.vue | 334 +++++++----
ruoyi-ui/src/views/selectRoom/index.vue | 5 +-
6 files changed, 457 insertions(+), 569 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java
index 15ee0d2..18a57c5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java
@@ -77,7 +77,12 @@ public class RoutesController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody Routes routes)
{
- return toAjax(routesService.insertRoutes(routes));
+ // 1. 执行插入，MyBatis 会通过 useGeneratedKeys="true" 自动将新 ID 注入 routes 对象
+ int rows = routesService.insertRoutes(routes);
+
+ // 2. 不要用 toAjax，直接返回 success 并带上 routes 对象
+ // 这样前端 response.data 就会包含这个带有 ID 的完整对象
+ return rows > 0 ? AjaxResult.success(routes) : AjaxResult.error("新增航线失败");
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
index e106817..cf781a4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RoutesServiceImpl.java
@@ -58,7 +58,16 @@ public class RoutesServiceImpl implements IRoutesService
@Override
public List
-
+
+ ⚠️ 首尾航点坡度已锁定为 0，不可编辑
+