zyy
|
4c520f09cd
|
增加陪标项目筛选
|
2020-11-09 10:35:05 +08:00 |
|
joylink_cuiweidong
|
e9c65e5ba3
|
场景编辑代码调整
|
2020-11-09 10:33:39 +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
|
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 |
|
joylink_cuiweidong
|
241633ef53
|
竞赛 选择角色 默认选id最小的行调
|
2020-11-05 15:50:35 +08:00 |
|
fan
|
b9fcc9d193
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 15:31:44 +08:00 |
|
fan
|
3d03111631
|
条件管理调整
|
2020-11-05 15:31:28 +08:00 |
|
joylink_cuiweidong
|
d69f7f6e10
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 15:25:13 +08:00 |
|
joylink_cuiweidong
|
582aa76b4d
|
运行图编辑代码调整
|
2020-11-05 15:24:41 +08:00 |
|
fan
|
d5371da85c
|
会话文字接口调整
|
2020-11-05 14:40:08 +08:00 |
|
fan
|
25f1f7934d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 13:54:29 +08:00 |
|
fan
|
af42284fef
|
会话问题调整
|
2020-11-05 13:54:20 +08:00 |
|
joylink_cuiweidong
|
c4b88ec9e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-11-05 13:33:53 +08:00 |
|
joylink_cuiweidong
|
3639cc32e6
|
剧本动作 转换函数代码调整
|
2020-11-05 13:33:38 +08:00 |
|