fan
|
0d27ba3d6f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:55:33 +08:00 |
|
fan
|
eff6615407
|
西安一三号线道岔失表表示灯状态&裁判分数展示调整
|
2020-05-29 17:55:22 +08:00 |
|
zyy
|
007802267a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:50:02 +08:00 |
|
zyy
|
29f027077d
|
调整考试结果页面接口对接
|
2020-05-29 17:49:26 +08:00 |
|
fan
|
68675f7759
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 17:32:29 +08:00 |
|
joylink_cuiweidong
|
9477a7ddc2
|
综合演练仿真聊天代码调整
|
2020-05-29 17:28:40 +08:00 |
|
fan
|
a4924383fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:58:11 +08:00 |
|
fan
|
31dd88b426
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:57:31 +08:00 |
|
fan
|
95e4f4c938
|
西安一三号线道岔失表调整&iscs调整
|
2020-05-29 16:57:21 +08:00 |
|
joylink_cuiweidong
|
42cd8a3aec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:56:23 +08:00 |
|
joylink_cuiweidong
|
933db5fb50
|
综合演练 仿真聊天 代码调整
|
2020-05-29 16:56:02 +08:00 |
|
zyy
|
243a5763bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 16:55:53 +08:00 |
|
zyy
|
16ebf3e013
|
调整竞赛结果流程，列车放大流程
|
2020-05-29 16:55:25 +08:00 |
|
joylink_cuiweidong
|
6fe1a0c22b
|
新版地图绘图 高级数据交路代码调整
|
2020-05-29 16:23:38 +08:00 |
|
joylink_cuiweidong
|
2fd42c22f9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 14:05:03 +08:00 |
|
joylink_cuiweidong
|
7449b6b2a3
|
综合演练 仿真聊天代码调整
|
2020-05-29 14:03:43 +08:00 |
|
fan
|
e0b5f1d249
|
提示调整
|
2020-05-29 13:02:44 +08:00 |
|
fan
|
2abe815c87
|
理论考试缓存调整
|
2020-05-29 11:18:44 +08:00 |
|
fan
|
f21751fcd3
|
哈尔滨title调整&理论考试缓存调整
|
2020-05-29 11:08:38 +08:00 |
|
joylink_cuiweidong
|
edcefeab07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:17:16 +08:00 |
|
joylink_cuiweidong
|
8c99f4a3ce
|
西安一/三号线的侧边栏 代码调整
|
2020-05-29 09:16:35 +08:00 |
|
zyy
|
3aeb6f85bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:48:50 +08:00 |
|
zyy
|
88be776582
|
调整样式
|
2020-05-28 18:48:28 +08:00 |
|
joylink_cuiweidong
|
cf6dadf46b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:39:11 +08:00 |
|
joylink_cuiweidong
|
65569da4cd
|
西安一/三号线的侧边栏 代码调整
|
2020-05-28 18:38:49 +08:00 |
|
zyy
|
79e76bbfb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:34:47 +08:00 |
|
zyy
|
e63a299a77
|
校验裁判打分最大分值
|
2020-05-28 18:34:34 +08:00 |
|
fan
|
2a1ce3543f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:29:03 +08:00 |
|
fan
|
fffd6f0be7
|
调整运行图加载lineCode获取
|
2020-05-28 18:28:46 +08:00 |
|
zyy
|
474dcc2d74
|
新增车站字段
|
2020-05-28 18:17:15 +08:00 |
|
zyy
|
f1a66f8f73
|
调整站台轨关联站台也会修改
|
2020-05-28 18:08:20 +08:00 |
|
fan
|
5e97623b06
|
逻辑区段始终点偏移量设置调整
|
2020-05-28 17:47:52 +08:00 |
|
zyy
|
84afa25fe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 17:09:51 +08:00 |
|
zyy
|
e569702907
|
增加裁判平台修改分数
|
2020-05-28 17:09:22 +08:00 |
|
fan
|
601aed6f5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 16:41:04 +08:00 |
|
fan
|
80d016a2b5
|
公共菜单调整
|
2020-05-28 16:40:52 +08:00 |
|
joylink_cuiweidong
|
8822e8b3c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/theory/quiz/index.vue
|
2020-05-28 15:31:11 +08:00 |
|
joylink_cuiweidong
|
c502d755f9
|
竞赛平台代码调整
|
2020-05-28 15:28:18 +08:00 |
|
fan
|
76ba1caf8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:04:07 +08:00 |
|
fan
|
c300fe2f5f
|
理论考试倒计时
|
2020-05-28 15:03:58 +08:00 |
|
zyy
|
6ae66333e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:53 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +08:00 |
|
zyy
|
6eefedb434
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:39:21 +08:00 |
|
zyy
|
df4dc3eea9
|
调整供电线路保存，福州皮肤配置文件调整
|
2020-05-28 14:39:06 +08:00 |
|
sunzhenyu
|
bfe172ff30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:39:50 +08:00 |
|
sunzhenyu
|
fe5bfa50e0
|
三维cctv修改
|
2020-05-28 13:39:41 +08:00 |
|
joylink_cuiweidong
|
0939eecf59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:22:20 +08:00 |
|
joylink_cuiweidong
|
27981666b1
|
仿真聊天代码调整
|
2020-05-28 13:21:51 +08:00 |
|
fan
|
e5d4a31dce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 11:28:06 +08:00 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +08:00 |
|
joylink_cuiweidong
|
062cdc69dd
|
综合演练聊天代码调整
|
2020-05-28 10:35:16 +08:00 |
|
joylink_cuiweidong
|
a302ab24c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 10:16:33 +08:00 |
|
joylink_cuiweidong
|
a471120ea0
|
综合演练 聊天代码调整
|
2020-05-28 10:16:13 +08:00 |
|
fan
|
bf1bbbe948
|
调整取消进路指令&调整导出试卷参数&公共菜单
|
2020-05-28 09:54:47 +08:00 |
|
joylink_cuiweidong
|
9fb51bd047
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 19:03:54 +08:00 |
|
joylink_cuiweidong
|
4afcef1ce2
|
综合演练 聊天 创建群聊代码调整
|
2020-05-27 19:02:39 +08:00 |
|
zyy
|
4fe1330990
|
调整试卷加载
|
2020-05-27 19:02:34 +08:00 |
|
zyy
|
07679a37e7
|
调整理论流程结果页面
|
2020-05-27 18:30:14 +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 |
|
fan
|
6a1215621d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:57:34 +08:00 |
|
fan
|
bb009011c3
|
修改列车识别号调整
|
2020-05-27 14:57:25 +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 |
|
fan
|
accfc78a65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 10:33:51 +08:00 |
|
fan
|
d492634c98
|
生成试题理论调整
|
2020-05-27 10:33:26 +08:00 |
|
joylink_cuiweidong
|
9051a15605
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:57:21 +08:00 |
|
joylink_cuiweidong
|
5beb834384
|
竞赛系统 实操试题删除修改代码调整
|
2020-05-27 09:56:59 +08:00 |
|
zyy
|
e9f35e6804
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 09:09:49 +08:00 |
|
zyy
|
0a54a5988e
|
调整理论列表
|
2020-05-27 09:09:29 +08:00 |
|
fan
|
1aeb7e0d33
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:44:24 +08:00 |
|
fan
|
8e2537a9d0
|
生成试题调整
|
2020-05-26 18:43:59 +08:00 |
|
zyy
|
ee16508b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:30:43 +08:00 |
|
zyy
|
94dddea3bd
|
调整字段显示
|
2020-05-26 18:30:17 +08:00 |
|
joylink_cuiweidong
|
0ada88bafc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:28:34 +08:00 |
|
joylink_cuiweidong
|
f91a46552b
|
实操列表添加修改代码调整
|
2020-05-26 18:28:18 +08:00 |
|
zyy
|
438ccb2404
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 18:12:57 +08:00 |
|
zyy
|
92b144ddeb
|
调整理论考试接口调整，字段
|
2020-05-26 18:12:42 +08:00 |
|
joylink_cuiweidong
|
4fb37b3c7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 17:56:17 +08:00 |
|
joylink_cuiweidong
|
d8cfcbd595
|
添加实操列表页面和实操创建页面
|
2020-05-26 17:55:11 +08:00 |
|