Commit Graph

198 Commits

Author SHA1 Message Date
fan
365f36edef iscs 绘图 2020-01-14 09:06:03 +08:00
zyy
fa643db9db 调整成都一号线 请求堆栈 取消请求流程 2020-01-10 11:27:43 +08:00
fan
a4ebf22bab 成都一号线菜单调整 2020-01-09 17:48:25 +08:00
zyy
2310fec6ef 兼容老板地图状态,调整宁波线批量扣车数据 2020-01-07 18:03:49 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
100b852a9c 修复:顶掉用户,再次登录未获取新用户信息 2020-01-03 18:17:40 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00
zyy
760225549e 兼容新旧两种发送机制 2019-12-31 17:20:04 +08:00
zyy
00a7517e52 修改指令发送流程及配置文件 2019-12-31 17:10:52 +08:00
zyy
3044da2ea4 调整福州使用新版指令方式发送 2019-12-31 16:11:09 +08:00
fan
ef1f301292 菜单置灰调整 2019-12-31 15:53:55 +08:00
zyy
4a06c92ea1 修改鼠标静止隐藏移动显示逻辑 2019-12-30 14:06:42 +08:00
zyy
ce44ec4429 调整宁波线 样式,显示宁波线右键操作 2019-12-30 13:24:40 +08:00
zyy
97dc97d8db Merge branch 'dev' into test 2019-12-18 10:14:33 +08:00
zyy
9fe6c9739d 调整代码 2019-12-17 09:13:57 +08:00
zyy
9e50f2eacf Merge branch 'dev' into test 2019-12-11 09:08:28 +08:00
zyy
9aec1ef099 调整拖拽逻辑 2019-12-10 16:57:31 +08:00
zyy
1ecc091f41 修改删除绑定逻辑 2019-12-10 15:06:29 +08:00
joylink_cuiweidong
90c0598af7 订单管理创建订单页面代码调整 2019-12-09 15:35:57 +08:00
zyy
2bac1022b4 修改生成规则,调整新版地图右键操作 2019-12-09 10:50:21 +08:00
fan
e281045268 Merge remote-tracking branch 'origin/dev' into test 2019-12-06 18:11:05 +08:00
zyy
35688adcd0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-06 18:03:18 +08:00
zyy
dc381e2a63 desc: 新增屏蔽门绘制以及紧急停车按钮生成流程 2019-12-06 18:03:13 +08:00
fan
ac3b2d85fd ibp 添加屏蔽门操作 2019-12-06 17:54:38 +08:00
joylink_cuiweidong
53626c8a12 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-06 15:54:29 +08:00
fan
d09b418bba 绘图相关调整_(添加快捷键修改) 2019-12-06 15:12:22 +08:00
fan
75f400a1c7 绘图相关调整_(添加快捷删除) 2019-12-05 18:53:06 +08:00
zyy
5f591dd0c9 Merge branch 'dev' into test 2019-12-05 16:44:28 +08:00
zyy
a03c797c60 修改道岔计轴区段生成逻辑 2019-12-05 15:39:15 +08:00
joylink_cuiweidong
ff26ebfc08 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-12-04 14:10:48 +08:00
zyy
632d8c5c1b desc: 调整数据保存格式处理逻辑 2019-12-04 11:31:59 +08:00
fan
1e7fa5de77 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/utils/baseUrl.js
2019-12-03 17:47:27 +08:00
zyy
8eb6aca36c 道岔逻辑修改 2019-12-03 15:21:52 +08:00
fan
7d262fc7c9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2019-12-03 14:46:24 +08:00
fan
1743a0a26d 调整绘图相关调整 2019-12-03 14:46:06 +08:00
zyy
68d0f374aa desc: 调整道岔生成逻辑 2019-12-03 14:42:00 +08:00
sunzhenyu
4b3bb2c142 merge 2019-12-03 13:50:24 +08:00
zyy
d0a986e8bf 新版地图保存 2019-12-02 14:09:50 +08:00
joylink_cuiweidong
0f5c3bc2e0 自动登录调整 2019-11-28 18:45:37 +08:00
lVAL
5852ca6ebf 修改代码 2019-11-26 09:44:37 +08:00
joylink_cuiweidong
c3642d67eb 代码调整 2019-11-26 09:21:26 +08:00
zyy
93094cf623 desc: 屏蔽获取不到list 报错问题 2019-11-25 11:01:57 +08:00
zyy
fa3d0cb099 desc: 调整代码书写逻辑 2019-11-20 16:31:41 +08:00
zyy
9c24d43a7c 修改代码 2019-11-20 10:51:02 +08:00
zyy
00877ac164 修改代码 调整绘图逻辑 2019-11-19 16:39:24 +08:00
ival
fb71e4cbe8 修改订阅问题 2019-11-19 10:08:57 +08:00
ival
f26275e03c 修改代码 2019-11-18 18:47:02 +08:00
ival
5a4f6f5999 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-18 14:44:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
joylink_cuiweidong
a1ff86bd05 代码调整 2019-11-18 14:01:06 +08:00