From db523e0fdf7801cdc01f10886f2c9aec04e711bb Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 25 二月 2021 11:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/role_mng.xhtml | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/role_mng.xhtml b/src/main/webapp/role_mng.xhtml
index eca8c77..2856202 100644
--- a/src/main/webapp/role_mng.xhtml
+++ b/src/main/webapp/role_mng.xhtml
@@ -16,7 +16,7 @@
<p:outputLabel styleClass="title" value="角色管理"></p:outputLabel>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn">
+ <p:panelGrid columns="5" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
process="@this"
actionListener="#{roleMngController.onNewBtnClick}"
@@ -32,6 +32,16 @@
update="@form">
<p:confirm header="确认" message="确认操作？"></p:confirm>
</p:commandButton>
+
+ <p:commandButton value="按钮权限" styleClass="edit-btn"
+ process="@form"
+ actionListener="#{roleMngController.btnPermissionClick}"
+ update=":btnDialog,:btnDialogForm"/>
+
+ <p:commandButton value="人员权限" styleClass="edit-btn"
+ process="@form"
+ actionListener="#{roleMngController.userPermissionClick}"
+ update=":userDialog,:userDialogForm"/>
</p:panelGrid>
<p:dataTable id="roleMngDataTable" styleClass="data-table"
@@ -75,5 +85,54 @@
</p:panel>
</h:form>
</p:dialog>
+
+ <p:dialog modal="true" header="修改" appendTo="@(body)"
+ id="btnDialog" widgetVar="btnDialog" resizable="false" width="420">
+ <h:form id="btnDialogForm">
+ <p:panelGrid columns="1" styleClass="content">
+ <p:outputLabel value="角色名称"/>
+ <p:inputText value="#{roleMngController.baseRole.name}" readonly="true"/>
+
+ <p:outputLabel value="人员管理页面："/>
+
+ <p:selectManyCheckbox value="#{roleMngController.baseRole.btnPermissions}" layout="grid" columns="2" style="width: 100%;">
+ <f:selectItem itemLabel="新增功能" itemValue="新增"/>
+ <f:selectItem itemLabel="修改功能" itemValue="修改"/>
+ <f:selectItem itemLabel="删除功能" itemValue="删除"/>
+ <f:selectItem itemLabel="导入功能" itemValue="导入"/>
+ </p:selectManyCheckbox>
+ </p:panelGrid>
+ <p:panel styleClass="btn">
+ <p:commandButton value="保存" actionListener="#{roleMngController.onSaveBtnPermission}"
+ process="@form" update=":roleMngForm:roleMngDataTable">
+ <p:confirm header="确认" message="确认操作？"/>
+ </p:commandButton>
+ </p:panel>
+ </h:form>
+ </p:dialog>
+
+ <p:dialog modal="true" header="修改" appendTo="@(body)"
+ id="userDialog" widgetVar="userDialog" resizable="false" width="420">
+ <h:form id="userDialogForm">
+ <p:panelGrid columns="1" styleClass="content">
+ <p:outputLabel value="角色名称"/>
+ <p:inputText value="#{roleMngController.baseRole.name}" readonly="true"/>
+
+ <p:outputLabel value="人员管理页面："/>
+
+ <p:selectOneRadio value="#{roleMngController.baseRole.userPermission}" layout="grid" columns="1" style="width: 100%;">
+ <f:selectItem itemLabel="可见所有人员" itemValue="所有人员"/>
+ <f:selectItem itemLabel="只可见课题组成员" itemValue="课题组"/>
+ <f:selectItem itemLabel="只可见自己" itemValue="自己"/>
+ </p:selectOneRadio>
+ </p:panelGrid>
+ <p:panel styleClass="btn">
+ <p:commandButton value="保存" actionListener="#{roleMngController.onSaveUserPermission}"
+ process="@form" update=":roleMngForm:roleMngDataTable">
+ <p:confirm header="确认" message="确认操作？"/>
+ </p:commandButton>
+ </p:panel>
+ </h:form>
+ </p:dialog>
</ui:composition>
</html>
\ No newline at end of file
--
Gitblit v1.9.2