From 21e123149b39ffe5f1b0d170551d09e3d14aa3ac Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 15 Nov 2022 09:04:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E9=AB=98=E4=BA=AE=E6=98=BE?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 @@
- {{cinfo.teacher=='BOE教师'? '':cinfo.teacher}} + + {{formatNum(cinfo.studies)}}人学习
@@ -737,6 +738,9 @@ export default { item.teacher=item.teacher.substring(0,dotIdx); } } + if(item.teacher && item.teacher=='BOE教师'){ + item.teacher=''; + } //转化标红显示 item.title=item.name; From 0999553fe6f0a7518c0a04f9874e12e388d51fd5 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 15 Nov 2022 17:19:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/weikeContent.vue | 1 + src/security.js | 3 --- src/utils/xpage.js | 2 +- src/views/study/coursenew.vue | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) 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/study/coursenew.vue b/src/views/study/coursenew.vue index 3eae578a..76b4e6cb 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -359,7 +359,7 @@ totalContent: 0, //课程内容数量 pageCount: 0, currentPage: 0, - fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl: this.$xpage.constants.fileBaseUrl,//使用动态的路径 ，不使用配置的路径了process.env.VUE_APP_FILE_BASE_URL, contentList: [], sectionList: [], teachers: [], @@ -393,7 +393,7 @@ this.$watermark.set(this.userInfo.name + this.userInfo.loginName); this.courseId = this.$route.query.id; this.loadData(); - + //console.log(this.$xpage.constants.fileBaseUrl,'this.$xpage.constants.fileBaseUrl'); }, computed: { ...mapGetters(['userInfo']), From 9cfbeb4e8f250705567a4c746da40cfed0980d8a Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 15 Nov 2022 21:53:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0userbasic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/userbasic.js | 17 +++++++++++++++++ src/components/Course/courseForm.vue | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/api/boe/userbasic.js 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(){