Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

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
+}

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(){

src/components/Course/weikeContent.vue

@@ -946,6 +946,7 @@
           return;
         }
         let postData={
+          type:10,
           content:null,
           homework:null,
           exam:null

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) {

src/utils/xpage.js

@@ -1,6 +1,6 @@
 /**页面设置的一些常量,方便，用于一个处理只写一处，不要多处写*/
 const constants={
-  fileBaseUrl:'',
+  fileBaseUrl:'/upload',
   newLoginKey:'boe_new_login'
 }
 

src/views/portal/course/Index.vue

@@ -96,7 +96,8 @@
                   <div style="width:80%" class="course-title two-line-ellipsis" :title="cinfo.title"   v-html="cinfo.name"></div>
                   <div class="course-info">
                     <div class="course-info-user">
-                       <span class="course-info-author"  v-if="cinfo.teacher">{{cinfo.teacher=='BOE教师'? '':cinfo.teacher}}</span>
+                       <!-- <span class="course-info-author"  v-if="cinfo.teacher">{{cinfo.teacher=='BOE教师'? '':cinfo.teacher}}</span> -->
+                       <span class="course-info-author"  v-if="cinfo.teacher" v-html="cinfo.teacher"></span>
                        <span class="course-info-studys" >{{formatNum(cinfo.studies)}}人学习</span>
                     </div>
                     <div class="course-info-score">
@@ -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;

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']),