Commit Graph

1347 Commits

Author SHA1 Message Date
fan
6c8a8574da 暂时提交 2019-09-29 14:27:58 +08:00
joylink_cuiweidong
a502d0a118 产品分化 设计平台页面调整以及接口调整 2019-09-29 14:21:06 +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
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
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
joylink_cuiweidong
58b429f852 地图设计右键操作添加 2019-09-27 10:16:11 +08:00
joylink_cuiweidong
9d41af74bd 产品分化 导入地图按钮名称修改 2019-09-26 17:46:27 +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
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
0bb8e6ba0b 产品分化剧本修改 2019-09-26 10:54:07 +08:00
joylink_cuiweidong
bde4904b2a 产品分化调整 2019-09-26 09:07:19 +08:00
fan
0fac6ce22e 产品分化调整 2019-09-25 18:56:30 +08:00
joylink_cuiweidong
1f27473d44 Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product 2019-09-25 15:34:40 +08:00
joylink_cuiweidong
edcfd5f738 产品分化调整 2019-09-25 15:34:29 +08:00
fan
37dd77bc55 上下拖拽尺寸调整 2019-09-25 15:32:44 +08:00
fan
00f6a41eeb Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-25 14:52:30 +08:00
fan
6e14ba3382 设计平台调整 2019-09-25 14:52:21 +08:00
joylink_cuiweidong
7f77c3d33f 产品分化 标题,路由调整 2019-09-25 14:45:18 +08:00
joylink_cuiweidong
7abd6ddeea 产品分化调整 2019-09-25 13:45:20 +08:00
fan
5f7fe163d5 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-25 13:05:10 +08:00
fan
e7d7ad76f0 实训平台调整 2019-09-25 13:05:01 +08:00
joylink_cuiweidong
2c32dbc655 产品分化菜单栏调整 2019-09-25 11:21:31 +08:00
fan
575ca24299 产品分化调整:添加测试路由跳转 2019-09-25 09:32:48 +08:00
fan
155229e205 产品分化调整:注释测试路由跳转 2019-09-25 09:29:00 +08:00
fan
87acc40279 产品分化调整 2019-09-25 09:21:35 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
joylink_cuiweidong
341097de50 产品分化调整 2019-09-24 17:40:04 +08:00
fan
8daaffc854 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
#	src/views/login/index.vue
2019-09-24 15:56:49 +08:00
fan
7e72a54f8c 控制只在第一次进入时变全屏 2019-09-24 15:54:59 +08:00
fan
b998eee746 产品分化调整 2019-09-24 15:03:03 +08:00
joylink_cuiweidong
589306de80 产品分化菜单栏调整 2019-09-24 13:47:52 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
joylink_cuiweidong
823eb02b90 产品分化菜单栏调整 2019-09-24 10:51:41 +08:00
fan
e2ee048f56 产品分化调整 2019-09-23 18:06:29 +08:00
fan
622ba7b5f2 Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:53:16 +08:00
joylink_cuiweidong
fd8a1817c5 菜单栏调整 2019-09-23 17:52:44 +08:00
fan
9c3071dc4b Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:51:34 +08:00
joylink_cuiweidong
7514a7657f 菜单栏调整 2019-09-23 17:50:07 +08:00