liuQiang 2 лет назад
Родитель
Сommit
33ae0005c6

+ 84 - 34
src/components/ListShow/ListShow.vue

@@ -1,34 +1,50 @@
 <template>
   <div>
     <div class="topMenu">
-      <div class="search_box">
-        <el-input
-          v-model="searchFire"
-          @keyup.enter="fileBlur"
-          @input="fileBlur"
-          class="searchFire"
-          size="large"
-          placeholder="搜索文件"
-        />
-        <el-icon class="SearchIcon" @click="fileBlur">
-          <Search />
-        </el-icon>
+      <div class="left_search">
+        <div class="search_box">
+          <el-input
+            v-model="searchFire"
+            @keyup.enter="fileBlur"
+            @input="fileBlur"
+            class="searchFire"
+            size="large"
+            placeholder="搜索文件"
+          />
+          <el-icon class="SearchIcon" @click="fileBlur">
+            <Search />
+          </el-icon>
+        </div>
+        <div class="line">|</div>
+        <div class="searchFor">
+          <div class="search_title">筛选:</div>
+          <el-tabs
+            v-model="searchType"
+            class="demo-tabs"
+            @tab-change="changeSearchType"
+          >
+            <el-tab-pane label="全部" name="all"></el-tab-pane>
+            <el-tab-pane label="文档" name="doc"></el-tab-pane>
+            <el-tab-pane label="图片" name="img"></el-tab-pane>
+            <el-tab-pane label="音频" name="audio"></el-tab-pane>
+            <el-tab-pane label="视频" name="video"></el-tab-pane>
+            <el-tab-pane label="压缩包" name="zip"></el-tab-pane>
+          </el-tabs>
+        </div>
       </div>
-      <div class="line">|</div>
-      <div class="searchFor">
-        <div class="search_title">筛选:</div>
-        <el-tabs
-          v-model="searchType"
-          class="demo-tabs"
-          @tab-change="changeSearchType"
-        >
-          <el-tab-pane label="全部" name="all"></el-tab-pane>
-          <el-tab-pane label="文档" name="doc"></el-tab-pane>
-          <el-tab-pane label="图片" name="img"></el-tab-pane>
-          <el-tab-pane label="音频" name="audio"></el-tab-pane>
-          <el-tab-pane label="视频" name="video"></el-tab-pane>
-          <el-tab-pane label="压缩包" name="zip"></el-tab-pane>
-        </el-tabs>
+      <div class="changeIcon">
+        <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=""
+        />
       </div>
     </div>
     <div class="table_box">
@@ -96,6 +112,7 @@ const typeData = ref(); //当前分类下的数据
 const tableData = ref(); // 表格展示的数据
 const searchFire = ref();
 const copyFileType = ref();
