Commit Graph

3913 Commits

Author SHA1 Message Date
sunleking
7b7345123b 三维编辑器加载模型修改 2020-03-02 08:52:58 +08:00
8dc726bbe1 Merge remote-tracking branch 'origin/dev' into test 2020-03-01 18:39:35 +08:00
joylink_zyy
e7a247ab4d 调整哈尔滨曲线封锁绘图 2020-03-01 12:26:55 +08:00
joylink_zyy
2c09aa0e84 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-29 00:04:29 +08:00
joylink_zyy
446593fded 调整哈尔滨道岔显示问题 2020-02-29 00:04:24 +08:00
joylink_cuiweidong
167ca0e2a9 北京一号线信号机操作代码调整 2020-02-28 20:30:46 +08:00
joylink_cuiweidong
4ee98785c4 宁波一号线 成都三号线站台信号机操作代码调整 2020-02-28 18:50:03 +08:00
joylink_zyy
ff640adf39 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 18:10:26 +08:00
joylink_zyy
448523cf88 调整哈尔滨线路道岔显示问题 2020-02-28 18:10:20 +08:00
joylink_fanyuhong
d73f084fd5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 16:47:35 +08:00
joylink_fanyuhong
92f4f2f1ca 按计划行车接口报错提示 2020-02-28 16:47:26 +08:00
joylink_cuiweidong
d5ac3f37a2 成都三号线 信号机 操作代码调整 2020-02-28 15:50:20 +08:00
joylink_zyy
c32b986cea 调整区段颜色 2020-02-28 15:36:03 +08:00
joylink_zyy
a9d40c7af6 哈尔滨区段颜色 2020-02-28 15:30:40 +08:00
joylink_zyy
9887627fd8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 15:20:31 +08:00
joylink_zyy
870a68a476 调整区段,道岔显示样式 2020-02-28 15:20:26 +08:00
joylink_cuiweidong
32b16077f3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-28 13:10:48 +08:00
joylink_cuiweidong
7038ec12a8 哈尔滨线路信号机操作代码调整 2020-02-28 13:07:49 +08:00
joylink_fanyuhong
d5539a986b 按计划行车接口报错提示
(cherry picked from commit 1abad25)
2020-02-28 11:28:13 +08:00
joylink_cuiweidong
04878f54ba 哈尔滨线路 信号机操作代码调整 2020-02-28 10:41:36 +08:00
joylink_fanyuhong
ee33dec8a1 Merge remote-tracking branch 'origin/dev' into test 2020-02-27 22:18:42 +08:00
joylink_fanyuhong
b880101a46 运行图预览 2020-02-27 22:17:33 +08:00
joylink_fanyuhong
543b3c1259 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 22:10:08 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
zyy
60024d9e06 调整根路径 2020-02-27 21:39:30 +08:00
zyy
01783d5005 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 21:38:17 +08:00
zyy
c7ece4aa60 调整速度 2020-02-27 21:37:58 +08:00
joylink_cuiweidong
4d4c10f2d5 哈尔滨线路 信号机操作代码调整 2020-02-27 20:37:35 +08:00
joylink_fanyuhong
29d68e3b1b Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 18:51:55 +08:00
joylink_fanyuhong
bd7069f6f4 调整运行图预览尺寸 2020-02-27 18:51:48 +08:00
zyy
632a3275e4 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 18:22:11 +08:00
zyy
07330bf054 调整道岔,区段操作 2020-02-27 18:21:39 +08:00
joylink_cuiweidong
4dab35a61e 哈尔滨线路 右键操作 代码调整 2020-02-27 17:31:29 +08:00
joylink_fanyuhong
40c8ee9c0c 调整运行图预览尺寸 2020-02-27 16:57:51 +08:00
joylink_fanyuhong
040636e2ce 调整运行图预览尺寸 2020-02-27 16:52:48 +08:00
joylink_fanyuhong
0bd0da3af7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 16:30:55 +08:00
joylink_fanyuhong
d85f8ea5a8 仿真调整 2020-02-27 16:30:48 +08:00
zyy
4e6f107896 调整宁波一道岔操作 2020-02-27 15:44:51 +08:00
joylink_cuiweidong
9f5f30cd14 成都一号线 北京一号线 新建计划车代码调整 2020-02-27 13:05:02 +08:00
joylink_zyy
aa1de4372f Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 11:35:45 +08:00
joylink_zyy
05abf3049a 增加宁波线新建列车查询 2020-02-27 11:35:41 +08:00
joylink_fanyuhong
1948083c42 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-27 11:30:30 +08:00
joylink_fanyuhong
56d32ca088 仿真调整 2020-02-27 11:30:22 +08:00
joylink_zyy
d9e7900f44 调整道岔绘图图形 2020-02-26 22:10:48 +08:00
joylink_cuiweidong
5e3d3d86f6 宁波一号线 站台操作调整 (北京一号线,成都一号线站台参数修改) 2020-02-26 18:59:19 +08:00
joylink_cuiweidong
3dddd5bff9 代码调整 2020-02-26 15:39:25 +08:00
joylink_cuiweidong
d17195e524 北京一号线 宁波一号线 信号机 操作代码调整 2020-02-26 14:37:52 +08:00
joylink_fanyuhong
5815a2efa5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-02-26 11:35:11 +08:00
joylink_fanyuhong
c3ca956bd5 仿真调整 2020-02-26 11:34:50 +08:00
joylink_cuiweidong
076cbeb23b 北京一号线 成都三号线 信号机操作代码调整 2020-02-25 19:39:30 +08:00