diff --git a/src/components/Course/catalogCourseware.vue b/src/components/Course/catalogCourseware.vue
index c115226c..cd2ba745 100644
--- a/src/components/Course/catalogCourseware.vue
+++ b/src/components/Course/catalogCourseware.vue
@@ -102,10 +102,10 @@
            </div>
            <!--课件选择或上传的公用组件-->
            <div v-show="content.contentRefId=='' && content.contentType>0 && content.contentType<41">
-              <choose-course-file ref="coursewarePanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
+              <choose-course-file :orgId="course.orgId" :orgName="course.orgName" ref="coursewarePanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
            </div>
            <div v-show="content.contentRefId=='' && content.contentType==50">
-              <choose-course-file ref="coursewareScormPanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
+              <choose-course-file :orgId="course.orgId" :orgName="course.orgName" ref="coursewareScormPanel" :resType="content.contentType" @choose="chooseFile"></choose-course-file>
            </div>
            <!--图文-->
            <div v-show="content.contentType==41">
diff --git a/src/components/Course/chooseCourseFile.vue b/src/components/Course/chooseCourseFile.vue
index d14bb2ec..d5252794 100644
--- a/src/components/Course/chooseCourseFile.vue
+++ b/src/components/Course/chooseCourseFile.vue
@@ -44,11 +44,18 @@
       </el-tab-pane>
       <el-tab-pane :label="'上传新'+curComType.name">
         <div v-if="!courseFile.id">
+          <div v-if="resType>20" style="padding-bottom: 10px;">
+            <span style="font-weight: 700;">内容时长（分）：</span>
+            <span>
+              <el-input-number v-model="duration" size="mini" :min="1" :max="100"></el-input-number>
+            </span>
+          </div>
           <el-upload class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
             <div class="el-upload__tip" slot="tip">文件大小限制：{{curComType.maxSizeName}},支持的文件类型：{{curComType.fileTypes.join(',')}}</div>
           </el-upload>
+
         </div>
         <div v-else style="text-align: center;">
            <div style="padding: 20px;">{{courseFile.fileName}} <span style="color: green;">上传成功</span></div>
@@ -68,6 +75,14 @@
         type: String,
         default:'500'
       },
+      orgId:{
+        type: String,
+        default:''
+      },
+      orgName:{
+        type: String,
+        default:''
+      },
       resType:{
         type: Number,
         default:0
@@ -86,6 +101,7 @@
         pageIndex:1,
         count:0,
         keyword: '',
+        duration:1,
         comTypes:[
             {id:'1',type:'video',name:'视频',img:'el-icon-video-camera',resType:10,maxSize:1024,maxSizeName:"1G",fileTypes:['mp4']},
             {id:'2',type:'sound',name:'音频',img:'el-icon-service',resType:20,maxSize:1024,maxSizeName:"1G",fileTypes:['mp3']},
@@ -156,6 +172,9 @@
             fileType:res.result.fileType,
             filePath:res.result.filePath,
             resType:this.resType,
+            orgId:this.orgId,
+            orgName:this.orgName,
+            duration:this.duration,
             remark:'课程中直接上传'
           }
           apiCourseFile.saveUpload(courseWare).then(rs=>{
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 2aad98c5..f5f3f242 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -567,6 +567,7 @@ export default {
       this.orgName=orgInfo.name;
       this.orgKid=orgInfo.kid; //kid已不存在
       this.courseInfo.orgId=orgInfo.id;
+      this.courseInfo.orgName=orgInfo.name;
       this.$refs.refChooseOrg.dlgShow = false;
     },
     getTeacherList(res) {
@@ -729,6 +730,7 @@ export default {
           apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
             if(rs.status==200){
                 this.orgName=rs.result.name;
+                this.courseInfo.orgName=rs.result.name;
                 //this.orgKid=rs.result.kid;
                 this.orgNamePath=rs.result.namePath;
              }
@@ -849,6 +851,7 @@ export default {
                  apiUserBasic.getOrgInfo(ors.result.id).then(rrs=>{
                     if(rrs.status==200){
                       $this.orgName=rrs.result.name;
+                      this.courseInfo.orgName=rrs.result.name;
                       //$this.orgKid=rrs.result.kid;
                       $this.orgNamePath=rrs.result.namePath;
                     }else{
@@ -875,6 +878,7 @@ export default {
             apiUserBasic.getOrgInfo(this.courseInfo.orgId).then(rs=>{
               if(rs.status==200){
                   $this.orgName=rs.result.name;
+                  $this.courseInfo.orgName=rs.result.name;
                   //$this.orgKid=rs.result.kid;
                   $this.orgNamePath=rs.result.namePath;
                }else{
diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue
index 52df84a4..3c2f2865 100644
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -231,6 +231,7 @@
             <el-cascader v-model="projectOwnership1" :options="resOwnerListMap" :props="defaultProps" @change="handleChange"></el-cascader>
           </el-form-item> -->
           <!-- <el-form-item label="编号">{{}}</el-form-item> -->
+          <el-form-item label="资源归属">{{ form.orgName }}</el-form-item>
           <el-form-item label="文件名称">{{ form.fileName }}</el-form-item>
           <el-form-item label="课件名称"><el-input v-model="form.name"  maxlength="50" show-word-limit></el-input></el-form-item>
           <el-form-item label="课件类型">{{ getType(form.resType) }}</el-form-item>
@@ -255,7 +256,7 @@
 </template>
 
 <script>
-import coueseFile from '../../api/modules/courseFile';
+import coueseFile from '@/api/modules/courseFile';
 import FileUpload from '@/components/FileUpload/index.vue';
 import { getType, deepCopy, toContentType } from '../../utils/tools.js';
 import pdfPreview from '@/components/PdfPreview/index.vue';
@@ -263,6 +264,7 @@ import { mapGetters, mapActions } from 'vuex';
 import videoPlayer from '@/components/VideoPlayer/index.vue';
 import audioPlayer from '@/components/AudioPlayer/index.vue';
 import chooseOrg from '@/components/System/chooseOrg.vue';
+import apiUserBasic from '@/api/boe/userbasic.js';
 export default {
   components: { FileUpload, pdfPreview, videoPlayer, audioPlayer,chooseOrg},
   computed: {
@@ -361,7 +363,8 @@ export default {
     }
   },
   mounted() {
-    this.upload.orgId==this.userInfo.departId;
+    this.upload.orgId=this.userInfo.departId;
+    //console.log(this.upload.orgId,'this.upload.orgId')
     if(this.upload.orgId){
        apiUserBasic.getOrgInfo(this.upload.orgId).then(rs=>{
          if(rs.status==200){