Начало Каталог Помощ
Регистрация Вход
tmzn
/
jinzaifoodadmin
1
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

feat UI整体修改

wzh преди 6 месеца
родител
9241e9455e
ревизия
1c8b4bc10b
променени са 12 файла, в които са добавени 188 реда и са изтрити 78 реда
Обединен изглед Покажи статистика за разликите
  1. 20 0
      src/main/webapp/css/new/jinzai.css
  2. 23 25
      src/main/webapp/css/style.css
  3. BIN
      src/main/webapp/img/login/denglu.png
  4. BIN
      src/main/webapp/img/login/pwd.png
  5. BIN
      src/main/webapp/img/login/slogan.png
  6. BIN
      src/main/webapp/img/login/yanzheng.png
  7. BIN
      src/main/webapp/img/login_bg_01.png
  8. BIN
      src/main/webapp/img/logojinzai.png
  9. 2 5
      src/main/webapp/js/login/login.js
  10. 9 1
      src/main/webapp/page/jinzai/t_jz_product.jsp
  11. 105 12
      src/main/webapp/page/login.jsp
  12. 29 35
      src/main/webapp/page/menu.jsp

+ 20 - 0
src/main/webapp/css/new/jinzai.css
Целия файл 

@@ -0,0 +1,20 @@
 
+.jinzai_head {
 
+	height: 60px;
 
+	background: rgb(228, 98, 0);
 
+	width: 100%;
 
+	position:relative;
 
+	line-height:60px;
 
+	display: flex;
 
+	flex-direction:column
 
+}
 
+.jinzai_head_img {
 
+	margin-left:10px
 
+}
 
+
 
+.jinzai_head_user{
 
+	position: absolute;
 
+	right:10px;
 
+}
 
+.dropdown-menu li{
 
+	height:25px;
 
+}

+ 23 - 25
src/main/webapp/css/style.css
Целия файл 

@@ -50,8 +50,7 @@ a:focus {
 
 }
 
 }
 
 
 
 .nav > li > a {
 
 .nav > li > a {
 
-    color: #a7b1c2;
 
-    font-weight: 600;
 
+    color: black;
 
     padding: 14px 20px 14px 25px;
 
     padding: 14px 20px 14px 25px;
 
 }
 
 }
 
 
 
@@ -65,13 +64,12 @@ a:focus {
 
 }
 
 }
 
 
 
 .nav > li.active > a {
 
 .nav > li.active > a {
 
-    color: #ffffff;
 
 }
 
 }
 
 
 
 .navbar-default .nav > li > a:hover,
 
 .navbar-default .nav > li > a:hover,
 
 .navbar-default .nav > li > a:focus {
 
 .navbar-default .nav > li > a:focus {
 
-    background-color: #293846;
 
-    color: white;
 
+    background-color: rgb(250,238,229);
 
+    color: rgb(222,87,0);
 
 }
 
 }
 
 
 
 .nav .open > a,
 
 .nav .open > a,
 
@@ -211,8 +209,6 @@ body.body-small .navbar-top-links li:last-child {
 
 }
 
 }
 
 
 
 .nav > li.active {
 
 .nav > li.active {
 
-    border-left: 4px solid #19aa8d;
 
-    background: #293846;
 
 }
 
 }
 
 
 
 .nav.nav-second-level > li.active {
 
 .nav.nav-second-level > li.active {
 
@@ -721,9 +717,9 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 
 }
 
 }
 
 
 
 .btn-primary {
 
 .btn-primary {
 
-    background-color: #1ab394;
 
-    border-color: #1ab394;
 
-    color: #FFFFFF;
 
+    background-color: rgb(250,238,229);
 
+    border-color: rgb(250,238,229);
 
+    color: black;
 
 }
 
 }
 
 
 
 .btn-primary:hover,
 
 .btn-primary:hover,
 
@@ -731,9 +727,9 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 
 .btn-primary:active,
 
 .btn-primary:active,
 
 .btn-primary.active,
 
 .btn-primary.active,
 
 .open .dropdown-toggle.btn-primary {
 
 .open .dropdown-toggle.btn-primary {
 
-    background-color: #18a689;
 
-    border-color: #18a689;
 
-    color: #FFFFFF;
 
+    background-color: rgb(250,238,229);
 
+    border-color: rgb(250,238,229);
 
+    color: black;
 
 }
 
 }
 
 
 
 .btn-primary:active,
 
 .btn-primary:active,
 
