diff --git a/src/views/subsystem/display/index.vue b/src/views/subsystem/display/index.vue index 448ad31..fdedf75 100644 --- a/src/views/subsystem/display/index.vue +++ b/src/views/subsystem/display/index.vue @@ -2,7 +2,28 @@ 显示子系统 - 推演想定【{{ roomName }}-{{ scenarioName }}】 + + 推演想定【{{ roomName }}-{{ scenarioName }}】 + + + + + 剩余 {{ roomInfo.remainTimeStr }} @@ -61,6 +82,7 @@ export default { async getScenarioDetail() { try { const res = await getAction(`/baseData/scenario/${this.scenarioId}`) + this.scenarioDetail = res.data const { leftUpLng, leftUpLat, diff --git a/src/views/subsystem/model/index.vue b/src/views/subsystem/model/index.vue index 588d00a..3054b74 100644 --- a/src/views/subsystem/model/index.vue +++ b/src/views/subsystem/model/index.vue @@ -2,7 +2,28 @@ 场景编辑子系统 - 推演想定【{{ roomName }}-{{ scenarioName }}】 + + 推演想定【{{ roomName }}-{{ scenarioName }}】 + + + + + 剩余 {{ roomInfo.remainTimeStr }} @@ -205,7 +226,7 @@ export default { case 'xdrw': return [1, 1, 8] default: - return [4, 3, 3] + return [2, 4, 4] } }, blbzShowKeys() { @@ -255,6 +276,7 @@ export default { async getScenarioDetail() { try { const res = await getAction(`/baseData/scenario/${this.scenarioId}`) + this.scenarioDetail = res.data const { leftUpLng, leftUpLat, @@ -285,7 +307,11 @@ export default { this.roomInfo.duringTime = response.data.during_time break case 'path_init': - this.cesium.drawRouteByCoordinates(response.data.points, response.data.resourceId, ['red', 'blue'][response.data.teamType]) + this.cesium.drawRouteByCoordinates( + response.data.points, + response.data.resourceId, + ['red', 'blue'][response.data.teamType] + ) break case 'path_update': this.cesium.movePlotByCoordinates(response.data.resourceId, response.data.points) diff --git a/src/views/subsystem/scene/components/Zzxd.vue b/src/views/subsystem/scene/components/Zzxd.vue index a035756..7fa865b 100644 --- a/src/views/subsystem/scene/components/Zzxd.vue +++ b/src/views/subsystem/scene/components/Zzxd.vue @@ -108,6 +108,11 @@ export default { }, } }, + watch: { + resourceId() { + this.checkedAction = null + }, + }, methods: { handleOpenAddModal({ key: taskType }) { this.AEModal.formItems = this.actionTypeMapFormItemProps[taskType].map((p) => diff --git a/src/views/subsystem/scene/index.vue b/src/views/subsystem/scene/index.vue index 259b4fe..a78eafc 100644 --- a/src/views/subsystem/scene/index.vue +++ b/src/views/subsystem/scene/index.vue @@ -2,7 +2,27 @@ 场景编辑子系统 - 推演想定【{{ roomName }}-{{ scenarioName }}】 + + 推演想定【{{ roomName }}-{{ scenarioName }}】 + + + + 剩余 {{ roomInfo.remainTimeStr }} @@ -169,7 +189,7 @@ export default { case 'xdrw': return [1, 1, 8] default: - return [4, 3, 3] + return [2, 4, 4] } }, blbzShowKeys() { @@ -219,6 +239,7 @@ export default { async getScenarioDetail() { try { const res = await getAction(`/baseData/scenario/${this.scenarioId}`) + this.scenarioDetail = res.data const { leftUpLng, leftUpLat, @@ -249,7 +270,11 @@ export default { this.roomInfo.duringTime = response.data.during_time break case 'path_init': - this.cesium.drawRouteByCoordinates(response.data.points, response.data.resourceId, ['red', 'blue'][response.data.teamType]) + this.cesium.drawRouteByCoordinates( + response.data.points, + response.data.resourceId, + ['red', 'blue'][response.data.teamType] + ) break case 'path_update': this.cesium.movePlotByCoordinates(response.data.resourceId, response.data.points) diff --git a/src/views/subsystem/scene/presetting.vue b/src/views/subsystem/scene/presetting.vue index ea2a652..8335e76 100644 --- a/src/views/subsystem/scene/presetting.vue +++ b/src/views/subsystem/scene/presetting.vue @@ -2,7 +2,28 @@ 场景编辑子系统 - 编辑想定【{{ scenarioId }}-{{ scenarioName }}】 + + 编辑想定【{{ scenarioId }}-{{ scenarioName }}】 + + + + + 场景编辑子系统 @@ -238,7 +259,7 @@ export default { case 'xdrw': return [1, 1, 8] default: - return [4, 3, 3] + return [2, 4, 4] } }, showBlbzCheckedTreeData() { @@ -276,6 +297,7 @@ export default { async getScenarioDetail() { try { const res = await getAction(`/baseData/scenario/${this.scenarioId}`) + this.scenarioDetail = res.data const { leftUpLng, leftUpLat,