|
|
@@ -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,
|