@@ -762,9 +758,9 @@ fieldset[disabled] .btn-primary.active {
 
 }
 
 }
 
 
 
 .btn-success {
 
 .btn-success {
 
-    background-color: #1c84c6;
 
-    border-color: #1c84c6;
 
-    color: #FFFFFF;
 
+    background-color: #F76B1B;
 
+    border-color:  #F76B1B;
 
+    color: white;
 
 }
 
 }
 
 
 
 .btn-success:hover,
 
 .btn-success:hover,
 
@@ -772,9 +768,9 @@ fieldset[disabled] .btn-primary.active {
 
 .btn-success:active,
 
 .btn-success:active,
 
 .btn-success.active,
 
 .btn-success.active,
 
 .open .dropdown-toggle.btn-success {
 
 .open .dropdown-toggle.btn-success {
 
-    background-color: #1a7bb9;
 
-    border-color: #1a7bb9;
 
-    color: #FFFFFF;
 
+    background-color: #F76B1B;
 
+    border-color:  #F76B1B;
 
+    color: white;
 
 }
 
 }
 
 
 
 .btn-success:active,
 
 .btn-success:active,
 
@@ -7183,11 +7179,11 @@ body.rtls.top-navigation .footer.fixed {
 
 }
 
 }
 
 
 
 .content-tabs {
 
 .content-tabs {
 
-    border-bottom: solid 2px #2f4050;
 
 }
 
 }
 
 
 
 .page-tabs a {
 
 .page-tabs a {
 
     color: #999;
 
     color: #999;
 
+    height:40px
 
 }
 
 }
 
 
 
 .page-tabs a i {
 
 .page-tabs a i {
 
@@ -7195,15 +7191,17 @@ body.rtls.top-navigation .footer.fixed {
 
 }
 
 }
 
 
 
 .page-tabs a.active {
 
 .page-tabs a.active {
 
-    background: #2f4050;
 
-    color: #a7b1c2;
 
+    background: rgb(250,238,229);
 
+    color: rgb(222,87,0);
 
+    border-bottom:3px solid rgb(222,87,0)
 
 }
 
 }
 
+    
 
 
 .page-tabs a.active:hover,
 
 .page-tabs a.active:hover,
 
 .page-tabs a.active i:hover {
 
 .page-tabs a.active i:hover {
 
-    background: #293846;
 
-    color: #fff;
 
-}
 
+ background: rgb(250,238,229);
 
+    color: rgb(222,87,0);
 
+	}
 
 
 
 
 
 /*
 
 /*

BIN
src/main/webapp/img/login/denglu.png
Целия файл


BIN
src/main/webapp/img/login/pwd.png
Целия файл


BIN
src/main/webapp/img/login/slogan.png
Целия файл


BIN
src/main/webapp/img/login/yanzheng.png
Целия файл


BIN
src/main/webapp/img/login_bg_01.png
Целия файл


BIN
src/main/webapp/img/logojinzai.png
Целия файл


+ 2 - 5
src/main/webapp/js/login/login.js
Целия файл 

@@ -9,11 +9,8 @@ $(function(){
 
 			password : {
 
 			password : {
 
 				required : true,
 
 				required : true,
 
 				minlength : 2
 
 				minlength : 2
 
-			},
 
-			captcha:{
 
-				required : true,
 
-				minlength : 4
 
-			},
 
+			}
 
+			
 		},
 
 		},
 
 		messages : {
 
 		messages : {
 
 			username : {
 
 			username : {

+ 9 - 1
src/main/webapp/page/jinzai/t_jz_product.jsp
Целия файл 

@@ -74,7 +74,15 @@ var dataFormat = [
 
                          edit:true,
 
                          edit:true,
 
                          show:false
 
                          show:false
 
   					
   					
-                      }
 
+                      } ,
 
+                      {
 
+                          field:"line_on",
 
+                          title:"是否工控机显示",
 
+                          dataType:"string",
 
+                          edit:true,
 
+                          show:false
 
+   					
+                       }
 
                     
                     
                    
                    
             ];
 
             ];

+ 105 - 12
src/main/webapp/page/login.jsp
Целия файл 

@@ -4,8 +4,9 @@
 
 <%
 
 <%
 
 	String message = (String) request.getParameter("message");
 
 	String message = (String) request.getParameter("message");
 
 %>
 
 %>
 
-
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
+<c:set value="<%=request.getContextPath()%>" var="ctx"></c:set>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 
@@ -25,22 +26,99 @@
 
     <!--[if lt IE 9]>
 
     <!--[if lt IE 9]>
 
     <meta http-equiv="refresh" content="0;ie.html" />
 
     <meta http-equiv="refresh" content="0;ie.html" />
 
     <![endif]-->
 
     <![endif]-->
 
+    
+    <style>
 
+    
+    
+    	.gray-bg{
 
+    	  background-image: url('/img/login_bg_01.png');
 
+		  background-repeat: no-repeat;         /* 在水平和垂直方向都重复 */
 
+		  background-size: auto;          
+    	}
 
