diff --git a/src/api/upload-api.js b/src/api/upload-api.js
index 7380761..e8fb0f2 100644
--- a/src/api/upload-api.js
+++ b/src/api/upload-api.js
@@ -57,6 +57,14 @@ export default {
return qs.stringify(params, { arrayFormat: 'repeat' })
}
})
+ },
+ // 重名名
+ rename: function(params) {
+ return request({
+ url: 'rename',
+ method: 'get',
+ params
+ })
}
}
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index c853c6d..c32f260 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -67,9 +67,9 @@ export default {
username: this.$store.state.user.name,
options: {
target: api.simpleUploadURL,
- chunkSize: 5 * 1024 * 1024,
+ chunkSize: 2 * 1024 * 1024,
maxChunkRetries: 1, // 最大重试次数
- simultaneousUploads: 6, // 并发上传数
+ simultaneousUploads: 3, // 并发上传数
testChunks: true, // 是否开启服务器分片校验
// 服务器分片校验函数，秒传及断点续传基础
checkChunkUploadedByResponse: function(chunk, message) {
@@ -129,10 +129,10 @@ export default {
// Bus.$emit('fileAdded')
// },
onFilesAdded(files) {
- console.log('files', files)
const filePaths = this.uploader.filePaths
const paths = Object.keys(filePaths)
- if (paths.length > 0) {
+ const pathsLength = paths.length
+ if (pathsLength > 0) {
paths.forEach(path => {
const folder = filePaths[path]
// 上传文件夹
@@ -144,16 +144,28 @@ export default {
username: this.params.username,
userId: this.params.userId
}).then(() => {
- console.log('上传文件' + folder.name + '夹成功！', folder)
this.getFileList()
}).catch(e => {})
})
}
files.forEach(file => {
// 上传文件
- console.log('上传->', file.name)
+ console.log('上传->', file)
this.panelShow = true
- this.computeMD5(file)
+ console.log(pathsLength)
+ // this.computeMD5(file)
+ if (pathsLength < 1) {
+ this.computeMD5(file)
+ } else {
+ console.log(pathsLength)
+ Object.assign(this.uploader.opts, {
+ query: {
+ isFolder: false,
+ ...this.params
+ }
+ })
+ file.resume()
+ }
Bus.$emit('fileAdded')
})
},
@@ -324,7 +336,7 @@ export default {
this.$nextTick(() => {
$(``).appendTo(`.file_${id} .uploader-file-status`).css({
'position': 'absolute',
- 'top': '-14px',
+ // 'top': '-14px',
'font-size': '13px',
'left': '0',
'right': '0',
@@ -385,13 +397,12 @@ export default {
.file-title {
display: flex;
- /*line-height: 8px;*/
+ height: 3.5rem;
+ line-height: 3.5rem;
padding: 0 10px;
border-bottom: 1px solid #ddd;
.files-title {
margin-left: 3%;
- height: 20px;
- line-height: 20px;
}
.operate {
flex: 1;
@@ -450,6 +461,9 @@ export default {
&[icon=audio] {
background: url(./images/audio.svg);
}
+ &[icon=folder] {
+ background: url(./images/folder.svg);
+ }
}
/deep/.uploader-file-actions > span {
@@ -462,7 +476,7 @@ export default {
text-indent: 20px;
}
/deep/.uploader-file-meta {
- width: 0%;
+ width: 0;
}
/deep/.uploader-file-icon {
width: 32px;
diff --git a/src/icons/svg/audio.svg b/src/icons/svg/audio.svg
index dea21ab..66659a1 100644
--- a/src/icons/svg/audio.svg
+++ b/src/icons/svg/audio.svg
@@ -1 +1 @@
-
+
diff --git a/src/icons/svg/file-add.svg b/src/icons/svg/file-add.svg
new file mode 100644
index 0000000..c2bca0b
--- /dev/null
+++ b/src/icons/svg/file-add.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/file-excel.svg b/src/icons/svg/file-excel.svg
new file mode 100644
index 0000000..2373196
--- /dev/null
+++ b/src/icons/svg/file-excel.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/file-pdf.svg b/src/icons/svg/file-pdf.svg
new file mode 100644
index 0000000..bd98515
--- /dev/null
+++ b/src/icons/svg/file-pdf.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/file-txt.svg b/src/icons/svg/file-txt.svg
new file mode 100644
index 0000000..360ebcd
--- /dev/null
+++ b/src/icons/svg/file-txt.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/file-upload.svg b/src/icons/svg/file-upload.svg
new file mode 100644
index 0000000..50b977c
--- /dev/null
+++ b/src/icons/svg/file-upload.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/file-word.svg b/src/icons/svg/file-word.svg
new file mode 100644
index 0000000..d2ead63
--- /dev/null
+++ b/src/icons/svg/file-word.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/file.svg b/src/icons/svg/file.svg
index a928e57..ea67622 100644
--- a/src/icons/svg/file.svg
+++ b/src/icons/svg/file.svg
@@ -1 +1 @@
-
+
diff --git a/src/icons/svg/file/pdf.svg b/src/icons/svg/file/pdf.svg
new file mode 100644
index 0000000..bd98515
--- /dev/null
+++ b/src/icons/svg/file/pdf.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/folder-add.svg b/src/icons/svg/folder-add.svg
new file mode 100644
index 0000000..e372371
--- /dev/null
+++ b/src/icons/svg/folder-add.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/folder-upload.svg b/src/icons/svg/folder-upload.svg
new file mode 100644
index 0000000..822ab4b
--- /dev/null
+++ b/src/icons/svg/folder-upload.svg
@@ -0,0 +1 @@
+
diff --git a/src/icons/svg/txt.svg b/src/icons/svg/txt.svg
deleted file mode 100644
index 2a2c22d..0000000
--- a/src/icons/svg/txt.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/icons/svg/video.svg b/src/icons/svg/video.svg
index 5094386..e8bc97c 100644
--- a/src/icons/svg/video.svg
+++ b/src/icons/svg/video.svg
@@ -1 +1 @@
-
+
diff --git a/src/settings.js b/src/settings.js
index a4cad10..6f74303 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -14,5 +14,5 @@ module.exports = {
*/
sidebarLogo: false,
- FILE_SERVER_URL: 'http://192.168.1.118:10010/' // nginx文件服务器地址
+ FILE_SERVER_URL: 'http://192.168.1.108:10010/' // nginx文件服务器地址
}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 2df2610..19e1584 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -17,7 +17,7 @@ label {
}
html {
- font-size: 24.1458px!important;
+ font-size: 1rem!important;
height: 100%;
box-sizing: border-box;
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 15cbdfe..b7e7f43 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests
- timeout: 20000 // request timeout
+ timeout: 50000 // request timeout
})
// request interceptor
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e9e86e2..4209cfc 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -18,16 +18,16 @@