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 |
|
lVAL
|
b081587002
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 17:48:40 +08:00 |
|
joylink_cuiweidong
|
35df9b43ec
|
剧本编制代码调整
会话代码调整
|
2020-10-23 17:48:40 +08:00 |
|
lVAL
|
0516f856ef
|
优化代码
|
2020-10-23 17:48:31 +08:00 |
|
fan
|
c5a4dd68f3
|
添加设置计划车、设置头码车、设置人工车
|
2020-10-23 17:23:09 +08:00 |
|
fan
|
d529837e03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 16:35:38 +08:00 |
|
fan
|
6210911b2a
|
皮肤显示调整
|
2020-10-23 16:35:27 +08:00 |
|
lVAL
|
a32030695a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 16:15:51 +08:00 |
|
lVAL
|
5bc8be961d
|
优化代码
|
2020-10-23 16:15:39 +08:00 |
|
fan
|
a952ebeafe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 15:13:32 +08:00 |
|
fan
|
2e0c08089c
|
理论题导入调整&&福州一新版调整&&国赛添加取消限速操作
|
2020-10-23 15:13:18 +08:00 |
|
zyy
|
e9a5039c43
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 15:09:33 +08:00 |
|
zyy
|
c3d3adbc3e
|
调整福州综合监控逻辑
|
2020-10-23 15:09:20 +08:00 |
|
lVAL
|
a870debe70
|
优化拖动的问题
|
2020-10-23 10:15:36 +08:00 |
|
lVAL
|
b34e347ab1
|
修改代码
|
2020-10-23 09:21:42 +08:00 |
|
lVAL
|
6489d67e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-23 09:03:14 +08:00 |
|
lVAL
|
b49c1c29d1
|
修改运行时间校验错误的问题
|
2020-10-23 09:03:05 +08:00 |
|
zyy
|
f9d38a4efc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 18:33:51 +08:00 |
|
zyy
|
1163d9def9
|
调整新建地图流程
|
2020-10-22 18:33:28 +08:00 |
|
joylink_cuiweidong
|
f8e1c29642
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 18:30:51 +08:00 |
|
joylink_cuiweidong
|
683f73c005
|
运行图 展示界面 车次号调整
|
2020-10-22 18:30:02 +08:00 |
|
lVAL
|
fdeaabb699
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 18:20:40 +08:00 |
|
lVAL
|
439e9194c6
|
修改AUSTool功能
|
2020-10-22 18:20:29 +08:00 |
|
joylink_cuiweidong
|
50620f9447
|
代码调整
|
2020-10-22 17:34:49 +08:00 |
|
joylink_cuiweidong
|
9af669f708
|
运行图绘制代码调整
|
2020-10-22 17:30:56 +08:00 |
|
lVAL
|
a7011888b4
|
修改文件大小写
|
2020-10-22 16:49:58 +08:00 |
|
lVAL
|
5184721b62
|
删除错误带小写文件
|
2020-10-22 16:49:29 +08:00 |
|
fan
|
1fce4cb363
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:47:29 +08:00 |
|
fan
|
dc7cf80222
|
国赛皮肤调整
|
2020-10-22 16:47:18 +08:00 |
|
joylink_cuiweidong
|
3d3fc84041
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:39:55 +08:00 |
|
joylink_cuiweidong
|
751ebe5a16
|
竞赛线路 列车样式调整
|
2020-10-22 16:39:34 +08:00 |
|
lVAL
|
08e3d6aa90
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:34:27 +08:00 |
|
lVAL
|
77d83cfaf7
|
增加，AUSTool施工区域编辑功能
|
2020-10-22 16:34:15 +08:00 |
|
fan
|
90390462a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 16:26:15 +08:00 |
|
fan
|
700a37d312
|
国赛皮肤调整&接触网调整
|
2020-10-22 16:26:03 +08:00 |
|
sunzhenyu
|
bd6fc3b077
|
修改三维设备点击道岔bug
|
2020-10-22 15:42:57 +08:00 |
|
sunzhenyu
|
9e93958224
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 15:22:53 +08:00 |
|
sunzhenyu
|
5e4f341ff9
|
修改三维cctv代码结构，剔除不必要代码，优化判断
|
2020-10-22 15:22:40 +08:00 |
|
joylink_cuiweidong
|
7352193df1
|
代码调整
|
2020-10-22 14:29:55 +08:00 |
|
fan
|
6ce8978b8b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 14:25:26 +08:00 |
|
joylink_cuiweidong
|
c89c2f2e11
|
代码调整
|
2020-10-22 14:22:21 +08:00 |
|
fan
|
c2f350a0c2
|
国赛皮肤调整
|
2020-10-22 14:07:18 +08:00 |
|
joylink_cuiweidong
|
6c32b53fb4
|
Merge remote-tracking branch 'remotes/origin/test_runplan' into test
# Conflicts:
# src/router/index_Common.js
|
2020-10-22 13:49:35 +08:00 |
|
fan
|
80c3f726b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 13:41:06 +08:00 |
|
fan
|
7613a38be1
|
国赛皮肤调整
|
2020-10-22 13:40:56 +08:00 |
|
joylink_cuiweidong
|
c7d99e7913
|
运行图编辑代码调整
|
2020-10-22 13:34:08 +08:00 |
|
zyy
|
415486c815
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 13:03:40 +08:00 |
|
zyy
|
8053b51e24
|
增加iscs事件弹窗
|
2020-10-22 13:03:26 +08:00 |
|
lVAL
|
ba6e29943b
|
增加修改折返时间的功能
|
2020-10-22 11:13:29 +08:00 |
|
lVAL
|
f749a9bfdb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 10:28:50 +08:00 |
|
lVAL
|
457dd7381a
|
修改AUSTool
|
2020-10-22 10:28:38 +08:00 |
|
joylink_cuiweidong
|
3d1c5dacd4
|
运行图 增加任务 添加了 起始终到车站的筛选
|
2020-10-22 09:53:29 +08:00 |
|
fan
|
883a6b88df
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-22 09:45:57 +08:00 |
|
fan
|
94e626ce49
|
理论题调整
|
2020-10-22 09:45:33 +08:00 |
|
joylink_cuiweidong
|
4eb69d03a6
|
运行图代码调整
|
2020-10-21 18:40:02 +08:00 |
|
lVAL
|
c1050d16ab
|
修改AUSTool 功能
|
2020-10-21 18:36:52 +08:00 |
|
joylink_cuiweidong
|
c684dd5149
|
运行图代码调整
|
2020-10-21 17:39:52 +08:00 |
|
joylink_cuiweidong
|
8fd587ac13
|
运行图代码调整
|
2020-10-21 17:19:47 +08:00 |
|
joylink_cuiweidong
|
14f54eeb85
|
运行图代码调整
|
2020-10-21 16:12:19 +08:00 |
|
joylink_cuiweidong
|
103c306313
|
运行图代码调整
|
2020-10-21 15:16:30 +08:00 |
|
joylink_cuiweidong
|
cc196d9696
|
运行图添加 修改计划号 和 修改任务车次号
|
2020-10-21 14:03:25 +08:00 |
|
joylink_cuiweidong
|
181a1491da
|
运行图代码调整
|
2020-10-21 11:07:10 +08:00 |
|
lVAL
|
599e092c57
|
提交代码
|
2020-10-21 09:17:28 +08:00 |
|
joylink_cuiweidong
|
ab4f13d5f0
|
运行图代码调整
|
2020-10-20 20:25:45 +08:00 |
|
lVAL
|
703d637126
|
增加点击空白取消选中状态
|
2020-10-20 18:41:27 +08:00 |
|
lVAL
|
306af6fb6d
|
删除创建车次时间小于2min不让创建的代码
|
2020-10-20 18:31:21 +08:00 |
|
lVAL
|
c66ec45d9b
|
修改数据点选中状态的尺寸
|
2020-10-20 18:21:28 +08:00 |
|
lVAL
|
4ea3b3b9e4
|
修改“取消删除”为英文
|
2020-10-20 18:16:30 +08:00 |
|
joylink_cuiweidong
|
9783691cf2
|
代码调整
|
2020-10-20 18:10:26 +08:00 |
|
lVAL
|
ce6b2a46b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 18:05:14 +08:00 |
|
lVAL
|
16c443eb0c
|
优化标记不准的问题
|
2020-10-20 18:05:06 +08:00 |
|
fan
|
12bcbdb02b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 17:50:32 +08:00 |
|
fan
|
8843ad6394
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 17:49:55 +08:00 |
|
fan
|
acd75346b9
|
道岔定位失表反位失表调整
|
2020-10-20 17:49:46 +08:00 |
|
lVAL
|
50426cbb7a
|
修改AUSTool的功能
|
2020-10-20 17:47:47 +08:00 |
|
lVAL
|
c37bec7fa4
|
修改AUSTool 拖动车次的问题
|
2020-10-20 17:33:43 +08:00 |
|
lVAL
|
a1604ed5a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 17:22:27 +08:00 |
|
lVAL
|
2fadaade87
|
增加车次号标签
|
2020-10-20 17:22:15 +08:00 |
|
joylink_cuiweidong
|
fe0e1c3e32
|
运行图编制工具代码调整
|
2020-10-20 17:21:02 +08:00 |
|
fan
|
4265ed0092
|
设备管理配置调整
|
2020-10-20 17:16:41 +08:00 |
|
fan
|
d74575bfb9
|
设备管理配置调整
|
2020-10-20 16:57:41 +08:00 |
|
fan
|
06a06a26d9
|
merge
|
2020-10-20 16:49:35 +08:00 |
|
fan
|
ceef20681f
|
理论题调整&设备管理调整&聊天室问题调整
|
2020-10-20 16:48:28 +08:00 |
|
lVAL
|
d3ea1cd22e
|
增加AUSTool绘制区域功能
|
2020-10-20 15:38:26 +08:00 |
|
lVAL
|
bdeb030276
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-20 11:13:03 +08:00 |
|
lVAL
|
ef7a30fe3c
|
修改AUS运行图编辑工具
|
2020-10-20 11:12:48 +08:00 |
|
joylink_cuiweidong
|
0af48e7887
|
竞赛 实操 自动播放代码调整
|
2020-10-20 11:06:41 +08:00 |
|
joylink_cuiweidong
|
5ff38125a2
|
代码调整
|
2020-10-20 09:10:53 +08:00 |
|
joylink_cuiweidong
|
2f3be6bb18
|
运行图 服务号两位校验变成2~3位
运行图 增加任务 停战时间事件代码调整
修改任务代码调整
|
2020-10-19 18:41:15 +08:00 |
|
lVAL
|
8858cac72a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-19 18:39:45 +08:00 |
|
lVAL
|
dc7a5ab749
|
增加运行图编辑的功能
|
2020-10-19 18:39:19 +08:00 |
|