+    .input-group {
 
+  display: flex;
 
+  align-items: center;
 
+  border: 1px solid #ccc;
 
+  border-radius: 4px;
 
+  padding: 6px 10px;
 
+  margin-bottom: 10px;
 
+  width: 350px;
 
+}
 
+
 
+.input-group img {
 
+  width: 20px;
 
+  height: 20px;
 
+  margin-right: 8px;
 
+}
 
+
 
+.input-group input {
 
+  border: none;
 
+  outline: none;
 
+  font-size: 14px;
 
+  flex: 1;
 
+}
 
+.captcha-group {
 
+  display: flex;
 
+  align-items: center;
 
+  border: 1px solid #ccc;
 
+  border-radius: 4px;
 
+  padding: 6px 10px;
 
+  width: 350px;
 
+}
 
+
 
+.captcha-group img.icon {
 
+  width: 20px;
 
+  height: 20px;
 
+  margin-right: 8px;
 
+}
 
+
 
+.captcha-group input {
 
+  flex: 1;
 
+  border: none;
 
+  outline: none;
 
+  font-size: 14px;
 
+}
 
+
 
+.captcha-group img.captcha {
 
+  width: 80px;
 
+  height: 32px;
 
+  margin-left: 10px;
 
+  cursor: pointer;
 
+  border: 1px solid #ddd;
 
+}
 
+    </style>
 
+    
+    
+    
 </head>
 
 </head>
 
 
 
-<body class="gray-bg">
 
-    <div class="middle-box  loginscreen  animated fadeInDown" style="background-color: #fff;padding: 0 60px 20px; width: auto; ">
 
-        <div class="">
 
-            <div class="text-center">
 
-                <h1><img src="${ctx }/img/logo.png" width="70%" /></h1>
 
+<body class="gray-bg" >
 
+    <div style="background: rgba(238,67,2,0.50);height:60px;width:100%;line-height: 60px;">
 
+       <div class="jinzai_head_img" style="position: relative;left:10%">
 
+    	<img src="${ctx }/img/logojinzai.png"/>
 
+    </div>
 
+    </div>
 
+    <div style="position: absolute;top:40%;left:5%">
 
+    <img src="${ctx }/img/login/slogan.png"/>
 
+    </div>
 
+    <div class="middle-box  loginscreen  animated fadeInDown" style="max-width:none;widht:470px;background-color: #fff;padding: 0 60px 20px; width: auto; height:400px;   position: absolute;
 
+    right: 10%;
 
+    top: 30%;
 
+    border-radius: 14px; ">
 
+        <div style="padding-top:30px">
 
+            <div class="text-center" style="color:#EA5703;">
 
             
             
-            <h3>劲仔智能物码平台</h3>
 
+            <h3 style="font-size:28px;margin-bottom: 18px;">欢迎登录防窜货系统</h3>
 
             </div>
 
             </div>
 
             <form action="${ctx}/login"
 
             <form action="${ctx}/login"
 
 				method="post" id="portalLoginForm" name="portalLoginForm">
 
 				method="post" id="portalLoginForm" name="portalLoginForm">
 
                 <div class="form-group">
 
                 <div class="form-group">
 
                      <div class="row">
 
                      <div class="row">
 
                         <div class="col-sm-12 control-label">
 
                         <div class="col-sm-12 control-label">
 
-                            <input type="text" class="form-control" placeholder="用户名" name="adminView.username" id="username">
 
+                        <div class="input-group">
 
+  <img src="/img/login/denglu.png" alt="用户名">
 
+                            <input type="text" class="form-control" placeholder="请输入账号" name="adminView.username" id="username">
 
+</div>
 
                             <!-- <span class="help-block m-b-none">请输入您注册时所填的E-mail</span> -->
 
                             <!-- <span class="help-block m-b-none">请输入您注册时所填的E-mail</span> -->
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
@@ -48,7 +126,11 @@
 
                 <div class="form-group">
 
                 <div class="form-group">
 
                     <div class="row"><!--提交错误或未填写：has-error-->
 
                     <div class="row"><!--提交错误或未填写：has-error-->
 
                         <div class="col-sm-12 control-label">
 
                         <div class="col-sm-12 control-label">
 
-                            <input type="password" class="form-control" placeholder="密码" name="adminView.password" id="password">
 
+                         <div class="input-group">
 
+  <img src="/img/login/pwd.png" alt="用户名">
 
