Commit Graph

82 Commits

Author SHA1 Message Date
joylink_cuiweidong
a471120ea0 综合演练 聊天代码调整 2020-05-28 10:16:13 +08:00
joylink_cuiweidong
4afcef1ce2 综合演练 聊天 创建群聊代码调整 2020-05-27 19:02:39 +08:00
joylink_cuiweidong
681e67468f 竞赛代码调整 2020-05-26 10:18:54 +08:00
zyy
dc33306c96 调整参赛人员路由判断 2020-05-25 18:26:05 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
joylink_cuiweidong
3d10668abf 竞赛系统代码调整 2020-05-25 15:43:36 +08:00
joylink_cuiweidong
992892ee6b 竞赛代码调整 2020-05-25 14:55:42 +08:00
joylink_cuiweidong
af46cd3ff9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 13:49:14 +08:00
zyy
9d7e4f928f 调整竞赛系统进入仿真界面流程 2020-05-25 13:48:43 +08:00
joylink_cuiweidong
3b0d842b97 竞赛代码调整 2020-05-25 13:40:25 +08:00
zyy
04f41456d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/jsxt/competition/examDetail.vue
#	src/views/jsxt/refereeList/index.vue
2020-05-25 10:47:20 +08:00
zyy
cf8e39f765 调整流程 2020-05-25 10:45:56 +08:00
joylink_cuiweidong
d41f874bdc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
#	src/views/jsxt/refereeList/index.vue
2020-05-25 10:36:21 +08:00
fan
58118ba06a 西安一三日期显示调整 2020-05-25 10:32:14 +08:00
fan
23167aa4a9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 16:34:19 +08:00
fan
86edffb984 竞赛考试结果调整 2020-05-22 16:34:05 +08:00
joylink_cuiweidong
ba42e40200 竞赛系统代码调整 2020-05-22 16:30:18 +08:00
joylink_cuiweidong
4210599f6b 竞赛裁判系统代码调整 2020-05-22 11:07:10 +08:00
joylink_cuiweidong
3b81436fbb 竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
2020-05-22 10:43:23 +08:00
joylink_cuiweidong
480df83efa 竞赛裁判系统代码调整 2020-05-22 09:32:48 +08:00
joylink_cuiweidong
16513c64d5 剧本编制代码调整 2020-05-22 09:07:39 +08:00
joylink_cuiweidong
9dc0995e59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/jointTrainingNew/menuDemon.vue
2020-05-21 17:01:36 +08:00
joylink_cuiweidong
3a48755817 竞赛裁判系统代码调整 2020-05-21 16:59:36 +08:00
zyy
81973b6967 添加实操考试 结束生成分值流程 2020-05-21 15:18:00 +08:00
zyy
9918678b27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 14:59:29 +08:00
zyy
568ac44bf9 调整打包模式, 报名系统逻辑 2020-05-21 14:59:18 +08:00
joylink_cuiweidong
cf021736b2 竞赛裁判系统代码调整 2020-05-21 10:43:32 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
fan
46a28d3cd5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:39:31 +08:00
sunzhenyu
4819efc14e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:00:47 +08:00
fan
bfb3c9357c 竞赛系统调整 2020-05-19 17:06:34 +08:00
joylink_cuiweidong
e69840c87f 综合演练代码调整 2020-05-19 17:05:23 +08:00
sunzhenyu
5046a886fd merge 2020-05-19 16:50:34 +08:00
sunzhenyu
6a25030a53 修改三维数据 2020-05-19 16:49:56 +08:00
joylink_cuiweidong
c1ce6f46ae 综合演练代码调整 2020-05-19 15:44:57 +08:00
joylink_cuiweidong
e3b7d513ba 综合演练行调添加 列车选择 2020-05-19 14:47:47 +08:00
joylink_cuiweidong
eed312e72f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
2020-05-19 14:03:44 +08:00
joylink_cuiweidong
736c81a61d 综合演练 剧本代码调整 2020-05-19 14:01:23 +08:00
fan
cc3f117a8f 宁波一综合演练现地设置显示站 2020-05-19 13:41:48 +08:00
joylink_cuiweidong
ddbf334419 剧本代码调整 2020-05-14 19:13:44 +08:00
joylink_cuiweidong
70f06409df 综合演练 语音聊天接口调整
剧本预览 代码调整
2020-05-14 14:36:15 +08:00
joylink_cuiweidong
36ca6dc3d1 综合演练 聊天代码调整 2020-05-13 19:31:14 +08:00
joylink_cuiweidong
2b8757a074 实训平台 综合演练 聊天代码调整 2020-05-13 18:05:48 +08:00
joylink_cuiweidong
1cae47b8d7 实训平台 综合演练 聊天代码调整 2020-05-13 13:14:58 +08:00
joylink_cuiweidong
6866b58b19 实训平台 综合演练 聊天代码调整 2020-05-13 10:21:53 +08:00
joylink_cuiweidong
13a3ccf066 代码调整 2020-05-12 19:02:53 +08:00
joylink_cuiweidong
376662d96e 实训平台 综合演练 聊天代码调整 2020-05-12 17:49:00 +08:00
joylink_cuiweidong
6fe5363706 实训平台 综合演练 聊天代码调整 2020-05-12 16:46:41 +08:00
fan
ecf816d32a 地图数据维护中提示调整 2020-05-09 20:27:41 +08:00
fan
1601b655d1 地图数据维护中提示调整 2020-05-09 20:24:59 +08:00