收藏bug

src/layout/indexCommon.vue

@@ -950,7 +950,7 @@ const setTabLocal = (data) => {
   sessionStorage.setItem('tabData', JSON.stringify(data))
 }
 const setFileTabLocal = (data) => {
-  console.log('setFileTabLocal', data);
+  // console.log('setFileTabLocal', data);
   isSwitchFileIframe.value = true
   // console.log('setFileTabLocal',data);
   sessionStorage.setItem('fileTabData', JSON.stringify(data))
@@ -982,7 +982,7 @@ watch(() => editableTabsValue.value, (newValue, oldValue) => {
   if (!regExp.test(editableTabsValue.value) && editableTabsValue.value != "identifyFont" && editableTabsValue.value != "search"&& editableTabsValue.value != "pdf2word") {
     isAlive.value = false;
   }
-  console.log('first  editableTabsValue.value', editableTabsValue.value)
+  // console.log('first  editableTabsValue.value', editableTabsValue.value)
 }, {
   immediate: true,
   deep: true

src/views/HomePage/HomePage.vue

@@ -33,16 +33,20 @@
       <div class="btm">
         <div class="left_box">
           <div class="big_box">
-            <div class="one_box" v-for="item in 20" :key="item">
+            <div class="one_box" v-for="item in colllectArr" :key="item">
               <div class="left">
-                <img src="@/assets/images/fileBox.png" alt="" />
+                <img
+                  v-if="item.docDir.dirType === '1'"
+                  src="@/assets/images/fileBox.png"
+                  alt=""
+                />
+                <img v-else src="@/assets/images/ordinary.png" alt="" />
               </div>
               <div class="right">
-                <span class="title">Inceptos</span>
-                <span class="path">Inceptos11111111111111111111111111</span>
+                <span class="title">{{ item.docDir.dirName }}</span>
+                <span class="path">{{ item.docDir.dirPath }}</span>
               </div>
             </div>
-            <div class="add_box"></div>
           </div>
         </div>
         <div class="right_box">
@@ -52,6 +56,7 @@
               style="width: 100%"
               height="29vh"
               :scrollbar-always-on="false"
+              @row-click="toFile"
             >
               <el-table-column fixed prop="date" label="名称" width="500">
                 <template #default="scope">
@@ -127,6 +132,7 @@ import myfile from "@/api/myfile/myfile";
 import ScanFile from "@/components/ScanFile/ScanFile.vue";
 import MoveTo from "@/components/MoveTo/MoveTo.vue";
 import { listInfo, selectInfo, getFileByScanerId } from "@/api/scanner/info.js";
+import { listFavoriteById } from "@/api/biz/favorite.js";
 const tableFileData = ref([]);
 const tableFolderData = ref([]);
 const useSpace = ref();
@@ -140,6 +146,8 @@ const scannerFiles = ref([]); //选择的扫描仪的文件
 const openScanMove = ref(false);
 const openScan = ref(false); //控制扫描文档显示
 const scanFileArr = ref([]); //认领的扫描文件数组
+const colllectArr = ref([]); // 收藏文件夹
+const addFileTab = inject("addFileTab");
 
 const getList = async () => {
   const resY = await listRecent({ isFolder: "Y" });
@@ -240,8 +248,26 @@ const closeOpenScanMove = () => {
   openScanMove.value = false;
   // refreshFile();
 };
+// 获取收藏数据
+const getCollectFolder = async () => {
+  const query = {
+    isAsc: "desc",
+    orderByColumn: "createTime",
+  };
+  const res = await listFavoriteById(-1, query);
+  // console.log("res", res);
+  // console.log("----res", res);
+  colllectArr.value = res.rows.filter((item) => item.isFolder === "Y");
+  // console.log('colllectArr.value',colllectArr.value);
+};
+// 打开文件
+const toFile = (row) => {
+  console.log("row", row);
+  addFileTab(row, 0, 0);
+};
 onMounted(() => {
   getList();
+  getCollectFolder();
   getSpaceList();
 });
 </script>
@@ -435,7 +461,14 @@ onMounted(() => {
             align-items: flex-start;
             // text-align: left;
             .title {
+              width: 120px;
               color: #f4f5ff;
+              /*第一步： 溢出隐藏 */
+              overflow: hidden;
+              /* 第二步：让文本不会换行， 在同一行继续 */
+              white-space: nowrap;
+              /* 第三步：用省略号来代表未显示完的文本 */
+              text-overflow: ellipsis;
             }
             .path {
               font-size: 14px;
@@ -496,6 +529,10 @@ onMounted(() => {
 :deep(.el-table__header) {
   background-color: rgba(0, 0, 0, 0) !important;
 }
+:deep(.el-table tr) {
+  background-color: rgba(0, 0, 0, 0) !important;
+  // color: #F4F5FF !important;
+}
 :deep(.el-table__header-wrapper) {
   background-color: rgba(0, 0, 0, 0) !important;
 }
@@ -504,7 +541,8 @@ onMounted(() => {
   font-size: 14px !important;
   font-weight: 400 !important;
 
-  color: #000 !important;
+  background-color: rgba(0, 0, 0, 0) !important;
+  color: #f4f5ff !important;
 }
 :deep(.el-table__row) {
   height: 32px !important;

src/views/department/MyFile.vue

@@ -748,6 +748,7 @@ export default {
         const inputTitle = ref()//验证框标题
         const isCode = ref(false)// 验证的类型
         const isAsc = ref("desc");
+        const clickPath = inject("clickPath");
         const changeSort = async () => {
            isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc")
            refreshFile()
@@ -1707,8 +1708,13 @@ export default {
             collects.value = true
         }
         const backTopPath = ()=>{
-            pathLabelData.value = ([])
-            getAllTop()
+            // pathLabelData.value = ([])
+            // getAllTop()
+            const addData = {
+                path: '/department',
+                label: '部门文件'
+            }
+            clickPath(null,addData)
         }
         // 取消文件收藏
         const delCollect = async (row,isfolder)=>{
@@ -2325,7 +2331,8 @@ export default {
             upFileData,
             fileBig,
             isAsc,
-            changeSort
+            changeSort,
+            clickPath
         }
     },
     watch: {

src/views/myfile/MyFile.vue

@@ -1834,7 +1834,6 @@ export default {
             e.stopPropagation();
             // thisFolder.value = ''   //先清空
             let thisRow = toRaw(row)
-            console.log('row',row);
             clickRow.value = thisRow
             copyFolderName.value = row.dirName
             //  唤出右键菜单，思路：获取鼠标位置来定位菜单
@@ -1943,7 +1942,6 @@ export default {
 
         //点击收藏后刷新文件
         const refreshFile = (left,edit) => {
-            // console.log(333);
             if(edit){
                 getFirstFolder()
             }
@@ -2176,8 +2174,13 @@ export default {
             // console.log('fileList',fileList.value);
         }
         const backTopPath = ()=>{
-            pathLabelData.value = ([])
-            getAllTop()
+            // pathLabelData.value = ([])
+            // getAllTop()
+           const addData = {
+                path: '/myfile',
+                label: '我的文件'
+            }
+            clickPath(null,addData)
         }
         const upBefore = (file,files)=>{
             const maxSize = (maxFileSize.value-0)*1024*1024

src/views/myfile/modalComponebts/FileCollect.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { ref, onMounted, toRef } from "vue"
+import { ref, onMounted, toRef, toRaw } from "vue"
 import { ElMessage } from "element-plus"
 import collect from "../../../api/collect/collect"
 import {
@@ -68,6 +68,7 @@ export default {
         let result = props.collects
         let fname = props.copyFileName
         let fid = props.copyFileId
+        console.log('checkrow',props.clickRow);
         let fileCollect = ref(false)
         let collectForm = ref({
             name: "",
@@ -125,18 +126,19 @@ export default {
         }
         // 确认收藏
         function sureCollect() {
-            // console.log('clickRow',props.clickRow.value);
+            const clickRow = toRaw(props.clickRow)
+            console.log('clickRow1',clickRow.dirId);
             let query = {}
             if(props.isFolder === "Y"){
                 query = {
                     "isFolder":props.isFolder,
-                    "relaId": props.clickRow.dirId,
+                    "relaId": clickRow.dirId,
                     "labelId": collectForm.value.folders - 0 || null,
                 }
             }else{
                 query = {
                     "isFolder":props.isFolder,
-                    "relaId": props.clickRow.docId,
+                    "relaId": clickRow.docId,
                     "labelId": collectForm.value.folders - 0 || null,
                 }
             }

src/views/publicment/MyFile.vue

@@ -756,6 +756,7 @@ export default {
         const inputTitle = ref()//验证框标题
         const isCode = ref(false)// 验证的类型
         const isAsc = ref("desc");
+        const clickPath = inject("clickPath");
         const changeSort = async () => {
            isAsc.value == "asc" ? (isAsc.value = "desc") : (isAsc.value = "asc")
            refreshFile()
@@ -1934,8 +1935,13 @@ export default {
             folderCase.value = true
         }
         const backTopPath = ()=>{
-            pathLabelData.value = ([])
-            getAllTop()
+            // pathLabelData.value = ([])
+            // getAllTop()
+            const addData = {
+                path: '/publicment',
+                label: '公共文件'
+            }
+            clickPath(null,addData)
         }
         const upBefore = (file)=>{
             // console.log('file',file.size);
@@ -2330,7 +2336,8 @@ export default {
             sureCode,
             upFileData,
             isAsc,
-            changeSort
+            changeSort,
+            clickPath
         }
     },
     watch: {