合并

src/views/myfile/MyFile.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="overflow: hidden;">
+    <div>
         <div class="bigBox">
             <div class="settingBox">
                 <!-- 设置盒子顶部搜索 -->
@@ -435,7 +435,7 @@
 </template>
 
 <script>
-import { ref, toRaw } from 'vue'
+import { ref, toRaw, onMounted } from 'vue'
 import myfile from '../../api/myfile/myfile'
 import documents from '../../api/document/document'
 import fileSpace from '../../api/filespace/fileSpace'
@@ -586,10 +586,10 @@ export default {
                 img: ImgFile.textbox,
                 name: "重命名"
             },
-            {
-                img: ImgFile.goon,
-                name: "发送"
-            },
+            // {
+            //     img: ImgFile.goon,
+            //     name: "发送"
+            // },
             {
                 img: ImgFile.share,
                 name: "分享"
@@ -615,7 +615,7 @@ export default {
                 name: "预览"
             },
             {
-                img: ImgFile.share,
+                img: ImgFile.trash,
                 name: "删除"
             }
         ])
@@ -729,13 +729,19 @@ export default {
             newSpaceId.value = row.spaceId
             documents.getALLdocument({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 }).then(res => {
                 folderList.value = res.data
-                if (res.code === 200) {
-                    myfile.getAllFileMenu({ dirId: res.data[0].dirId - 0 }).then(res => {
+                // if (res.code === 200) {
+                console.log("准备调用 myfile.getAllFileMenu");
+                myfile.getAllFileMenu({ parentId: res.data[0].dirId - 0 })
+                    .then(res => {
+                        console.log("myfile.getAllFileMenu 调用成功");
                         if (res.code === 200) {
-                            fileList.value = res.rows
+                            fileList.value = res.rows;
                         }
                     })
-                }
+                    .catch(error => {
+                        console.error("myfile.getAllFileMenu 调用失败:", error);
+                    });
+                // }
             })
             this.selectedIndex = num
             const newItem = {
@@ -763,7 +769,6 @@ export default {
         // 文件名表格每一行点击事件
         function handleRowClick(row) {
             copyRow.value = row
-            console.log('row = ', toRaw(row));
             clickRowId.value = row.docId
             copyDirId.value = row.dirId
             copySpaceId.value = row.spaceId
@@ -841,8 +846,8 @@ export default {
             }
             if (row.name === '文字识别') {
                 router.push({
-                    path:'/identifyFont'
-                }) 
+                    path: '/identifyFont'
+                })
             }
             if (row.name === '预览') {
                 // console.log('row=', toRaw(row));
@@ -858,10 +863,6 @@ export default {
             transferModal.value = true
             anyP.value = false
         }
-        function getSpace() {
-
-        }
-
         function createNewMenu(num) {
             impNum.value = num
             addBoser.value = true
@@ -942,11 +943,11 @@ export default {
         // 确认上传
         function sureUpload() {
             if (fileArr.value.length > 0) {
-                for (var i = 0; i <= fileArr.value.length; i++) {
+                for (var i = 1; i <= fileArr.value.length; i++) {
                     myfile.uploadFile({
                         spaceId: newSpaceId.value - 0,
                         dirId: newDirId.value - 0,
-                        file: fileArr.value[i]
+                        file: fileArr.value[i - 1]
                     }).then(res => {
                         if (res.code === 200) {
                             ElMessage({
@@ -1004,10 +1005,6 @@ export default {
             folderName.value = true
             selectedBox.value = row.dirId
         }
-        // 重命名失焦事件
-        function nameChange(row, index) {
-
-        }
         function getMenu(row, num) {
             if (row.name === '删除') {
                 // 文件夹删除
@@ -1052,8 +1049,8 @@ export default {
             let numP = 0
             if (useSpace.value) {
                 numP = parseInt(useSpace.value / (allSpace.value * 1024) * 100)
-                return numP
             }
+            return numP
         }
         // 文件夹每行点击事件
         function folderClick(row, list) {
@@ -1161,13 +1158,13 @@ export default {
         }
         // 判断id
         function isId() {
-            if (this.directoryId === '') {
-                this.directoryId = 0
-                this.getAllTop()
+            if (directoryId.value === '') {
+                directoryId.value = 0
+                getAllTop()
             }
-            if (this.folderId === '') {
-                this.folderId = 0
-                this.getAllTop()
+            if (folderId.value === '') {
+                folderId.value = 0
+                getAllTop()
             }
         }
         // 中栏重命名
@@ -1191,6 +1188,14 @@ export default {
             // console.log('close');
             showPreview.value = false
         }
+        function getChildren(data) {
+            fileTrees.value = data
+
+        }
+        onMounted(() => {
+            getAllTop()
+            getAllUser()
+        })
         return {
             allBag,
             folderList,//文件夹的数据
@@ -1223,7 +1228,6 @@ export default {
             tranvalue,
             anyP,
             chooseSet1,
-            getSpace,//获取内存空间
             fileMenu,
             addBoser,
             boserForm,
@@ -1242,7 +1246,6 @@ export default {
             selectedBox,//重命名相关
             restName,//重命名相关
             newName,//重命名相关
-            nameChange,
             getMenu,
             folderId,
             fileId,
@@ -1311,13 +1314,6 @@ export default {
             impNum,
             impSpaceId
         }
-    },
-    created() {
-        this.getAllTop()
-        this.getSpace()
-        this.getAllUser()
-        this.getAllCollect()
-        this.isId()
 
     },
     watch: {
@@ -1341,6 +1337,7 @@ p {
 .bigBox {
     display: flex;
     justify-content: flex-start;
+    overflow: hidden;
 }
 
 .settingBox {
@@ -1487,7 +1484,7 @@ p {
 
 .setCli {
     width: 156px;
-    height: 400px;
+    height: 380px;
     position: absolute;
     top: -70px;
     left: 300px;
@@ -1500,7 +1497,7 @@ p {
 
 .setCli1 {
     width: 156px;
-    height: 400px;
+    height: 380px;
     position: absolute;
     top: 185px;
     left: 155px;