joylink_cuiweidong
|
f4e6c4bee3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 15:27:28 +08:00 |
|
joylink_cuiweidong
|
36883d9587
|
iscs 转换函数代码调整
ibp盘绘制代码调整
|
2020-06-28 15:27:10 +08:00 |
|
fan
|
9637c7edc6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 14:50:22 +08:00 |
|
fan
|
1fc6bd7058
|
控制权转移调整
|
2020-06-28 14:50:09 +08:00 |
|
fan
|
4f248c3b19
|
综合演练界面调整&项目配置整理
|
2020-06-28 14:27:28 +08:00 |
|
joylink_cuiweidong
|
d76dfe293e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 13:44:22 +08:00 |
|
joylink_cuiweidong
|
24c975184c
|
设计平台 课程设计代码优化
|
2020-06-28 13:44:04 +08:00 |
|
zyy
|
621a077e86
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 13:27:24 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
joylink_cuiweidong
|
daa2415d15
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 11:09:47 +08:00 |
|
joylink_cuiweidong
|
4060947de7
|
实训编辑制作模式删除
|
2020-06-28 11:09:31 +08:00 |
|
fan
|
fd2347e4e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-28 11:01:34 +08:00 |
|
fan
|
618419e4ba
|
佛山信号机操作调整
|
2020-06-28 11:01:13 +08:00 |
|
joylink_cuiweidong
|
dea4481783
|
北京一号线现地操作代码调整
|
2020-06-28 10:38:34 +08:00 |
|
fan
|
80524d254d
|
项目配置调整
|
2020-06-28 10:33:35 +08:00 |
|
fan
|
d7a5b555a2
|
设备登录调整
|
2020-06-24 18:40:48 +08:00 |
|
zyy
|
6b78dc89f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 18:40:09 +08:00 |
|
zyy
|
b5a22e2dd1
|
调整佛山实训定义操作配置
|
2020-06-24 18:39:49 +08:00 |
|
joylink_cuiweidong
|
c0c60e0bb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 18:39:11 +08:00 |
|
joylink_cuiweidong
|
97320237c3
|
西安三号线道岔添加 道岔钩锁操作
|
2020-06-24 18:38:46 +08:00 |
|
zyy
|
5620f497da
|
Merge branch 'test'
# Conflicts:
# src/layout/components/userInfo.vue
|
2020-06-24 17:41:55 +08:00 |
|
zyy
|
678f0ba839
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 17:37:24 +08:00 |
|
zyy
|
c570e418e1
|
调整佛山操作定义，调整个人信息
|
2020-06-24 17:37:09 +08:00 |
|
fan
|
92000b3d09
|
宁波一运行图预览调整
|
2020-06-24 17:31:21 +08:00 |
|
joylink_cuiweidong
|
f3859ba247
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 16:22:18 +08:00 |
|
joylink_cuiweidong
|
73b2da9421
|
右键操作取消故障代码调整
|
2020-06-24 16:21:56 +08:00 |
|
fan
|
8722316b7d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 16:19:59 +08:00 |
|
fan
|
2399be67d0
|
宁波道岔失表增加表示红色矩形
|
2020-06-24 16:19:47 +08:00 |
|
zyy
|
6bba94355a
|
Merge branch 'test'
|
2020-06-24 16:04:47 +08:00 |
|
zyy
|
3bd16e211f
|
调整佛山新路操作定义配置
|
2020-06-24 16:04:05 +08:00 |
|
zyy
|
81ecb046ba
|
删除创建道岔区段字符
|
2020-06-24 15:45:46 +08:00 |
|
zyy
|
74b5f8a291
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 15:44:14 +08:00 |
|
zyy
|
e4b730f300
|
调整配置
|
2020-06-24 15:43:58 +08:00 |
|
fan
|
599afaaeae
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 15:02:23 +08:00 |
|
fan
|
86c7e44876
|
iscs调整
|
2020-06-24 15:02:09 +08:00 |
|
joylink_cuiweidong
|
12ab61179e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:07:22 +08:00 |
|
joylink_cuiweidong
|
5715c7cc98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:48 +08:00 |
|
zyy
|
45cac99681
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:45 +08:00 |
|
zyy
|
3b330a0932
|
调整佛山线路实训定义，删除区段定义
|
2020-06-24 14:06:17 +08:00 |
|
joylink_cuiweidong
|
eec3d47b84
|
西安二号线操作代码整理
|
2020-06-24 14:06:12 +08:00 |
|
fan
|
e71f74a769
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 13:28:07 +08:00 |
|
fan
|
9a620f8629
|
西安三道岔设置故障&iscs调整（未完）
|
2020-06-24 13:27:58 +08:00 |
|
joylink_cuiweidong
|
ccdbf781a0
|
西安二号线信号机右键操作代码调整
|
2020-06-24 11:25:17 +08:00 |
|
joylink_cuiweidong
|
555552af28
|
删除多余的文件
|
2020-06-24 10:56:40 +08:00 |
|
fan
|
45b88d3a46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 10:00:24 +08:00 |
|
fan
|
8c476d0dcc
|
新建课程参数丢失问题调整
|
2020-06-24 10:00:13 +08:00 |
|
fan
|
0128576386
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 09:25:04 +08:00 |
|
fan
|
d5cd233e98
|
调整故障操作
|
2020-06-24 09:24:54 +08:00 |
|
joylink_cuiweidong
|
45a0f35901
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 09:24:36 +08:00 |
|
joylink_cuiweidong
|
0f7cdb2b8e
|
剧本编制代码调整
|
2020-06-24 09:24:08 +08:00 |
|