Commit Graph

93 Commits

Author SHA1 Message Date
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
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
977a6d8b47 产品分化调整 2019-10-10 16:07:13 +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
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
fan
641345e801 设计平台调整 2019-09-30 17:56:16 +08:00
fan
5075e999b9 设计平台调整 2019-09-30 16:20:31 +08:00
fan
5d27847379 设计平台系统调整 2019-09-30 13:24:47 +08:00
fan
c9570a4631 暂时提交 2019-09-29 15:55:01 +08:00
fan
6c8a8574da 暂时提交 2019-09-29 14:27:58 +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
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
fan
31721a4738 产品分化调整 2019-09-26 16:14:07 +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