Commit Graph

2804 Commits

Author SHA1 Message Date
fan
67ea835805 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 18:52:36 +08:00
fan
4e136ca8b3 成都一号线样式调整 2020-01-10 18:51:57 +08:00
zyy
28bac5e7bc 调整svg加载路径 2020-01-10 17:25:14 +08:00
zyy
d3d64c7c91 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 17:11:41 +08:00
zyy
5d6a994cbc 删除宁波批量扣车反向操作 2020-01-10 17:11:35 +08:00
fan
d77559211c 成都一、三号线z站台参数调整 2020-01-10 15:15:00 +08:00
fan
9f14f4bbda 成都一号线菜单调整 2020-01-10 14:51:55 +08:00
fan
1254ba912c 成都一号线菜单调整 2020-01-10 14:50:04 +08:00
zyy
a7b97dd7cc 调整宁波一号线请求参数 2020-01-10 14:41:20 +08:00
zyy
19edd695be 删除多余输出 2020-01-10 11:28:43 +08:00
zyy
fa643db9db 调整成都一号线 请求堆栈 取消请求流程 2020-01-10 11:27:43 +08:00
zyy
2b56d3f636 修改样式 2020-01-10 10:29:52 +08:00
zyy
021f3bc148 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-10 09:32:38 +08:00
zyy
bd0518acc7 调整成都一号线操作堆样式流程 2020-01-10 09:32:32 +08:00
fan
06c6ec66e5 成都一号线菜单样式调整 2020-01-09 18:49:58 +08:00
fan
e8b616b705 成都一号线菜单调整 2020-01-09 18:21:04 +08:00
fan
68180d0c83 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 17:48:46 +08:00
fan
a4ebf22bab 成都一号线菜单调整 2020-01-09 17:48:25 +08:00
zyy
5e781415b0 调整打包配置 2020-01-09 17:43:18 +08:00
zyy
41329739dc Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 16:24:10 +08:00
zyy
a4e3e30c78 增加成都一号线请求堆栈 2020-01-09 16:24:01 +08:00
fan
7f54b99883 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 13:03:02 +08:00
fan
ab64e6858e 成都一号线marbar菜单调整 2020-01-09 13:02:40 +08:00
zyy
ed3df55457 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:54:40 +08:00
zyy
197d75342c 调整宁波一号线批量扣车逻辑 2020-01-09 09:54:34 +08:00
fan
6e90989ece 成都一号线右键菜单调整 2020-01-09 09:28:20 +08:00
fan
09b27a8d62 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:02:22 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
joylink_cuiweidong
54a5ff38a1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 18:26:20 +08:00
joylink_cuiweidong
82bef6ed4d 北京一号线新版 右键菜单指令调整 2020-01-08 18:26:07 +08:00
zyy
2e042b9fee Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 17:50:22 +08:00
zyy
fa513a1e8f 调整宁波一号线控制权右键条件 2020-01-08 17:50:16 +08:00
joylink_cuiweidong
b45b59599d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 17:42:39 +08:00
joylink_cuiweidong
88d4ccf8d9 北京一号线新版 区段道岔指令调整 2020-01-08 17:42:28 +08:00
zyy
d79641e0e4 调整指令字典中条件参数 2020-01-08 17:21:17 +08:00
joylink_cuiweidong
c29033177d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 16:24:24 +08:00
joylink_cuiweidong
4dde67b582 北京一号线新版信号机操作调整 2020-01-08 16:23:45 +08:00
zyy
b345594605 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 14:59:33 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
joylink_cuiweidong
387746a69b 北京一号线新版 站台指令操作调整 2020-01-08 14:49:20 +08:00
fan
bf49c52c3e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-08 09:56:44 +08:00
zyy
9bbc497488 调整宁波一号线批量扣车key 2020-01-08 09:48:24 +08:00
fan
83a37a1b28 成都一号线右键菜单调整 2020-01-08 09:41:55 +08:00
zyy
02af288233 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 18:03:56 +08:00
zyy
2310fec6ef 兼容老板地图状态,调整宁波线批量扣车数据 2020-01-07 18:03:49 +08:00
joylink_cuiweidong
91d1f98f69 北京一号线新版站台区段车站右键菜单调整 2020-01-07 17:40:24 +08:00
joylink_cuiweidong
7fd885a1c2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/theme/beijing_01/planConvert.js
2020-01-07 15:22:50 +08:00
joylink_cuiweidong
ce98244b44 北京一号线新版 道岔和信号机的右键菜单代码调整 2020-01-07 15:19:18 +08:00
zyy
473b289692 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 14:49:58 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00