Commit Graph

2116 Commits

Author SHA1 Message Date
sunzhenyu
0eedf1bd6b merge 2020-12-29 10:00:29 +08:00
sunzhenyu
e857d580ac 修改客流车站模型 2020-12-29 09:59:43 +08:00
fan
8b2291e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 09:59:26 +08:00
fan
fda2e940a5 调整路径 2020-12-29 09:59:11 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
8028103feb 综合演练行调添加ISCS&ISCS列车时刻表&ISCS信号系统 2020-12-28 11:20:36 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
fan
e38833b119 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:27:31 +08:00
fan
8b2cd16fe9 运行图调整 2020-12-22 17:27:04 +08:00
sunzhenyu
af7e9d8dbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 14:08:33 +08:00
sunzhenyu
e3b9c2f682 修改北交大客流人数颜色图示 2020-12-22 14:08:25 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
zyy
baffbf36c8 调整南京二号线线路点击选择 2020-12-20 10:55:34 +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
fan
941e0a791a 留言板调整 2020-12-18 13:38:13 +08:00
joylink_fanyuhong
e534232f2d 留言板调整
(cherry picked from commit 0dbc19027a)
2020-12-18 09:18:43 +08:00
fan
5740b863b3 text、line、outFrame添加参数&报错提示调整 2020-12-18 09:17:18 +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
fdfd54f452 北交大客流项目 代码调整 2020-12-17 09:59:06 +08:00
zyy
34bff76eb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 15:37:22 +08:00
zyy
c2f6c3461b 调整宁波三,增加字段 2020-12-16 15:37:09 +08:00
joylink_cuiweidong
90f0b4e918 运行图编制代码调整 2020-12-16 14:51:59 +08:00
fan
bd0aac34fe 综合演练现地显示调整 2020-12-16 13:25:55 +08:00
fan
d5b0508467 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 10:55:25 +08:00
fan
eebb034208 现地增加ibp& 现地切换值班员角色调整 2020-12-16 10:54:55 +08:00
joylink_cuiweidong
1715dcad32 北交大 客流数据代码调整 2020-12-16 10:18:58 +08:00
joylink_cuiweidong
525fc25469 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 09:42:15 +08:00
joylink_cuiweidong
0a5eb83904 代码调整 2020-12-16 09:41:53 +08:00
joylink_cuiweidong
3f7d5da3b1 代码调整 2020-12-16 09:40:37 +08:00
fan
1faa02cffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 18:16:04 +08:00
fan
19e9cb7948 缓存运行图数据 2020-12-15 18:15:48 +08:00
joylink_cuiweidong
1453d5538a 北交大客流仿真代码调整 2020-12-15 18:09:10 +08:00
joylink_cuiweidong
845b620e65 北交大仿真 切换客流数据调整 2020-12-15 16:20:11 +08:00
zyy
9e48ca39a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 14:41:36 +08:00
zyy
249bef4802 调整道岔生成逻辑 2020-12-15 14:41:23 +08:00
joylink_cuiweidong
a45374acc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 13:36:05 +08:00
joylink_cuiweidong
da59fdbed6 代码调整 2020-12-15 13:35:38 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
zyy
7ec4a2db59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 11:10:19 +08:00
zyy
b85dcb41dc 调整道岔生成逻辑 2020-12-15 11:10:05 +08:00
joylink_cuiweidong
c437ac62c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:19:31 +08:00
joylink_cuiweidong
0ecea0aabc 地图绘制代码调整 2020-12-14 17:18:57 +08:00
zyy
e5a51e0d90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-12-14 17:07:15 +08:00
zyy
40687fcd5b 调整信号机批量设置偏移量 2020-12-14 17:06:23 +08:00
joylink_cuiweidong
1deaf4defc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 16:54:31 +08:00