+const isAsc = ref("asc");
 
 const props = defineProps({
   fileList: {
@@ -103,7 +120,34 @@ const props = defineProps({
     default: () => [],
   },
 });
-const emit = defineEmits(["handleRowClick",'delCollect','collectByStar']);
+const emit = defineEmits(["handleRowClick", "delCollect", "collectByStar"]);
+// 排序
+const changeSort = async () => {
+  isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc");
+  // refreshFile();
+  let obj = {
+    pageNum: 1,
+    pageSize: 9999,
+    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 changeSearchType = (name) => {
   let baseDataObj = props.fileList;
@@ -135,12 +179,12 @@ const fileBlur = () => {
 const rightClick = (row, col, e) => {
   emit("handleRowClick", row, null, e);
 };
-const collect = (row, bool)=>{
-  emit('collectByStar',row,bool)
-}
-const dCollect = (row, bool)=>{
-  emit('delCollect',row,bool)
-}
+const collect = (row, bool) => {
+  emit("collectByStar", row, bool);
+};
+const dCollect = (row, bool) => {
+  emit("delCollect", row, bool);
+};
 
 //工具函数
 //对mouseCli数组进行筛选,实现菜单的区分显示
@@ -382,6 +426,12 @@ watch(
   //   box-sizing: border-box;
   display: flex;
   align-items: center;
+  .left_search {
+    width: 100%;
+    height: 48px;
+    display: flex;
+    align-items: center;
+  }
   .search_box {
     width: 320px;
     height: 48px;

+ 4 - 4
src/views/department/MyFile.vue

@@ -754,7 +754,7 @@ export default {
            refreshFile()
            let obj = {
                    pageNum: 1,
-                   pageSize: 10,
+                   pageSize: 9999,
                     isAsc: isAsc.value,
                    orderByColumn: "createTime"
                }
@@ -816,7 +816,7 @@ export default {
                     isAsc: isAsc.value,
                     orderByColumn: "createTime",
                 }
-                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 => {
+                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: 9999 },2).then(res => {
                     fileMenu.value = res.rows
                     folderList.value = res.rows
                 })
@@ -846,7 +846,7 @@ export default {
         const getFirstFolder = ()=>{
             let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 9999
                 }
             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
@@ -1889,7 +1889,7 @@ export default {
                     let blob = new Blob([res]);     
                     link.style.display = 'none';
                     link.href = URL.createObjectURL(blob);   // 创建下载的链接
-                    link.setAttribute('download',clickRow.value.fileName);  // 给下载后的文件命名
+                    link.setAttribute('download', clickRow.value.fileName+clickRow.value.fileType);  // 给下载后的文件命名
                     document.body.appendChild(link);
                     link.click();  // 点击下载
                     document.body.removeChild(link);  //  完成移除元素

+ 11 - 4
src/views/myfile/MyFile.vue

@@ -890,7 +890,7 @@ export default {
         const getFirstFolder = ()=>{
             let obj = {
                     pageNum: 1,
-                    pageSize: 10,
+                    pageSize: 9999,
                      isAsc: isAsc.value,
                     orderByColumn: "createTime"
                 }
@@ -1003,7 +1003,7 @@ export default {
             } else {
                 let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 9999
                 }
                 documents.getALLdocumentByType({ parentId: row.dirIds - 0, spaceId: row.spaceIds - 0, pageNum: obj.pageNum, pageSize: obj.pageSize }, 3).then(res => {
                     // fileMenu.value = res.data
@@ -1537,9 +1537,15 @@ export default {
                         message: "删除成功",
                         type: "success"
                     })
+                    delFolder()
                 }
             })
         }
+        const delFolder = ()=>{
+            const arrJson = sessionStorage.getItem('tabData')
+            const tableData = JSON.parse(arrJson)
+            console.log('tableData',tableData);
+        }
         // 计算百分比
         function percent() {
             let numP = 0;
@@ -2143,7 +2149,7 @@ export default {
                         let blob = new Blob([res]);
                         link.style.display = 'none';
                         link.href = URL.createObjectURL(blob);   // 创建下载的链接
-                        link.setAttribute('download', clickRow.value.fileName);  // 给下载后的文件命名
+                        link.setAttribute('download', clickRow.value.fileName+clickRow.value.fileType);  // 给下载后的文件命名
                         document.body.appendChild(link);
                         link.click();  // 点击下载
                         document.body.removeChild(link);  //  完成移除元素
@@ -2634,7 +2640,8 @@ export default {
             searchFolderTree,
             treeRClick,
             showTreeMenu,
-            closeTreeRMenu
+            closeTreeRMenu,
+            delFolder
         }
     },
     watch: {

+ 4 - 4
src/views/publicment/MyFile.vue

@@ -762,7 +762,7 @@ export default {
            refreshFile()
            let obj = {
                    pageNum: 1,
-                   pageSize: 10,
+                   pageSize: 9999,
                     isAsc: isAsc.value,
                    orderByColumn: "createTime"
                }
@@ -822,7 +822,7 @@ export default {
                       isAsc: isAsc.value,
                     orderByColumn: "createTime",
                 }
-                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 => {
+                documents.getALLdocumentByType({ parentId: userMe[0].dirId - 0, spaceId: userMe[0].spaceId,isAsc: isAsc.value,orderByColumn: "createTime", pageNum: obj.pageNum, pageSize: 9999 },1).then(res => {
                     fileMenu.value = res.rows
                     folderList.value = res.rows
                 },1)
@@ -852,7 +852,7 @@ export default {
         const getFirstFolder = ()=>{
             let obj = {
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 9999
                 }
             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
@@ -1885,7 +1885,7 @@ export default {
                     let blob = new Blob([res]);     
                     link.style.display = 'none';
                     link.href = URL.createObjectURL(blob);   // 创建下载的链接
-                    link.setAttribute('download',clickRow.value.fileName);  // 给下载后的文件命名
+                    link.setAttribute('download', clickRow.value.fileName+clickRow.value.fileType);  // 给下载后的文件命名
                     document.body.appendChild(link);
                     link.click();  // 点击下载
                     document.body.removeChild(link);  //  完成移除元素