zyy
|
85dde7c4f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 16:56:46 +08:00 |
|
zyy
|
cb0fcd1a3f
|
增加报名页面
|
2020-05-19 16:56:36 +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
|
3b2d431400
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:45:17 +08:00 |
|
joylink_cuiweidong
|
c1ce6f46ae
|
综合演练代码调整
|
2020-05-19 15:44:57 +08:00 |
|
fan
|
247bc7ef30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:44:13 +08:00 |
|
fan
|
45422c8cd2
|
信号机批量设置引导信号&虚拟信号机旋转
|
2020-05-19 15:44:01 +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
|
df83fbb904
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 13:42:06 +08:00 |
|
fan
|
cc3f117a8f
|
宁波一综合演练现地设置显示站
|
2020-05-19 13:41:48 +08:00 |
|
zyy
|
4b683de30f
|
调整竞赛开始考试
|
2020-05-19 13:15:36 +08:00 |
|
zyy
|
28123b0525
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 13:10:56 +08:00 |
|
zyy
|
63e52f1986
|
调整理论竞赛流程页面
|
2020-05-19 13:10:45 +08:00 |
|
fan
|
6afafc9371
|
调整绘图批量设置信号机类型&竞赛考试详情
|
2020-05-19 11:20:09 +08:00 |
|
fan
|
f6dd6b00cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:34:51 +08:00 |
|
fan
|
c48ea602e7
|
去除登出清除project
|
2020-05-19 10:34:40 +08:00 |
|
zyy
|
f2430c3625
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/router/index_Common.js
|
2020-05-19 10:32:07 +08:00 |
|
zyy
|
3a72195e15
|
调整竞赛系统页面路由
|
2020-05-19 10:30:27 +08:00 |
|
joylink_cuiweidong
|
f0cb7a11cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:25:09 +08:00 |
|
joylink_cuiweidong
|
9fc821f940
|
综合演练代码调整（添加获取所有需要值班员的车站接口）
|
2020-05-19 10:24:48 +08:00 |
|
fan
|
462b8e972b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:18:10 +08:00 |
|
fan
|
eba0bff786
|
竞赛系统
|
2020-05-19 10:18:01 +08:00 |
|
joylink_cuiweidong
|
a1097088ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:45:31 +08:00 |
|
joylink_cuiweidong
|
08991c8694
|
剧本代码调整
|
2020-05-19 09:45:15 +08:00 |
|
fan
|
1357400c75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:09:47 +08:00 |
|
fan
|
46092a9b8e
|
西安三右键菜单
|
2020-05-19 09:09:38 +08:00 |
|
zyy
|
27891b29c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/store/modules/permission.js
|
2020-05-19 09:05:27 +08:00 |
|
zyy
|
09b3b684cf
|
调整竞赛系统路由
|
2020-05-19 09:03:38 +08:00 |
|
fan
|
9580d4b966
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:59:52 +08:00 |
|
fan
|
86d59db177
|
调整路由处理
|
2020-05-18 17:59:38 +08:00 |
|
zyy
|
3069cf2112
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:08:32 +08:00 |
|
zyy
|
b8bf51fc82
|
优化地图绘制
|
2020-05-18 17:08:21 +08:00 |
|
fan
|
9e03602403
|
草稿地图右键点击改变tree选中状态
|
2020-05-18 16:08:49 +08:00 |
|
fan
|
79f9f72c07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 15:48:06 +08:00 |
|
fan
|
c8d7347e61
|
课程问题调整
|
2020-05-18 15:47:55 +08:00 |
|
joylink_cuiweidong
|
559c33bb2a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 15:19:43 +08:00 |
|
joylink_cuiweidong
|
cc8b700328
|
剧本录制代码调整
退出剧本代码调整
|
2020-05-18 15:18:57 +08:00 |
|
fan
|
5f9806cdb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:49:29 +08:00 |
|
fan
|
135b328dd1
|
故障操作调整
|
2020-05-18 14:49:16 +08:00 |
|
joylink_cuiweidong
|
f0d51a2771
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:00:40 +08:00 |
|
joylink_cuiweidong
|
bdf627e812
|
剧本调整
|
2020-05-18 14:00:16 +08:00 |
|
zyy
|
8e57bbe91e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:35:21 +08:00 |
|
zyy
|
6fdf3b74aa
|
调整车次窗撤销操作问题
|
2020-05-18 13:34:46 +08:00 |
|
joylink_cuiweidong
|
71eca2ad9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:33:20 +08:00 |
|
joylink_cuiweidong
|
25b1c09141
|
剧本代码调整
|
2020-05-18 13:32:25 +08:00 |
|
zyy
|
bbc79b1b17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:08:56 +08:00 |
|
zyy
|
9591cbd268
|
调整竞赛系统登陆权限
|
2020-05-18 13:08:45 +08:00 |
|
joylink_cuiweidong
|
3e64c6da02
|
西安三号线 仿真系统车次与实际车次显示不符 修改
|
2020-05-18 11:32:46 +08:00 |
|
joylink_cuiweidong
|
f092b27282
|
剧本代码调整
|
2020-05-18 11:04:39 +08:00 |
|
joylink_cuiweidong
|
2844386ad3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 10:32:31 +08:00 |
|
joylink_cuiweidong
|
be4da83dcd
|
剧本代码调整
|
2020-05-18 10:31:55 +08:00 |
|
fan
|
fbd0dbee74
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 09:11:38 +08:00 |
|
fan
|
08f5edbb53
|
调整接口
|
2020-05-18 09:11:28 +08:00 |
|
joylink_cuiweidong
|
9bad1d2eb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 20:47:11 +08:00 |
|
joylink_cuiweidong
|
8059353f06
|
剧本代码调整
|
2020-05-15 20:45:59 +08:00 |
|
fan
|
ce8ded0bfb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 19:25:35 +08:00 |
|
fan
|
cc6227f6f4
|
故障调整
|
2020-05-15 19:24:58 +08:00 |
|
zyy
|
93f7210596
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 19:01:18 +08:00 |
|
zyy
|
674bcea387
|
调整综合监控
|
2020-05-15 19:01:07 +08:00 |
|
fan
|
c0d75502fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 18:48:38 +08:00 |
|
fan
|
d47a986fcc
|
故障操作&贵州状态班级展示
|
2020-05-15 18:48:10 +08:00 |
|
zyy
|
191f9358be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 18:36:42 +08:00 |
|
zyy
|
2faa2688e5
|
综合监控广播
|
2020-05-15 18:36:31 +08:00 |
|
joylink_cuiweidong
|
b1ca16b62f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 17:11:59 +08:00 |
|
joylink_cuiweidong
|
bda901f4c9
|
剧本代码调整
|
2020-05-15 17:11:15 +08:00 |
|
zyy
|
7945dedade
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:55:35 +08:00 |
|
zyy
|
dc783bd2a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:55:14 +08:00 |
|
zyy
|
7992a2e11e
|
调整格式
|
2020-05-15 16:55:00 +08:00 |
|
joylink_cuiweidong
|
f775f76aa8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:54:59 +08:00 |
|
joylink_cuiweidong
|
901ab1a8bd
|
剧本添加提示
|
2020-05-15 16:54:31 +08:00 |
|
fan
|
6aeb2d1b8d
|
删除localStore 操作
|
2020-05-15 16:33:14 +08:00 |
|
fan
|
a13567faaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:26:37 +08:00 |
|
fan
|
9db76cbf52
|
添加贵州装备教师课程删除功能
|
2020-05-15 16:26:21 +08:00 |
|
zyy
|
bc00f1660a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:01:28 +08:00 |
|
zyy
|
6391e8e881
|
调整竞赛系统路径，页面路由配置
|
2020-05-15 16:01:16 +08:00 |
|
fan
|
e4b14d96e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 15:58:19 +08:00 |
|
fan
|
dff3a090a5
|
调整右键跳转车站
|
2020-05-15 15:58:08 +08:00 |
|
zyy
|
399111c682
|
调整列表字段显示
|
2020-05-15 14:59:53 +08:00 |
|
zyy
|
322ca86dec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 14:50:19 +08:00 |
|
zyy
|
ae5916b90a
|
调整竞赛系统路由配置
|
2020-05-15 14:50:05 +08:00 |
|
fan
|
c27204aeb7
|
信号机添加非空校验
|
2020-05-15 14:18:17 +08:00 |
|
fan
|
b7e8409b1a
|
西安二号线信号机内三角进路排列后显示样式调整
|
2020-05-15 13:56:19 +08:00 |
|
fan
|
4bf80d3e5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 13:43:23 +08:00 |
|
fan
|
4e379324ea
|
调整贵州成绩计算小数
|
2020-05-15 13:43:02 +08:00 |
|
joylink_cuiweidong
|
f25a73c4e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 13:17:33 +08:00 |
|
joylink_cuiweidong
|
d3df0afc94
|
剧本代码调整
|
2020-05-15 13:16:55 +08:00 |
|
fan
|
71efb6f575
|
配置icon
|
2020-05-15 11:31:22 +08:00 |
|
fan
|
912816d324
|
学生管理日期限制调整
|
2020-05-15 11:29:24 +08:00 |
|
fan
|
557d8d2b7a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 11:12:18 +08:00 |
|
fan
|
65a225accd
|
代码调整
|
2020-05-15 11:12:06 +08:00 |
|
zyy
|
cb47cd612d
|
调整加载线路字段
|
2020-05-15 10:34:15 +08:00 |
|
joylink_cuiweidong
|
fab4e149c8
|
代码调整
|
2020-05-14 19:42:49 +08:00 |
|
joylink_cuiweidong
|
bd730d5946
|
代码调整
|
2020-05-14 19:42:08 +08:00 |
|
joylink_cuiweidong
|
8f0129a742
|
代码调整
|
2020-05-14 19:34:22 +08:00 |
|
joylink_cuiweidong
|
8ff8356d28
|
代码调整
|
2020-05-14 19:33:48 +08:00 |
|
joylink_cuiweidong
|
ddbf334419
|
剧本代码调整
|
2020-05-14 19:13:44 +08:00 |
|
fan
|
396dd0d899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 18:55:12 +08:00 |
|