Commit Graph

80 Commits

Author SHA1 Message Date
fan
78ef4a7b8d 理论调整 2020-10-29 17:09:03 +08:00
fan
1f4d592b9f merge 2020-10-28 14:41:47 +08:00
fan
e3b4c65811 问题调整 2020-10-28 14:38:37 +08:00
zyy
12e84a6a49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/project.js
2020-10-28 13:52:36 +08:00
zyy
316249fbd6 调整多余配置路径 2020-10-28 13:51:26 +08:00
fan
0e2f67e6aa 加载备用车 2020-10-28 13:39:45 +08:00
fan
85216079e4 理论调整 2020-10-27 17:00:00 +08:00
fan
02f5652141 理论题管理调整 2020-10-27 11:01:22 +08:00
fan
0a6852fb27 理论题管理调整 2020-10-27 10:43:55 +08:00
joylink_cuiweidong
45190c3b6f 删除无用的文件 2020-10-26 10:51:14 +08:00
fan
2e0c08089c 理论题导入调整&&福州一新版调整&&国赛添加取消限速操作 2020-10-23 15:13:18 +08:00
fan
94e626ce49 理论题调整 2020-10-22 09:45:33 +08:00
fan
ceef20681f 理论题调整&设备管理调整&聊天室问题调整 2020-10-20 16:48:28 +08:00
joylink_cuiweidong
c5fbc578db 竞赛 场景管理 创建的创建和查询接口代码调整 2020-09-27 11:22:48 +08:00
fan
7b766e2a47 理论题库导入 2020-09-22 16:56:32 +08:00
fan
21d2a9953f 理论题库导入 2020-09-22 16:45:19 +08:00
fan
53d7586313 理论题库导入 2020-09-22 16:45:03 +08:00
fan
f586cced67 行调大赛理论考试 2020-09-17 09:50:52 +08:00
zyy
36a0b1dd93 调整代码 2020-08-12 18:26:27 +08:00
joylink_cuiweidong
96ff4c49f6 剧本编制代码调整 2020-07-09 10:17:55 +08:00
fan
0f5185702b 合并代码 2020-06-03 15:28:57 +08:00
joylink_cuiweidong
979a9e78b2 仿真聊天代码调整
竞赛 实操代码调整
2020-06-02 15:00:48 +08:00
joylink_cuiweidong
ff9842f43b ISCS 绘图机电小系统代码调整 2020-06-02 13:43:42 +08:00
joylink_cuiweidong
7e83cc9505 代码调整 2020-06-01 18:58:38 +08:00
joylink_cuiweidong
2bc47186cf 竞赛实操代码调整 2020-06-01 18:52:37 +08:00
fan
bf1bbbe948 调整取消进路指令&调整导出试卷参数&公共菜单 2020-05-28 09:54:47 +08:00
zyy
32d94e6b38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/competitionManage/generatePaper.vue
2020-05-27 18:10:39 +08:00
zyy
707fa4ba43 调整理论竞赛流程 2020-05-27 18:09:21 +08:00
fan
cfed64b4d5 调整合并代码错误 2020-05-27 17:37:32 +08:00
fan
cacaa155b0 合并代码 2020-05-27 17:32:20 +08:00
fan
18735986e6 修改列车识别号禁用人工车类型&生成试卷 2020-05-27 17:30:39 +08:00
zyy
7fbc759595 调整总分显示 2020-05-27 17:27:50 +08:00
fan
ff3d4329d6 调整生成试卷 2020-05-27 16:36:55 +08:00
fan
6ebfffd36b 调整table移出bug 2020-05-27 15:38:40 +08:00
fan
643c5e0b9e 添加分值初始化和校验 2020-05-27 15:31:47 +08:00
joylink_cuiweidong
47e02a0ce8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 14:45:54 +08:00
joylink_cuiweidong
53c8c13405 竞赛系统 实操题目录制代码调整 2020-05-27 14:45:32 +08:00
zyy
3a68650a89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 14:14:00 +08:00
zyy
160587e333 调整试题流程 2020-05-27 14:13:47 +08:00
fan
23c49b965d 生成试卷调整 2020-05-27 13:51:27 +08:00
fan
04bf8a9dda 生成试卷实操调整 2020-05-27 11:28:29 +08:00
fan
8cc1dd66d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 11:25:50 +08:00
fan
a44fe915b8 生成试卷实操调整 2020-05-27 11:25:39 +08:00
joylink_cuiweidong
eaa18f3539 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 11:20:33 +08:00
joylink_cuiweidong
61b0d22d53 竞赛系统 实操列表代码调整 2020-05-27 11:20:14 +08:00
fan
31f516abb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 11:07:14 +08:00
fan
eb7dd84c48 生成试卷实操调整 2020-05-27 11:07:04 +08:00
joylink_cuiweidong
60c90f24e8 竞赛代码调整 2020-05-27 10:49:53 +08:00
zyy
64256f5982 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 10:36:51 +08:00
zyy
b7d4eb7bda 调整区段绘图元素层级,调整字段显示 2020-05-27 10:36:40 +08:00