diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index a84bbd49..6cd3b36f 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -185,7 +185,7 @@ export default {
     },
     // 文件个数超出
     handleExceed(res) {
-      this.$message({message:`只允许上传单个文件`,type:'error',offset:100});
+      this.$message({message:`一次性最多上传${this.limit}个文件`,type:'error',offset:100});
     },
     // 上传失败
     handleUploadError(err) {
@@ -193,16 +193,31 @@ export default {
       this.$message({message:"上传失败, 请重试",type:'error',offset:100});
     },
     // 上传成功回调
-    handleUploadSuccess(res, file) {
+    handleUploadSuccess(res, file,fileList) {
       if(res.status == 200) {
-        this.fileList = [];
+        //this.fileList = [];
+        //console.log(file,'file');
+        //console.log(fileList,'fileList');
         this.isLoading = false;
         this.$message({message:"上传成功",type:'success',offset:100});
+        let delIdx=-1;
+        fileList.some((fl,flIndx)=>{
+          if(fl.uid==file.uid){
+             delIdx=flIndx;
+             return true;
+          }else{
+            return false;
+          }
+        });
+        if(delIdx>-1){
+          fileList.splice(delIdx,1);
+        }
       } else {
         this.isLoading = false;
-        this.fileList = [];
+        //this.fileList = [];
         this.$message({message:"上传失败",type:'error',offset:100});
       }
+
       this.$emit("success", res);
     },
     // 删除文件
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index c5a1bc68..ec6dfaaa 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -415,9 +415,9 @@ export default {
     this.getLastStudy();
   },
   mounted() {
-    console.log(this.userInfo.loginName,'this.userInfo.loginName');
+    //console.log(this.userInfo.loginName,'this.userInfo.loginName');
     let flag=testUser.isTest(this.userInfo.loginName);
-    console.log(flag,'this.isTest22');
+    //console.log(flag,'this.isTest22');
     this.isTest=flag;
     // if(testUser.isTest(this.userInfo.loginName)){
     //   console.log(this.isTest,'this.isTest');
diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue
index 2f58f760..79254eac 100644
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -363,15 +363,17 @@ export default {
   },
   mounted() {
     this.upload.orgId=this.userInfo.departId;
+    this.upload.orgName=this.userInfo.departName;
+    this.needOrg='';
     //console.log(this.upload.orgId,'this.upload.orgId')
-    if(this.upload.orgId){
-       apiUserBasic.getOrgInfo(this.upload.orgId).then(rs=>{
-         if(rs.status==200){
-             this.upload.orgName=rs.result.name;
-             this.needOrg='';
-          }
-       });
-    }
+    // if(this.upload.orgId){
+    //    apiUserBasic.getOrgInfo(this.upload.orgId).then(rs=>{
+    //      if(rs.status==200){
+    //          this.upload.orgName=rs.result.name;
+    //          this.needOrg='';
+    //       }
+    //    });
+    // }
     this.loadResOwners();
     this.getResOwnerTree().then(rs => {
       this.resOwnerListMap = rs;
@@ -508,7 +510,7 @@ export default {
         });
       }
     },
-    async handleUploadSuccess(rs) {
+    handleUploadSuccess(rs) {
       if (rs.status === 200) {
         let type = toContentType(rs.result.fileType);
         // ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3"]
@@ -516,6 +518,7 @@ export default {
           this.$message.error('文件名称请不要超过100个字符');
           return;
         }
+        //console.log('上传文件：'+rs.result.displayName);
         const data = {
           orgId:this.upload.orgId,
           orgName:this.upload.orgName,
@@ -528,23 +531,41 @@ export default {
           resType: type //文件类型,10视频，20音频，30图片， 40 文档，50表图文，60表scrom包,90表其它，
           // remark: 备注说明，可以为空，不填
         };
-        try {
-          const { result, status } = await coueseFile.saveUpload(data);
-          if (status === 200) {
-            result.device1 = true;
-            result.device2 = true;
-            result.minute='';
-            if(result.duration){
-              result.minute=Math.round(result.duration/60); //四舍五入
+        //try {
+          coueseFile.saveUpload(data).then(res=>{
+            if(res.status==200){
+              //console.log('上传文件成功：'+rs.result.displayName);
+              res.result.device1 = true;
+              res.result.device2 = true;
+              res.result.minute='';
+              if(res.result.duration){
+                res.result.minute=Math.round(res.result.duration/60); //四舍五入
+              }
+              this.fileList.push(res.result);
+            }else{
+              this.$message.error(res.message);
             }
+          }).catch (error=>{
+            console.log(error,'error')
+            //this.$message.error(error);
+          });
+          // const { result, status } = coueseFile.saveUpload(data);
+          // if (status === 200) {
+          //   console.log('上传文件成功：'+rs.result.displayName);
+          //   result.device1 = true;
+          //   result.device2 = true;
+          //   result.minute='';
+          //   if(result.duration){
+          //     result.minute=Math.round(result.duration/60); //四舍五入
+          //   }
 
-            this.fileList.push(result);
-          } else {
-            this.$message.error(error);
-          }
-        } catch (error) {
-          this.$message.error(error);
-        }
+          //   this.fileList.push(result);
+          // } else {
+          //   this.$message.error(error);
+          // }
+        //} catch (error) {
+        //  this.$message.error(error);
+        //}
       } else {
         this.$message.error(rs.message);
       }
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index f9f4f570..5ddc1bb9 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -394,7 +394,6 @@
       Teacherinfo(){
           this.workname=[];
           this.checkboxtearGroup=[];
-          
           apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
             if(res.result.courses){
               this.teachform.courses = res.result.courses;