diff --git a/ruoyi-ui/node_modules.zip b/ruoyi-ui/node_modules.zip deleted file mode 100644 index 9fc2cd2..0000000 Binary files a/ruoyi-ui/node_modules.zip and /dev/null differ diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index f52ace5..92bbe25 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -50,6 +50,8 @@ "vuex": "3.6.0" }, "devDependencies": { + "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6", + "@babel/plugin-transform-optional-chaining": "^7.28.6", "@vue/cli-plugin-babel": "4.4.6", "@vue/cli-service": "4.4.6", "babel-plugin-dynamic-import-node": "2.3.3", diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index b66190b..d4ff8dd 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register'] +const whiteList = ['/login', '/register', '/selectRoom', '/childRoom'] const isWhiteList = (path) => { return whiteList.some(pattern => isPathMatch(pattern, path)) diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index b0ef65e..e5847c7 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -1260,9 +1260,9 @@ export default { .main-toolbar { position: absolute; - top: 100px; + top: 365px; /* left: 50px; */ - right: 20px; + left: 62px; z-index: 1000; display: flex; diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue index e61d778..d8d61e7 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -53,6 +53,159 @@ > {{ item.name }} + + + + + + 新建计划 + 打开 + 保存 + + + + 导入 + + + + 导入计划 + 导入ACD + 导入ATO + 导入图层 + 导入航线 + + + + + 导出 + + + + + + + + 航线编辑 + 军事标绘 + 图标编辑 + 属性修改 + + + + 推演编辑 + + + + 时间设置 + 机型设置 + 关键事件编辑 + 导弹发射 + + + + + + + + + + + 2D/3D切换 + 显示/隐藏标尺 + 网格 + 比例尺 + 指北针 + + + + + + + + 加载/切换地形 + 投影 + 航空图 + + + + + + + + 航线计算 + 冲突显示 + 数据资料 + 坐标换算 + + + + + + + + 设置 + 系统说明 + + + + + + + + 图层收藏 + 航线收藏 + + @@ -70,7 +223,7 @@ -
+
在线人数
@@ -106,268 +259,38 @@
-
- -
- -
- - - - - - -
- - -
- -
+ -
- - -
- -
- - 方案 -
- - -
- - 冲突 - {{ conflictCount }} -
- - -
- - 平台 -
-
- - -
-
-
航线列表
-
-
- -
-
{{ route.name }}
-
{{ route.points }}个航点
-
- - 冲突 - -
-
-
- -
-
航点列表
-
-
- -
-
{{ point.name }}
-
高度: {{ point.altitude }}m | 速度: {{ point.speed }}
-
-
- - -
-
-
-
- -
- - 添加航点 - - - 取消 - -
-
- - -
-
-
-
- - {{ conflict.title }} - 严重 -
-
-
- 涉及航线: - {{ conflict.routes.join('、') }} -
-
- 冲突时间: - {{ conflict.time }} -
-
- 冲突位置: - {{ conflict.position }} -
-
-
- - 查看详情 - - - 解决冲突 - -
-
-
-
- -

暂无冲突

- - 重新检测 - -
-
- - -
-
- - -
-
-
- -
-
-
{{ platform.name }}
-
{{ platform.type }}
-
-
- -
-
-
-
- - -
-
-
- -
-
-
{{ platform.name }}
-
{{ platform.type }}
-
-
- -
-
-
-
- - -
-
-
- -
-
-
{{ platform.name }}
-
{{ platform.type }}
-
-
- -
-
-
-
-
-
-
-
+
+ + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue b/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue new file mode 100644 index 0000000..7a6d722 --- /dev/null +++ b/ruoyi-ui/src/views/dialogs/PlatformEditDialog.vue @@ -0,0 +1,295 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue b/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue new file mode 100644 index 0000000..ecee213 --- /dev/null +++ b/ruoyi-ui/src/views/dialogs/RouteEditDialog.vue @@ -0,0 +1,229 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue new file mode 100644 index 0000000..f32ec32 --- /dev/null +++ b/ruoyi-ui/src/views/dialogs/WaypointEditDialog.vue @@ -0,0 +1,227 @@ + + + + + \ No newline at end of file