joylink_cuiweidong
|
c60471023f
|
产品分化剧本管理调整
|
2019-10-14 13:10:36 +08:00 |
|
fan
|
6d15a95b3f
|
产品分化运行图发布调整
|
2019-10-14 13:04:23 +08:00 |
|
fan
|
38f4dc1093
|
产品分化调整
|
2019-10-12 18:43:41 +08:00 |
|
fan
|
5af0c7e4c9
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-12 17:16:09 +08:00 |
|
fan
|
8366f9a788
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/router/index.js
|
2019-10-12 17:15:48 +08:00 |
|
joylink_cuiweidong
|
12eed3629a
|
运行图 发布审核流程调整
|
2019-10-12 17:15:25 +08:00 |
|
fan
|
722596cdf4
|
产品分化调整
|
2019-10-12 17:14:03 +08:00 |
|
joylink_cuiweidong
|
af2c431511
|
运行图剧本 审核流程调整
|
2019-10-12 16:47:54 +08:00 |
|
sunzhenyu
|
b32b03bc81
|
修改link为主轨迹运行
|
2019-10-12 16:36:51 +08:00 |
|
zyy
|
842f29e5d9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/jointTraining/index.vue
|
2019-10-12 13:35:56 +08:00 |
|
zyy
|
99edd29aea
|
desc: 调整格式化问题， 调整列车详情国际化
|
2019-10-12 13:25:47 +08:00 |
|
joylink_cuiweidong
|
6adc8cdd5b
|
剧本国际化调整
|
2019-10-12 13:04:56 +08:00 |
|
joylink_cuiweidong
|
bf66b2c9e0
|
剧本发布申请页面调整
|
2019-10-12 11:11:34 +08:00 |
|
fan
|
a24603aedf
|
综合仿真页面跳转调整
|
2019-10-12 11:03:15 +08:00 |
|
zyy
|
e03aefd80d
|
desc: 调整字段
|
2019-10-11 19:10:27 +08:00 |
|
zyy
|
ef3f909a2d
|
desc: 调整字段显示
|
2019-10-11 19:02:12 +08:00 |
|
zyy
|
3b8da62bf2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-11 18:40:37 +08:00 |
|
zyy
|
5e8089cacd
|
desc: 修改权限字段
|
2019-10-11 18:40:32 +08:00 |
|
fan
|
862f251adb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-11 17:45:36 +08:00 |
|
fan
|
3326f1c917
|
ibp调整
|
2019-10-11 17:17:05 +08:00 |
|
zyy
|
1e3486efc6
|
desc: 增加权限分发列表【设置失效】功能
|
2019-10-11 16:09:15 +08:00 |
|
zyy
|
aa0199754a
|
desc: 调整创建权限流程，创建字段修改
|
2019-10-11 15:27:14 +08:00 |
|
fan
|
a4ccfee26d
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-10-11 08:57:38 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
zyy
|
f7cf33a5e2
|
desc: 调整登陆页面样式
|
2019-10-10 18:05:26 +08:00 |
|
joylink_cuiweidong
|
2a4bb6dba2
|
剧本发布申请页面
|
2019-10-10 17:37:07 +08:00 |
|
joylink_cuiweidong
|
e31bd2730f
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-10-10 16:18:43 +08:00 |
|
joylink_cuiweidong
|
17ed79b2dd
|
产品分化课程设计页面调整
刷新页面菜单栏选中状态调整
|
2019-10-10 16:18:31 +08:00 |
|
fan
|
f2d614d5af
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-10 16:12:47 +08:00 |
|
fan
|
977a6d8b47
|
产品分化调整
|
2019-10-10 16:07:13 +08:00 |
|
joylink_cuiweidong
|
059a4134d5
|
产品分化路由调整以及剧本发布样式调整
|
2019-10-10 14:08:23 +08:00 |
|
fan
|
758eccd074
|
产品分化调整
|
2019-10-10 13:56:33 +08:00 |
|
fan
|
95a6103575
|
产品分化调整
|
2019-10-10 13:16:00 +08:00 |
|
fan
|
c9f9aa6869
|
产品分化调整
|
2019-10-10 13:02:43 +08:00 |
|
fan
|
3381424f0d
|
产品分化调整
|
2019-10-10 09:33:56 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
fan
|
e27a189952
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-09 15:14:21 +08:00 |
|
fan
|
417c78ec72
|
产品分化调整优化
|
2019-10-09 15:14:00 +08:00 |
|
joylink_cuiweidong
|
28ca25b822
|
处理设计平台菜单栏显示的问题
|
2019-10-09 14:56:32 +08:00 |
|
joylink_cuiweidong
|
bb9cfc965d
|
产品分化 实训平台加载剧本接口修改
|
2019-10-09 14:01:02 +08:00 |
|
joylink_cuiweidong
|
62621b77a0
|
产品分化 设计平台页面调整
|
2019-10-09 11:28:11 +08:00 |
|
joylink_cuiweidong
|
b7cb2a36db
|
产品分化 剧本接口调整
|
2019-10-09 10:14:30 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
ec4e78548f
|
产品分化页面调整
|
2019-10-08 16:09:18 +08:00 |
|
zyy
|
88c1212af0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-08 16:08:19 +08:00 |
|
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
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
fan
|
ca413e3331
|
设计平台运行图调整
|
2019-09-30 18:11:31 +08:00 |
|
fan
|
641345e801
|
设计平台调整
|
2019-09-30 17:56:16 +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 |
|
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
|
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 |
|
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 |
|
zyy
|
f74ce907b8
|
desc: 调整获取二维码登陆接口
|
2019-09-27 15:29:25 +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 |
|
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 |
|
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 |
|
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 |
|
zyy
|
7ae79fd7e4
|
desc: 调整二维码字段
|
2019-09-26 10:03:20 +08:00 |
|