Commit Graph

6943 Commits

Author SHA1 Message Date
joylink_cuiweidong
c13221c6a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 16:36:30 +08:00
joylink_cuiweidong
e5a5c391f0 剧本编制代码调整 2020-09-11 16:36:13 +08:00
zyy
bdf348dbaa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 16:07:33 +08:00
zyy
27a9a7a744 新增系统信息逻辑 2020-09-11 16:07:18 +08:00
joylink_cuiweidong
06796c439b 剧本编制 会话样式调整 2020-09-11 16:01:41 +08:00
fan
34fe136bcb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 15:52:26 +08:00
fan
2875444ed7 会话调整 2020-09-11 15:52:15 +08:00
joylink_cuiweidong
51ed3b83c5 剧本编制代码调整 2020-09-11 15:09:43 +08:00
joylink_cuiweidong
b35bb2e6fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 14:14:08 +08:00
joylink_cuiweidong
2c74a91e2d 屏蔽门 绘图代码调整 2020-09-11 14:13:29 +08:00
sunzhenyu
d678d1369c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 13:52:27 +08:00
sunzhenyu
9254cb8cb6 修改初始化时站台轨顺序bug,修改加载哈尔滨bug 2020-09-11 13:52:17 +08:00
fan
5d7b1db6be 调整添加仿真成员管理 2020-09-11 13:35:08 +08:00
fan
e29bdb35e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 13:23:44 +08:00
fan
3ca753a31b 调整会话和drts倒计时时间 2020-09-11 13:23:24 +08:00
zyy
e5687c13dd 调整道岔生成逻辑 2020-09-11 10:28:55 +08:00
zyy
9ca3612715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 10:18:20 +08:00
zyy
50c9a4eabb 调整道岔生成 道岔区段问题 2020-09-11 10:18:07 +08:00
fan
60bfa0504b 剧本加载重新获取运行数据&会话调整&drts添加连接 2020-09-11 10:08:25 +08:00
fan
7715271b0b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-11 09:27:06 +08:00
fan
f98242374b 会话调整 2020-09-11 09:26:51 +08:00
sunzhenyu
e8a007cfba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-10 18:12:35 +08:00
sunzhenyu
7b65503938 修改编辑器兼容数据,适配西安一,成都一三,北京等数组自动初始化,修改三维页面加载方面区段和站台属性 2020-09-10 18:12:25 +08:00
fan
03d4a28ab6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 17:42:10 +08:00
fan
281bbc32f8 宁波三菜单调整&表单记录页数 2020-09-09 17:41:51 +08:00
fan
06ecb8dd1a 宁波三菜单调整 2020-09-09 14:45:38 +08:00
zyy
273d3073de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 14:36:01 +08:00
zyy
d6fba202b4 字段调整 2020-09-09 14:35:48 +08:00
joylink_cuiweidong
5aa9d94071 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/shape/Switch/index.js
2020-09-09 14:02:15 +08:00
joylink_cuiweidong
ccf2228eeb 站台 绘图代码调整 2020-09-09 13:55:42 +08:00
zyy
620d7aba3c 调整目的码判断 2020-09-09 13:38:30 +08:00
zyy
d01f367e73 调整右键操作显示 2020-09-09 13:25:34 +08:00
zyy
3986185b1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 11:25:43 +08:00
zyy
85f4a5e1b0 增加系统通知流程 2020-09-09 11:25:31 +08:00
fan
d5c3227909 调整加载动画 2020-09-09 11:22:56 +08:00
fan
4df950f495 调整加载动画 2020-09-09 10:42:05 +08:00
fan
201252dbf9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 10:29:06 +08:00
fan
ff4072c6da 调整加载动画 2020-09-09 10:28:56 +08:00
zyy
83b1d16773 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-09 09:40:01 +08:00
zyy
fa70285ef9 调整西安二号线列车右键操作栏 2020-09-09 09:39:23 +08:00
fan
5ceaaed517 调整加载动画 2020-09-08 16:57:48 +08:00
fan
3a25327100 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 16:41:47 +08:00
fan
9d42aac8fa 调整宁波三菜单&调整加载动画 2020-09-08 16:41:38 +08:00
zyy
f9e8e10458 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 15:39:33 +08:00
zyy
7d826a4d59 调整鼠标事件 2020-09-08 15:39:23 +08:00
fan
c432c2f614 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 15:29:54 +08:00
fan
cbb00efdcb 一键生成课程、试卷响应调整 2020-09-08 15:29:45 +08:00
zyy
5ff71d3820 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-09-08 14:26:59 +08:00
zyy
f548a7495a 调整车站点击 2020-09-08 14:26:49 +08:00
fan
d3a7504c2a 一键生成课程、试卷参数调整 2020-09-08 14:20:01 +08:00