diff --git a/src/config/router.config.js b/src/config/router.config.js
index 9aec983..5700aa9 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -225,11 +225,6 @@ export const constantRouterMap = [
component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/trainer/index.vue'),
meta: { title: '训练员系统' },
},
- {
- path: '/simulationScene/trainerMenu',
- name: 'SimulationSceneTrainerMenu',
- component: () => import(/* webpackChunkName: "fail" */ '@/views/simulationScene/trainer/Menu.vue'),
- },
{
path: '/simulationScene/trainerSystem',
name: 'SimulationSceneTrainerSystem',
diff --git a/src/views/simulationScene/centralControl/index.vue b/src/views/simulationScene/centralControl/index.vue
index b24a070..8b200be 100644
--- a/src/views/simulationScene/centralControl/index.vue
+++ b/src/views/simulationScene/centralControl/index.vue
@@ -413,7 +413,7 @@ export default {
const centerLon = (leftUpLon + rightUpLon + rightDownLon + leftDownLon) / 4
const centerLat = (leftUpLat + rightUpLat + rightDownLat + leftDownLat) / 4
this.roomInfo.cesium = new window.MyCesium('jwd-cesium', { center: [centerLon, centerLat] })
- this.roomInfo.cesium.setViewerByAllCorner(
+ this.roomInfo.cesium.setClientByAllCorner(
[leftUpLon, leftUpLat],
[rightUpLon, rightUpLat],
[rightDownLon, rightDownLat],
diff --git a/src/views/simulationScene/index.vue b/src/views/simulationScene/index.vue
index 2b79ee6..59608da 100644
--- a/src/views/simulationScene/index.vue
+++ b/src/views/simulationScene/index.vue
@@ -2,7 +2,7 @@
diff --git a/src/views/simulationScene/sceneEditing/components/SceneEditing.vue b/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
index 8bd0b6b..e828a2f 100644
--- a/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
+++ b/src/views/simulationScene/sceneEditing/components/SceneEditing.vue
@@ -190,6 +190,12 @@ export default {
}
},
dragend(item, e) {
+ const minX = this.$refs['cesium-container'].offsetLeft
+ const maxX = this.$refs['cesium-container'].offsetLeft + this.$refs['cesium-container'].offsetWidth
+ const minY = this.$refs['cesium-container'].offsetTop
+ const maxY = this.$refs['cesium-container'].offsetTop + this.$refs['cesium-container'].offsetHeight
+ if (e.x < minX || e.x > maxX || e.Y < minY || e.Y > maxY) return
+
const x = e.x - this.$refs['cesium-container'].offsetLeft
const y = e.y - this.$refs['cesium-container'].offsetTop
const { plotId, longitude, latitude } = this.cesium.addPlot(item.imgBase64, { x, y })
diff --git a/src/views/simulationScene/sceneEditing/index.vue b/src/views/simulationScene/sceneEditing/index.vue
index 859d099..545bce8 100644
--- a/src/views/simulationScene/sceneEditing/index.vue
+++ b/src/views/simulationScene/sceneEditing/index.vue
@@ -7,7 +7,7 @@
-
+
【{{ scenarioId }}】{{ scenarioName }}
@@ -73,4 +73,4 @@ export default {
letter-spacing: 2px;
color: #00deff;
}
-
\ No newline at end of file
+
diff --git a/src/views/simulationScene/trainer/Menu.vue b/src/views/simulationScene/trainer/Menu.vue
deleted file mode 100644
index ac65d2a..0000000
--- a/src/views/simulationScene/trainer/Menu.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/simulationScene/trainer/index.vue b/src/views/simulationScene/trainer/index.vue
index 2ee981f..d40196a 100644
--- a/src/views/simulationScene/trainer/index.vue
+++ b/src/views/simulationScene/trainer/index.vue
@@ -215,7 +215,7 @@ export default {
handleEnterRoom(roomItem) {
window.localStorage.setItem('trainerRoomId', roomItem.id)
window.localStorage.setItem('trainerRoomName', roomItem.roomName)
- this.$router.push({ name: 'SimulationSceneTrainerMenu' })
+ this.$router.push({ name: 'SimulationSceneTrainerSystemDisplay' })
},
},
}
diff --git a/src/views/simulationScene/trainer/system/index.vue b/src/views/simulationScene/trainer/system/index.vue
index 98db72d..e342c9b 100644
--- a/src/views/simulationScene/trainer/system/index.vue
+++ b/src/views/simulationScene/trainer/system/index.vue
@@ -1,27 +1,46 @@
-
-
-
-
+
- {{ roomName }}
+
\ No newline at end of file
+