From 9f0a2abe27085bd8c7edf8a43a24f375f17fc43c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 14:11:48 +0800
Subject: [PATCH] 模块：api接口 新增：根据7位货柜条码获取所属课题下的所有人员否则部门寻找 提出：秦老师
---
src/main/webapp/index.xhtml | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 28befa8..406de33 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -27,6 +27,7 @@
<p:outputLabel value="智慧实验室试剂全过程安全管理系统" style="color: #ffd74a"></p:outputLabel>
</p:column>
<p:column styleClass="header-personal">
+ <h:inputHidden id="ischange" value="#{loginController.ischange}"></h:inputHidden>
<p:commandLink class="userName" style="margin-right: 30px" value="#{menuController.userName}" action="#{userMngController.updatePassword}" oncomplete="PF('dialogPassword').show();" update=":dialogPassword,:dialogFormPassword"></p:commandLink >
<p:commandLink class="logout" action="#{loginController.logout}" ajax="false"></p:commandLink>
</p:column>
@@ -36,32 +37,63 @@
<p:dialog modal="true" header="#{'修改密码'}" appendTo="@(body)"
id="dialogPassword" widgetVar="dialogPassword"
resizable="false" width="420">
- <h:form id="dialogFormPassword">
- <p:panelGrid columns="1" styleClass="content">
- <p:outputLabel value="账号"></p:outputLabel>
- <p:inputText value="#{userMngController.username}" maxlength="100"
- required="true" requiredMessage="请输入原密码"></p:inputText>
-
- <p:outputLabel value="原密码"></p:outputLabel>
- <p:password value="#{userMngController.oriPassword}" maxlength="100"
+ <h:form id="dialogFormPassword">
+ <p:panelGrid columns="1" styleClass="content">
+ <p:outputLabel value="原密码"></p:outputLabel>
+ <p:password value="#{userMngController.oriPassword}" maxlength="100"
required="true" requiredMessage="请输入原密码"></p:password>
- <p:outputLabel value="新密码"></p:outputLabel>
- <p:password value="#{userMngController.newPassword}" maxlength="100"
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
+ <p:password value="#{userMngController.newPassword}" maxlength="100"
required="true" requiredMessage="请输入新密码"></p:password>
- <p:outputLabel value="确认密码"></p:outputLabel>
+ <p:outputLabel value="确认密码"></p:outputLabel>
<p:password value="#{userMngController.newPasswordSecond}" maxlength="100"
required="true" requiredMessage="请输入确认密码"></p:password>
- </p:panelGrid>
- <p:panel styleClass="btn">
- <p:commandButton value="修改" actionListener="#{userMngController.updatePasswordAction}"
+ </p:panelGrid>
+ <p:panel styleClass="btn">
+ <p:commandButton value="修改" actionListener="#{userMngController.updatePasswordAction}"
process="@form">
- <p:confirm header="确认" message="确认操作？"></p:confirm>
- </p:commandButton>
- </p:panel>
- </h:form>
- </p:dialog>
+ <p:confirm header="确认" message="确认操作？"></p:confirm>
+ </p:commandButton>
+ </p:panel>
+ </h:form>
+ </p:dialog>
+
+ <p:dialog modal="true" header="#{'重置密码'}" appendTo="@(body)"
+ id="changePassword" widgetVar="changePassword"
+ width="420" style="left: 650px;top: 250px;"
+ closable="false">
+ <h:form id="changeFormPassword">
+ <p:panelGrid columns="1" styleClass="content">
+ <p:outputLabel value="原密码"></p:outputLabel>
+ <p:password value="#{userMngController.oriPassword}" maxlength="100"
+ required="true" requiredMessage="请输入原密码"></p:password>
+
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
+ <p:password value="#{userMngController.newPassword}" maxlength="100"
+ required="true" requiredMessage="请输入新密码"></p:password>
+
+ <p:outputLabel value="确认密码"></p:outputLabel>
+ <p:password value="#{userMngController.newPasswordSecond}" maxlength="100"
+ required="true" requiredMessage="请输入确认密码"></p:password>
+ </p:panelGrid>
+ <p:panel styleClass="btn">
+ <p:commandButton value="修改" actionListener="#{userMngController.updatePasswordAction}"
+ process="@form">
+ <p:confirm header="确认" message="确认操作？"></p:confirm>
+ </p:commandButton>
+ </p:panel>
+ </h:form>
+ </p:dialog>
+ <script>
+ // console.log($('#northForm\\:ischange').val())
+ // if($('#northForm\\:ischange').val() == 0){
+ // $("#changePassword").hide();
+ // }else {
+ // $("#changePassword").show();
+ // }
+ </script>
</ui:define>
<ui:define name="west">
--
Gitblit v1.9.2