Przeglądaj źródła

分享人员选择bug

liuQiang 1 rok temu
rodzic
commit
bf8edcfe11

+ 2 - 2
src/layout/components/TopMenu/TopMenu.vue

@@ -401,7 +401,7 @@ onMounted(() => {
     position: absolute;
     top: 120%;
     right: 0;
-    width: 112px;
+    width: 140px;
     height: 96px;
     padding: 8px;
     display: flex;
@@ -413,7 +413,7 @@ onMounted(() => {
     box-shadow: 0px 3px 26px 1px rgba(191, 191, 191, 0.25),
       0px 2px 3px 0px rgba(210, 210, 210, 0.25);
     .oneBox {
-      width: 96px;
+      width: 110px;
       height: 36px;
       display: flex;
       padding: 0 8px;

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

@@ -92,7 +92,7 @@
             <div class="mesBox">
                 <!-- 展示文件夹盒子 -->
                 <!-- 文件夹 -->
-                <div v-if="editOnline">
+                <div>
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
@@ -183,7 +183,7 @@
                         <span>使用右键进行文件操作</span>
                        </div>
                     </div>
-                    <div v-show="leftShowList === 2">
+                    <div v-show="false">
                         <!-- 面包屑功能栏 -->
                         <div class="breadBox">
                             <!-- 左侧 -->
@@ -357,7 +357,7 @@
 
                         </div>
                     </div>
-                     <ListShow v-show="leftShowList === 1" @handleSelectionChange="handleSelectionChange" :fileList="fileList" @changeListSort="changeListSort" @delCollect="delCollect" @collectByStar="collectByStar" @handleRowClick="handleRowClick"></ListShow>
+                     <ListShow @handleSelectionChange="handleSelectionChange" :fileList="fileList" @changeListSort="changeListSort" @delCollect="delCollect" @collectByStar="collectByStar" @handleRowClick="handleRowClick"></ListShow>
                 </div>
             </div>
             <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">

+ 0 - 4
src/views/department/modalComponebts/Transfer.vue

@@ -222,10 +222,6 @@ export default {
                         return item.userId
                     })
                 })
-            } else if (!isNewMenus) {
-                fileCount.getActor(dees).then(res => {
-                    chooseTagData.value = res
-                })
             }
 
         }

+ 4 - 3
src/views/liveChat/index.vue

