Commit Graph

84 Commits

Author SHA1 Message Date
joylink_cuiweidong
8bc69347e7 实训平台创建试卷代码调整 2019-11-29 17:46:14 +08:00
zyy
1d82ce738f desc: 修改考试规则定义,调整更新商品更新样式 2019-11-25 10:44:48 +08:00
joylink_cuiweidong
859fbe5e4e 修改实训平台考试系统列表按钮显示 2019-11-15 11:40:49 +08:00
zyy
0cb102186f desc: 修改echarts加载方式 2019-11-12 17:20:23 +08:00
fan
92f2292592 暂无法购买,添加提示 2019-11-12 09:40:36 +08:00
fan
c35cef4800 样式调整 2019-11-11 18:42:14 +08:00
fan
be6bd12b52 代码调整 2019-11-11 09:56:11 +08:00
joylink_cuiweidong
fcf4f542e0 代码调整 2019-11-08 18:57:27 +08:00
joylink_cuiweidong
ee600f8915 skinCode调整 2019-11-08 18:19:35 +08:00
fan
75a871265e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-08 16:22:32 +08:00
fan
e677b24f6d 调整查询地图列表接口 2019-11-08 16:22:05 +08:00
joylink_cuiweidong
95ae0de627 skinCode调整 2019-11-08 16:12:23 +08:00
fan
71171625fa 删除console 2019-11-08 13:44:49 +08:00
fan
b4ba9cb3b8 代码修改 2019-11-08 13:41:22 +08:00
fan
7e13f98167 发布课程管理form 添加城市与地图的级联关系 2019-11-08 10:57:07 +08:00
fan
f8d6a3eb9f 课程发布管理添加归属地图 2019-11-08 10:21:54 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
joylink_cuiweidong
5cb7fe51b9 skinCode处理 2019-11-07 10:25:34 +08:00
fan
347e49f55c 调整接口 2019-11-04 13:29:51 +08:00
joylink_cuiweidong
075cdf5fd9 页面样式调整
代码优化
2019-11-04 10:59:50 +08:00
joylink_cuiweidong
96452b8dde 代码调整 2019-11-01 17:08:28 +08:00
joylink_cuiweidong
f3298cdb83 页面调整 2019-11-01 15:12:00 +08:00
fan
7455fb17ea 发布地图管理国际化调整,添加ibp角色多人时disable为true 调整 2019-10-31 16:52:49 +08:00
zyy
dfd148897b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-31 14:47:20 +08:00
zyy
dc8524e52a desc: 调整试题高度 2019-10-31 14:47:05 +08:00
fan
547589331b 发布地图管理调整调整 2019-10-31 14:35:28 +08:00
fan
934b67fea3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-31 13:57:36 +08:00
fan
3996f03e55 实训首页样式调整和复制地图调整 2019-10-31 13:57:17 +08:00
zyy
a87372ea2c desc: 发布高度调整 2019-10-31 13:24:45 +08:00
fan
ea219e6310 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/publish/publishMap/index.vue
#	src/views/publish/publishMap/project.vue
2019-10-31 10:36:30 +08:00
fan
900abcbe36 添加复制地图和调整实训平台树节点key 2019-10-31 10:32:46 +08:00
zyy
c006a98f2e desc: 修改代码 2019-10-31 10:09:43 +08:00
fan
6d37627e3d 发布地图管理调整 2019-10-31 09:09:43 +08:00
fan
3dff70d821 运行图调整 2019-10-30 19:04:21 +08:00
fan
1242c7e3d7 修改接口:/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId} 2019-10-30 18:18:09 +08:00
fan
6d0edb2370 合并代码 2019-10-30 16:57:01 +08:00
fan
4918c78204 删除接口:/api/runPlan/draft/station/{skinCode}/bySkin 2019-10-30 16:50:35 +08:00
joylink_cuiweidong
85733f5f0a 接口调整
无效文件删除
2019-10-30 14:40:31 +08:00
fan
973168970c 西铁院项目调整 2019-10-29 14:14:14 +08:00
joylink_cuiweidong
7ed9387731 更新发布课程信息
地图预览bug调整
2019-10-28 10:29:17 +08:00
joylink_cuiweidong
0f39f495af 发布地图管理页面添加更新城市 2019-10-25 17:50:55 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +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
joylink_cuiweidong
df5a76ea41 剧本管理英文版英文用词修改 2019-10-16 11:20:36 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理, 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
zyy
01cb0a699b desc: 调整权限字段限制, 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
joylink_cuiweidong
27d7431b9e 国际化调整 2019-09-24 14:09:26 +08:00
fan
d863e61b33 Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e"
This reverts commit 6ad0eebb2e.
2019-09-24 13:32:28 +08:00
fan
6ad0eebb2e revert 01c97f45ae 2019-09-24 13:23:50 +08:00