|
|
@@ -184,7 +184,7 @@
|
|
|
<!-- 右侧 -->
|
|
|
<div>
|
|
|
<img :src="sort" alt="">
|
|
|
- <img :src="squre" alt="" @click="gridChange">
|
|
|
+ <img :src="squre" alt="" @click="gridChange" class="shouzhi">
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- </div> -->
|
|
|
@@ -193,7 +193,10 @@
|
|
|
<div class="showBox">
|
|
|
<div class="detailBox file-jia" @click="mouseClick">
|
|
|
<el-collapse v-model="folder" >
|
|
|
- <el-collapse-item title="文件夹" name="1" class="custom-collapse-item">
|
|
|
+ <el-collapse-item name="1" class="custom-collapse-item">
|
|
|
+ <template #title>
|
|
|
+ <span class="file-title">文件夹</span>
|
|
|
+ </template>
|
|
|
<el-table v-if="folderGrid" height="37vh" :data="folderList" style="width: 100%" :scrollbar-always-on="true"
|
|
|
@selection-change="handleSelectionChange1" :single-select="true" @row-click="folderClick"
|
|
|
@row-contextmenu="folderRClick" ref="taskTableRef">
|
|
|
@@ -262,7 +265,10 @@
|
|
|
<!-- 文件 -->
|
|
|
<div class="fileTable">
|
|
|
<el-collapse v-model="files">
|
|
|
- <el-collapse-item title="文件" name="2" class="custom-collapse-item">
|
|
|
+ <el-collapse-item name="folder" class="custom-collapse-item">
|
|
|
+ <template #title>
|
|
|
+ <span class="file-title">文件</span>
|
|
|
+ </template>
|
|
|
<el-table v-el-table-infinite-scroll="setScroll" :infinite-scroll-distance="10"
|
|
|
:infinite-scroll-disabled="tableBeEnd" v-if="fileGrid" height="38vh"
|
|
|
:data="fileList" :scrollbar-always-on="true" style="width: 100%;"
|
|
|
@@ -352,8 +358,13 @@
|
|
|
</div>
|
|
|
<!-- 文件上传 -->
|
|
|
<div>
|
|
|
- <el-dialog v-model="uploadModal" title="文件上传" width="30%">
|
|
|
- <el-upload class="upload-demo" :file-list="fileArr" drag :http-request="onSuccess" multiple :on-remove="handleRemove">
|
|
|
+ <el-dialog v-model="uploadModal" title="文件上传" width="30%" @close="closeUpload">
|
|
|
+ <el-upload class="upload-demo" :file-list="fileArr" drag :http-request="onSuccess" multiple :on-remove="handleRemove"
|
|
|
+ element-loading-text="上传中..."
|
|
|
+ :element-loading-spinner="svg"
|
|
|
+ element-loading-svg-view-box="-10, -10, 50, 50"
|
|
|
+ element-loading-background="rgba(255, 255, 255, 0.8)"
|
|
|
+ v-loading="loadingUpload" >
|
|
|
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
|
|
|
<div class="el-upload__text">拖入或<em>点击上传</em></div>
|
|
|
<template #tip>
|
|
|
@@ -362,7 +373,7 @@
|
|
|
</el-upload>
|
|
|
<template #footer>
|
|
|
<span class="dialog-footer">
|
|
|
- <el-button @click="uploadModal = false">取消</el-button>
|
|
|
+ <el-button @click="closeUpload">取消</el-button>
|
|
|
<el-button type="primary" @click="sureUpload">确认</el-button>
|
|
|
</span>
|
|
|
</template>
|
|
|
@@ -530,6 +541,7 @@ export default {
|
|
|
let xz = ref(0)
|
|
|
let yz = ref(0)
|
|
|
let newAdd = ref(false)
|
|
|
+ const loadingUpload = ref(false);//文件上传加载
|
|
|
const fileUserTreeData = reactive({ data: {} });
|
|
|
let fileList = ref()
|
|
|
let menuList = ref([
|
|
|
@@ -1061,6 +1073,7 @@ export default {
|
|
|
}
|
|
|
// 确认上传
|
|
|
function sureUpload() {
|
|
|
+ loadingUpload.value =true
|
|
|
if (fileArr.value.length > 0) {
|
|
|
for (var i = 1; i <= fileArr.value.length; i++) {
|
|
|
uploadApi.uploadFile({
|
|
|
@@ -1076,13 +1089,16 @@ export default {
|
|
|
// getAllTop()
|
|
|
refreshFile()
|
|
|
uploadModal.value = false
|
|
|
+ loadingUpload.value = false
|
|
|
fileArr.value = []
|
|
|
}
|
|
|
}).catch(err => {
|
|
|
fileArr.value = []
|
|
|
+ loadingUpload.value = false
|
|
|
})
|
|
|
}
|
|
|
}else{
|
|
|
+ loadingUpload.value = false
|
|
|
return ElMessage({ message: "请选择文件", type: "error"})
|
|
|
}
|
|
|
|
|
|
@@ -1092,6 +1108,12 @@ export default {
|
|
|
fileArr.value.push(files.file)
|
|
|
console.log('大小');
|
|
|
}
|
|
|
+ //关闭文件上传
|
|
|
+ const closeUpload =() =>{
|
|
|
+ uploadModal.value = false;
|
|
|
+ loadingUpload.value = false
|
|
|
+ }
|
|
|
+ // 移除上传的某些文件
|
|
|
const handleRemove = (file,rawFile) => {
|
|
|
fileArr.value = [...rawFile]
|
|
|
}
|
|
|
@@ -1934,6 +1956,8 @@ export default {
|
|
|
leftNewFile,
|
|
|
fileBlur,
|
|
|
fileBig,
|
|
|
+ loadingUpload,
|
|
|
+ closeUpload
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -2219,7 +2243,7 @@ p {
|
|
|
/* color: white; */
|
|
|
}
|
|
|
|
|
|
-:deep([data-v-69cdaa40] .el-collapse-item__header) {
|
|
|
+:deep(.el-collapse-item__header) {
|
|
|
padding-left: 10px;
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
@@ -2316,4 +2340,13 @@ p {
|
|
|
.yincang {
|
|
|
opacity: 0.5;
|
|
|
}
|
|
|
+.file-title{
|
|
|
+ color: #2E6BC8;
|
|
|
+ margin-left: 30px;
|
|
|
+}
|
|
|
+::v-deep .el-collapse-item__arrow {
|
|
|
+ position: relative;
|
|
|
+ color: #2e6bc8;
|
|
|
+ right: 97%;
|
|
|
+}
|
|
|
</style>
|
“yueshang”