sunzhenyu
|
9a286521a6
|
merge
|
2020-11-13 09:36:44 +08:00 |
|
sunzhenyu
|
eb6151db35
|
增加三维客流站台通信逻辑
|
2020-11-13 09:36:14 +08:00 |
|
zyy
|
009f7b57a2
|
调整国赛场景说明
|
2020-11-13 09:34:12 +08:00 |
|
zyy
|
19e1a4208e
|
增加场景说明
|
2020-11-12 19:42:33 +08:00 |
|
joylink_cuiweidong
|
bc71bf5a1d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 19:05:37 +08:00 |
|
joylink_cuiweidong
|
e5e7111965
|
运行图绘制代码调整
|
2020-11-12 19:04:57 +08:00 |
|
zyy
|
eb9c9d8ee3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/utils/baseUrl.js
|
2020-11-12 15:42:18 +08:00 |
|
zyy
|
c875c1bac0
|
调整格式
|
2020-11-12 15:41:35 +08:00 |
|
sunzhenyu
|
6ef0a46870
|
urlmerge
|
2020-11-12 15:00:14 +08:00 |
|
sunzhenyu
|
243312ad24
|
增加三维客流量模块，修改三维沙盘行车部分代码
|
2020-11-12 14:59:40 +08:00 |
|
joylink_cuiweidong
|
db3660a0eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 14:06:50 +08:00 |
|
joylink_cuiweidong
|
d0421ff9fe
|
代码调整
|
2020-11-12 14:06:13 +08:00 |
|
fan
|
d036ff5d83
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 13:33:31 +08:00 |
|
fan
|
19e42a4ec6
|
调整北交大项目菜单显示
|
2020-11-12 13:33:09 +08:00 |
|
joylink_cuiweidong
|
fee759e83b
|
会话 发送语音代码调整
|
2020-11-12 10:21:37 +08:00 |
|
joylink_cuiweidong
|
584d7cc5f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 09:55:07 +08:00 |
|
joylink_cuiweidong
|
1d50db0510
|
线路管理 代码调整
|
2020-11-12 09:54:42 +08:00 |
|
fan
|
ffbb56ce57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-12 09:05:01 +08:00 |
|
fan
|
7e288934bc
|
张赛IP调整
|
2020-11-12 09:04:37 +08:00 |
|
joylink_cuiweidong
|
1a7a6e27c7
|
连挂操作代码调整
|
2020-11-11 18:49:32 +08:00 |
|
joylink_cuiweidong
|
b8f26007e4
|
设置连挂操作代码调整
|
2020-11-11 18:40:02 +08:00 |
|
joylink_cuiweidong
|
994433a3ba
|
指令字典 复刻指令代码调整
|
2020-11-11 17:52:08 +08:00 |
|
joylink_cuiweidong
|
2b51f077fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 17:00:13 +08:00 |
|
joylink_cuiweidong
|
387ad98a90
|
场景编辑代码调整
|
2020-11-11 16:59:58 +08:00 |
|
zyy
|
b0f2e8d8ae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:56:53 +08:00 |
|
zyy
|
866bf2414b
|
调整实操菜单
|
2020-11-11 16:56:38 +08:00 |
|
joylink_cuiweidong
|
cc514e7ee1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:40:21 +08:00 |
|
joylink_cuiweidong
|
e2eae2945b
|
运行图编制代码调整
|
2020-11-11 16:40:07 +08:00 |
|
lVAL
|
c76d8309cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:13:55 +08:00 |
|
lVAL
|
74919a6b81
|
data2json 过滤 列车数据 的两行错误数据
|
2020-11-11 16:13:48 +08:00 |
|
zyy
|
b539d54a6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 16:09:58 +08:00 |
|
zyy
|
286acf7348
|
调整剧本场景编辑
|
2020-11-11 16:09:43 +08:00 |
|
lVAL
|
15194a5e8f
|
增加打印信息
|
2020-11-11 16:00:47 +08:00 |
|
lVAL
|
b1702506cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 15:55:17 +08:00 |
|
lVAL
|
f4b0ad47ed
|
修改 data2json 中输出格式的问题
|
2020-11-11 15:55:05 +08:00 |
|
zyy
|
d1a5c3670f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 15:34:38 +08:00 |
|
zyy
|
62a756f521
|
调整格式
|
2020-11-11 15:34:24 +08:00 |
|
joylink_cuiweidong
|
f02a084bc8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 14:36:28 +08:00 |
|
joylink_cuiweidong
|
72ca1a24b2
|
运行图编制代码调整
|
2020-11-11 14:36:11 +08:00 |
|
fan
|
147848cfed
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-11 13:32:04 +08:00 |
|
fan
|
a0cf632380
|
排列进路调整
|
2020-11-11 13:31:46 +08:00 |
|
joylink_cuiweidong
|
f628e2b486
|
会话代码调整
|
2020-11-11 13:13:27 +08:00 |
|
joylink_cuiweidong
|
dee6c30f2f
|
运行图编制代码调整
|
2020-11-11 11:22:26 +08:00 |
|
joylink_cuiweidong
|
5012f9ce58
|
代码调整
|
2020-11-11 09:13:41 +08:00 |
|
joylink_cuiweidong
|
23a59be2c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 18:41:19 +08:00 |
|
joylink_cuiweidong
|
4d5d8f1fdc
|
哈尔滨仿真 运行图编辑代码调整
|
2020-11-10 18:41:02 +08:00 |
|
lVAL
|
9b4039daab
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 18:25:29 +08:00 |
|
lVAL
|
34fa80f4f8
|
解析excel数据，上传系统
|
2020-11-10 18:25:13 +08:00 |
|
fan
|
2a4d931e09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-10 18:19:08 +08:00 |
|
fan
|
0f6af4d835
|
动态列车list数据处理调整
|
2020-11-10 18:18:48 +08:00 |
|