Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/css/user/login.css

@@ -71,17 +71,18 @@ fieldset[disabled] .btn-primary:hover {
      background-image: url("/images/brige.png");
      background-repeat:no-repeat;
      background-position:center;
+     background-size:100% 100%;
      position: relative;
-     width: 1022px;
-     height: 485px;
+     width: 1075px;
+     height: 510px;
      margin: 0 auto;
      top:100px
 }
 .login{
     position: absolute;
-    bottom: 120px;
-    width: 260px;
-    right: 60px;
+    bottom: 26%;
+    width: 25%;
+    right: 6%;
 }
 .ll{
 

VisualInspection/js/user/login.js

@@ -1,6 +1,24 @@
 $(document).ready(function() {
     $.zui.store.set("user", "");
 
+
+   //获取屏幕高
+   var bg_height =  window.innerHeight*0.6;
+   var bg_width = bg_height*(1022/485.0);
+   $("#bg").css("height",bg_height);
+   $("#bg").css("width",bg_width);
+
+   var top = (window.innerHeight-bg_height)/2.0
+   $("#bg").css("top",top);
+   $("#bg input").css("height",window.innerHeight*.04);
+   $("#bg label").css("line-height",window.innerHeight*.04+"px");
+
+   $("#bg").css("font-size",window.innerHeight*.02);
+   $(".p").css("margin-top",window.innerHeight*.035+"px");
+
+  $(".login").css("bottom",window.innerHeight*.15+"px")
+
+
     $('html').bind('keydown', function(e) {
         if (e.keyCode == 13) {
             // alert('enter'); 
@@ -10,8 +28,6 @@ $(document).ready(function() {
     $('#loadingBtn').on('click', function() {
         var $btn = $(this);
         $btn.button('loading');
-
-
         //获取用户名
         //获取密码
         var data = {

VisualInspection/view/user/login.html

@@ -12,7 +12,7 @@
     <!--<link rel="import" href="/view/common/login_head.html?__inline">-->
 
     <div id="main" class="container-fluid main">
-        <div class="bg">
+        <div class="bg" id="bg">
             <div class="row login">
       
                     <!--<div class="form-group">
@@ -36,7 +36,7 @@
                         </div>
                     </div>
 
-                    <div class="row" style="margin-top:20px">
+                    <div class="row p" style="margin-top:13%">
                         <label for="exampleInputAccount4" class="col-md-3  ll">密&emsp;码：</label>
                         <div class="col-md-9 lll">
                             <input id="password" type="password" class="form-control" placeholder="密码">
@@ -44,7 +44,7 @@
                     </div>
 
                
-                <div class="row" style="margin-top:20px">
+                <div class="row p" style="margin-top:13%">
                     <button id="loadingBtn" type="button" class="btn btn-primary  btn-block login_btn" data-loading-text="正在登录...">登录</button>
                 </div>
             </div>
@@ -53,7 +53,7 @@
     </div>
 
 
-    <link rel="import" href="/view/common/foot.html?__inline">
+    <!--<link rel="import" href="/view/common/foot.html?__inline">-->
     <link rel="import" href="/view/common/commonscriptlink.html?__inline">
 
     <script src="/js/user/login.js"></script>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/MenuServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xintong.visualinspection.service.impl;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,6 +74,17 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 			}
 		}
 		
+		mlist.sort(new Comparator<Menu>() {
+
+			@Override
+			public int compare(Menu arg0, Menu arg1) {
+				if(arg0.getSortNo()>arg1.getSortNo()){
+					return 1;
+				}
+				return -1;
+			}
+		});
+		
 		return mlist;
 	}