Commit Graph

8791 Commits

Author SHA1 Message Date
joylink_cuiweidong
8d14c93231 仿真代码调整 2020-11-09 15:17:11 +08:00
lVAL
87b19773e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 13:01:11 +08:00
lVAL
779f76d4ec 1.优化修改data中的model属性,其他计算data中设别列表没有更新的问题
2.修改激活状态点击修改后,未重置激活态的问题。
2020-11-09 13:01:00 +08:00
fan
0553c4ce5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 11:31:45 +08:00
fan
a6ebcda15e 北交大项目调整 2020-11-09 11:31:20 +08:00
zyy
bd4780b389 增加陪标项目筛选 2020-11-09 10:49:40 +08:00
fan
fc08611c9b 北交大项目调整 2020-11-09 10:47:08 +08:00
zyy
8f89c9b678 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 10:36:50 +08:00
zyy
4c520f09cd 增加陪标项目筛选 2020-11-09 10:35:05 +08:00
joylink_cuiweidong
e9c65e5ba3 场景编辑代码调整 2020-11-09 10:33:39 +08:00
zyy
bc8b63dad3 Merge branch 'test' 2020-11-06 18:35:34 +08:00
sunzhenyu
3a76731646 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 18:28:39 +08:00
sunzhenyu
3ad0ccffc1 增加三维客流规划模块 2020-11-06 18:28:30 +08:00
joylink_cuiweidong
35bb645fba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 17:44:52 +08:00
joylink_cuiweidong
42fb506612 剧本预览代码调整 2020-11-06 17:44:36 +08:00
zyy
99b466fb49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 17:00:57 +08:00
zyy
226abef552 调整车站筛选 2020-11-06 17:00:41 +08:00
fan
d7bcea323f 道岔区段计轴故障 2020-11-06 16:54:00 +08:00
joylink_cuiweidong
0a4de52bb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 15:04:47 +08:00
joylink_cuiweidong
5eedbdf1e5 剧本录制代码调整 2020-11-06 15:04:18 +08:00
zyy
6f4b4fa6dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 14:50:28 +08:00
zyy
a7519ae06e 调整剧本描述,及样式 2020-11-06 14:50:13 +08:00
joylink_cuiweidong
46a18fabeb 场景编辑代码调整 2020-11-06 14:34:28 +08:00
zyy
c01b35aff7 调整重置剧本报错 2020-11-06 14:23:43 +08:00
zyy
8d00ded8ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 14:11:31 +08:00
zyy
8f1e38ce29 调整剧本显示,菜单显示 2020-11-06 14:11:16 +08:00
fan
08fce4cb60 初始化剧本动作条件 2020-11-06 13:59:27 +08:00
fan
988f2308e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 13:46:52 +08:00
fan
93d1558704 延时条件label调整 2020-11-06 13:46:31 +08:00
zyy
f3162dfbd8 调整场景描述位置,调整列车清空逻辑 2020-11-06 13:41:33 +08:00
fan
a36acdbd45 按钮顺序调整 2020-11-06 13:20:15 +08:00
fan
7a162317ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 13:15:55 +08:00
fan
c746a97d3d 条件管理调整 2020-11-06 13:15:18 +08:00
zyy
e823a14c48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 11:25:53 +08:00
zyy
79d95a8cc0 调整导出名称 2020-11-06 11:25:42 +08:00
joylink_cuiweidong
24280abc02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 11:04:56 +08:00
joylink_cuiweidong
58e5635a72 教学实训操作定义代码调整
运行图代码调整
2020-11-06 11:04:38 +08:00
zyy
e897673742 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 10:51:12 +08:00
fan
9171d8f579 替换背景需两次初始化 2020-11-06 10:51:02 +08:00
zyy
e792597fd8 调整场景显示 2020-11-06 10:50:58 +08:00
fan
143c2a27ee Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 09:49:13 +08:00
fan
08580da2a9 剧本提示控制模式=》系统/站遥控&条件管理清除stop 2020-11-06 09:48:51 +08:00
lVAL
cc4edd174c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 09:26:55 +08:00
lVAL
5aefda5ef0 修改设计平台,table样式,增加padding:50px 2020-11-06 09:26:41 +08:00
fan
f301a89815 Merge remote-tracking branch 'origin/test' 2020-11-05 18:41:17 +08:00
fan
02615110a2 调整条件管理关闭 2020-11-05 18:02:02 +08:00
fan
a212984e3d 添加仿真场景加载消息 2020-11-05 17:50:35 +08:00
fan
f09b1aa17d 按计划行车状态判断调整 2020-11-05 17:32:48 +08:00
lVAL
cfc6f9648a 修改重置背景,按计划行车状态错误的问题 2020-11-05 16:58:42 +08:00
joylink_cuiweidong
341ed08db2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-05 15:50:51 +08:00