+  
+                            <input type="password" class="form-control" placeholder="请输入密码" name="adminView.password" id="password">
 
+</div>
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
                 </div>
 
                 </div>
 
@@ -56,14 +138,21 @@
 
                 <div class="form-group">
 
                 <div class="form-group">
 
                     <div class="row">
 
                     <div class="row">
 
                         <div class="col-sm-6 control-label">
 
                         <div class="col-sm-6 control-label">
 
-                            <input type="text" class="form-control" name="captcha" placeholder="验证码">
 
+                        <div class="captcha-group">
 
+  <img src="/img/login/yanzheng.png" src="icon-captcha.png" alt="用户名">
 
+  
+                            <input type="text" class="form-control" name="captcha" placeholder="请输入验证码">
 
+                             <img src="${ctx}/AuthImage"  class="captcha" width="100%" height="44px" />
 
+</div>
 
                         </div>
 
                         </div>
 
                         <div class="col-sm-6 control-label">
 
                         <div class="col-sm-6 control-label">
 
-                            <img src="${ctx}/AuthImage" width="100%" height="34px" />
 
+                           
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
                 </div>
 
                 </div>
 
-                <button onclick="loginOnClick();return false;" class="btn btn-primary block full-width m-b">登 录</button> 
+                <button onclick="loginOnClick();return false;" style="    margin-top: 40px;
 
+    height: 50px;
 
+                " class="btn btn-success block full-width m-b">登 录</button> 
 			<c:if test="${message != null}" >
 
 			<c:if test="${message != null}" >
 
 				<div id="msgDiv">
 
 				<div id="msgDiv">
 
 					<label id="errMsg" style="color: red">${message}</label>
 
 					<label id="errMsg" style="color: red">${message}</label>
 
@@ -71,6 +160,10 @@
 
 				</c:if>
 
 				</c:if>
 
             </form>
 
             </form>
 
         </div>
 
         </div>
 
+    </div>
 
+    
+    <div style="background: rgba(238,67,2,0.60);position: absolute;bottom:0px;height:60px;line-height: 60px;color:white;width:100%;text-align: center">
 
+    版权所有 劲仔食品集团股份有限公司
 
     </div>
 
     </div>
 
         <!-- 全局js -->
 
         <!-- 全局js -->
 
     <script src="${ctx}/js/jquery.min.js?v=2.1.4"></script>
 
     <script src="${ctx}/js/jquery.min.js?v=2.1.4"></script>

+ 29 - 35
src/main/webapp/page/menu.jsp
Целия файл 

@@ -21,35 +21,44 @@
 
     <link href="${ctx}/css/style.css?v=4.1.0" rel="stylesheet">
 
     <link href="${ctx}/css/style.css?v=4.1.0" rel="stylesheet">
 
     <link href="${ctx}/css/plugins/sweetalert/sweetalert.css"
 
     <link href="${ctx}/css/plugins/sweetalert/sweetalert.css"
 
 	rel="stylesheet">
 
 	rel="stylesheet">
 
+	
+	    <link href="${ctx}/css/new/jinzai.css"
 
+	rel="stylesheet">
 
+	
+	
 </head>
 
 </head>
 
 
 
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
 
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
 
-    <div id="wrapper">
 
-        <!--左侧导航开始-->
 
-        <nav class="navbar-default navbar-static-side" role="navigation">
 
-            <div class="nav-close"><i class="fa fa-times-circle"></i>
 
-            </div>
 
-            <div class="sidebar-collapse">
 
-                <ul class="nav" id="side-menu">
 
-                    <li class="nav-header">
 
-                        <div class="dropdown profile-element text-center">
 
-                            <a data-toggle="dropdown" class="dropdown-toggle" href="#">
 
+
 
+
 
+    <div id="wrapper" style="background: rgb(216,98,0)">
 
+    <div class="jinzai_head">
 
+    <div class="jinzai_head_img">
 
+    	<img src="${ctx }/img/logojinzai.png"/>
 
+    </div>
 
+    <div class="jinzai_head_user">
 
+     <a data-toggle="dropdown" class="dropdown-toggle" href="#">
 
                                 <span class="clear">
 
                                 <span class="clear">
 
                                 <span><img alt="image" class="" src="${ctx }/img/logo.png" width="50px"></span>
 
                                 <span><img alt="image" class="" src="${ctx }/img/logo.png" width="50px"></span>
 
-                               <span class="block m-t-xs"><strong class="font-bold">劲仔食品</strong></span>
 
-                                <span class="text-muted text-xs block">${adminView.username }<b class="caret"></b></span>
 
