liuQiang 1 жил өмнө
parent
commit
b5bf0c627d

+ 5 - 0
src/components/ScanFile/ScanFile.vue

@@ -49,6 +49,7 @@ import {
   onDeactivated,
 } from "vue";
 import Sortable from "sortablejs";
+import { ElMessage } from "element-plus";
 const props = defineProps({
   openScan: {
     type: Boolean,
@@ -120,6 +121,10 @@ const checkAllChange = () => {
   console.log("fileArr", fileArr.value);
 };
 const toSave = () => {
+  console.log("fileArr", fileArr.value);
+  if(fileArr.value.length<=0){
+    return ElMessage({ message: "请先勾选文件", type: "error" });
+  }
   const arr = []
   copyList.value.forEach(item=>{
     if(item.checked){

+ 3 - 3
src/components/historyList/index.vue

@@ -33,14 +33,14 @@
 
       <template #footer>
         <span class="dialog-footer" style="display: flex;align-items: center;justify-content: space-between;">
-          <pagination
+          <!-- <pagination
           v-show="total > 0"
           :total="total"
           v-model:page="pageNum"
           v-model:limit="pageSize"
           @pagination="getList"
           style="width: 70%;"
-        />
+        /> -->
           <el-button @click="closeOpen" class="cancel-button">关闭</el-button>
         </span>
       </template>
@@ -95,7 +95,7 @@ watchEffect(() => {
 });
 const addFileTab = inject("addFileTab");
 const pageNum=ref(1)
-const pageSize=ref(10)
+const pageSize=ref(9999)
 const defaultProps = {
   children: "",
   label: "createTime",

+ 2 - 1
src/views/collect/index.vue

@@ -368,7 +368,7 @@ const filePageNum = ref(1); //获取文件分页
 const tableBeEnd = ref(true); //控制下拉是否到底
 const tableTotal = ref(0); //表格数据总数
 const thisFolder = ref(); //当前右键的文件夹
-const pageSize = ref(10);
+const pageSize = ref(9999);
 const newDirId = ref();
 const newSpaceId = ref();
 const pathLabelData = ref([]);
@@ -730,6 +730,7 @@ const tabchange = async (labelId) => {
   console.log("labelId", toRaw(labelId));
   thisFolder.value = null
   const query = {
+    pageSize:9999,
     isAsc: isAsc.value,
     orderByColumn: "createTime",
   };

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

@@ -953,11 +953,11 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 ,isAsc: isAsc.value,orderByColumn: "createTime"},2).then(res => {
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0, pageNum: 1, pageSize: 9999 ,isAsc: isAsc.value,orderByColumn: "createTime"},2).then(res => {
                 folderList.value = res.rows
                 // if (res.code === 200) {
                 if (res.rows.length === 0) {
-                    myfile.getById(newDirId.value)
+                    myfile.getById(`${newDirId.value}?pageNum=1&pageSize=9999&isAsc=${isAsc.value}&orderByColumn=createTime`)
                         .then(res => {
                             if (res.code === 200) {
                                 fileList.value = res.rows;
@@ -967,7 +967,7 @@ export default {
                             console.error("myfile.getAllFileMenu 调用失败:", error);
                         });
                 } else {
-                    myfile.getById(row.dirId - 0)
+                    myfile.getById(`${row.dirId - 0}?pageNum=1&pageSize=9999&isAsc=${isAsc.value}&orderByColumn=createTime`)
                         .then(res => {
                             if (res.code === 200) {
                                 fileList.value = res.rows;

+ 3 - 3
src/views/myfile/MyFile.vue

@@ -967,11 +967,11 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0,isAsc: isAsc.value,orderByColumn: "createTime" }, 3).then(res => {
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0, pageNum: 1, pageSize: 9999,isAsc: isAsc.value,orderByColumn: "createTime" }, 3).then(res => {
                 folderList.value = res.rows
                 // if (res.code === 200) {
                 if (res.rows.length === 0) {
-                    myfile.getById(newDirId.value)
+                    myfile.getById(`${newDirId.value}?pageNum=1&pageSize=9999&isAsc=${isAsc.value}&orderByColumn=createTime`)
                         .then(res => {
                             if (res.code === 200) {
                                 fileList.value = res.rows;
@@ -981,7 +981,7 @@ export default {
                             console.error("myfile.getAllFileMenu 调用失败:", error);
                         });
                 } else {
-                    myfile.getById(row.dirId - 0)
+                    myfile.getById(`${row.dirId - 0}?pageNum=1&pageSize=9999&isAsc=${isAsc.value}&orderByColumn=createTime`)
                         .then(res => {
                             if (res.code === 200) {
                                 fileList.value = res.rows;

+ 34 - 1
src/views/myfile/components/PlaceGridFolder.vue

@@ -27,6 +27,8 @@
                             </el-icon>
                             <img v-else @click.stop="delStarFolder(item,true)" src="@/assets/images/yellowstar.png" alt="">
                         </div>
+                        <img class="levelImg shouzhi" v-if="item.isEncrypt === 'Y'"
+                        :src="getLevelImg(item.encryptLevel)" alt="">
                     </div>
                 </template>
                 <!-- 右键唤出的菜单 -->
@@ -55,6 +57,10 @@ import myfile from "../../../api/myfile/myfile";
 import documents from "../../../api/document/document";
 import ImgFile from "../jsComponents/ImgFile";
 import PalaceGridFile from "./PalaceGridFile.vue";
+import level1 from "@/assets/images/level1.png";
+import level2 from "@/assets/images/level2.png";
+import level3 from "@/assets/images/level3.png";
+import level4 from "@/assets/images/level4.png";
 export default {
     props: {
         folderClick: {
@@ -189,6 +195,25 @@ export default {
         const setScrollFn = ()=>{
             // emit('setScroll')
         }
+                //获取安全图标
+        const getLevelImg = (level) => {
+            switch (level) {
+                case "L1":
+                    return level1;
+                    break;
+                case "L2":
+                    return level2;
+                    break;
+                case "L3":
+                    return level3;
+                    break;
+                case "L4":
+                    return level4;
+                    break;
+                    return level1;
+                    break;
+            }
+        }
         onMounted(() => {
             // props.getAllTop()
             // getAllTop()
@@ -228,7 +253,8 @@ export default {
             folderList,
             setScrollFn,
             starFolder,
-            delStarFolder
+            delStarFolder,
+            getLevelImg
         }
     },
     components:{
@@ -266,6 +292,13 @@ export default {
         top: 5%;
         right: 5%;
     }
+    .levelImg{
+        position: absolute;
+        width: 32px;
+        height: 32px;
+        right: 10%;
+        bottom: 30%;
+    }
 }
 
 .nameName {

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

@@ -958,11 +958,11 @@ export default {
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 ,isAsc: isAsc.value,orderByColumn: "createTime"},1).then(res => {
+            documents.getALLdocumentByType({ parentId: row.dirId - 0, spaceId: row.spaceId - 0 , pageNum: 1, pageSize: 9999,isAsc: isAsc.value,orderByColumn: "createTime"},1).then(res => {
                 folderList.value = res.rows
                 // if (res.code === 200) {
                 if (res.rows.length === 0) {
-                    myfile.getById(newDirId.value)
+                    myfile.getById(`${newDirId.value}?pageNum=1&pageSize=9999&isAsc=${isAsc.value}&orderByColumn=createTime`)
                         .then(res => {
                             if (res.code === 200) {
                                 fileList.value = res.rows;
@@ -972,7 +972,7 @@ export default {
                             console.error("myfile.getAllFileMenu 调用失败:", error);
                         });
                 } else {
-                    myfile.getById(row.dirId - 0)
+                    myfile.getById(`${row.dirId - 0}?pageNum=1&pageSize=9999&isAsc=${isAsc.value}&orderByColumn=createTime`)
                         .then(res => {
                             if (res.code === 200) {
                                 fileList.value = res.rows;