918

src/components/TreeMenu/TreeMenu.vue

@@ -15,6 +15,14 @@
       <!-- <img src="@/assets/images/textbox.png" alt="" /> -->
       <span class="shouzhi">编辑</span>
     </div>
+    <div class="menu_item" v-if="props.clickRow?.isFavorite ==='N'" @click="collectFn">
+      <!-- <img src="@/assets/images/trash.png" alt="" /> -->
+      <span class="shouzhi">收藏</span>
+    </div>
+    <div class="menu_item" v-else @click="delcollectFn">
+      <!-- <img src="@/assets/images/trash.png" alt="" /> -->
+      <span class="shouzhi">取消收藏</span>
+    </div>
     <div class="menu_item" @click="delFn">
       <!-- <img src="@/assets/images/trash.png" alt="" /> -->
       <span class="shouzhi">删除</span>
@@ -61,14 +69,20 @@ const props = defineProps({
     default: false,
   },
 });
-const emit = defineEmits(["restName", "delName", "upFirstFoler"]);
+const emit = defineEmits(["restName", "delName", "upFirstFoler",'collectFolder','delCollect']);
 const reNameFn = () => {
-  console.log(1);
+  // console.log(1);
   emit("restName");
 };
 const delFn = () => {
   emit("delName");
 };
+const collectFn = () => {
+  emit("collectFolder");
+};
+const delcollectFn = () => {
+  emit("delCollect",props.clickRow,true);
+};
 const editFolder = () => {
   emit("upFirstFoler",props.clickRow);
 };

src/views/department/MyFile.vue

@@ -483,7 +483,7 @@
     </div>
     <!-- 扫描文件移动到 -->
     <MoveTo v-if="openScanMove" :spaceType='2' :scanFileArr="scanFileArr" :thisFolder="thisFolder" :openScanMove="openScanMove" @closeOpenScanMove='closeOpenScanMove'></MoveTo>
-    <TreeMenu v-show="showTreeMenu" :spaceType='2' :noEdit="noEdit" :clickRow="clickRow" :isDept="isDept" @upFirstFoler="upFirstFoler" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
+    <TreeMenu v-show="showTreeMenu" :spaceType='2' @delCollect="delCollect" @collectFolder="collectFolder" :noEdit="noEdit" :clickRow="clickRow" :isDept="isDept" @upFirstFoler="upFirstFoler" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
 </template>
 
 <script>
@@ -1945,6 +1945,7 @@ export default {
                 listfolderClick()
             }else {
                 getAllTop()
+                getFirstFolder()
             }
             getSpaceList()
         }
@@ -1994,8 +1995,10 @@ export default {
                 } 
             }
             const res = await delFavorite(query)
-            //TODO 之后需要重新获取数据 并message提示
-            console.log('res',res);
+            ElMessage({
+                type: "success",
+                message: "已取消收藏"
+            })
             refreshFile()
         }
         //获取安全图标

src/views/myfile/MyFile.vue

@@ -519,7 +519,7 @@
     </div>
     <!-- 扫描文件移动到 -->
     <MoveTo v-if="openScanMove" :spaceType='3' :scanFileArr="scanFileArr" :thisFolder="thisFolder" :openScanMove="openScanMove" @closeOpenScanMove='closeOpenScanMove'></MoveTo>
-    <TreeMenu v-show="showTreeMenu" :spaceType='3'  @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
+    <TreeMenu v-show="showTreeMenu" :spaceType='3' @delCollect="delCollect" @collectFolder="collectFolder" :clickRow="clickRow" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
 </template>
 
 <script>
@@ -2090,6 +2090,7 @@ export default {
             }else {
                 console.log(222);
                 getAllTop()
+                getFirstFolder()
             }
             getSpaceList()
         }
@@ -2116,7 +2117,7 @@ export default {
         // 取消文件收藏
         const delCollect = async (row, isfolder) => {
             const thisRow = toRaw(row)
-            console.log('thisRow', thisRow);
+            // console.log('thisRow', thisRow);
             let query = {}
             if (isfolder) {
                 query = {
@@ -2130,8 +2131,10 @@ export default {
                 }
             }
             const res = await delFavorite(query)
-            //TODO 之后需要重新获取数据 并message提示
-            // console.log('res', res);
+            ElMessage({
+                type: "success",
+                message: "已取消收藏"
+            })
             refreshFile()
         }
         //获取安全图标

src/views/publicment/MyFile.vue

@@ -476,7 +476,7 @@
     </div>
     <!-- 扫描文件移动到 -->
     <MoveTo v-if="openScanMove" :spaceType='1' :scanFileArr="scanFileArr" :thisFolder="thisFolder" :openScanMove="openScanMove" @closeOpenScanMove='closeOpenScanMove'></MoveTo>
-     <TreeMenu v-show="showTreeMenu" :spaceType='1' :clickRow="clickRow" :noEdit="noEdit" :isDept="isDept" @upFirstFoler="upFirstFoler" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
+     <TreeMenu v-show="showTreeMenu" :spaceType='1' @delCollect="delCollect" @collectFolder="collectFolder" :clickRow="clickRow" :noEdit="noEdit" :isDept="isDept" @upFirstFoler="upFirstFoler" @restName="restName" @delName="delName" :xz="xz" :yz="yz"></TreeMenu>
 </template>
 
 <script>
@@ -1935,6 +1935,7 @@ export default {
                 listfolderClick()
             }else {
                 getAllTop()
+                getFirstFolder()
             }
             getSpaceList()
         }
@@ -1975,8 +1976,10 @@ export default {
                 } 
             }
             const res = await delFavorite(query)
-            //TODO 之后需要重新获取数据 并message提示
-            console.log('res',res);
+            ElMessage({
+                type: "success",
+                message: "已取消收藏"
+            })
             refreshFile()
         }
         //获取安全图标