diff --git a/src/config/router.config.js b/src/config/router.config.js index 55e4fc6..12d13ea 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -117,12 +117,17 @@ export const constantRouterMap = [ // component: () => import(/* webpackChunkName: "fail" */ '@/views/subsystem/sceneEditing/index.vue'), // meta: { title: '场景编辑子系统' }, // }, - // { - // path: '/subsystem/display', - // name: 'SimulationSceneDisplay', - // component: () => import(/* webpackChunkName: "fail" */ '@/views/subsystem/display/index.vue'), - // meta: { title: '显示子系统' }, - // }, + { + path: '/subsystem/displayEntry', + name: 'SubsystemDisplayEntry', + component: () => import(/* webpackChunkName: "fail" */ '@/views/subsystem/display/entry.vue'), + }, + { + path: '/subsystem/display', + name: 'SubsystemDisplay', + component: () => import(/* webpackChunkName: "fail" */ '@/views/subsystem/display/index.vue'), + meta: { title: '显示子系统' }, + }, // { // path: '/subsystem/evaluation', // name: 'SimulationSceneEvaluation', diff --git a/src/views/subsystem/display/entry.vue b/src/views/subsystem/display/entry.vue new file mode 100644 index 0000000..24b9bd7 --- /dev/null +++ b/src/views/subsystem/display/entry.vue @@ -0,0 +1,164 @@ + + + + + diff --git a/src/views/subsystem/display/index.vue b/src/views/subsystem/display/index.vue new file mode 100644 index 0000000..6b14e12 --- /dev/null +++ b/src/views/subsystem/display/index.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/subsystem/model/index.vue b/src/views/subsystem/model/index.vue index e46ab64..79f29c5 100644 --- a/src/views/subsystem/model/index.vue +++ b/src/views/subsystem/model/index.vue @@ -3,7 +3,7 @@ 系统控制子系统 推演想定【{{ roomName }}-{{ scenarioName }}】 - 剩余 {{ roomInfo.remainTime }} + 剩余 {{ roomInfo.remainTimeStr }}
@@ -177,8 +177,9 @@ export default { return { ws: null, roomInfo: { - currentTime: '', + remainTimeStr: '', remainTime: '', + duringTime: '', }, roomId: '', roomName: '', @@ -318,7 +319,9 @@ export default { if (error) return this.$message.error(error.message) switch (response.cmdType) { case 'update_time': - this.roomInfo.remainTime = response.data + this.roomInfo.remainTimeStr = response.data.update_time_str + this.roomInfo.remainTime = response.data.remain_time + this.roomInfo.duringTime = response.data.during_time break default: break diff --git a/src/views/user/Welcome.vue b/src/views/user/Welcome.vue index 5cc7838..deb4a40 100644 --- a/src/views/user/Welcome.vue +++ b/src/views/user/Welcome.vue @@ -59,7 +59,7 @@ export default { moduleCode: 'display_system', moduleName: '显示子系统', icon: require('@/assets/images/simulation-scene/system-icon/display.png'), - modulePath: '/simulationScene/display', + modulePath: '/subsystem/displayEntry', }, { moduleCode: 'evaluation_system',