Commit Graph

8572 Commits

Author SHA1 Message Date
zyy
82679405a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 14:09:59 +08:00
zyy
0f6090c576 调整操作指令新增字段 2020-12-21 14:09:50 +08:00
joylink_cuiweidong
bde24b5190 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 13:53:02 +08:00
fan
7f38c06229 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 13:52:52 +08:00
joylink_cuiweidong
5f00a98526 箭头绘图代码调整 2020-12-21 13:52:45 +08:00
fan
01ed2bee99 信号机灯柱调整 2020-12-21 13:52:36 +08:00
joylink_cuiweidong
76167c0acb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 11:01:49 +08:00
joylink_cuiweidong
ffa572eb24 南铁院16站线路(西门子) 线路配置与绘图 代码调整 2020-12-21 11:01:33 +08:00
fan
b84b8cfd36 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 09:25:50 +08:00
fan
9d74937073 宁波二号线样式调整 2020-12-21 09:25:17 +08:00
zyy
baffbf36c8 调整南京二号线线路点击选择 2020-12-20 10:55:34 +08:00
joylink_fanyuhong
1915215083 取消越战 非安全命令 2020-12-18 21:18:57 +08:00
joylink_cuiweidong
4a350e9706 代码调整 2020-12-18 19:08:34 +08:00
joylink_cuiweidong
1fe1e35c03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 17:52:25 +08:00
joylink_cuiweidong
fa7380f8ad 运行图代码调整 2020-12-18 17:51:54 +08:00
fan
0cb19a5ee9 子系统生成按钮放开限制 2020-12-18 17:45:27 +08:00
fan
e809765dd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 17:20:27 +08:00
fan
9ba280bc03 南铁院专业版配置调整 2020-12-18 17:20:09 +08:00
joylink_cuiweidong
465e6a5d08 南京二号线 区段绘图 调整 2020-12-18 16:28:42 +08:00
joylink_cuiweidong
c8487b6e60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 16:12:53 +08:00
joylink_cuiweidong
a3e8c7cecc 南京一号线 线路 样式调整 2020-12-18 16:12:39 +08:00
zyy
2884d0f02c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 15:37:53 +08:00
zyy
901fa60bc4 调整道岔生成流程 2020-12-18 15:37:35 +08:00
sunzhenyu
ad462cfc70 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 15:26:12 +08:00
sunzhenyu
6351d966a1 修改三维客流车站乘客上错站台bug,修改三维编辑器 2020-12-18 15:26:02 +08:00
fan
31954a545d 哈尔滨操作调整 2020-12-18 14:10:25 +08:00
fan
941e0a791a 留言板调整 2020-12-18 13:38:13 +08:00
fan
2ddc94f7aa 南京二号线皮肤调整 2020-12-18 13:10:55 +08:00
joylink_cuiweidong
0594529577 代码调整 2020-12-18 09:35:43 +08:00
joylink_cuiweidong
213d14b212 新增南京二号线 线路配置文件 2020-12-18 09:30:18 +08:00
joylink_fanyuhong
e534232f2d 留言板调整
(cherry picked from commit 0dbc19027a)
2020-12-18 09:18:43 +08:00
fan
8941e18f69 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 09:18:11 +08:00
fan
5740b863b3 text、line、outFrame添加参数&报错提示调整 2020-12-18 09:17:18 +08:00
sunzhenyu
2d52f15296 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-17 17:49:32 +08:00
sunzhenyu
bfa396be54 修改三维驾驶根据列车节数动态更新位置 2020-12-17 17:49:25 +08:00
joylink_cuiweidong
acd8c46a65 代码调整 2020-12-17 16:37:10 +08:00
joylink_cuiweidong
dd1783405e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-17 16:25:02 +08:00
joylink_cuiweidong
d6b58f5ffb 哈尔滨线路日志功能添加 2020-12-17 16:24:29 +08:00
sunzhenyu
3534abb5ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-17 15:23:32 +08:00
sunzhenyu
c4d96ec386 修改三维驾驶列车号更新和显示,修改佛山加载三维通号设备间贴图问题 2020-12-17 15:23:25 +08:00
zyy
f22ee14ab2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-17 13:59:20 +08:00
zyy
54cf4b3f97 调整哈尔滨鼠标事件 2020-12-17 13:59:08 +08:00
fan
ca8da79986 merge 2020-12-17 13:20:47 +08:00
fan
855295ca75 通用ibp&留言板管理&贵装备课程发布调整 2020-12-17 13:19:12 +08:00
joylink_cuiweidong
3b5ed0b399 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-17 10:00:03 +08:00
joylink_cuiweidong
fdfd54f452 北交大客流项目 代码调整 2020-12-17 09:59:06 +08:00
joylink_cuiweidong
98603f09a8 代码调整 2020-12-16 18:22:37 +08:00
zyy
3ec50678c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 16:22:38 +08:00
zyy
24b95e3811 调整成都一报错 2020-12-16 16:22:24 +08:00
fan
68a0eadf9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 16:05:55 +08:00