Merge branch 'master' into third

src/api/boe/userbasic.js

@@ -63,6 +63,11 @@ const modifyPassword = function(data) {
     return ajax.postJson(baseURL,'/user/resetPassword',data);
 }
 
+/**获取加入的受众的id集合*/
+const getInAudienceIds = function() {
+    return ajax.post(baseURL,'/audience/audienceByUser',{});
+}
+
 export default {
     userParentOrg,
     findOrgsByKeyword,
@@ -72,5 +77,6 @@ export default {
     getUserCrowds,
     getUserAudiences,
     getOrgHrbpInfo,
-    modifyPassword
+    modifyPassword,
+    getInAudienceIds
 }

src/views/manage/ViewUserGroup.vue

@@ -17,7 +17,7 @@
     </div>
     <el-table ref="multipleTable" :data="tableDataShow" tooltip-effect="dark" style="width: 100%">
 
-      <el-table-column label="姓名" prop="name" align="center" ></el-table-column>
+      <el-table-column label="姓名" prop="realName" align="center" ></el-table-column>
       <el-table-column prop="userNo" label="工号"  align="center"></el-table-column>
       <el-table-column prop="departName" label="部门" align="center"></el-table-column>
       <!-- <el-table-column prop="position" label="岗位" align="center"></el-table-column> -->

src/views/portal/course/Index.vue

@@ -317,7 +317,7 @@ import apiOldCourse from "@/api/boe/course.js";
 import apiTeacher from "@/api/modules/teacher.js";
 import apiUser from "@/api/system/user.js";
 import scene from "@/api/modules/scene.js";
-import apiUserGroup from "@/api/modules/usergroup.js";
+import apiUserbasic from "@/api/boe/userbasic.js";
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
 import { courseType, getType, toScore,formatDate,formatUserNumber,formatDateByFmt } from "@/utils/tools.js";
@@ -515,19 +515,26 @@ export default {
          this.audiences=hasIds.split(",");
          this.search();
        }else{
-         Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
+         apiUserbasic.getInAudienceIds().then(rs=>{
-            //console.log(rs,'rs');
+            if(rs.status==200){
-            let aids=[];
+               this.audiences=rs.result;
-            if(rs[0].status==200){
+            }else{
-              aids.push(rs[0].result);
+              console.log(rs.message);
             }
-            if(rs[1].status==200){
-              aids.push(rs[1].result);
-            }
-            this.audiences=aids;
-            sessionStorage.setItem(localKey,this.audiences);
-            this.search();
          })
+         // Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
+         //    //console.log(rs,'rs');
+         //    let aids=[];
+         //    if(rs[0].status==200){
+         //      aids.push(rs[0].result);
+         //    }
+         //    if(rs[1].status==200){
+         //      aids.push(rs[1].result);
+         //    }
+         //    this.audiences=aids;
+         //    sessionStorage.setItem(localKey,this.audiences);
+         //    this.search();
+         // })
        }
     }
 

src/views/study/coursenew.vue

@@ -1279,8 +1279,8 @@
           contentId: this.contentData.id, //内容id,
           contentType: this.contentData.contentType,
           contentName: this.contentData.contentName, //内容名称
-          progress: 0,
+          progress: 1,
-          status: 1,
+          status: 2,
           contentTotal: this.totalContent
         };
         apiStudy.studyContent(params).then(res => {