From 1eeae82f74cbb3469ad8931e45b6fc77a945b912 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 十月 2023 16:10:08 +0800
Subject: [PATCH] 姑苏实验室去除价格确认过程
---
src/main/webapp/index.xhtml | 110 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 28befa8..22e051a 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -13,20 +13,24 @@
<head></head>
<ui:composition template="layouts/default.xhtml">
<ui:define name="title">智慧实验室试剂全过程安全管理系统</ui:define>
+<!-- <ui:define name="title">智能安全危险化学品全生命周期管控系统</ui:define>-->
<ui:define name="north">
<h:form id="northForm">
<p:panelGrid styleClass="header">
<p:row>
<p:column styleClass="header-logo">
- <p:graphicImage value="/resources/images/logo.png"></p:graphicImage>
+ <p:graphicImage value="#{loginController.logo}" style="width: 80px;height: 80px"></p:graphicImage>
</p:column>
<p:column styleClass="header-title">
- <p:outputLabel value="${institute.name}"></p:outputLabel>
+ <p:outputLabel value="#{loginController.title}"></p:outputLabel>
+<!-- <p:outputLabel value="中国科学院苏州纳米技术与纳米仿生研究所"></p:outputLabel>-->
<br/>
<p:outputLabel value="智慧实验室试剂全过程安全管理系统" style="color: #ffd74a"></p:outputLabel>
+<!-- <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 +40,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>
+ <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="请输入原密码" autocomplete="off"></p:password>
- <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="请输入新密码" autocomplete="off"></p:password>
- <p:outputLabel value="新密码"></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}"
+ required="true" requiredMessage="请输入确认密码" autocomplete="off"></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>
+ <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="请输入原密码" autocomplete="off"></p:password>
+
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
+ <p:password value="#{userMngController.newPassword}" maxlength="100"
+ required="true" requiredMessage="请输入新密码" autocomplete="off"></p:password>
+
+ <p:outputLabel value="确认密码"></p:outputLabel>
+ <p:password value="#{userMngController.newPasswordSecond}" maxlength="100"
+ required="true" requiredMessage="请输入确认密码" autocomplete="off"></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">
@@ -75,12 +110,17 @@
<p:submenu label="#{menu.title}" rendered="#{menuController.isDispRootMenu(menu)}"
style="border: none"
styleClass="#{menu.icon}">
+
<c:forEach items="#{menu.subMenu}" var="subMenu">
- <p:menuitem value="#{subMenu.title}"
- actionListener="#{menuController.goToPage(subMenu)}"
- update=":centerRootPanel,@form"
- containerStyleClass="#{menuController.currentPage==subMenu.page?'menu-item-selected':''}"
- rendered="#{menuController.isPermitted(subMenu.privilegeCode)}"></p:menuitem>
+ <c:if test="#{menuController.activeEnv ne 'gslab' or subMenu.id ne 'price_mng'}" >
+ <p:menuitem value="#{subMenu.title}"
+ actionListener="#{menuController.goToPage(subMenu)}"
+ update=":centerRootPanel,@form"
+ containerStyleClass="#{menuController.currentPage==subMenu.page?'menu-item-selected':''}"
+ rendered="#{menuController.isPermitted(subMenu.privilegeCode)}">
+ </p:menuitem>
+ </c:if>
+
</c:forEach>
</p:submenu>
</p:panelMenu>
@@ -95,6 +135,10 @@
</c:if>
</c:forEach>
</c:if>
+ <!-- 添加系统链接 -->
+
+
+
</p:panelGrid>
</h:form>
</ui:define>
@@ -107,13 +151,7 @@
</ui:define>
<ui:define name="south">
- Copyright © 2017 ${institute.name}
- <!--<p:commandLink id="nonAjax" src="http:beian.miit.gov.cn/" ajax="false">
- <h:outputText value="苏ICP备13012319号-1" />
- </p:commandLink>-->
- <a href="http://beian.miit.gov.cn">苏ICP备10220403号-6</a>
+ <a style="text-align: center;display: block" href="http://beian.miit.gov.cn" target="_Blank">Copyright©2017 中国科学院苏州纳米技术与纳米仿生研究所 苏ICP备10220403号-6</a>
</ui:define>
-
-
</ui:composition>
</html>
--
Gitblit v1.9.2