fan
|
9134be8c19
|
问题调整
|
2019-10-22 18:18:21 +08:00 |
|
fan
|
6f314ba150
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 16:06:20 +08:00 |
|
fan
|
0e23a62b39
|
调整代码
|
2019-10-22 16:05:58 +08:00 |
|
zyy
|
3c67e18350
|
desc: 修改代码
|
2019-10-22 15:24:36 +08:00 |
|
fan
|
b7a16a9074
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 13:40:55 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +08:00 |
|
joylink_cuiweidong
|
343372d83a
|
设计平台地图三维路径调整
|
2019-10-21 16:12:03 +08:00 |
|
fan
|
be2bbc67cd
|
接口参数调整
|
2019-10-21 11:15:15 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
fan
|
0ebab6201f
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/views/scriptManage/home.vue
|
2019-10-17 18:09:02 +08:00 |
|
joylink_cuiweidong
|
99b2cfc05b
|
剧本预览页面调整
|
2019-10-17 18:06:04 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
fan
|
ee62ceb0e5
|
产品分化调整
|
2019-10-17 16:04:07 +08:00 |
|
fan
|
6924577078
|
代码调整
|
2019-10-17 14:39:37 +08:00 |
|
zyy
|
6ca619b71f
|
desc: 修改格式化
|
2019-10-17 14:35:10 +08:00 |
|
fan
|
ece8f0cf21
|
Merge remote-tracking branch 'origin/dev_product' into dev_merger
# Conflicts:
# src/router/index.js
# src/scripts/ConstDic.js
|
2019-10-17 09:36:32 +08:00 |
|
fan
|
5ba5ca7ea7
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/components/QueryListPage/QueryForm.vue
# src/i18n/langs/en/rules.js
# src/i18n/langs/en/scriptRecord.js
# src/i18n/langs/zh/lesson.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/scriptRecord.js
# src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
# src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
# src/permission.js
# src/router/index.js
# src/utils/baseUrl.js
# src/views/demonstration/detail/index.vue
# src/views/display/tipExamList.vue
# src/views/lesson/lessoncategory/edit/lesson/publish.vue
# src/views/lesson/taskmanage/createTask.vue
# src/views/lesson/trainingRule/list.vue
# src/views/login/index.vue
# src/views/planMonitor/editTool/statusBar.vue
# src/views/scriptManage/home.vue
# src/views/teach/category/tree.vue
# src/views/trainRoom/index.vue
|
2019-10-17 09:16:40 +08:00 |
|
fan
|
126886e1ce
|
西铁院暂存
|
2019-10-16 15:28:29 +08:00 |
|
fan
|
0640586712
|
西铁院暂存
|
2019-10-15 13:04:28 +08:00 |
|
fan
|
1ec45e2c19
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:06:16 +08:00 |
|
joylink_cuiweidong
|
232789ca73
|
产品分化路由处理
|
2019-10-15 11:05:30 +08:00 |
|
fan
|
729be7ec69
|
西铁院暂存
|
2019-10-15 09:39:01 +08:00 |
|
joylink_cuiweidong
|
af2c431511
|
运行图剧本 审核流程调整
|
2019-10-12 16:47:54 +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 |
|
joylink_cuiweidong
|
2a4bb6dba2
|
剧本发布申请页面
|
2019-10-10 17:37:07 +08:00 |
|
joylink_cuiweidong
|
17ed79b2dd
|
产品分化课程设计页面调整
刷新页面菜单栏选中状态调整
|
2019-10-10 16:18:31 +08:00 |
|
joylink_cuiweidong
|
059a4134d5
|
产品分化路由调整以及剧本发布样式调整
|
2019-10-10 14:08:23 +08:00 |
|
fan
|
f7e85b493c
|
添加发布申请路由
|
2019-10-10 10:32:57 +08:00 |
|
fan
|
0a36fee338
|
产品分化调整
|
2019-10-10 10:21:22 +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
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +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 |
|
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 |
|
fan
|
c9570a4631
|
暂时提交
|
2019-09-29 15:55:01 +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 |
|
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 |
|