Commit Graph

1743 Commits

Author SHA1 Message Date
zyy
df43ef4cc3 desc: 调整登陆界面显示 2019-10-08 16:08:13 +08:00
joylink_cuiweidong
672c075ada ibp 车站名称以及上下行车站名称修改 2019-10-08 15:51:19 +08:00
joylink_cuiweidong
88cead3f28 ibp盘触摸屏的拖拽事件添加 2019-10-08 14:55:40 +08:00
joylink_cuiweidong
db971bf591 产品分化运行图修改 2019-10-08 14:12:53 +08:00
joylink_cuiweidong
873fbcd686 超时登出处理 2019-10-08 09:51:13 +08:00
sunzhenyu
2c5284b6c4 增加信号机位置重置 2019-09-30 18:38:42 +08:00
joylink_cuiweidong
35faeb8583 产品分化 设计平台 剧本修改 2019-09-30 18:13:24 +08:00
fan
ca413e3331 设计平台运行图调整 2019-09-30 18:11:31 +08:00
fan
5e5a17fee9 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-30 17:56:26 +08:00
fan
641345e801 设计平台调整 2019-09-30 17:56:16 +08:00
joylink_cuiweidong
a46f94f85e 产品分化 设计系统调整 2019-09-30 17:31:40 +08:00
fan
588c886f3b Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-30 16:20:51 +08:00
fan
5075e999b9 设计平台调整 2019-09-30 16:20:31 +08:00
zyy
95877f344e desc: 提示国际化修改逻辑 2019-09-30 16:13:59 +08:00
joylink_cuiweidong
cad6eeb98e 产品分化 删除地图调整 2019-09-30 16:00:52 +08:00
joylink_cuiweidong
e9638517d8 产品分化 运行图列表调整 2019-09-30 15:18:34 +08:00
joylink_cuiweidong
4fb174f185 产品分化 创建运行图调整 2019-09-30 14:17:20 +08:00
fan
2be7de7527 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/api/designPlatform.js
2019-09-30 13:26:13 +08:00
fan
5d27847379 设计平台系统调整 2019-09-30 13:24:47 +08:00
joylink_cuiweidong
c7b5188d74 产品分化 设计平台调整 2019-09-30 10:46:29 +08:00
zyy
25cb199850 desc: 调整登陆页面样式 2019-09-29 19:20:10 +08:00
joylink_cuiweidong
2e1f6739eb 产品分化调整 2019-09-29 16:54:11 +08:00
sunzhenyu
2551a4d595 Merge branch 'dev' into 3dtest 2019-09-29 16:13:21 +08:00
zyy
6dfdc0ccfc Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-29 16:09:48 +08:00
zyy
64a601c967 desc: 调整登陆页面样式 2019-09-29 16:09:40 +08:00
joylink_cuiweidong
53a9dc5feb Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-29 15:57:33 +08:00
joylink_cuiweidong
8d4bf59c34 产品分化调整 2019-09-29 15:57:19 +08:00
fan
c9570a4631 暂时提交 2019-09-29 15:55:01 +08:00
fan
dae0ceff57 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 15:38:38 +08:00
joylink_cuiweidong
0aa02cc85c 产品分化 地图右键操作调整 2019-09-29 15:25:23 +08:00
fan
7c69943277 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 14:28:05 +08:00
fan
6c8a8574da 暂时提交 2019-09-29 14:27:58 +08:00
joylink_cuiweidong
a502d0a118 产品分化 设计平台页面调整以及接口调整 2019-09-29 14:21:06 +08:00
sunzhenyu
c1d20befc1 Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev 2019-09-29 14:06:02 +08:00
sunzhenyu
aace4f9337 修改列车进站和转换区段速度 2019-09-29 14:05:33 +08:00
fan
a88cbe11d6 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-29 13:40:15 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
zyy
a8302b610e desc: 注释多余代码 2019-09-29 11:09:02 +08:00
sunzhenyu
3dccd86682 修改自动轨道link 2019-09-29 09:21:38 +08:00
sunzhenyu
ba4c041468 修改道岔生成 2019-09-27 18:46:27 +08:00
joylink_cuiweidong
2a9f7b38df Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/router/index.js
2019-09-27 18:20:10 +08:00
joylink_cuiweidong
1e95cae5e5 产品分化 设计系统界面调整 2019-09-27 18:16:27 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
zyy
f74ce907b8 desc: 调整获取二维码登陆接口 2019-09-27 15:29:25 +08:00
fan
bc29c3fb3a 合并代码 2019-09-27 14:49:11 +08:00
fan
f9bdaaac4f Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/router/index.js
2019-09-27 14:48:50 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
zyy
f334814012 desc: 增加琏计划心跳接口 2019-09-27 10:53:48 +08:00
zyy
2d2cc343a8 desc: 调整白名单顺序 2019-09-27 10:25:48 +08:00
joylink_cuiweidong
58b429f852 地图设计右键操作添加 2019-09-27 10:16:11 +08:00