From 446b2b02f1e2cbd1eedf845927f1d043626ab876 Mon Sep 17 00:00:00 2001 From: zhangxiao <898441624@qq.com> Date: 星期四, 29 八月 2024 21:12:14 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web --- src/views/authority/users/index.vue | 12 +++++++----- src/store/modules/user/index.ts | 8 +++++++- src/views/sessionManager/index.vue | 2 -- src/views/dmx/knowledgeLib/config.vue | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts index 047dcc1..84388d7 100644 --- a/src/store/modules/user/index.ts +++ b/src/store/modules/user/index.ts @@ -81,7 +81,13 @@ this.name=res.data.userName if(res.data?.roles.length>0) - this.resources=res.data.roles[0].resources; + //閬嶅巻roles + for (const r of res.data.roles) { + if (!(this.resources)) { + this.resources = []; + } + this.resources = this.resources.concat(r.resources); + } setUserInfo(JSON.stringify(userInfo)); setUserResources(JSON.stringify(this.resources)) for (const r of this.resources) { diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue index 2dbda97..068e9b5 100644 --- a/src/views/authority/users/index.vue +++ b/src/views/authority/users/index.vue @@ -499,11 +499,13 @@ uuu = res.data; }); } - deptvisible.value = true; - checkedKeys.value = []; - expandKdys.value = []; - checkStrictly.value = []; - selectUser.value = uuu; + if (uuu.dept?false:true) { + deptvisible.value = true; + checkedKeys.value = []; + expandKdys.value = []; + checkStrictly.value = []; + selectUser.value = uuu; + } } }; const editHandleOk = () => { diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue index 29d9de8..ebec067 100644 --- a/src/views/dmx/knowledgeLib/config.vue +++ b/src/views/dmx/knowledgeLib/config.vue @@ -362,7 +362,7 @@ description: kbObj.description, language: "English", permission: kbObj.permission, - embd_id: props.kbtenantInfo.embd_id || kbObj.embd_id, + embd_id: kbObj.embd_id || props.kbtenantInfo.embd_id, parser_id: kbObj.parser_id, layout_recognize: true, } diff --git a/src/views/sessionManager/index.vue b/src/views/sessionManager/index.vue index 4208bee..4845075 100644 --- a/src/views/sessionManager/index.vue +++ b/src/views/sessionManager/index.vue @@ -766,8 +766,6 @@ }; const selectFileCallback = (data) => { - // debugger; - // console.log(data, 'selectFileCallback'); uploaditemList.value = [...uploaditemList.value, ...data]; }; -- Gitblit v1.8.0