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/index.xhtml |   88 +++++++++++++++++++++++++++++---------------
 1 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 28befa8..318a75b 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -13,20 +13,23 @@
 <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="/resources/images/${institute.name}logo.png" style="width: 80px;height: 80px"></p:graphicImage>
                     </p:column>
                     <p:column styleClass="header-title">
                         <p:outputLabel value="${institute.name}"></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 +39,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">
@@ -107,13 +141,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">${institute.copyright}</a>
     </ui:define>
-
-
 </ui:composition>
 </html>

--
Gitblit v1.9.2