From db3baa97ee954204a7ec1b934b833815b7333485 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Sat, 19 Apr 2025 13:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=B0=83=E6=95=B4=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=92=8C=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fileManage/index.vue               | 19 +++++++++++--------
 src/views/fileManage/modules/SliceUpload.vue | 18 +++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/fileManage/index.vue b/src/views/fileManage/index.vue
index bc554f4..ca6decc 100644
--- a/src/views/fileManage/index.vue
+++ b/src/views/fileManage/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
       <a-row>
-        <a-col :span="6">
+        <a-col :span="4">
           <div class="flodContent">
             <div class="linese"></div>
             <div class="siderHeader echartsTitle">
@@ -31,10 +31,10 @@
             <div class="linese"></div>
           </div>
         </a-col>
-        <a-col :span="18">
+        <a-col :span="20">
           <div class="righttop">
             <div class="linese"></div>
-            <div style="height:130px;background: #e6e9f1;margin-left: 10px;" >
+            <div style="height:130px;background: #e6e9f1;padding-left: 10px;" >
               <a-row class="quarter-div">
                 <a-col :span="11">
                   <img src="~@/assets/img/文件总数.png" />
@@ -95,7 +95,7 @@
 
             <div class="search">
               <a-row :gutter="30">
-                <a-col :span="11">
+                <a-col :span="12">
                   <a-form layout="inline">
                     <a-form-item>
                       <a-input placeholder="请输入" v-model="searchFile.queryCondition" style="color: #fff;"></a-input>
@@ -109,8 +109,8 @@
                     </a-form-item>
                   </a-form>
                 </a-col>
-                <a-col :span="11" style="text-align: right">
-                  <a-button type="primary" style="margin-left: 8px" @click="clickfile">
+                <a-col :span="12" style="text-align: right">
+                  <a-button type="primary" style="margin-right: 14px" @click="clickfile">
                     <a-icon type="upload" />
                     文件上传
                   </a-button>
@@ -215,6 +215,7 @@ export default {
       loading: false,
       selectedRowKeys: [],
       selectId: '',
+      parentId: '',
       modalTitle: '',
       modelType: '',
       searchFile: {
@@ -403,7 +404,7 @@ export default {
         title: '确认删除',
         content: '是否删除选中目录?',
         onOk: function () {
-          logicDelDir({ id: that.selectId }).then((res) => {
+          logicDelDir({ id: that.selectId, pid: that.parentId }).then((res) => {
             that.$message.warning(res.message)
             that.getDirList()
           })
@@ -418,6 +419,7 @@ export default {
     },
     changeSelect(selectedKeys, e) {
       this.selectId = e.node.dataRef.id
+      this.parentId = e.node.dataRef.parentId
       this.searchFile.dirId = this.selectId
       this.searchgetFileList()
     },
@@ -459,9 +461,10 @@ export default {
 }
 
 .quarter-div {
+  min-width: 200px;
   height: 130px;
   float: left;
-  margin-right: 20px;
+  margin-right: 12px;
   color: #fff;
   font-size: 16px;
   text-align: center;
diff --git a/src/views/fileManage/modules/SliceUpload.vue b/src/views/fileManage/modules/SliceUpload.vue
index 7c28244..8acc176 100644
--- a/src/views/fileManage/modules/SliceUpload.vue
+++ b/src/views/fileManage/modules/SliceUpload.vue
@@ -2,11 +2,11 @@
   <div>
     <a-row>
       <a-col>
-        <a-select show-search placeholder="选择任务" option-filter-prop="children" size="large" v-model="taskId" style="width: 260px;margin-right: 20px;">
+        <!-- <a-select show-search placeholder="选择任务" option-filter-prop="children" size="large" v-model="taskId" style="width: 260px;margin-right: 20px;">
             <a-select-option v-for="d in allTask" :key="d.id">
               {{ d.name }}
           </a-select-option>
-        </a-select>
+        </a-select> -->
         <a-upload
           class="upload-wrapper"
           :showUploadList="false"
@@ -97,7 +97,7 @@ export default {
       isStop: false,
       fileList: [],
       tableDate: [],
-      taskId:"",
+      // taskId:"",
       allTask:{},
       queryParam: {
         pageNum :1,
@@ -153,7 +153,7 @@ export default {
     deleteFile () {
       this.fileList = []
       this.tableDate = []
-      this.taskId =""
+      // this.taskId =""
     },
     getFileList () {
       return this.tableDate
@@ -209,10 +209,10 @@ export default {
         this.$message.error('文件目录选择异常请刷新页面')
         return;
       }
-      if(this.taskId.length <= 0){
-        this.$message.error('请选择任务')
-        return;
-      }
+      // if(this.taskId.length <= 0){
+      //   this.$message.error('请选择任务')
+      //   return;
+      // }
       const currentRow = this.tableDate.find((row) => row.uid === file.uid)
       if (currentRow) {
         // 当前上传进度归0
@@ -278,7 +278,7 @@ export default {
       formData.append('shareIndex', shareIndex)
       formData.append('currShareM5', currShareM5)
       formData.append('file', file)
-      formData.append('taskId', this.taskId)
+      // formData.append('taskId', this.taskId)
       
       return formData
     },