fan
|
6f440e6215
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 18:09:16 +08:00 |
|
fan
|
9a9355fcac
|
调整仿真开始判断
|
2020-11-04 18:09:04 +08:00 |
|
joylink_cuiweidong
|
04c51b0aca
|
剧本提示代码调整
|
2020-11-04 17:15:53 +08:00 |
|
joylink_cuiweidong
|
48668a2b07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 17:07:53 +08:00 |
|
joylink_cuiweidong
|
9dc3911d6d
|
运行图编制代码调整
|
2020-11-04 17:05:23 +08:00 |
|
fan
|
d693cd0517
|
merge
|
2020-11-04 16:43:58 +08:00 |
|
fan
|
2c79a2bce0
|
merge
|
2020-11-04 16:42:29 +08:00 |
|
fan
|
08a306f373
|
剧本条件调整
|
2020-11-04 16:41:01 +08:00 |
|
lVAL
|
fe76a6abd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 16:39:26 +08:00 |
|
lVAL
|
847d97eb5d
|
优化替换背景 mask样式问题
|
2020-11-04 16:39:17 +08:00 |
|
zyy
|
12148efe9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 16:32:31 +08:00 |
|
zyy
|
04d73495b7
|
调整综合监控关联关系
|
2020-11-04 16:32:19 +08:00 |
|
lVAL
|
e9991d97f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/scriptManage/tipScriptRecord.vue
|
2020-11-04 16:18:56 +08:00 |
|
lVAL
|
f492750443
|
修改 替换背景 屏蔽范围
|
2020-11-04 16:17:01 +08:00 |
|
joylink_cuiweidong
|
d7c8619243
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 16:14:58 +08:00 |
|
joylink_cuiweidong
|
8ff03944ce
|
哈尔滨教学实训代码调整
|
2020-11-04 16:14:41 +08:00 |
|
zyy
|
94c141dbbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 15:32:41 +08:00 |
|
zyy
|
096b681c35
|
调整剧本内容样式
|
2020-11-04 15:32:28 +08:00 |
|
fan
|
62dddae1e5
|
剧本条件调整
|
2020-11-04 14:54:12 +08:00 |
|
fan
|
06c252cd58
|
merge
|
2020-11-04 14:51:54 +08:00 |
|
fan
|
6993ad8d8e
|
剧本条件
|
2020-11-04 14:48:36 +08:00 |
|
lVAL
|
d72deda666
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 14:42:59 +08:00 |
|
lVAL
|
872a71c7b5
|
增加 替换背景的操作
|
2020-11-04 14:42:48 +08:00 |
|
zyy
|
7c9f69e5d8
|
调整报错
|
2020-11-04 13:21:02 +08:00 |
|
joylink_cuiweidong
|
ad572fdcc9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 10:47:15 +08:00 |
|
joylink_cuiweidong
|
0f3c1e9ab8
|
运行图代码调整
|
2020-11-04 10:46:55 +08:00 |
|
fan
|
8158eb7773
|
剧本条件暂提
|
2020-11-04 10:18:29 +08:00 |
|
zyy
|
109511d02b
|
调整报警窗口样式逻辑
|
2020-11-04 10:14:54 +08:00 |
|
fan
|
09e5cac7b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-04 09:26:39 +08:00 |
|
fan
|
55dda9ca10
|
添加停车场信号楼角色
|
2020-11-04 09:26:22 +08:00 |
|
joylink_cuiweidong
|
b312371a64
|
绘图---车站---按图折返字段删除
绘图---区段---公里标字段删除
|
2020-11-04 09:19:13 +08:00 |
|
joylink_cuiweidong
|
e8ee2efc50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 19:02:18 +08:00 |
|
joylink_cuiweidong
|
9aeb3d295c
|
剧本代码调整
|
2020-11-03 19:02:02 +08:00 |
|
fan
|
a1be6dbfb9
|
暂提
|
2020-11-03 18:52:33 +08:00 |
|
zyy
|
76bb7b1e65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 18:48:11 +08:00 |
|
zyy
|
6684ffd729
|
调整综合监控故障流程显示
|
2020-11-03 18:48:02 +08:00 |
|
fan
|
13913841de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 18:24:00 +08:00 |
|
fan
|
0603e45a07
|
设置头码车调整参数
|
2020-11-03 18:23:30 +08:00 |
|
joylink_cuiweidong
|
5bf5c3bac3
|
代码调整
|
2020-11-03 17:13:49 +08:00 |
|
fan
|
5378a06f25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:39:35 +08:00 |
|
fan
|
22192206c4
|
设置头码车调整参数
|
2020-11-03 16:39:24 +08:00 |
|
joylink_cuiweidong
|
d8ae05cb06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:38:01 +08:00 |
|
joylink_cuiweidong
|
b9f71f75d9
|
添加剧本删除动作接口
修改剧本编制样式
|
2020-11-03 16:37:47 +08:00 |
|
zyy
|
eef7ccfba3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:18:29 +08:00 |
|
zyy
|
4c00fa1a90
|
调整国赛运行图显示
|
2020-11-03 16:18:15 +08:00 |
|
joylink_cuiweidong
|
8ad829cf24
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 16:06:50 +08:00 |
|
joylink_cuiweidong
|
6fbfa0dc1a
|
各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
|
2020-11-03 16:06:11 +08:00 |
|
fan
|
ffbd8a06f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 14:06:41 +08:00 |
|
fan
|
4e0b6dc7e6
|
取消实训考试重置默认状态
|
2020-11-03 14:06:30 +08:00 |
|
zyy
|
f08640c546
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-03 13:54:37 +08:00 |
|