From 2a80ff2298706c7ed9de0ee86f47e802c54bebe9 Mon Sep 17 00:00:00 2001
From: XuHaoJie <1446765036@qq.com>
Date: Tue, 30 Nov 2021 18:02:05 +0800
Subject: [PATCH] 杭州-文档管理-只显示信息中心的人员、机构授权不成功 屏蔽
---
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html | 2 +-
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js | 35 +++++++++++++++++++++++++++++++++++
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js | 66 ++++++++++++++++++++++++++++++++++++++----------------------------
3 files changed, 74 insertions(+), 29 deletions(-)
diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html
index 9c11067..bffc476 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html
@@ -164,7 +164,7 @@
</template>
</cm-dialog>
- <cm-userright :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" @callback="selectUser"
+ <cm-userright :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
@hideDialog="showUserDialog"></cm-userright>
<cm-upload :showDialogVisible="showUploadDialogVisible" @callback="uploadCallBack" @hideDialog="showUploadFile"
diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js
index 068d1b7..5938d50 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js
@@ -511,6 +511,9 @@ export default {
// 用户授权
let showUserDialogVisible = Vue.ref(false);
let userFileRight = Vue.ref([]);
+ //获取用户
+ let userList = Vue.ref([]);
+ let isUser = Vue.ref("false");
let getCheckedFile = () => {
let arr = dataList.value.filter(function (v) {
if (v.checked != undefined && v.checked == true) {
@@ -691,6 +694,7 @@ export default {
* 挂载完
*/
Vue.onMounted(() => {
+ getUserList();
// 预览模式 不展示左侧树
if (!props.isView) {
getTree();
@@ -729,6 +733,35 @@ export default {
}
}
+ //获取用户数据
+ let getUserList=()=>{
+ proxy.userList = [];
+
+ // 查询信息中心的用户
+ proxy.$http.get("/api-user/org/getOrgUserList?orgCode=xxzx", {}, function (res) {
+ if (res && res.data) {
+ res.data.map(function (v) {
+ let desc = [];
+ let orgName = v.orgName;
+ let nickname = v.nickname;
+ if (orgName) {
+ desc.push(orgName);
+ }
+ if (nickname) {
+ desc.push(nickname);
+ }
+
+ proxy.userList.push({
+ value: v.username,
+ type:'USER',
+ desc: `${desc.join(' / ')}`,
+ props : v
+ })
+ });
+
+ }
+ },function (){},false)
+ }
return {
/* viewEdit,*/
@@ -766,6 +799,8 @@ export default {
userFileRight,
selectUser,
showUserDialog,
+ userList,
+ isUser,
showUploadDialogVisible,
historyNode,
diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js
index c9fe013..92a9b1f 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js
@@ -43,6 +43,16 @@ export default {
type: Array,
default: ['取消', '授权']
},
+ //用户数据
+ userArr:{
+ type: Array,
+ default:[],
+ },
+ //是否获取所有用户数据
+ isUser:{
+ type: Boolean,
+ default: true
+ }
},
data() {
return {
@@ -53,8 +63,11 @@ export default {
const {proxy} = Vue.getCurrentInstance();
let allArr = Vue.ref([]);
-
let userArr = Vue.ref([]);
+ let isUser = props.isUser;
+ if(!isUser){
+ userArr = props.userArr;
+ }
let roleArr = Vue.ref([]);
let orgArr = Vue.ref([]);
let activeName = Vue.ref('user');
@@ -71,33 +84,30 @@ export default {
}
const getAllUser = () => {
- if(userArr.value.length != 0){
- return;
+ if(isUser){
+ // 查询全部用户
+ proxy.$http.get("/api-user/users?page=1&limit=10000&username=&nickname=&enabled=&orgId=&roles=", {}, function (res) {
+ if (res && res.data) {
+ res.data.map(function (v) {
+ let desc = [];
+ let orgName = v.orgName;
+ let nickname = v.nickname;
+ if (orgName) {
+ desc.push(orgName);
+ }
+ if (nickname) {
+ desc.push(nickname);
+ }
+ userArr.value.push({
+ value: v.username,
+ type:'USER',
+ desc: `${desc.join(' / ')}`,
+ props : v
+ })
+ });
+ }
+ },function (){},false)
}
- // 查询全部用户
- proxy.$http.get("/api-user/users?page=1&limit=10000&username=&nickname=&enabled=&orgId=&roles=", {}, function (res) {
- if (res && res.data) {
- res.data.map(function (v) {
- let desc = [];
- let orgName = v.orgName;
- let nickname = v.nickname;
- if (orgName) {
- desc.push(orgName);
- }
- if (nickname) {
- desc.push(nickname);
- }
-
- userArr.value.push({
- value: v.username,
- type:'USER',
- desc: `${desc.join(' / ')}`,
- props : v
- })
- });
- }
- },function (){},false)
-
}
const getAllRole = () => {
@@ -266,7 +276,7 @@ export default {
hidedialog,
activeName,
- userArr,
+ //userArr,
roleArr,
orgArr,
--
libgit2 0.24.0