Merge branch 'master-V32-XuHaoJie' into 'master'

杭州-文档管理-只显示信息中心的人员、机构授权不成功 屏蔽



See merge request !148

@@ -334,6 +334,10 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
                                     //点击告警数字，跳转至告警页面
                                     //点击告警数字，跳转至告警页面
                                     $("#indexbizhealth [data-index-banner-item='resType'] .index-banner-item-tips ").unbind('click').on("click", function () {
                                     $("#indexbizhealth [data-index-banner-item='resType'] .index-banner-item-tips ").unbind('click').on("click", function () {
                                         var restype = $(this).data('restype');
                                         var restype = $(this).data('restype');
+                                        //不以资源类型不包括父节点的资源类型 包括阿里云、华为云
+                                        if("ALI_CLOUD_PLAT"== restype || "HUAWEI_CLOUD_PLAT" == restype){
+                                            restype =restype.substring(0,restype.lastIndexOf("_"));
+                                        }
                                         var alink = document.createElement('a');
                                         var alink = document.createElement('a');
                                         alink.setAttribute("lay-href", "/alarm/activewarning/restype=" + restype);
                                         alink.setAttribute("lay-href", "/alarm/activewarning/restype=" + restype);
                                         document.body.appendChild(alink);
                                         document.body.appendChild(alink);

@@ -166,7 +166,7 @@
         </template>
         </template>
     </cm-dialog>
     </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>
                   @hideDialog="showUserDialog"></cm-userright>
 
 
     <cm-upload :showDialogVisible="showUploadDialogVisible" @callback="uploadCallBack" @hideDialog="showUploadFile"
     <cm-upload :showDialogVisible="showUploadDialogVisible" @callback="uploadCallBack" @hideDialog="showUploadFile"

@@ -525,6 +525,9 @@ export default {
         // 用户授权
         // 用户授权
         let showUserDialogVisible = Vue.ref(false);
         let showUserDialogVisible = Vue.ref(false);
         let userFileRight = Vue.ref([]);
         let userFileRight = Vue.ref([]);
+        //获取用户
+        let userList = Vue.ref([]);
+        let isUser = Vue.ref("false");
         let getCheckedFile = () => {
         let getCheckedFile = () => {
             let arr = dataList.value.filter(function (v) {
             let arr = dataList.value.filter(function (v) {
                 if (v.checked != undefined && v.checked == true) {
                 if (v.checked != undefined && v.checked == true) {
@@ -705,6 +708,7 @@ export default {
          * 挂载完
          * 挂载完
          */
          */
         Vue.onMounted(() => {
         Vue.onMounted(() => {
+            getUserList();
             // 预览模式 不展示左侧树
             // 预览模式 不展示左侧树
             if (!props.isView) {
             if (!props.isView) {
                 getTree();
                 getTree();
@@ -743,6 +747,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 {
         return {
             /* viewEdit,*/
             /* viewEdit,*/
@@ -780,6 +813,8 @@ export default {
             userFileRight,
             userFileRight,
             selectUser,
             selectUser,
             showUserDialog,
             showUserDialog,
+            userList,
+            isUser,
 
 
             showUploadDialogVisible,
             showUploadDialogVisible,
             historyNode,
             historyNode,

@@ -43,6 +43,16 @@ export default {
             type: Array,
             type: Array,
             default: ['取消', '授权']
             default: ['取消', '授权']
         },
         },
+        //用户数据
+        userArr:{
+            type: Array,
+            default:[],
+        },
+        //是否获取所有用户数据
+        isUser:{
+            type: Boolean,
+            default: true
+        }
     },
     },
     data() {
     data() {
         return {
         return {
@@ -53,8 +63,11 @@ export default {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
 
 
         let allArr = Vue.ref([]);
         let allArr = Vue.ref([]);
-
         let userArr = Vue.ref([]);
         let userArr = Vue.ref([]);
+        let isUser = props.isUser;
+        if(!isUser){
+            userArr = props.userArr;
+        }
         let roleArr = Vue.ref([]);
         let roleArr = Vue.ref([]);
         let orgArr = Vue.ref([]);
         let orgArr = Vue.ref([]);
         let activeName = Vue.ref('user');
         let activeName = Vue.ref('user');
@@ -71,33 +84,30 @@ export default {
         }
         }
 
 
         const getAllUser = () => {
         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 = () => {
         const getAllRole = () => {
@@ -266,7 +276,7 @@ export default {
             hidedialog,
             hidedialog,
             activeName,
             activeName,
 
 
-            userArr,
+            //userArr,
             roleArr,
             roleArr,
             orgArr,
             orgArr,
 
 

@@ -59,7 +59,7 @@ export default {
             var params = {
             var params = {
                 // page: pageInfo.page,
                 // page: pageInfo.page,
                 // limit: pageInfo.limit,
                 // limit: pageInfo.limit,
-                username: '1',
+                username: localStorage.getItem("lgn"),
             };
             };
             proxy.$http.get("/api-web/bOpsProject/getTree", params, function (res) {
             proxy.$http.get("/api-web/bOpsProject/getTree", params, function (res) {
                 if (res && res.data) {
                 if (res && res.data) {