修改，优化。文件夹图片换成svg，图片上传功能优化，增加上传失败处理。页面UI优化。增加刷新按钮

dist/static/css/chunk-5840c19e.3f792b5c.css

@@ -1 +1 @@
-.subfile_main{padding:26px 5% 47px 5%}.subfile_main .block{margin:0 0 28px 0}.subfile_main .sou_bottom{margin-left:10px}.subfile_main .use_button{margin:15px 0 16px 0}.subfile_main .file_caozuo>button{margin:6px 10px 0 0}.subfile_main .el-table td{padding:9px 0}.subfile_main .folder_bottom a{margin:0 6px}.subfile_main .el-table__body-wrapper img{display:block;max-width:66%;max-height:286px}.subfile_main .el-drawer__body{text-align:center;padding:0 10% 20px 10%}.subfile_main .request_main{text-align:center;margin:12px 0}.subfile_main .addimgtext{line-height:25px;display:inline-block;color:#8c939d;vertical-align:middle}.subfile_main .el-upload--picture-card i{vertical-align:middle}.subfile_main .type_file_click img{width:64px;height:48px}.subfile_main .file_show a,.subfile_main .type_file_click a{display:block}
+.subfile_main{padding:26px 5% 47px 5%}.subfile_main .block{margin:0 0 28px 0}.subfile_main .sou_bottom{margin-left:10px}.subfile_main .use_button{margin:15px 0 16px 0}.subfile_main .file_caozuo>button{margin:6px 10px 0 0}.subfile_main .el-table td{padding:9px 0}.subfile_main .folder_bottom a{margin:0 6px}.subfile_main .el-table__body-wrapper img{display:block;max-width:68%;max-height:286px}.subfile_main .el-drawer__body{text-align:center;padding:0 10% 20px 10%}.subfile_main .request_main{text-align:center;margin:12px 0}.subfile_main .addimgtext{line-height:25px;display:inline-block;color:#8c939d;vertical-align:middle}.subfile_main .el-upload--picture-card i{vertical-align:middle}.subfile_main .type_file_click img{width:64px;height:48px}.subfile_main .type_file_click a{display:block}.subfile_main .file_show a{display:block;min-height:156px;min-width:140px}@media(max-width:990px){.subfile_main .el-table__body-wrapper img{max-width:100%}}

src/api/user.js

@@ -12,13 +12,14 @@ export function captcha(datas) {
 
 // 请求出错处理
 export function requesterr(thiss, err) {
-    console.log(err);
+    // console.log(err.toJSON());
+    // console.log(err);
     
-    console.log(err.toJSON());
+    //console.log(err.toJSON());
     if (err.response) {
         thiss.$message({ showClose: true, message: err.response.data.err, type: 'error' });
     } else if (err.request) {
-        thiss.$message({ showClose: true, message: err.request, type: 'error' });
+        thiss.$message({ showClose: true, message: err.message, type: 'error' });
     } else {
         thiss.$message({ showClose: true, message: err.message, type: 'error' });
     }

src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
 
   title: '嘉洛马',
-  address: 'https://demo.jialuoma.com',
+  address: 'https://demo.jialuoma.cn',
 
   /**
    * @type {boolean} true | false

src/styles/element-ui.scss

@@ -51,6 +51,7 @@
 .el-submenu__title i{color:#FFF;}
 .el-message{z-index:6000 !important;}
 .content_main .el-drawer__wrapper{z-index:2200 !important;}
+.el-message-box__wrapper{z-index:2300 !important;}
 #nprogress .bar{background:#409EFF !important;}
 
 

src/views/subfile/index.vue

@@ -69,7 +69,7 @@
                 <!-- 文件数据列表 -->
                 <el-table
                     :show-header="false"
-                    empty-text="无文件数据"
+                    :empty-text="emptyText"
                     :data="tableData"
                     style="width:100%;">
                     
@@ -175,7 +175,9 @@
 		<el-drawer
 			title="上传图片"
 			:visible.sync="uploadDrawer"
+            ref="drawerref"
 			:direction="direction"
+            :before-close="drawerClose"
 			size="100%"
 			>
 
@@ -246,10 +248,11 @@ export default {
   data() {
     return {
         // 环境变量
-        //imgurl:process.env.VUE_APP_IMG_URL,
-        imgurl:'https://demo.jialuoma.com',
+        imgurl:process.env.VUE_APP_IMG_URL,
+        //imgurl:'https://demo.jialuoma.cn',
 
         loadingText: '文件获取中...',
+        emptyText: '无文件数据',
         
         //haveRealpath: 0,
         // 当前目录文件数据
@@ -464,7 +467,7 @@ export default {
                 //console.log(num);
                 files.onProgress({percent: num})  //进度条
             }
-            
+            //files.onError()
             //console.log(uploaddata);
             uploadrequest(uploaddata, Progress).then(response => {
                 let datamain = response.data;
@@ -473,8 +476,10 @@ export default {
                     //this.$message({showClose: true,message: datamain.msg, type:'success'});
                     files.onSuccess(); //上传成功(打钩的小图标)
                         
+
                     this.uploadCount++;  //如果全部上传完成则刷新数据
                     console.log(this.uploadCount);
+                    console.log(this.uploadFilelist);
                     if (this.uploadCount == this.uploadFilelist.length) {
                         this.uploadDrawer = false;
                         this.uploadFilelist = [];
@@ -488,7 +493,12 @@ export default {
                 }
                 
             }).catch(error => {
+                // this.uploadCount++;
+                // console.log(this.uploadCount);
+                // console.log(this.uploadFilelist);
                 requesterr(this, error);
+                this.$message({showClose: true,message: error.message+ '/文件('+files.file.name+')上传失败，请重新上传', type:'error'});
+                files.onError(); // 上传失败回调函数，同时删除上传失败的文件
                 this.uploadLoad = false;
             });
       		//console.log(res)
@@ -497,10 +507,33 @@ export default {
 	},
 
     //关闭图片上传窗口回调
-    // uploadDrawerClose(done) {
+    drawerClose(done) {
         // this.uploadDrawer = false;
         // this.uploadFilelist = [];
-    // },
+        //confirm('离开该页面将退出照片上传')
+        console.log(this.uploadCount);
+        if (this.uploadFilelist.length == 0) {
+            done();
+            return;
+        }
+
+        this.$confirm('离开该页面将退出照片上传', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+        }).then(() => {
+            if(this.uploadCount > 0) {
+                this.getFileData();
+                this.loadingText = '新增上传文件中...'
+            }
+            done();
+            this.uploadFilelist = [];
+        }).catch(() => {
+                        
+        });
+        
+        
+    },
     getFileData() {
         let can = {};
 		const menusindex = window.location.href
@@ -509,12 +542,13 @@ export default {
 			can.id =  menusindex.split('?id=')[1]
 		}
 		let thiss = this;
-        
+        this.subloading = true
+        this.loadingText = '获取文件中...'
+        this.emptyText = ' ' //空数据提示设置为空
         this.dirdata = []
         this.tableData = []        
-        this.loadingText = '获取文件中...'
-		this.subloading = true        
 		mirlist(can).then(response => {
+            
 			let datamain = response.data;
 			let maindata = datamain.data.dirTree;
 			if (datamain.code == 1) {
@@ -528,7 +562,7 @@ export default {
 					this.tableData = this.forObjectData(maindata.files);
 					
 				}
-
+                this.emptyText = '无文件数据'
                 //this.haveRealpath = maindata.realpath;
                 //console.log(this.haveRealpath);
 				this.dirform.parent = maindata.realpath; //获取当前目录的位置
@@ -838,7 +872,7 @@ export default {
     .type_file_click img{width:64px;height:48px;}
     .type_file_click a{display:block;}
     // .file_show{position:relative;}
-    .file_show a{display:block;}
+    .file_show a{display:block;min-height:156px;min-width:140px;}
     // .link_copy{position:absolute;top:0;right:0;}
     // .el-table .is-center{text-align:left;}
 }