Commit Graph

85 Commits

Author SHA1 Message Date
joylink_cuiweidong
6886ea3190 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 13:04:21 +08:00
joylink_cuiweidong
a354264097 竞赛代码调整 2020-05-26 13:03:37 +08:00
zyy
83343d54b8 调整竞赛系统逻辑 2020-05-26 12:11:59 +08:00
zyy
7382a0d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 10:30:22 +08:00
zyy
c1cead3475 调整报名系统报名提示 2020-05-26 10:30:11 +08:00
joylink_cuiweidong
630b2b16d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 10:19:13 +08:00
joylink_cuiweidong
681e67468f 竞赛代码调整 2020-05-26 10:18:54 +08:00
zyy
66ad222321 删除注释 2020-05-26 09:51:24 +08:00
zyy
fde7e609c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 09:43:23 +08:00
zyy
d10fccb624 调整竞赛流程 2020-05-26 09:43:09 +08:00
joylink_cuiweidong
c667b7f980 竞赛代码调整 2020-05-25 18:50:38 +08:00
joylink_cuiweidong
0967316106 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/chatView/chatBox.vue
2020-05-25 18:34:30 +08:00
joylink_cuiweidong
1db4c0e193 竞赛代码调整 2020-05-25 18:32:59 +08:00
zyy
dc33306c96 调整参赛人员路由判断 2020-05-25 18:26:05 +08:00
joylink_cuiweidong
663f25cddc 竞赛代码调整 2020-05-25 16:56:00 +08:00
joylink_cuiweidong
9f1c594a4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 16:45:19 +08:00
joylink_cuiweidong
ab8ea51140 代码调整 2020-05-25 16:44:26 +08:00
zyy
e0c6f6a12a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 16:38:15 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
joylink_cuiweidong
3bd5572e58 裁判系统代码调整 2020-05-25 16:29:13 +08:00
joylink_cuiweidong
0f21696e19 裁判平台代码调整 2020-05-25 16:15:15 +08:00
joylink_cuiweidong
8a104a09f6 代码调整 2020-05-25 15:45:51 +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
0f863cffe1 竞赛系统代码调整 2020-05-25 13:49:44 +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
joylink_cuiweidong
24ed5f502d 竞赛代码调整 2020-05-25 10:31:32 +08:00
zyy
15643b0d05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 10:29:14 +08:00
zyy
f90514777a 调整竞赛系统登录流程,调整接口字段 2020-05-25 10:29:03 +08:00
joylink_cuiweidong
6cf41569c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 09:52:42 +08:00
joylink_cuiweidong
46e6dec30e 竞赛系统代码调整 2020-05-25 09:52:23 +08:00
zyy
f60d72aaf8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 09:40:27 +08:00
zyy
aa6d821fed 调整裁判平台人员列表字段 2020-05-25 09:40:14 +08:00
joylink_cuiweidong
b74b070367 竞赛系统代码调整 2020-05-25 09:29:34 +08:00
joylink_cuiweidong
0f3520a8e3 竞赛代码调整 2020-05-22 20:46:03 +08:00
joylink_cuiweidong
5bbb5ddd4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 17:30:48 +08:00
joylink_cuiweidong
526fefceec 竞赛代码调整 2020-05-22 17:30:17 +08:00
zyy
e221ca9b22 调整报名流程字段,调整西安线路非连锁站邮件操作 2020-05-22 17:10:07 +08:00
zyy
f3cbe93987 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 16:52:24 +08:00
zyy
48523b2d0a 调整首页 2020-05-22 16:52:12 +08:00
fan
18054e5001 竞赛考试结果调整 2020-05-22 16:42:42 +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
198b16d926 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 16:27:20 +08:00