Commit Graph

13421 Commits

Author SHA1 Message Date
dong
13b63988dd 仿真成员界面样式优化 2023-05-25 10:31:57 +08:00
dong
9426ece04f 仿真角色统一 2023-05-24 18:34:38 +08:00
joylink_zhaoerwei
8256758a7a 微调--NCC消息判断 2023-05-24 18:21:49 +08:00
fan
4c65f22c8a 泰国翻译 2023-05-24 18:01:44 +08:00
joylink_zhaoerwei
dd4f2a2fe6 微调 2023-05-24 17:46:01 +08:00
joylink_zhaoerwei
9cde1a5487 微调 2023-05-24 17:28:03 +08:00
joylink_zhaoerwei
82359d5a4c 微调 2023-05-24 17:04:45 +08:00
c90da32501 Merge remote-tracking branch 'origin/test' into test 2023-05-24 17:00:41 +08:00
f85fba0b5d 处理仿真销毁后创建者没有退出页面问题 -by fan 2023-05-24 17:00:27 +08:00
joylink_zhaoerwei
5874e8d81f 微调 2023-05-24 15:44:05 +08:00
joylink_zhaoerwei
82b4d671b2 告警分页 2023-05-24 15:15:35 +08:00
fan
334710bb94 Merge remote-tracking branch 'origin/test' into thailand
# Conflicts:
#	src/jmapNew/theme/components/menus/dialog/cmdManage.vue
#	src/jmapNew/theme/datie_01/menus/menuButton.vue
#	src/jmapNew/theme/datie_01/menus/menuSection.vue
#	src/jmapNew/theme/datie_01/menus/menuSignal.vue
#	src/jmapNew/theme/datie_01/menus/menuStation.vue
#	src/jmapNew/theme/datie_01/menus/menuStationStand.vue
#	src/jmapNew/theme/datie_01/menus/menuSwitch.vue
#	src/jmapNew/theme/datie_01/menus/menuTrain.vue
#	src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue
#	src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
#	src/jmapNew/theme/datie_02/menus/menuPanel.vue
#	src/jmapNew/theme/datie_02/menus/menuSection.vue
#	src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
#	src/jmapNew/theme/datie_jd1a/menus/dialog/mapVisual.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuSection.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
#	src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
#	src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue
#	src/jmapNew/theme/datie_jd1a/menus/runplanPane.vue
#	src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
#	src/jmapNew/theme/datie_ksk/menus/dialog/mapVisual.vue
#	src/jmapNew/theme/datie_ksk/menus/menuButton.vue
#	src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
#	src/jmapNew/theme/datie_ksk/menus/menuSection.vue
#	src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
#	src/jmapNew/theme/datie_ksk/menus/menuStation.vue
#	src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
#	src/jmapNew/theme/datie_ksk/menus/menuSwitch.vue
#	src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
#	src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue
#	src/jmapNew/theme/datie_ksk/menus/runplanPane.vue
#	src/jmapNew/theme/datie_tky/menus/menuSection.vue
#	src/jmapNew/theme/datie_tky/menus/menuSignal.vue
#	src/jmapNew/theme/datie_tky/menus/menuSwitch.vue
#	src/jmapNew/theme/datie_tky/menus/menuTrain.vue
#	src/views/info/personalInfo.vue
#	src/views/newMap/display/exam/examPanel.vue
#	src/views/newMap/display/memberManage/addMember.vue
#	src/views/newMap/display/memberManage/membersManage.vue
#	src/views/newMap/display/simulationMenu/simulationMenu.vue
#	src/views/newMap/display/terminals/terminalMenu.vue
#	src/views/newMap/display/trainingDesign/draftTrainingList.vue
#	src/views/newMap/display/trainingList/testResult.vue
#	src/views/newMap/display/trainingList/trainingMenu.vue
2023-05-24 15:06:06 +08:00
fan
79b8d24c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-24 14:25:53 +08:00
fan
e29700534a 派班工作站获取列车调整 2023-05-24 14:25:22 +08:00
joylink_zhaoerwei
1c31517588 微调 2023-05-24 14:00:51 +08:00
joylink_zhaoerwei
aa1e6ca4c7 微调 2023-05-24 13:56:43 +08:00
joylink_zhaoerwei
4e2a36bcb8 去分组 2023-05-24 13:52:07 +08:00
joylink_zhaoerwei
01471bba12 故障报警初提交 2023-05-24 11:25:54 +08:00
fan
fa6883fe8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-24 11:13:19 +08:00
fan
bab7cd6c40 注释调整 2023-05-24 11:12:59 +08:00
fan
43db0d138f 项目配置完善全部迁移为配置项 2023-05-24 11:04:39 +08:00
dong
404d028585 新会话调整 2023-05-24 10:55:27 +08:00
dong
248f2a767a 新会话调整 2023-05-23 18:11:28 +08:00
dong
6c8ae4f763 角色信息调度名称修改 2023-05-23 17:38:23 +08:00
fan
341e0ff829 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-23 16:59:59 +08:00
fan
ca4c184e14 实训设计限制新标签页打开客户端 2023-05-23 16:59:43 +08:00
dong
f1a7f09cc7 添加角色OCC_DISPATCHER信息调度 2023-05-23 16:42:31 +08:00
dong
ac1ef8e5a8 线路数据管理-生成实训 2023-05-23 15:54:33 +08:00
fan
88b9ac889c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-23 15:50:56 +08:00
fan
9acd8a8eba 生成客户端调整+覆盖生成快捷方式 2023-05-23 15:50:40 +08:00
dong
fa906225a7 新会话调整 2023-05-23 15:02:26 +08:00
dong
642a09f80c 新会话优化调整 2023-05-23 14:13:02 +08:00
fan
21774b94a3 客户端跳转判断调整 2023-05-23 13:27:41 +08:00
fan
94a3693337 仿真状态判断调整 2023-05-23 11:27:36 +08:00
joylink_zhaoerwei
228c06e61d 微调 2023-05-22 17:55:41 +08:00
fan
1501a75ad3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 17:16:53 +08:00
fan
fb351cd75d 新增推出仿真成员处理 2023-05-22 17:16:38 +08:00
joylink_zhaoerwei
4449a25c5b 去除警告计数 2023-05-22 16:47:09 +08:00
dong
1ee0cad514 新会话调整 2023-05-22 16:43:49 +08:00
dong
0a2cdb3257 新会话调整 2023-05-22 16:35:20 +08:00
fan
83ee31034b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 16:07:08 +08:00
fan
ae3c2ea269 统计信息单位调整 2023-05-22 16:06:34 +08:00
dong
fe6a835873 新会话调整 2023-05-22 15:51:56 +08:00
dong
ae4e6b652c 私聊实训功能 2023-05-22 14:41:35 +08:00
fan
e30494d404 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2023-05-22 13:47:32 +08:00
fan
545440b7e7 统计信息调整 2023-05-22 13:47:09 +08:00
dong
77a80c2b2d 群邀请成员功能 2023-05-22 11:02:36 +08:00
dong
2635ea8c57 修改群主功能 2023-05-22 10:08:13 +08:00
dong
e6b1d2777a 添加私聊及成员查看 2023-05-22 09:43:36 +08:00
fan
144fecf31a 删除日志 2023-05-21 16:31:04 +08:00