joylink_cuiweidong
|
437a6600cd
|
删除无用的接口
|
2020-10-28 10:08:18 +08:00 |
|
fan
|
9dc3a4528d
|
merge
|
2020-10-28 10:00:48 +08:00 |
|
fan
|
2509d11baf
|
代码调整
|
2020-10-28 10:00:04 +08:00 |
|
joylink_cuiweidong
|
509d43c834
|
竞赛 运营统计数据弹窗 初始化问题调整
|
2020-10-28 09:45:04 +08:00 |
|
joylink_cuiweidong
|
e59ff1f39e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 09:35:19 +08:00 |
|
joylink_cuiweidong
|
3d18dbe9ca
|
删除暂时没用到的文件
解决设置计划车 弹出的对话框 没有初始化的问题
|
2020-10-28 09:35:02 +08:00 |
|
zyy
|
68a3a08b0b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-28 09:18:57 +08:00 |
|
zyy
|
2babec750f
|
调整综合监控故障流程
|
2020-10-28 09:18:46 +08:00 |
|
fan
|
46aaa4f2a7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:48:26 +08:00 |
|
fan
|
1f955a2190
|
注释
|
2020-10-27 18:47:58 +08:00 |
|
fan
|
3bd70345e5
|
merge
|
2020-10-27 18:44:14 +08:00 |
|
fan
|
76bbc56825
|
哈尔滨报警
|
2020-10-27 18:43:04 +08:00 |
|
zyy
|
e025087171
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:42:31 +08:00 |
|
zyy
|
7882c1ed7f
|
删除多余接口
|
2020-10-27 18:42:18 +08:00 |
|
joylink_cuiweidong
|
940c4cb2e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:37:44 +08:00 |
|
joylink_cuiweidong
|
cc9ab37dd0
|
竞赛场景导入功能添加
|
2020-10-27 18:37:28 +08:00 |
|
lVAL
|
1efa433841
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/permission.js
|
2020-10-27 18:34:05 +08:00 |
|
lVAL
|
f9bab3da35
|
增加AUSline页面
|
2020-10-27 18:32:54 +08:00 |
|
zyy
|
285f2e2807
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 18:04:35 +08:00 |
|
zyy
|
aebf120bd8
|
调整状态删除无用接口
|
2020-10-27 18:04:19 +08:00 |
|
joylink_cuiweidong
|
d9415d81be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 17:59:32 +08:00 |
|
joylink_cuiweidong
|
9b988f318f
|
草稿剧本 导入导出功能添加
竞赛场景导出功能添加
|
2020-10-27 17:57:59 +08:00 |
|
fan
|
23a92119bc
|
merge
|
2020-10-27 17:01:19 +08:00 |
|
lVAL
|
469c99320e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 17:00:40 +08:00 |
|
lVAL
|
519b7903ee
|
调整 导出的时间间隔
|
2020-10-27 17:00:30 +08:00 |
|
fan
|
85216079e4
|
理论调整
|
2020-10-27 17:00:00 +08:00 |
|
zyy
|
03845f3ed8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-10-27 16:52:51 +08:00 |
|
zyy
|
e9e0d39bfc
|
调整状态多余代码
|
2020-10-27 16:51:57 +08:00 |
|
lVAL
|
68ae07676c
|
修改代码
|
2020-10-27 16:36:09 +08:00 |
|
lVAL
|
b55e6e6d76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-10-27 16:33:17 +08:00 |
|
lVAL
|
7e438dbf1f
|
增加运行图导出功能
|
2020-10-27 16:31:58 +08:00 |
|
joylink_cuiweidong
|
405915c56f
|
接口文件整理
|
2020-10-27 16:23:37 +08:00 |
|
joylink_cuiweidong
|
17e08686c6
|
站台绘图代码调整
|
2020-10-27 15:11:06 +08:00 |
|
fan
|
72789efe3f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 13:19:40 +08:00 |
|
fan
|
e0ab1506da
|
处理数据调整
|
2020-10-27 13:19:31 +08:00 |
|
fan
|
66aaa9f201
|
理论题管理调整
|
2020-10-27 12:14:17 +08:00 |
|
zyy
|
3738d06628
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 11:22:32 +08:00 |
|
zyy
|
fdcbc79e34
|
成都一号线避免加载错误
|
2020-10-27 11:22:11 +08:00 |
|
fan
|
02f5652141
|
理论题管理调整
|
2020-10-27 11:01:22 +08:00 |
|
fan
|
92eaa499ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-27 10:44:06 +08:00 |
|
fan
|
0a6852fb27
|
理论题管理调整
|
2020-10-27 10:43:55 +08:00 |
|
joylink_cuiweidong
|
3ac4945d71
|
代码调整
|
2020-10-26 18:41:10 +08:00 |
|
joylink_cuiweidong
|
36b8dbbdb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:50:53 +08:00 |
|
joylink_cuiweidong
|
4c185346cd
|
代码调整
|
2020-10-26 17:50:35 +08:00 |
|
sunzhenyu
|
ec7cde2373
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:33:24 +08:00 |
|
sunzhenyu
|
e63648a8e5
|
三维轨道修正
|
2020-10-26 17:33:15 +08:00 |
|
lVAL
|
480f4daa1c
|
修改AUSTool删除提示为英文
|
2020-10-26 17:14:32 +08:00 |
|
lVAL
|
f505de9795
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:11:24 +08:00 |
|
lVAL
|
baea2091ed
|
恢复AUSTool坐标转换限制
|
2020-10-26 17:11:17 +08:00 |
|
zyy
|
432c0d5206
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:05:30 +08:00 |
|
zyy
|
a55c67c721
|
调整国赛菜单
|
2020-10-26 17:05:04 +08:00 |
|
lVAL
|
ffab228863
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 17:04:29 +08:00 |
|
lVAL
|
17ec2297a9
|
优化 施工区域拖动 跳动的问题
|
2020-10-26 17:04:19 +08:00 |
|
zyy
|
bdb8e5d854
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 16:03:18 +08:00 |
|
zyy
|
ed32515215
|
调整综合监控流程
|
2020-10-26 16:03:06 +08:00 |
|
joylink_cuiweidong
|
b0eefffae0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 15:54:27 +08:00 |
|
joylink_cuiweidong
|
14b78b57d6
|
竞赛会话代码调整
|
2020-10-26 15:54:08 +08:00 |
|
sunzhenyu
|
d0e495bdad
|
merge
|
2020-10-26 15:29:16 +08:00 |
|
sunzhenyu
|
65d5aaf3aa
|
修复三维通号图片资源bug，剔除旧仿真相关三维内容，剔除无用三维资源
|
2020-10-26 15:26:51 +08:00 |
|
zyy
|
cc76f4aaa6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
|
2020-10-26 15:25:59 +08:00 |
|
zyy
|
cdf91f98d2
|
调整综合监控流程
|
2020-10-26 15:24:08 +08:00 |
|
fan
|
4ef0aa5093
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 15:17:41 +08:00 |
|
fan
|
d72e8baab6
|
竞赛皮肤调整
|
2020-10-26 15:16:48 +08:00 |
|
joylink_cuiweidong
|
da1b5f27d1
|
代码调整
|
2020-10-26 13:59:17 +08:00 |
|
joylink_cuiweidong
|
f34092741b
|
竞赛 添加 道岔钩锁指令（非语音指令）
删除不必要文件
|
2020-10-26 13:51:53 +08:00 |
|
joylink_cuiweidong
|
f99eea7aa1
|
代码调整
|
2020-10-26 11:31:32 +08:00 |
|
fan
|
034650ad0f
|
merge
|
2020-10-26 11:29:33 +08:00 |
|
fan
|
bc669b98f8
|
延续保护调整
|
2020-10-26 11:28:37 +08:00 |
|
zyy
|
fffe8fc0bc
|
update .gitignore
|
2020-10-26 11:24:01 +08:00 |
|
zyy
|
8295aaf92b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:18:01 +08:00 |
|
lVAL
|
fa8126ec34
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:17:53 +08:00 |
|
lVAL
|
1bea58747a
|
优化代码
|
2020-10-26 11:17:45 +08:00 |
|
zyy
|
bf7225c689
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:17:36 +08:00 |
|
zyy
|
7f4cc0edbe
|
调整配置
|
2020-10-26 11:17:13 +08:00 |
|
joylink_cuiweidong
|
4842dca6f4
|
代码调整
|
2020-10-26 11:13:37 +08:00 |
|
fan
|
e5b79263bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:10:08 +08:00 |
|
fan
|
1a6835c3cf
|
merge
|
2020-10-26 11:09:48 +08:00 |
|
joylink_cuiweidong
|
f02775868c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:08:52 +08:00 |
|
joylink_cuiweidong
|
b1c2d74d29
|
代码调整
|
2020-10-26 11:08:16 +08:00 |
|
fan
|
7e91cb2b3c
|
删除旧版地图drawWay参数使用
|
2020-10-26 11:07:49 +08:00 |
|
zyy
|
9cbb5246d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 11:06:13 +08:00 |
|
zyy
|
98c4d1e2b8
|
调整国赛列车显示
|
2020-10-26 11:05:36 +08:00 |
|
lVAL
|
773522b8f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 10:54:00 +08:00 |
|
lVAL
|
6111f07118
|
优化代码
|
2020-10-26 10:53:48 +08:00 |
|
joylink_cuiweidong
|
45190c3b6f
|
删除无用的文件
|
2020-10-26 10:51:14 +08:00 |
|
joylink_cuiweidong
|
7cccb83a08
|
竞赛道岔区段添加取消临时限速操作
|
2020-10-26 10:39:44 +08:00 |
|
joylink_cuiweidong
|
f456e71a95
|
竞赛操作方式 由北京线路转换为宁波线路
|
2020-10-26 10:21:11 +08:00 |
|
joylink_cuiweidong
|
620d73bf54
|
删除旧版个人地图文件
|
2020-10-26 10:00:35 +08:00 |
|
sunzhenyu
|
9c5cc2e9ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-26 09:15:28 +08:00 |
|
joylink_cuiweidong
|
c14814890f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:41:56 +08:00 |
|
joylink_cuiweidong
|
4fa37b7c60
|
竞赛场景列表代码调整
|
2020-10-23 18:40:24 +08:00 |
|
lVAL
|
74ebd8153e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:11:30 +08:00 |
|
lVAL
|
8869608082
|
修改配置参数
|
2020-10-23 18:11:19 +08:00 |
|
sunzhenyu
|
85a1546535
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:07:26 +08:00 |
|
sunzhenyu
|
83e99df71e
|
修改三维cctv注释
|
2020-10-23 18:06:24 +08:00 |
|
fan
|
4f0f85c60c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 18:06:05 +08:00 |
|
fan
|
e2dbbb5f0b
|
删除旧版仿真
|
2020-10-23 18:05:55 +08:00 |
|
lVAL
|
d345e5dcc2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 17:54:32 +08:00 |
|
lVAL
|
a7764ce7c4
|
修改代码
|
2020-10-23 17:54:16 +08:00 |
|
joylink_cuiweidong
|
dbf50b4324
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 17:49:24 +08:00 |
|