Commit Graph

1515 Commits

Author SHA1 Message Date
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
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
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
zyy
f712c93622 desc: 调整权限分发 组织结构配置 2019-09-27 10:06:46 +08:00
zyy
5c973ba468 desc: 调整英文版登陆窗口, 登陆样式调整 2019-09-26 18:40:38 +08:00
zyy
31a024b9ea desc: 调整国际化 2019-09-26 18:13:31 +08:00
joylink_cuiweidong
9d41af74bd 产品分化 导入地图按钮名称修改 2019-09-26 17:46:27 +08:00
zyy
91a93da574 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-26 17:42:32 +08:00
zyy
01cb0a699b desc: 调整权限字段限制, 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
joylink_cuiweidong
5e3e4b77e1 产品分化调整 2019-09-26 17:41:58 +08:00
joylink_cuiweidong
92169c34ab 产品分化调整 2019-09-26 16:40:39 +08:00
fan
b69433d8c4 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-26 16:14:15 +08:00
fan
31721a4738 产品分化调整 2019-09-26 16:14:07 +08:00
joylink_cuiweidong
1c73b2dba9 Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-26 15:51:34 +08:00
joylink_cuiweidong
3f516ae26b 产品分化 地图绘制按钮调整 2019-09-26 15:51:22 +08:00
fan
bc68f1adc9 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-09-26 15:43:56 +08:00
fan
2ce7cde8cb 调整icon导致x替换问题 2019-09-26 15:43:19 +08:00
fan
613f1f3b95 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/router/index.js
2019-09-26 15:13:47 +08:00
fan
1fb0cf3e94 产品分化调整 2019-09-26 15:08:53 +08:00
joylink_cuiweidong
6664d33ed2 产品分化剧本设计调整 2019-09-26 13:21:15 +08:00
joylink_cuiweidong
293cee8d2f 剧本管理bug修改 2019-09-26 11:07:30 +08:00
joylink_cuiweidong
5964baeea1 国际化调整 2019-09-26 10:59:38 +08:00
joylink_cuiweidong
0bb8e6ba0b 产品分化剧本修改 2019-09-26 10:54:07 +08:00
zyy
bf085f5de6 Merge branch 'master' into dev 2019-09-26 10:06:27 +08:00