排序

src/views/collect/index.vue

@@ -436,18 +436,20 @@ const folderClick = (row, list, e, jump) => {
   }
   newDirId.value = row.docDir ? row.docDir.dirId : row.dirId;
   newSpaceId.value = row.docDir ? row.docDir.spaceId : row.spaceId;
-  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,
+        isAsc: isAsc.value,
+        orderByColumn: "createTime"
       },
       2
     )
     .then((res) => {
-      folderArr.value = res.data;
-      if (res.data.length === 0) {
+      folderArr.value = res.rows;
+      if (res.rows.length === 0) {
         myfile.getById(query).then((res) => {
           if (res.code === 200) {
             tableTotal.value = res.total;
@@ -472,12 +474,14 @@ const folderClick = (row, list, e, jump) => {
           }
         });
       }
+      loadingPreview.value = false
     });
 };
 // 文件点击事件
 const clickFile = () => {};
 // 返回最顶层
 const backTopPath = () => {
+  thisFolder.value = null
   tabchange(clickCollect.value);
 };
 //取消收藏
@@ -724,6 +728,7 @@ const reTabName = async () => {
 
 const tabchange = async (labelId) => {
   console.log("labelId", toRaw(labelId));
+  thisFolder.value = null
   const query = {
     labelId,
     isAsc: isAsc.value,
@@ -744,6 +749,7 @@ const tabchange = async (labelId) => {
   fileArr.value = res.rows.filter((item) => item.isFolder === "N");
   //把路径清楚
   pathLabelData.value = [];
+  loadingPreview.value = false
   console.log("folderArr", folderArr.value);
   console.log("fileArr", fileArr.value);
 };
@@ -759,12 +765,13 @@ const changeShow = () => {
   sessionStorage.setItem("fileGrid", isList.value);
 };
 const changeSort = async () => {
+  loadingPreview.value = true
   isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
-  const query = {
-    labelId,
-    isAsc: isAsc.value,
-    orderByColumn: "createTime",
-  };
+  if(!thisFolder.value){
+    tabchange(clickCollect.value)
+  }else{
+    folderClick()
+  }
   // console.log("res", res);
 };
 

src/views/department/MyFile.vue

@@ -182,7 +182,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"
@@ -735,13 +746,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) {
@@ -782,9 +808,11 @@ 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 },2).then(res => {
+                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
                     fileMenu.value = res.rows
                     folderList.value = res.rows
                 })
@@ -816,7 +844,7 @@ export default {
                     pageNum: 1,
                     pageSize: 10
                 }
-            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
+            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },2).then(res => {
                     fileMenu.value = res.rows
                     folderList.value = res.rows
                 })
@@ -862,7 +890,7 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 },2).then(res => {
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 ,isAsc: isAsc.value,orderByColumn: "createTime"},2).then(res => {
                 folderList.value = res.rows
                 // if (res.code === 200) {
                 if (res.rows.length === 0) {
@@ -1347,10 +1375,12 @@ export default {
             // console.log('topPath',toRaw(topPath.value));
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            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"
             },2).then(res => {
                 folderList.value = res.rows
                 if (res.rows.length === 0) {
@@ -2284,7 +2314,9 @@ export default {
             isCode,
             sureCode,
             upFileData,
-            fileBig
+            fileBig,
+            isAsc,
+            changeSort
         }
     },
     watch: {

src/views/publicment/MyFile.vue

@@ -180,7 +180,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"
@@ -743,13 +754,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) {
@@ -789,9 +815,11 @@ 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 },1).then(res => {
+                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
                     fileMenu.value = res.rows
                     folderList.value = res.rows
                 },1)
@@ -823,7 +851,7 @@ export default {
                     pageNum: 1,
                     pageSize: 10
                 }
-            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value, pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
+            documents.getALLdocumentByType({ parentId: impDirId.value, spaceId: impSpaceId.value,isAsc: isAsc.value,orderByColumn: "createTime",  pageNum: obj.pageNum, pageSize: obj.pageSize },1).then(res => {
                     fileMenu.value = res.rows
                     folderList.value = res.rows
                 })
@@ -869,7 +897,7 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 },1).then(res => {
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 ,isAsc: isAsc.value,orderByColumn: "createTime"},1).then(res => {
                 folderList.value = res.rows
                 // if (res.code === 200) {
                 if (res.rows.length === 0) {
@@ -1339,10 +1367,12 @@ export default {
             // console.log('topPath',toRaw(topPath.value));
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            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"
             },1).then(res => {
                 folderList.value = res.rows
                 if (res.rows.length === 0) {
@@ -2290,7 +2320,9 @@ export default {
             inputTitle,
             isCode,
             sureCode,
-            upFileData
+            upFileData,
+            isAsc,
+            changeSort
         }
     },
     watch: {