diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js new file mode 100644 index 00000000..7382beb6 --- /dev/null +++ b/src/api/boe/userbasic.js @@ -0,0 +1,17 @@ + +import ajax from '../ajax'; +//const baseURL = process.env.VUE_APP_CESOURCE_BASE_API; +const baseURL ="userbasic"; + +/** + * 获取用户的组织机构 + * organization_id + */ +const userParentOrg = function() { + return ajax.post(baseURL,'/org/userParentOrg',{}); +} + + +export default { + userParentOrg +} diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 0856ac13..bdadb0e7 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -395,6 +395,7 @@ import apiUserGroup from '../../api/modules/usergroup.js'; import apiTeacher from '../../api/modules/teacher.js'; import apiTag from '../../api/modules/tag.js'; import apiHRBP from '../../api/boe/HRBP.js'; +import apiUserBasic from '../../api/boe/userbasic.js'; import apiCourse from '../../api/modules/course.js'; import apiOrg from '../../api/system/organiza.js'; import apiUser from '../../api/system/user.js'; @@ -544,7 +545,6 @@ export default { this.loadResOwners(); this.loadSysTypes(); this.loadUserGroup(); - }, methods: { showChooseOrg(){ diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index b406eb8a..c1010af0 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -946,6 +946,7 @@ return; } let postData={ + type:10, content:null, homework:null, exam:null diff --git a/src/security.js b/src/security.js index 31c11c9e..f414634e 100644 --- a/src/security.js +++ b/src/security.js @@ -17,14 +17,11 @@ router.beforeEach((to, from, next) => { //动态计算文件的路径 let configPath=process.env.VUE_APP_FILE_RELATIVE_PATH; if(configPath.startsWith('http')){ - //xpage.fileBaseUrl=configPath; xpage.constants.fileBaseUrl=configPath; }else{ - //xpage.fileBaseUrl = window.location.protocol+'//'+window.location.host+configPath; xpage.constants.fileBaseUrl=window.location.protocol+'//'+window.location.host+configPath; } - NProgress.start(); if (whiteList.indexOf(to.path) !== -1) { diff --git a/src/utils/xpage.js b/src/utils/xpage.js index 0f1da9fd..60bfc46e 100644 --- a/src/utils/xpage.js +++ b/src/utils/xpage.js @@ -1,6 +1,6 @@ /**页面设置的一些常量,方便,用于一个处理只写一处,不要多处写*/ const constants={ - fileBaseUrl:'', + fileBaseUrl:'/upload', newLoginKey:'boe_new_login' } diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index cd189102..2b903682 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -96,7 +96,8 @@