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

src/components/Course/catalogCourseware.vue

@@ -111,7 +111,7 @@
            <div v-show="content.contentType==41">
              <div style="display: flex;justify-content:space-between">
                 <div>
-                  <el-input maxlength="50" @change="updateName" v-model="content.contentName" placeholder="内容的名称(限50字以内)"></el-input>
+                  <el-input maxlength="50" @change="updateName" v-model="content.contentName" placeholder="内容的名称(限20字以内)"></el-input>
                 </div>
                 <div>
                   <el-button type="primary" @click="saveData()" >保存</el-button>

src/components/Course/chooseCourseFile.vue

@@ -128,6 +128,15 @@
           return false;
         }
       });
+      this.findCourseFile();
+    },
+    watch:{
+       resType(newVal,oldVal){
+          if(newVal!=oldVal){
+            this.findCourseFile();
+          }
+
+       }
     },
     methods:{
       handleBeforeUpload(file) {

src/components/Course/courseForm.vue

@@ -606,32 +606,32 @@ export default {
     }),
     loadUserGroup(){
       let $this=this;
-      apiUserGroup.findByName('').then(rs=>{
-         if(rs.status==200){
-           let crowdList=[];
-           rs.result.forEach(item=>{
-              crowdList.push({
-                 id:item.key,
-                 name:item.value,
-                 disabled:false
-               })
-           })
-           this.userGroupList=crowdList;
-         }
-      });
-      // apiUserBasic.getUserCrowds().then(rs=>{
-      //     if(rs.status==200){
-      //       let crowdList=[];
-      //       rs.result.forEach(item=>{
-      //          crowdList.push({
-      //            id:item.kid,
-      //            name:item.audienceName,
+      // apiUserGroup.findByName('').then(rs=>{
+      //    if(rs.status==200){
+      //      let crowdList=[];
+      //      rs.result.forEach(item=>{
+      //         crowdList.push({
+      //            id:item.key,
+      //            name:item.value,
       //            disabled:false
       //          })
-      //       });
-      //       this.userGroupList=crowdList;
-      //     }
-      // })
+      //      })
+      //      this.userGroupList=crowdList;
+      //    }
+      // });
+      apiUserBasic.getUserCrowds().then(rs=>{
+          if(rs.status==200){
+            let crowdList=[];
+            rs.result.forEach(item=>{
+               crowdList.push({
+                 id:item.id,
+                 name:item.audienceName,
+                 disabled:false
+               })
+            });
+            this.userGroupList=crowdList;
+          }
+      })
     },
     resOwnerName(code) {
       if (code == '') {

src/components/Course/weikeContent.vue

@@ -24,7 +24,7 @@
             </div>
             <!--内容区-->
             <div style="margin-top: 10px;">
-                <div v-if="cware.content.contentType<51  && cware.content.contentType!=41 && !cware.findShow">
+                <div v-if="cware.content.contentType<51 && cware.content.contentType!=41 && !cware.findShow">
                   <div v-if="cware.content.contentRefId==''">
                         <div style="padding-top: 0px;">
                           <!-- <div> -->