From 354cad3d3ab22ba147169beb6a0f6f51b9bab3a8 Mon Sep 17 00:00:00 2001 From: wangting <wangting@vci-tech.com> Date: 星期三, 08 一月 2025 09:07:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 327 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 262 insertions(+), 65 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue index f1c21f7..23e05b4 100644 --- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue +++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue @@ -7,8 +7,8 @@ <div style="height: calc(100vh - 190px);"> <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"> <span slot-scope="{ node, data }" class="el-tree-node__label"> - <span style="font-size: 15px"> - <i class="el-icon-s-promotion"></i> + <span> + <icon-show :name="data.icon"></icon-show> {{ (node || {}).label }} </span> </span> @@ -28,14 +28,23 @@ @refresh-change="handleRefresh" @current-row-change="rowClickHandler"> <template slot="menuLeft"> - <el-button icon="el-icon-plus" size="small" type="primary" @click="addHandler">娣诲姞</el-button> - <el-button icon="el-icon-plus" size="small" type="primary" @click="editHandler">淇敼</el-button> - <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">鍒犻櫎</el-button> - <el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅鎺堟潈缁撴灉</el-button> + <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary" @click="addHandler"> + <icon-show :name="permissionList.addBtn.source"></icon-show> + 娣诲姞 + </el-button> + <el-button v-if="permissionList.editBtn" class="button-custom-icon" size="small" type="primary" @click="editHandler"> + <icon-show :name="permissionList.editBtn.source"></icon-show> + 淇敼 + </el-button> + <el-button v-if="permissionList.delBtn" class="button-custom-icon" plain size="small" type="danger" @click="delHandler"> + <icon-show :name="permissionList.delBtn.source"></icon-show> + 鍒犻櫎 + </el-button> + <!--<el-button icon="el-icon-view" plain size="small" type="primary" @click="viewAuthHandler">鏌ョ湅鎺堟潈缁撴灉</el-button>--> </template> </avue-crud> <div style="margin-top: 15px;"> - <data-view key="dataView" :btmNode="nodeRow" :selectRow="selectRow" :actionMap="actionMap" :readOnly="true" :height="clientHeight-260-220"></data-view> + <data-view key="dataView" :btmNode="nodeRow" :actionMap="actionMap" :selectRow="selectRow" :readOnly="true" :height="clientHeight-260-220"></data-view> </div> <!-- 鏂板 && 缂栬緫 --> <el-dialog @@ -47,32 +56,78 @@ width="70%" @close="addDialogClose"> <div> - <data-view ref="editView" key="editView" :btmNode="nodeRow" :selectRow="title === 'add'?{}:selectRow" :actionMap="actionMap" :readOnly="false" :height="clientHeight-260"></data-view> + <data-view ref="editView" key="editView" :btmNode="nodeRow" :actionMap="actionMap" :selectRow="title === 'add'?{}:selectRow" :readOnly="false" :height="clientHeight-260"></data-view> </div> <span slot="footer" class="dialog-footer"> - <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button> + <el-button size="small" type="primary" @click="addDialogSavaHandler">淇� 瀛�</el-button> <el-button size="small" @click="addDialogClose">鍙� 娑�</el-button> </span> </el-dialog> <!-- 鏌ョ湅鎺堟潈缁撴灉 --> <el-dialog v-dialogDrag - v-loading="checkViewLoading" - :visible.sync="checkViewVisible" + :visible.sync="authResultVisible" append-to-body="true" class="avue-dialog" - title="鏌ョ湅浣跨敤鑼冨洿" + title="鏌ョ湅鎺堟潈缁撴灉" width="60%" > - <avue-crud - ref="checkViewCrud" - :data="checkViewData" - :option="checkViewOption" - @search-change="checkHandleSearch" - @search-reset="checkHandleReset" - > + <el-form ref="form" :inline="true" size="mini" :model="form" label-width="80px"> + <el-form-item label="涓氬姟瀵硅薄" prop="objectoid"> + <el-input v-model="form.objectoid" style="width:300px;"></el-input> + </el-form-item> + <el-form-item> + <el-button type="primary" @click="queryBtm" style="padding: 6px 15px;">鏌ヨ涓氬姟瀵硅薄</el-button> + </el-form-item> + <fieldset style="width: 99.5%"> + <legend> 鐢ㄦ埛淇℃伅 </legend> + <div> + <el-form-item label="鐢ㄦ埛"> + <el-select v-model="form.userOid"> + <el-option v-for="item in userDic" :label="item.name+'('+item.id+')'" :value="item.oid"></el-option> + </el-select> + </el-form-item> + <el-form-item label="瑙掕壊"> + <el-select v-model="form.roleOid"> + <el-option v-for="item in roleDic" :label="item.name" :value="item.oid"></el-option> + </el-select> + </el-form-item> + <el-form-item label="鐢ㄦ埛缁�"> + <el-select v-model="form.deptOid"> + <el-option v-for="item in deptDic" :label="item.name" :value="item.oid"></el-option> + </el-select> + </el-form-item> + </div> + </fieldset> + <el-dialog + v-dialogDrag + :visible.sync="btmObjVisible" + append-to-body="true" + class="avue-dialog" + title="涓氬姟瀵硅薄鍒楄〃" + width="90%" + > + <avue-crud + ref="btmObjCrud" + :data="btmObjData" + :option="btmObjOption" + @current-row-change="btmObjClickHandler" + > + </avue-crud> + </el-dialog> + </el-form> + <fieldset style="width: 99.5%;margin-top: 10px;"> + <legend> 鎺堟潈缁撴灉锛� </legend> + <div> + <avue-crud + ref="authResultCrud" + :data="authResultData" + :option="authResultOption" + > + </avue-crud> + </div> + </fieldset> - </avue-crud> </el-dialog> </basic-container> </el-main> @@ -84,9 +139,10 @@ import {getBizTree} from "@/api/UI/uiDefine"; import basicOption from "@/util/basic-option"; import dataView from "./dataView"; -import {getData,saveGrand,delGrand} from "@/api/authority/ui/dataAuthor"; +import {getData,saveGrand,delGrand,authResult,queryBusiness} from "@/api/authority/ui/dataAuthor"; +import {listUserByUserType, listRoleByUserOid, listDeptByUserOid} from "@/api/system/user/api"; import func from "@/util/func"; -import {getUsedEnumList} from "@/api/modeling/enumType/api"; +import {mapGetters} from "vuex"; export default { name: "index", components:{dataView}, @@ -136,7 +192,15 @@ data: [], title: '', visible: false, - form:{}, + form:{ + objectoid:'', + userOid:'', + roleOid:'', + deptOid:'' + }, + userDic:[], + roleDic:[], + deptDic:[], actionMap:{}, switchDic:[{ label:'', @@ -144,11 +208,81 @@ },{ label:'', value:true - }] + }], + authResultVisible:false, + authResultData:[], + authResultOption:{ + ...basicOption, + height:300, + tip: false, + index:false, + selection:false, + menu:false, + header:false, + column: [{ + label: '鍚嶇О', + prop: 'name', + overHidden: true + }] + }, + //涓氬姟瀵硅薄鍒楄〃 + btmObjVisible:false, + btmObjData:[], + btmObjOption:{ + ...basicOption, + height:500, + tip: false, + selection:false, + menu:false, + header:false, + column: [] + } } + }, + computed:{ + ...mapGetters(["permission"]), + permissionList() { + return { + addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false), + delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false), + editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false), + }; + }, }, created() { this.getTreeList(); + }, + watch:{ + 'form.userOid':{ + handler(val) { + /*if(val){ + listRoleByUserOid(val).then(res => { + // 缁勮濂界┛姊鍙敤鏁版嵁 + this.roleDic = res.data.data; + if(this.roleDic.length>0){ + this.form.roleOid=this.roleDic[0].oid + }else{ + this.form.roleOid='' + } + }) + listDeptByUserOid(val).then(res => { + this.deptDic = res.data.data; + if(this.deptDic.length>0){ + this.form.deptOid=this.deptDic[0].oid + }else { + this.form.deptOid=''; + } + }) + }else{ + this.roleDic=[]; + this.deptDic=[]; + this.form.roleOid='' + this.form.deptOid=''; + }*/ + }, + immediate: true, + deep: true + } }, methods: { //鏍戣〃鏌ヨ @@ -190,7 +324,7 @@ label: item, prop: i, overHidden: true, - width:'auto', + width:(this.stringLength(item) *6+35)+'px', html:true, formatter:(val)=> { return '<label class="el-checkbox is-disabled ' + (val[i] == true ? 'is-checked' : '') + '"><span class="el-checkbox__input is-disabled ' + (val[i] == true ? 'is-checked' : '') + '"><span class="el-checkbox__inner"></span><input type="checkbox" aria-hidden="false" class="el-checkbox__original" value="' + val[i] + '"></span></label>' @@ -199,11 +333,23 @@ }) } this.data = res.data.obj.rowList; - this.$refs.crud.clearSelection(); this.tableLoading = false; this.actionMap=res.data.obj.actionMap; - this.selectRow={} + this.$refs.crud.setCurrentRow( ); + }) + }, + stringLength(str) { + let len = 0; + for (let i = 0; i < str.length; i++) { + let code = str.charCodeAt(i); + if (code >= 0 && code <= 127) { + len += 1; // 鑻辨枃瀛楃 + } else { + len += 2; // 涓枃瀛楃 + } + } + return len; }, handleRefresh() { this.getTableList(); @@ -211,38 +357,6 @@ // 琛岀偣鍑� rowClickHandler(row) { this.selectRow=row - }, - // 鏌ョ湅鎺堟潈缁撴灉 - chekView() { - if (this.selectRow=={}) { - this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�'); - return; - } - - getUsedEnumList({enumName: this.selectRow.id}).then(res => { - if (res.data.code === 200) { - this.checkViewVisible = true; - this.checkViewData = res.data.data; - this.checkViewDataSearch = res.data.data; - } - }) - }, - - // 鏌ョ湅鎺堟潈缁撴灉鏌ヨ - checkHandleSearch(params, done) { - const {source} = params; - - if (!params.source) { - this.checkViewData = this.checkViewDataSearch; - return done(); - } - - this.checkViewData = this.checkViewData.filter(item => { - return item.source && item.source.includes(source); - }); - - done(); - }, //鍒涘缓 addHandler(){ @@ -264,7 +378,39 @@ }, // 鏂板缂栬緫淇濆瓨 addDialogSavaHandler() { - saveGrand(this.viewData).then(res => { + let form = this.$refs.editView.form; + if (form.ruleName == '') { + this.$message.error('瀹綋璇疯緭鍏ヨ鍒欏悕绉�'); + return; + } + form.users = '' + form.userGroups = ''; + form.roles = '' + this.$refs.editView.authData.forEach(item => { + let infos = item.name.split(', '); + infos[0] = infos[0].replace('{', '') + if (infos[2] == 'user}') { + form.users += infos[0] + ',' + } + if (infos[2] == 'userGroup}') { + form.userGroups += infos[0] + ',' + } + if (infos[2] == 'role}') { + form.roles += infos[0] + ',' + } + }); + let data = []; + for (var i in this.actionMap) { + data.push({ + ...form, + identifier: this.nodeRow.attributes.name + '_' + this.actionMap[i], + isGrand: this.$refs.editView.actionForm.some(item => { + return item == this.actionMap[i] + }) ? 49 : 48 + }) + } + + saveGrand(data).then(res => { if (res.data.code === 200) { this.$message.success(res.data.obj); this.getTableList(); @@ -287,7 +433,7 @@ cancelButtonText: '鍙栨秷', type: 'warning' }).then(() => { - delGrand({name:this.templateForm}).then(res => { + delGrand({typeName:this.nodeRow.attributes.name,ruleName:this.selectRow.rules[0].ruleName}).then(res => { if (res.data.code === 200) { this.$message.success(res.data.obj); this.getTableList(); @@ -300,10 +446,57 @@ }); }); }, - // 鏌ョ湅浣跨敤鑼冨洿閲嶇疆 - checkHandleReset() { - this.checkViewData = this.checkViewDataSearch; + + // 鏌ョ湅鎺堟潈缁撴灉 + viewAuthHandler() { + if (func.isEmptyObject(this.nodeRow)) { + this.$message.warning('璇烽�夋嫨绫诲瀷鏍戜俊鎭�'); + return; + } + this.authResultVisible = true; + listUserByUserType({type:1}).then(res => { + // 缁勮濂界┛姊鍙敤鏁版嵁 + this.userDic = res.data.data; + if(this.userDic.length>0){ + this.form.userOid=this.userDic[0].oid + }else{ + this.form.userOid='' + } + }) + this.getAuthResultData() }, + getAuthResultData(){ + authResult({biztype: this.nodeRow.attributes.name,objectoid:this.form.objectoid}).then(res => { + if (res.data.code === 200) { + this.authResultData = res.data.data; + } + }) + }, + //鏌ヨ涓氬姟瀵硅薄 + queryBtm(){ + queryBusiness({btmName: this.nodeRow.attributes.name,boFlag:true,btmType:'btm'}).then(res => { + if (res.data.code === 200) { + if(res.data.obj.tableHeader){ + this.btmObjOption.column=[]; + res.data.obj.tableHeader.forEach((item,i)=>{ + this.btmObjOption.column.push({ + label: item, + prop: i, + overHidden: true, + width:(this.stringLength(item) *8+30)+'px', + }) + }) + } + this.btmObjData = res.data.obj.tableValues; + } + }) + this.btmObjVisible=true; + }, + btmObjClickHandler(row){ + this.form.objectoid=row[0]; + this.getAuthResultData() + this.btmObjVisible=false; + } } } </script> @@ -314,5 +507,9 @@ overflow: auto !important; } } - +fieldset { + padding: 10px 6px; + margin: 0; + border: 1px solid #EBEEF5; +} </style> -- Gitblit v1.9.3