Commit Graph

79 Commits

Author SHA1 Message Date
joylink_cuiweidong
2bbfa5e860 代码调整 2019-12-18 14:50:34 +08:00
joylink_cuiweidong
cf03ac1e3d 综合演练的分发按钮去掉
所有的转增按钮去掉
2019-12-18 11:16:35 +08:00
zyy
03d766f5ee 修改实训平台购买提示 2019-12-05 18:12:09 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
fan
3ad044be4f 打开支付跳转页面 2019-11-15 09:42:53 +08:00
ival
6ce30aaee2 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
#	src/permission.js
#	src/views/display/demon/chartView.vue
#	src/views/display/demon/chatBox.vue
#	src/views/exam/detail/courseDetail.vue
2019-11-14 14:03:41 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
fan
6bb95775b3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
#	src/layout/components/Navbar.vue
2019-11-13 14:31:56 +08:00
fan
bd2e82c0ea 权限分发转赠归属人查询 & 其他问题调整 2019-11-13 14:29:20 +08:00
joylink_cuiweidong
a5a2d79e64 综合演练ibp盘返回代码调整 2019-11-13 14:16:59 +08:00
fan
92f2292592 暂无法购买,添加提示 2019-11-12 09:40:36 +08:00
joylink_cuiweidong
e8c8e491f5 skinCode调整 2019-11-11 15:54:04 +08:00
zyy
5a2ff68b15 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-11-07 18:46:23 +08:00
zyy
16e13f38b5 desc: 调整格式 2019-11-07 18:46:17 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
zyy
bc332c1a9d desc: 调整国际化,高度问题 2019-11-01 18:08:05 +08:00
zyy
aaa0eeedd8 desc: 调整国际化 2019-11-01 13:51:00 +08:00
zyy
7ec68a75e3 desc: 删除多余文件, 调整路径配置 2019-10-31 17:30:24 +08:00
fan
375773cceb 更换接口:/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details 2019-10-30 13:56:43 +08:00
joylink_cuiweidong
c45b991c22 代码调整 2019-10-29 16:49:48 +08:00
fan
ca736a93f3 登录过期不显示获取子系统信息失败 2019-10-25 13:16:07 +08:00
fan
89d71ed661 发现问题调整 2019-10-23 13:33:09 +08:00
fan
ff37fe128e 问题调整 2019-10-22 18:49:46 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
4b41c9fd27 考试路由调整 2019-10-21 13:16:49 +08:00
fan
9d072c4a6c 产品分化调整 2019-10-21 10:02:49 +08:00
fan
34a8cbf270 接口调整 2019-10-21 08:59:27 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
fan
ee62ceb0e5 产品分化调整 2019-10-17 16:04:07 +08:00
zyy
6ca619b71f desc: 修改格式化 2019-10-17 14:35:10 +08:00
zyy
5d13162c6b Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
2019-10-17 11:21:01 +08:00
zyy
5d7f736873 desc: 调整考试系统英文名称 2019-10-17 11:20:09 +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
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
fan
2ce7cde8cb 调整icon导致x替换问题 2019-09-26 15:43:19 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
fan
b998eee746 产品分化调整 2019-09-24 15:03:03 +08:00
fan
e95023fcf3 国际化调整 2019-09-24 11:26:28 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
sunzhenyu
b8afc684a3 pull 2019-09-17 10:51:38 +08:00
fan
3e1bd3fcd7 国际化考试系统大屏统计系统 2019-09-11 09:25:16 +08:00
zyy
921ef7c03d desc: 调整接口请求次数 2019-09-04 19:06:55 +08:00
sunzhenyu
3d977cc124 pull 2019-09-03 16:50:15 +08:00
zyy
95e6008c50 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 17:34:40 +08:00