数据结构更改

src/views/collect/index.vue

@@ -350,7 +350,7 @@ const isAddCollect = ref(false); //是否在添加标签
 const tabName = ref(""); //新增的标签名
 const changeTabName = ref(""); //修改的标签名
 const tabList = ref([]);
-const isAsc = ref("asc");
+const isAsc = ref("desc");
 const tableData = [];
 const visible = ref(false); //显示右键菜单
 const top = ref(0);
@@ -740,8 +740,8 @@ const tabchange = async (labelId) => {
   }
 
   // console.log("----res", res);
-  folderArr.value = res.filter((item) => item.isFolder === "Y");
-  fileArr.value = res.filter((item) => item.isFolder === "N");
+  folderArr.value = res.rows.filter((item) => item.isFolder === "Y");
+  fileArr.value = res.rows.filter((item) => item.isFolder === "N");
   //把路径清楚
   pathLabelData.value = [];
   console.log("folderArr", folderArr.value);
@@ -760,6 +760,11 @@ const changeShow = () => {
 };
 const changeSort = async () => {
   isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
+  const query = {
+    labelId,
+    isAsc: isAsc.value,
+    orderByColumn: "createTime",
+  };
   // console.log("res", res);
 };
 

src/views/department/MyFile.vue

@@ -785,8 +785,8 @@ export default {
                     pageSize: 10
                 }
                 documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId, pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -817,8 +817,8 @@ export default {
                     pageSize: 10
                 }
             documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
         }
         function fileBlur() {
@@ -863,9 +863,9 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 },2).then(res => {
-                folderList.value = res.data
+                folderList.value = res.rows
                 // if (res.code === 200) {
-                if (res.data.length === 0) {
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value)
                         .then(res => {
                             if (res.code === 200) {
@@ -1352,8 +1352,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },2).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                    myfile.getById(query).then(res => {
                         if (res.code === 200) {
                             tableTotal.value =res.total
@@ -1574,8 +1574,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },2).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value).then(res => {
                         if (res.code === 200) {
                             fileList.value = res.rows

src/views/myfile/MyFile.vue

@@ -208,7 +208,18 @@
                         </div>
                         <!-- 右侧 -->
                         <div>
-                            <img :src="sort" alt="">
+                             <img
+                                src="@/assets/images/sort.png"
+                                @click="changeSort"
+                                v-if="isAsc == 'asc'"
+                                alt=""
+                            />
+                            <img
+                                src="@/assets/images/Frame_188.png"
+                                @click="changeSort"
+                                v-else
+                                alt=""
+                            />
                             <!-- //控制宫格展示 -->
                             <img
                               v-if="fileGrid"
@@ -745,13 +756,28 @@ export default {
         const delMoreFolder = ref([])
         const inputTitle = ref()//验证框标题
         const isCode = ref(false)// 验证的类型
+        const isAsc = ref("desc");
+        const changeSort = async () => {
+            isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
+            refreshFile()
+            let obj = {
+                    pageNum: 1,
+                    pageSize: 10,
+                     isAsc: isAsc.value,
+                    orderByColumn: "createTime"
+                }
+            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },3).then(res => {
+                    fileMenu.value = res.rows
+                    // folderList.value = res.rows
+                })
+            };
         const changeShow =async (fileGrids) => {
             filePageNum.value = 1
         if(fileGrid.value == 1){
             fileGrid.value = 0 // 变宫格
             pageSize.value = 30+pageSize.value
             if(!thisFolder.value.dirId)return
-            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             const res = await myfile.getById(query)
               console.log('filessetScrollres',res);
             if (res.code === 200) {
@@ -790,11 +816,13 @@ export default {
                 spaceName.value = userMe[0].dirPath
                 let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 10,
+                    isAsc: isAsc.value,
+                    orderByColumn: "createTime",
                 }
-                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId, pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                     console.log('folderList.value',folderList.value);
                 })
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
@@ -824,11 +852,13 @@ export default {
         const getFirstFolder = ()=>{
             let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 10,
+                     isAsc: isAsc.value,
+                    orderByColumn: "createTime"
                 }
-            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },3).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },3).then(res => {
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
         }
         function getSpaceList() {
@@ -860,10 +890,10 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 }, 3).then(res => {
-                folderList.value = res.data
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0,isAsc: isAsc.value,orderByColumn: "createTime" }, 3).then(res => {
+                folderList.value = res.rows
                 // if (res.code === 200) {
-                if (res.data.length === 0) {
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value)
                         .then(res => {
                             if (res.code === 200) {
@@ -915,7 +945,7 @@ export default {
                 }
                 documents.getALLdocumentByType({ parentId: row.dirIds - 0, spaceId: row.spaceIds - 0, pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
                     // fileMenu.value = res.data
-                    folderList.value = res.data
+                    folderList.value = res.rows
                 })
                 myfile.getById(row.dirIds - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -1191,7 +1221,9 @@ export default {
             console.log('cli', clickFileData.value)
             let obj = {
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                isAsc: isAsc.value,
+                orderByColumn: "createTime",
             }
             myfile.getById(clickFileData.value.dirId, obj).then(res => {
                 if (res.code === 200) {
@@ -1473,13 +1505,15 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             clickFileData.value = row
-            const query = `${newDirId.value}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
             documents.getALLdocumentByType({
                 parentId: newDirId.value - 0,
-                spaceId: newSpaceId.value - 0
+                spaceId: newSpaceId.value - 0,
+                isAsc: isAsc.value,
+                orderByColumn: "createTime"
             }, 3).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(query).then(res => {
                         // console.log('res = ',res);
                         if (res.code === 200) {
@@ -1696,8 +1730,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             }, 3).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value).then(res => {
                         if (res.code === 200) {
                             fileList.value = res.rows
@@ -1760,7 +1794,7 @@ export default {
 
         //点击收藏后刷新文件
         const refreshFile = (left,edit) => {
-            console.log(333);
+            // console.log(333);
             if(edit){
                 getFirstFolder()
             }
@@ -2402,7 +2436,9 @@ export default {
             inputTitle,
             isCode,
             sureCode,
-            upFileData
+            upFileData,
+            isAsc,
+            changeSort
         }
     },
     watch: {

src/views/publicment/MyFile.vue

@@ -792,8 +792,8 @@ export default {
                     pageSize: 10
                 }
                 documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId, pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 },1)
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -824,8 +824,8 @@ export default {
                     pageSize: 10
                 }
             documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
-                    fileMenu.value = res.data
-                    folderList.value = res.data
+                    fileMenu.value = res.rows
+                    folderList.value = res.rows
                 })
         }
         function getSpaceList() {
@@ -870,9 +870,9 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 },1).then(res => {
-                folderList.value = res.data
+                folderList.value = res.rows
                 // if (res.code === 200) {
-                if (res.data.length === 0) {
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value)
                         .then(res => {
                             if (res.code === 200) {
@@ -1344,8 +1344,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },1).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                      myfile.getById(query).then(res => {
                         if (res.code === 200) {
                             tableTotal.value =res.total
@@ -1570,8 +1570,8 @@ export default {
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0
             },1).then(res => {
-                folderList.value = res.data
-                if (res.data.length === 0) {
+                folderList.value = res.rows
+                if (res.rows.length === 0) {
                     myfile.getById(newDirId.value).then(res => {
                         if (res.code === 200) {
                             fileList.value = res.rows