@@ -145,7 +145,7 @@ const readChat =async ()=>{
       const resMsgData = await msgRecord(toIdValue, queryParams);
       if(resMsgData.rows[0].isRead === "N"){
         readChat()
-        }
+      }
 }
 //获取用户的聊天记录
 const msgRecordEvent = async (toIdValue) => {
@@ -409,8 +409,9 @@ const handleNewMessage = async () => {
 watchEffect(async() => {
   let newMessages = {}
   newMessages = websoctStore.messOne  
-  // console.log("===============有新消息了:",newMessages)
-  if(router.currentRoute.value.path!='/index' || newMessages.fromId==null) return;
+  console.log("===============有新消息了:",newMessages)
+  // if(router.currentRoute.value.path!='/index' || newMessages.fromId==null) return;
+  if( newMessages.fromId==null) return;
   //此处判断messOne是否已发生更改,如果还未发生更改则清除该消息
   if(websoctStore.messOne.fromId==newMessages.fromId){    
     noMes.value = false;

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

@@ -103,7 +103,7 @@
                     </div>
 
                 </div> -->
-                <div v-if="editOnline">
+                <div>
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
@@ -218,7 +218,7 @@
                             <span>使用右键进行文件操作</span>
                        </div>
                     </div>
-                    <div v-show="leftShowList === 2">
+                    <div v-show="false">
                         <!-- 面包屑功能栏 -->
                         <div class="breadBox">
                             <!-- 左侧 -->
@@ -403,7 +403,7 @@
                             </div>
                         </div>
                     </div>
-                    <ListShow v-show="leftShowList === 1" @handleSelectionChange="handleSelectionChange" :fileList="fileList" @changeListSort="changeListSort" @delCollect="delCollect" @collectByStar="collectByStar" @handleRowClick="handleRowClick"></ListShow>
+                    <ListShow @handleSelectionChange="handleSelectionChange" :fileList="fileList" @changeListSort="changeListSort" @delCollect="delCollect" @collectByStar="collectByStar" @handleRowClick="handleRowClick"></ListShow>
 
                 </div>
             </div>
@@ -2048,7 +2048,6 @@ export default {
         }
         function getCback(data) {
             thanks.value = data
-            refreshFile()
         }
         function getChildrenC(data) {
             folderCase.value = data

+ 15 - 9
src/views/myfile/modalComponebts/Transfer.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { ref, onMounted, toRef, watch } from 'vue';
+import { ref, onMounted, toRef, watch,onBeforeMount,toRaw } from 'vue';
 import userTree from '../../../api/user/userTree';
 import fileShare from '../../../api/fileShare/fileShare';
 import fileCount from '../../../api/fileCount/fileCount'
@@ -200,8 +200,10 @@ export default {
             })
             if (feeh === 1) {
                 fileShare.getSharePeople(dees).then(res => {
-                    // 去除数组内部的重复元素
-                    const uniqueRes = Array.from(new Set(res.map(item => item.userName))).map(id => res.find(item => item.userName === id));
+                    // 去除res数组内部的userName想同的重复元素
+                    let uniqueRes = res.filter((item, index, self) => {
+                        return self.findIndex(t => t.userId === item.userId) === index;
+                    });
                     // 现在的 uniqueRes 数组不包含重复元素
                     chooseTagData.value = uniqueRes;
                     backScreen.value = chooseTagData.value.map(item => {
@@ -216,11 +218,13 @@ export default {
                         return item.userId
                     })
                 })
-            } else if (!isNewMenus) {
-                fileCount.getActor(dees).then(res => {
-                    chooseTagData.value = res
-                })
-            }
+            } 
+            // else if (!isNewMenus) {
+            //     fileCount.getActor(dees).then(res => {
+            //         console.log('res222',res);
+            //         chooseTagData.value = res
+            //     })
+            // }
 
         }
         function cleanPeople() {
@@ -275,9 +279,11 @@ export default {
             })
             treeRef.value.setCheckedKeys(result);
         }
+        onBeforeMount(() => {
+             getAllUser()
+        })
         onMounted(() => {
             allTeam()
-            getAllUser()
         })
         return {
             transferModals,

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

@@ -88,7 +88,7 @@
             <div class="mesBox">
                 <!-- 展示文件夹盒子 -->
                 <!-- 文件夹 -->
-                <div v-if="editOnline">
+                <div>
                     <!-- 众多功能 -->
                     <div class="manyUse">
                         <div class="useMenu">
@@ -178,7 +178,7 @@
                             <span>使用右键进行文件操作</span>
                        </div>
                     </div>
-                    <div v-show="leftShowList === 2">
+                    <div v-show="false">
                         <!-- 面包屑功能栏 -->
                         <div class="breadBox">
                             <!-- 左侧 -->
@@ -350,7 +350,7 @@
                                 </div>
                         </div>
                     </div>
-                     <ListShow v-show="leftShowList === 1" @handleSelectionChange="handleSelectionChange" :fileList="fileList" @changeListSort="changeListSort" @delCollect="delCollect" @collectByStar="collectByStar" @handleRowClick="handleRowClick"></ListShow>
+                     <ListShow @handleSelectionChange="handleSelectionChange" :fileList="fileList" @changeListSort="changeListSort" @delCollect="delCollect" @collectByStar="collectByStar" @handleRowClick="handleRowClick"></ListShow>
                     </div>
             </div>
             <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">

+ 0 - 4
src/views/publicment/modalComponebts/Transfer.vue

@@ -216,10 +216,6 @@ export default {
                         return item.userId
                     })
                 })
-            } else if (!isNewMenus) {
-                fileCount.getActor(dees).then(res => {
-                    chooseTagData.value = res
-                })
             }
 
         }