Commit Graph

930 Commits

Author SHA1 Message Date
joylink_cuiweidong
53c8c13405 竞赛系统 实操题目录制代码调整 2020-05-27 14:45:32 +08:00
zyy
d161492fed 添加题库管理流程 2020-05-26 15:59:11 +08:00
joylink_cuiweidong
681e67468f 竞赛代码调整 2020-05-26 10:18:54 +08:00
zyy
dc33306c96 调整参赛人员路由判断 2020-05-25 18:26:05 +08:00
zyy
f329e30049 调整西安一三 号线路 右键操作 2020-05-25 17:57:24 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
joylink_cuiweidong
40d7d960cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 15:43:58 +08:00
joylink_cuiweidong
3d10668abf 竞赛系统代码调整 2020-05-25 15:43:36 +08:00
zyy
fb6ba36680 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 15:06:47 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +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
a2e0522a30 调整判断状态 2020-05-25 10:53:01 +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
d54db9bfe2 西安三号线调整 2020-05-22 20:32:19 +08:00
fan
4d29da9228 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 18:42:55 +08:00
fan
bb37c6ebbb 西安三号线调整 2020-05-22 18:41:23 +08:00
zyy
39d055ec09 调整车站连锁关系 右键空白处显示连锁关系 2020-05-22 18:28:03 +08:00
zyy
e221ca9b22 调整报名流程字段,调整西安线路非连锁站邮件操作 2020-05-22 17:10:07 +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
joylink_cuiweidong
1cc644d893 剧本编制代码调整 2020-05-20 15:29:41 +08:00
joylink_cuiweidong
df718218e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:51:35 +08:00
joylink_cuiweidong
0b37830a8d 剧本录制代码调整 2020-05-20 14:50:34 +08:00
fan
e3034f630e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:46:39 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
sunzhenyu
a58f175afc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:50:18 +08:00
sunzhenyu
01f90f6a2d 隐藏三维站台 2020-05-20 10:50:13 +08:00
joylink_cuiweidong
582543dd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:56:49 +08:00
joylink_cuiweidong
a51ae0aa30 西安二号线 列车正占用的区段,计轴标示也会显示为红色 代码调整 2020-05-19 18:54:51 +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