Browse Source

城管委页面UI调整

hujie 1 year ago
parent
commit
f06f36b53e

+ 6 - 6
blue_theme/src/main/resources/dbdc_theme/20190513/css/login.css

@@ -25,7 +25,7 @@ body {
 	position: relative;
 }
 .loginbg{
-	background: url(../img/new/loginbg.png) no-repeat top center;
+	background: url(../img/new/login_bg_1.jpg) no-repeat top center;
 }
 .pagehint{
 	width: 800px;
@@ -72,7 +72,7 @@ body {
 	width: 240px;
 	height: 320px;
 	padding: 10px 40px;
-	background-color: #ffffff;
+	background-color: rgba(255,255,255,0.4);
 	border-radius: 0px 10px 10px 0px;
 	float: left;
 }
@@ -94,7 +94,7 @@ body {
 	width: 120px;
 	height: 53px;
 	line-height: 53px;
-	font-size: 18px;
+	font-size: 22px;
 	color: #4D4D4D;
 	border-bottom: solid 2px #e5e5e5;
 	text-align: center;
@@ -163,7 +163,7 @@ body {
 	line-height: 40px;
 	font-size:16px;
 	color:#333;
-	background:none;
+	background: rgba(255,255,255,1);
 	outline: none;
 	border-radius: 5px;
 	border: solid 1px #bfbfbf;
@@ -176,14 +176,14 @@ body {
 	line-height:40px;
 	text-align: center;
 	color: #ffffff;
-	background-color: #275599;
+	background-color: rgba(39, 85,153,0.6);
 	border-radius: 20px;
 	display: block;
 	border: 0px;
 	font-family: "SourceHanSansCN-Regular_0" !important;
 }
 .login-btn button:hover{
-	background-color: #0e3d83;
+	background-color: rgba(39, 85,153,0.8);
 }
 input::-webkit-input-placeholder { /* WebKit browsers */
      color:#CCCCCC;

BIN
blue_theme/src/main/resources/dbdc_theme/20190513/img/new/login_bg_1.jpg


BIN
blue_theme/src/main/resources/dbdc_theme/20190513/img/new/login_logo_1.png


+ 9 - 18
cn.com.taiji.myapp/src/main/java/cn/com/taiji/commAll/HomeController.java

@@ -1,8 +1,6 @@
 package cn.com.taiji.commAll;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.security.Principal;
@@ -37,26 +35,23 @@ public class HomeController {
  */
 	@RequestMapping(value = "/image", method = RequestMethod.GET)
 	public String image(HttpServletRequest request, HttpServletResponse response) {
+
 		response.setHeader("Pragma","No-cache");
 		response.setHeader("Cache-Control","no-cache");
 		response.setDateHeader("Expires",0);
-		BufferedImage img = new BufferedImage(68, 22,  
-
-				BufferedImage.TYPE_INT_RGB);  
+		BufferedImage img = new BufferedImage(68, 22, BufferedImage.TYPE_INT_ARGB);
 
-		// 得到该图片的绘图对象    
-
-		Graphics g = img.getGraphics();  
+		// 得到该图片的绘图对象
+		Graphics2D g = img.createGraphics();
 
 		Random r = new Random();  
 
-		Color c = new Color(200, 150, 255);  
-
-		g.setColor(c);  
+		Color c = new Color(0, 0, 0, 0);
+		g.setColor(c);
 
 		// 填充整个图片的颜色    
 
-		g.fillRect(0, 0, 68, 22);  
+		g.fillRect(0, 0, 68, 22);
 
 		// 向图片中输出数字和字母    
 
@@ -80,16 +75,12 @@ public class HomeController {
 		request.getSession().setAttribute("j_captcha", sb.toString());  
 
 		try {
-		    
-		    
-		   
 		    response.setHeader("content-type","image/jpeg");
 		    response.setContentType("image/jpeg");
 		    response.setHeader("Param","no-cache");
 		    response.setHeader("Cache-Control", "no-cache");
 		    response.setIntHeader("Expries",-1);
-		    
-			ImageIO.write(img, "JPEG", response.getOutputStream());
+			ImageIO.write(img, "PNG", response.getOutputStream());
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

+ 2 - 2
cn.com.taiji.myapp/src/main/resources/application.properties

@@ -3,14 +3,14 @@ spring.thymeleaf.cache=false
 #spring.datasource.url=jdbc:mysql://200.1.54.238:13306/zyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username=cgw
 #spring.datasource.password=Cgw!1@2#3$4
-spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=umisoft.cn
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 #spring.datasource2.url=jdbc:mysql://200.1.54.238:13306/zyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource2.username=cgw
 #spring.datasource2.password=Cgw!1@2#3$4
-spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource2.username=root
 spring.datasource2.password=umisoft.cn
 spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver

+ 9 - 9
cn.com.taiji.myapp/src/main/resources/templates/login.html

@@ -11,9 +11,9 @@
 	</head>
 
 	<body  id="lgbox" style="display:none;">		
-		<div class="lg-box" >
-			<div class="lg-img">
-				<img th:src="@{/dbdc_theme/20190513/img/new/loginlogo.png}"/>
+		<div class="lg-box" >
+			<div class="lg-img" style="background-color: rgba(255,255,255,0.3)">
+				<img th:src="@{/dbdc_theme/20190513/img/new/login_logo_1.png}" style="margin: 0 0 0 90px;"/>
 			</div>
 			<div class="lg-login">
 					<div class="slideTxtBox">
@@ -25,7 +25,7 @@
 						<form name="mainform" id="mainform" th:action="@{/login}" method="post">
 						<div class="bd">
 							
-							<div class="pd-t3">
+							<div class="pd-t3">
 								<div class="user mg-b4"> 
 			                    	<span></span>
 			                        <input type="text" value="" name="username" id="username" autocomplete="off"  placeholder="请输入用户名"/>
@@ -35,20 +35,20 @@
 				                        <input type="password" value="" id="password" name="password" autocomplete="off" placeholder="请输入密码"/>
 				                </div>
 				                <div class="verification"> 
-			                    	<div class="yzm">
-			                    		  <a href="javascript:refreshImg();" class="fn-right mr-25"><img id="imageF" th:src="@{/image}"/></a>
+			                    	<div class="yzm">
+			                    		  <a href="javascript:refreshImg();" class="fn-right mr-25"><img id="imageF" th:src="@{/image}"/></a>
 			                    	</div>
 			                        <input type="text" value="" name="j_captcha" id="j_captcha" placeholder="请输入验证码" />
 				                </div>
 				                 <div class="login-btn mg-t4 fn-clear">
 									<button type="button" onclick="javascript:denglu();">登 录</button>
 				                </div>
-				                <div th:if="${session.SPRING_SECURITY_LAST_EXCEPTION!=null}" style="color:red" th:text="${session.SPRING_SECURITY_LAST_EXCEPTION.message}">您输入的用户名或密码有误,请重新输入。</div>
+				                <div th:if="${session.SPRING_SECURITY_LAST_EXCEPTION!=null}" style="color:red" th:text="${session.SPRING_SECURITY_LAST_EXCEPTION.message}">您输入的用户名或密码有误,请重新输入。</div>
 							</div>
 						</div>
 						</form>
-					</div>
-			</div>
+					</div>
+			</div>
 		</div>
 		
 		

+ 16 - 12
cn.com.taiji.myapp/src/main/resources/templates/sys/new_index.html

@@ -55,16 +55,16 @@
               <i class="layui-icon layui-icon-theme"></i>
             </a>
           </li>
-          <li class="layui-nav-item layui-hide-xs" lay-unselect="">
-            <a href="javascript:;" layadmin-event="note" title="便签">
-              <i class="layui-icon layui-icon-note" ></i>
-            </a>
-          </li>
-          <li class="layui-nav-item layui-hide-xs" lay-unselect="">
-            <a href="javascript:;" layadmin-event="fullscreen" title="全屏">
-              <i class="layui-icon layui-icon-screen-full" ></i>
-            </a>
-          </li>
+<!--          <li class="layui-nav-item layui-hide-xs" lay-unselect="">-->
+<!--            <a href="javascript:;" layadmin-event="note" title="便签">-->
+<!--              <i class="layui-icon layui-icon-note" ></i>-->
+<!--            </a>-->
+<!--          </li>-->
+<!--          <li class="layui-nav-item layui-hide-xs" lay-unselect="">-->
+<!--            <a href="javascript:;" layadmin-event="fullscreen" title="全屏">-->
+<!--              <i class="layui-icon layui-icon-screen-full" ></i>-->
+<!--            </a>-->
+<!--          </li>-->
           <li class="layui-nav-item" lay-unselect="">
             <a href="javascript:;">
               <cite th:text="${username}"></cite>
@@ -89,7 +89,7 @@
       <div class="layui-side layui-side-menu ">
         <div class="layui-side-scroll">
           <div class="layui-logo" >
-            <span>信息资源目录系统</span>
+<!--            <span>信息资源目录系统</span>-->
           </div>
           
           <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
@@ -179,7 +179,11 @@
 	 var temp=menulist[i];
 	 var urlstr="";
 	 if(temp.url!=""){
-		 urlstr="lay-href=\""+temp.url+"\""; 
+         if (temp.url.startsWith("http")) {
+           urlstr="target=\"_blank\" href=\""+temp.url+"\"";
+         } else {
+           urlstr="lay-href=\""+temp.url+"\"";
+         }
 	 }
 	 else{
 		 urlstr="href=\"javascript:;\"";