+                                <span style="color:white" class="text-muted text-xs">${adminView.username }<b class="caret"></b></span>
 
                                 </span>
 
                                 </span>
 
                             </a>
 
                             </a>
 
-                            <ul class="dropdown-menu animated fadeInRight m-t-xs">
 
-                                <li><a class="J_menuItem" id="modify_password">修改密码</a>
 
+                            <ul style="z-index: 88888;background: rgb(250,240,240)" class="dropdown-menu animated fadeInRight m-t-xs">
 
+                                <li ><a class="J_menuItem" id="modify_password">修改密码</a>
 
                                 </li>
 
                                 </li>
 
                                 <li class="divider"></li>
 
                                 <li class="divider"></li>
 
                                 <li><a href="${ctx}/login">安全退出</a>
 
                                 <li><a href="${ctx}/login">安全退出</a>
 
                                 </li>
 
                                 </li>
 
                             </ul>
 
                             </ul>
 
-                        </div>
 
-                        <div class="logo-element">劲仔食品</div>
 
-                    </li>
 
+                        
+    </div>
 
+</div>
 
+        <!--左侧导航开始-->
 
+        <nav class="navbar-default navbar-static-side" role="navigation" style="background: white;color:black;border-top-left-radius: 10px;">
 
+            <div class="nav-close"><i class="fa fa-times-circle"></i>
 
+            </div>
 
+            <div class="sidebar-collapse">
 
+                <ul class="nav" id="side-menu">
 
                      <!-- 动态菜单 开始 -->
 
                      <!-- 动态菜单 开始 -->
 
                     ${menus}
 
                     ${menus}
 
                     <!-- 动态菜单 结束 -->
 
                     <!-- 动态菜单 结束 -->
 
@@ -59,24 +68,13 @@
 
         <!--左侧导航结束-->
 
         <!--左侧导航结束-->
 
         <!--右侧部分开始-->
 
         <!--右侧部分开始-->
 
         <div id="page-wrapper" class="gray-bg dashbard-1">
 
         <div id="page-wrapper" class="gray-bg dashbard-1">
 
-            <div class="row border-bottom">
 
-                <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
 
-                    <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
 
-                    </div>
 
-                  
-                </nav>
 
-            </div>
 
             <div class="row content-tabs">
 
             <div class="row content-tabs">
 
-                <button class="roll-nav roll-left J_tabLeft"><i class="fa fa-backward"></i>
 
-                </button>
 
-                <nav class="page-tabs J_menuTabs">
 
+                <nav class="page-tabs J_menuTabs" style="margin-left:0px">
 
                     <div class="page-tabs-content">
 
                     <div class="page-tabs-content">
 
 <%--                         <a href="javascript:;" class="active J_menuTab" data-id="${ctx}/index/mainPage">首页</a> --%>
 
 <%--                         <a href="javascript:;" class="active J_menuTab" data-id="${ctx}/index/mainPage">首页</a> --%>
 
                     </div>
 
                     </div>
 
                 </nav>
 
                 </nav>
 
-                <button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i>
 
-                </button>
 
-                <div class="btn-group roll-nav roll-right">
 
+           <%--      <div class="btn-group roll-nav roll-right">
 
                     <button class="dropdown J_tabClose" data-toggle="dropdown">关闭操作<span class="caret"></span>
 
                     <button class="dropdown J_tabClose" data-toggle="dropdown">关闭操作<span class="caret"></span>
 
                     </button>
 
                     </button>
 
                     <ul role="menu" class="dropdown-menu dropdown-menu-right">
 
                     <ul role="menu" class="dropdown-menu dropdown-menu-right">
 
@@ -87,16 +85,12 @@
 
                         </li>
 
                         </li>
 
                     </ul>
 
                     </ul>
 
                 </div>
 
                 </div>
 
-                <a href="${ctx}/login" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a>
 
+                <a href="${ctx}/login" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a> --%>
 
             </div>
 
             </div>
 
 
 
             <div class="row J_mainContent" id="content-main">
 
             <div class="row J_mainContent" id="content-main">
 
                 <iframe class="J_iframe" name="iframe0" width="100%" height="100%" frameborder="0" seamless></iframe>
 
                 <iframe class="J_iframe" name="iframe0" width="100%" height="100%" frameborder="0" seamless></iframe>
 
             </div>
 
             </div>
 
-            <div class="footer">
 
-                <div class="pull-right">Copyright 2024 劲仔食品
 
-                </div>
 
-            </div>
 
         </div>
 
         </div>
 
         <!--右侧部分结束-->
 
         <!--右侧部分结束-->
 
         <!--右侧边栏开始-->
 
         <!--右侧边栏开始-->