joylink_cuiweidong
|
681ac5e886
|
路由调整
接口调整
|
2019-10-31 13:56:42 +08:00 |
|
joylink_cuiweidong
|
b5b08a0afd
|
接口调整
|
2019-10-31 11:03:19 +08:00 |
|
joylink_cuiweidong
|
3636bd06b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 19:37:07 +08:00 |
|
joylink_cuiweidong
|
de76904dfc
|
接口调整
|
2019-10-30 19:36:29 +08:00 |
|
fan
|
00dcbdf7bd
|
任务管理调整
|
2019-10-30 19:36:26 +08:00 |
|
joylink_cuiweidong
|
2df4c5f8cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 18:07:45 +08:00 |
|
joylink_cuiweidong
|
ce0230150b
|
接口调整
|
2019-10-30 18:07:09 +08:00 |
|
fan
|
e5c832aa00
|
修改接口：/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list
|
2019-10-30 17:41:29 +08:00 |
|
fan
|
b6f11064da
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 13:07:27 +08:00 |
|
fan
|
0489cf2fd3
|
删除接口：/api/map/{skinCode}/train
|
2019-10-30 11:18:41 +08:00 |
|
joylink_cuiweidong
|
81921a4a0d
|
国际化调整
|
2019-10-30 09:58:23 +08:00 |
|
joylink_cuiweidong
|
e8cacb4a84
|
样式调整
|
2019-10-29 18:55:10 +08:00 |
|
zyy
|
3fa60b2e8b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/ConstDic.js
# src/views/lesson/lessoncategory/edit/sorttree/index.vue
# src/views/lesson/lessoncategory/index.vue
# src/views/login/index.vue
|
2019-10-29 17:36:48 +08:00 |
|
zyy
|
df8d104bd1
|
desc: 高度修改，登陆页面英文调整
|
2019-10-29 17:33:11 +08:00 |
|
joylink_cuiweidong
|
462b0cfb6c
|
样式调整
|
2019-10-29 16:23:57 +08:00 |
|
joylink_cuiweidong
|
b1c3e10eb1
|
课程设计内容排序样式调整
|
2019-10-29 13:43:23 +08:00 |
|
zyy
|
0222dfe5c2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-29 13:16:04 +08:00 |
|
zyy
|
c08e2afaaa
|
desc: 调整高度样式
|
2019-10-29 13:15:57 +08:00 |
|
joylink_cuiweidong
|
9fc78c18c3
|
课程设计内容排序调整
运行图发布弹出提示调整
|
2019-10-29 13:06:55 +08:00 |
|
fan
|
8710a6231a
|
综合演练房间调整
|
2019-10-23 16:13:36 +08:00 |
|
fan
|
3119f4f308
|
设计平台课程设计调整
|
2019-10-23 15:01:25 +08:00 |
|
fan
|
89d71ed661
|
发现问题调整
|
2019-10-23 13:33:09 +08:00 |
|
fan
|
48fafacdc2
|
获取上次用户登录系统
|
2019-10-22 20:01:03 +08:00 |
|
fan
|
21510d9464
|
创建章节修改
|
2019-10-22 19:49:37 +08:00 |
|
fan
|
5c5c2412fd
|
章节下添加创建章节
|
2019-10-22 19:23:01 +08:00 |
|
fan
|
ff37fe128e
|
问题调整
|
2019-10-22 18:49:46 +08:00 |
|
fan
|
9134be8c19
|
问题调整
|
2019-10-22 18:18:21 +08:00 |
|
fan
|
0cafd0c7f3
|
设计平台课程系统调整
|
2019-10-22 17:24:41 +08:00 |
|
fan
|
0e23a62b39
|
调整代码
|
2019-10-22 16:05:58 +08:00 |
|
fan
|
e89211a873
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 14:28:41 +08:00 |
|
fan
|
a49b195090
|
调整代码
|
2019-10-22 14:28:22 +08:00 |
|
zyy
|
a61f917f4a
|
desc: 调整站台扣车状态显示
|
2019-10-22 14:07:20 +08:00 |
|
zyy
|
ac0fafebc0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-22 13:41:29 +08:00 |
|
zyy
|
0c6de0e011
|
desc: 修改代码
|
2019-10-22 13:41:23 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +08:00 |
|
fan
|
b68dd99bde
|
仿真路由调整
|
2019-10-21 16:07:15 +08:00 |
|
fan
|
be2bbc67cd
|
接口参数调整
|
2019-10-21 11:15:15 +08:00 |
|
fan
|
9d072c4a6c
|
产品分化调整
|
2019-10-21 10:02:49 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|
fan
|
902b1a494b
|
接口调整
|
2019-10-18 18:36:45 +08:00 |
|
fan
|
b23bff36f0
|
打开实训录制按钮
|
2019-10-18 17:32:14 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
zyy
|
7b5255c3eb
|
desc: 调整格式化，样式
|
2019-10-17 18:27:49 +08:00 |
|
fan
|
ab815ec493
|
实训管理调整
|
2019-10-17 17:56:25 +08:00 |
|
fan
|
00c4415fcc
|
代码整合调整
|
2019-10-17 14:31:59 +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
|
6d15a95b3f
|
产品分化运行图发布调整
|
2019-10-14 13:04:23 +08:00 |
|
fan
|
38f4dc1093
|
产品分化调整
|
2019-10-12 18:43:41 +08:00 |
|
fan
|
722596cdf4
|
产品分化调整
|
2019-10-12 17:14:03 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|