diff --git a/ruoyi-ui/public/stepEditor.html b/ruoyi-ui/public/stepEditor.html deleted file mode 100644 index af92c33..0000000 --- a/ruoyi-ui/public/stepEditor.html +++ /dev/null @@ -1,832 +0,0 @@ - - - - - - 六步法编辑器 - - - - -
-
-
-
- - 关闭 - - {{ stepTitle }} -
-
- - - 保存 - - - - 导出 - -
-
- -
-
- - - - - - - - - - -
- -
- -
- - - - - - - - - - -
- -
- -
- - - B - - - - - I - - - - - U - - - - - S - - -
- -
- -
- - - x² - - - - - x₂ - - -
- -
- -
- - - - - - - - - - - - - - - - - - - - -
- -
- -
- - - - - - - - - - - - - - - - - - - - -
- -
- -
- - - - - -
- {{ wordCount }} 字 -
-
-
- -
-
-
-
- - -
-
- - - - - - - \ No newline at end of file diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 1770a53..835c700 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -58,12 +58,6 @@ export const constantRoutes = [ component: () => import('@/views/childRoom'), hidden: true }, - // 六步法编辑器 - { - path: '/stepEditor', - component: () => import('@/views/childRoom/StepEditor'), - hidden: true - }, { path: '/cesiumMap', component: () => import('@/views/cesiumMap'), diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index 7e35d8f..26e3d2c 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -297,8 +297,8 @@ - -
+ +
{{ scaleBarText }}
@@ -362,6 +362,11 @@ export default { type: Boolean, default: false }, + /** 六步法弹窗打开时为 true，隐藏坐标和比例尺 */ + hideMapInfo: { + type: Boolean, + default: false + }, /** 航线上锁状态（由父组件维护，与右侧列表锁图标同步） */ routeLocked: { type: Object, diff --git a/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue b/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue index 7220a27..e752bf6 100644 --- a/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue +++ b/ruoyi-ui/src/views/childRoom/BottomLeftPanel.vue @@ -1,6 +1,11 @@ + + diff --git a/ruoyi-ui/src/views/childRoom/StepEditor.vue b/ruoyi-ui/src/views/childRoom/StepEditor.vue deleted file mode 100644 index 14783af..0000000 --- a/ruoyi-ui/src/views/childRoom/StepEditor.vue +++ /dev/null @@ -1,599 +0,0 @@ - - - - - diff --git a/ruoyi-ui/src/views/childRoom/TaskPageContent.vue b/ruoyi-ui/src/views/childRoom/TaskPageContent.vue new file mode 100644 index 0000000..93a7b84 --- /dev/null +++ b/ruoyi-ui/src/views/childRoom/TaskPageContent.vue @@ -0,0 +1,683 @@ + + + + + diff --git a/ruoyi-ui/src/views/childRoom/UnderstandingStepContent.vue b/ruoyi-ui/src/views/childRoom/UnderstandingStepContent.vue new file mode 100644 index 0000000..9e96319 --- /dev/null +++ b/ruoyi-ui/src/views/childRoom/UnderstandingStepContent.vue @@ -0,0 +1,700 @@ + + + + + diff --git a/ruoyi-ui/src/views/childRoom/index.vue b/ruoyi-ui/src/views/childRoom/index.vue index d9efc8a..0ec1d0e 100644 --- a/ruoyi-ui/src/views/childRoom/index.vue +++ b/ruoyi-ui/src/views/childRoom/index.vue @@ -14,6 +14,7 @@ :scaleConfig="scaleConfig" :coordinateFormat="coordinateFormat" :bottomPanelVisible="bottomPanelVisible" + :hide-map-info="sixStepsOverlayVisible" :route-locked="routeLocked" :route-locked-by-other-ids="routeLockedByOtherRouteIds" :deduction-time-minutes="deductionMinutesFromK" @@ -207,7 +208,7 @@ @open-import-dialog="showImportDialog = true" /> - +