Merge branch 'liuqiang' into v3

src/views/department/MyFile.vue

@@ -714,7 +714,7 @@ export default {
                 name:row.dirName,
                 clickRowId:toRaw(row)
             }
-            // addFolderAdd(addData) //加了这句代码界面会渲染两次
+            addFolderAdd(addData) //加了这句代码界面会渲染两次
             thisFolder.value = row
             console.log('row2',row);
             topPath.value = row.dirPath

src/views/myfile/MyFile.vue

@@ -231,10 +231,11 @@
                                         <el-table-column prop="createTime" label="时间" width="180" />
                                         <el-table-column prop="dirType" label="类型">
                                             <template #default="scope">
-                                                <span>文件夹</span>
+                                                <span v-if="scope.row.isEncrypt == 'N'">公开目录</span>
+                                                <span v-else>加密目录</span>
                                             </template>
                                         </el-table-column>
-                                        <el-table-column label="大小">
+                                        <el-table-column label="加密等级">
                                             <template #default="scope">
                                                 <span>
                                                     10KB
@@ -481,6 +482,7 @@ import { getLeveldetail } from '../../api/level/level';
 import { encrypt, decrypt } from "@/utils/jsencrypt";
 import Cookies from "js-cookie";
 import elTableInfiniteScroll from 'el-table-infinite-scroll'
+import { getLevel } from '@/api/level/level.js';
 
 export default {
     directives: {
@@ -488,6 +490,7 @@ export default {
     },
     setup() {
         const { proxy } = getCurrentInstance();
+        const levelList = ref()
         let fileTrees = ref(false)//filetree父传子
         let thanks = ref(false)//transfer父传子
         let collects = ref(false)//文件收藏父传子
@@ -704,6 +707,7 @@ export default {
                 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
+                    console.log('folderList.value',folderList.value);
                 })
                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
                     if (res.code === 200) {
@@ -714,7 +718,7 @@ export default {
                             for (var i = 1; i <= x; i++) {
                                 obj.pageNum = i
                                 myfile.getById(userMe[0].dirId - 0, obj).then(res => {
-                                    console.log('topallfn');
+                                    // console.log('topallfn');
                                     fileList.value = fileList.value.concat(res.rows)
                                     const uniqueFileList = Array.from(new Set(fileList.value.map(item => item.docId)))
                                         .map(docId => fileList.value.find(item => item.docId === docId));
@@ -742,7 +746,7 @@ export default {
                 name: row.dirName,
                 clickRowId: toRaw(row)
             }
-            // addFolderAdd(addData)   //加了这句代码界面会渲染两次
+            addFolderAdd(addData)   //加了这句代码界面会渲染两次
             thisFolder.value = row
             topPath.value = row.dirPath
             if (row.isEncrypt === "Y") {
@@ -1319,7 +1323,7 @@ export default {
                 folderList.value = res.data
                 if (res.data.length === 0) {
                     myfile.getById(query).then(res => {
-                        console.log('res = ',res);
+                        // console.log('res = ',res);
                         if (res.code === 200) {
                             tableTotal.value = res.total
                             if (res.rows.length < res.total) {
@@ -1328,7 +1332,7 @@ export default {
                             }
                             fileList.value = JSON.parse(JSON.stringify(res.rows))
                         }
-                    console.log('folderClickshijian1',tableTotal.value,tableBeEnd.value);
+                    // console.log('folderClickshijian1',tableTotal.value,tableBeEnd.value);
                     })
                 } else {
                     myfile.getById(query).then(res => {
@@ -1340,7 +1344,7 @@ export default {
                             }
                             fileList.value = JSON.parse(JSON.stringify(res.rows))
                         }
-                        console.log('folderClickshijian2',tableTotal.value,tableBeEnd.value);
+                        // console.log('folderClickshijian2',tableTotal.value,tableBeEnd.value);
                     })
                 }
             })
@@ -1643,6 +1647,18 @@ export default {
                     break;
             }
         }
+        const getLevelList = async ()=>{
+            const res = await getLevel()
+            if(res.rows){
+                levelList.value = res.rows.map(item=>{
+                    return {
+                        levelCode:item.levelCode,
+                        levelName:item.levelName
+                    }
+                })
+            console.log('levelList',levelList.value);
+            }
+        }
         //获取权限详情
         const getLeveldetailFn = async (data) => {
             const res = await getLeveldetail(data)
@@ -1748,6 +1764,7 @@ export default {
             getAllTop()
             // }
             getSpaceList()
+            getLevelList()
             // console.log('!thisFolder.value',thisFolder.value);
             // refreshFile()
             // 添加监听，点击其他地方关闭文件夹右键菜单
@@ -1990,6 +2007,8 @@ export default {
             isList,
             throttled,
             throttleSureUpload,
+            getLevelList,
+            levelList
         }
     },
     watch: {