From 798aa9213a565c6c5ffb411e3cef40a10f99e9d1 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 31 三月 2023 09:16:53 +0800
Subject: [PATCH] 新疆绿色智能综合研究所补充
---
src/main/webapp/user_mng.xhtml | 104 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index 71022e0..3071e72 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -15,39 +15,53 @@
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="用户管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="7">
+ <p:panelGrid styleClass="filter" columns="11">
<p:outputLabel value="ARP号："></p:outputLabel>
<p:inputText value="#{userMngController.arp}"></p:inputText>
<p:outputLabel value="姓名："></p:outputLabel>
<p:inputText value="#{userMngController.name}"></p:inputText>
+ <p:outputLabel value="课题组："></p:outputLabel>
+ <p:inputText value="#{userMngController.project}"></p:inputText>
+
<p:outputLabel value="部门："></p:outputLabel>
<p:inputText value="#{userMngController.departmentName}"></p:inputText>
+
+ <p:outputLabel value="单位："></p:outputLabel>
+ <p:inputText value="#{userMngController.company}"></p:inputText>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="5" styleClass="btn">
+ <p:panelGrid columns="6" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
- process="@this"
+ process="@form"
actionListener="#{userMngController.onNewBtnClick}"
oncomplete="PF('dialog').show();"
- update=":dialog,:dialogForm"></p:commandButton>
+ update=":dialog,:dialogForm"
+ rendered="#{userMngController.isAccess('新增')}"></p:commandButton>
<p:commandButton value="修改" styleClass="edit-btn"
process="@form"
actionListener="#{userMngController.onEditBtnClick}"
- update=":dialog,:dialogForm"></p:commandButton>
+ update=":dialog,:dialogForm"
+ rendered="#{userMngController.isAccess('修改')}"></p:commandButton>
<p:commandButton value="删除" styleClass="del-btn"
process="@form"
actionListener="#{userMngController.onDeleteBtnClick}"
- update="@form">
+ update="@form"
+ rendered="#{userMngController.isAccess('删除')}">
<p:confirm header="确认" message="确认操作？"></p:confirm>
</p:commandButton>
<p:commandButton value="导入" styleClass="import-btn" onclick="importUser()"
+ rendered="#{userMngController.isAccess('导入')}"
></p:commandButton>
- <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
+ <p:outputLabel rendered="#{userMngController.isAccess('导入')}">
+ <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
+ </p:outputLabel>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{userMngController.exportLab2Excel}"
+ />
<script>
function importUser(){
$("#userMngForm\\:importUserBtn_input").click();
@@ -69,6 +83,9 @@
white-space: normal;
word-break: break-all;
}
+ #dialogForm\:img-pic > tbody > tr > td:nth-child(2):has(img) {
+ width: 200px !important;
+ }
</style>
<p:dataTable id="userMngDataTable" styleClass="data-table"
paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
@@ -82,6 +99,10 @@
<p:column headerText="部门">
<h:outputText value="#{baseMetaService.getBaseMetaValue(row.department)}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="课题组">
+ <h:outputText value="#{row.project}"></h:outputText>
</p:column>
<p:column headerText="ARP">
@@ -124,6 +145,10 @@
<h:outputText value="#{row.seeFlag!=null?row.seeFlag.text:''}"></h:outputText>
</p:column>
+ <p:column headerText="危废人员">
+ <h:outputText value="#{row.waster!=null?row.waster.text:''}"></h:outputText>
+ </p:column>
+
<p:column headerText="更新时间">
<h:outputText value="#{row.updateTime!=null?row.updateTime:''}">
<f:convertDateTime pattern="yyyy-M-d HH:mm" /></h:outputText>
@@ -140,7 +165,8 @@
<p:dialog modal="true" header="#{userMngController.action==constants.ACTION_ADD?'新建':'修改'}" appendTo="@(body)"
id="dialog" widgetVar="dialog"
- resizable="false" width="800">
+ resizable="false" width="900">
+
<h:form id="dialogForm">
<p:panelGrid columns="4" styleClass="content2 grid-padding-bottom2">
<p:outputLabel value="单位"></p:outputLabel>
@@ -161,6 +187,13 @@
<p:inputText value="#{userMngController.sysUser.arp}" maxlength="100"
required="true" requiredMessage="请输入ARP号"></p:inputText>
+ <p:outputLabel value="课题组"></p:outputLabel>
+ <p:selectOneMenu value="#{userMngController.sysUser.project}" filter="true" filterMatchMode="startsWith">
+ <f:selectItem itemLabel="不选择课题组" />
+ <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
+ var="item" itemLabel="#{item.project}" itemValue="#{item.project}"></f:selectItems>
+ </p:selectOneMenu>
+
<p:outputLabel value="姓名"></p:outputLabel>
<p:inputText value="#{userMngController.sysUser.name}" maxlength="100"
required="true" requiredMessage="请输入姓名"></p:inputText>
@@ -168,12 +201,11 @@
<p:outputLabel value="账号"></p:outputLabel>
<p:inputText value="#{userMngController.sysUser.account}" maxlength="100"
required="true" requiredMessage="请输入账号"
- disabled="#{userMngController.action == constants.ACTION_EDIT}"></p:inputText>
+ disabled="#{userMngController.action == constants.ACTION_EDIT}" autocomplete="off"></p:inputText>
<p:outputLabel value="密码" ></p:outputLabel>
<p:password value="#{userMngController.sysUser.password}" maxlength="100"
- requiredMessage="请输入密码"
- ></p:password>
+ requiredMessage="请输入密码" autocomplete="off"></p:password>
<p:outputLabel value="电话"></p:outputLabel>
<p:inputText value="#{userMngController.sysUser.phone}" maxlength="30"></p:inputText>
@@ -214,6 +246,34 @@
<p:inputTextarea autoResize="false" style="height: 80px"
value="#{userMngController.sysUser.memo}"
maxlength="200"></p:inputTextarea>
+
+ <p:outputLabel value="危废角色"></p:outputLabel>
+ <p:selectOneMenu value="#{userMngController.sysUser.waster}"
+ required="true" requiredMessage="请选择危废角色">
+ <f:converter converterId="wasterConvert"></f:converter>
+ <f:selectItems value="#{userMngController.wasterSelectList}"
+ var="item" itemLabel="#{item.text}" itemValue="#{item}"></f:selectItems>
+ </p:selectOneMenu>
+
+ <p:outputLabel value="考试分数"/>
+ <p:inputNumber value="#{userMngController.sysUser.score}" decimalPlaces="0" minValue="0"
+ > </p:inputNumber>
+
+ <p:outputLabel />
+ <p:outputLabel />
+
+ </p:panelGrid>
+ <p:panelGrid columns="4" styleClass="content2 grid-padding-bottom2" id="img-pic">
+ <p:outputLabel value="图片"/>
+
+ <p:graphicImage rendered="#{userMngController.sysUser.url ne null and userMngController.sysUser.url ne ''}"
+ url="#{userMngController.sysUser.url}"
+ width="120"
+ height="120"/>
+
+ <p:commandButton value="点击上传"
+ oncomplete="PF('imgDialog').show();"/>
+
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="保存" actionListener="#{userMngController.onSaveBtnClick}"
@@ -223,5 +283,27 @@
</p:panel>
</h:form>
</p:dialog>
+ <p:dialog modal="true" header="图片上传" appendTo="@(body)"
+ id="imgDialog" widgetVar="imgDialog"
+ resizable="false" width="700">
+ <p:panelGrid columns="1" styleClass="content2 grid-padding-bottom2">
+ <h:form id="dialogForm2">
+ <p:fileUpload fileUploadListener="#{userMngController.handleImageUpload}"
+ mode="advanced"
+ dragDropSupport="false"
+ uploadLabel="上传"
+ cancelLabel="取消"
+ label="浏览"
+ invalidFileMessage="请上传gif、jpe、jpg、png文件"
+ multiple="false"
+ sizeLimit="10000000"
+ fileLimit="1"
+ allowTypes="/(\.|\/)(gif|jpe?g|png)$/"
+ > </p:fileUpload>
+ </h:form>
+
+ </p:panelGrid>
+
+ </p:dialog>
</ui:composition>
</html>
--
Gitblit v1.9.2