温红权 8 jaren geleden
bovenliggende
commit
431195eaf3

+ 37 - 23
VisualInspection/css/user/login.css

@@ -1,3 +1,7 @@
+html {
+    height: 100%
+}
+
 .col-md-4 {
 .col-md-4 {
     text-align: center;
     text-align: center;
 }
 }
@@ -54,7 +58,7 @@ fieldset[disabled] .btn-primary:hover {
 }
 }
 
 
 .login_btn {
 .login_btn {
-    background: #328dc7;
+    background: #4c95e1;
     color: white;
     color: white;
     border: none;
     border: none;
     font-size: 18px;
     font-size: 18px;
@@ -62,35 +66,45 @@ fieldset[disabled] .btn-primary:hover {
 }
 }
 
 
 .main {
 .main {
-    background-image: url("/images/bg.png");
+    background-image: url("/images/login/bg.png");
     filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
     filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
-    -moz-background-size: 100% 100%;
-    background-size: 100% 100%;
+    -moz-background-size: 100%;
+    background-size: 100%;
+    height: 100%;
+    background-repeat: no-repeat;
+    background-position-y: center;
+    background-color: white;
 }
 }
-.bg{
-     background-image: url("/images/brige.png");
-     background-repeat:no-repeat;
-     background-position:center;
-     background-size:100% 100%;
-     position: relative;
-     width: 1075px;
-     height: 510px;
-     margin: 0 auto;
-     top:100px
-}
-.login{
+
+.bg {
+    background: white;
+    /* background-repeat: no-repeat; */
+    /* background-position: center; */
+    /* background-size: 100% 100%; */
     position: absolute;
     position: absolute;
-    bottom: 26%;
-    width: 25%;
-    right: 6%;
+    width: 263px;
+    height: 200px;
+    top: 29%;
+    right: 11.5%;
+    border-radius: 5px;
 }
 }
-.ll{
 
 
-    padding:0px;
+.row {
+    margin-right: 0px;
+    margin-left: 0px;
+}
+
+.login {
+    width: 100%;
+    padding: 36px;
+}
+
+.ll {
+    padding: 0px;
     line-height: 32px;
     line-height: 32px;
     text-align: left;
     text-align: left;
-
 }
 }
-.lll{
+
+.lll {
     padding: 0px
     padding: 0px
 }
 }

BIN
VisualInspection/images/login/bg.png


BIN
VisualInspection/images/login/header.png


BIN
VisualInspection/images/login/logo.png


BIN
VisualInspection/images/login/title.png


+ 16 - 16
VisualInspection/js/user/login.js

@@ -2,26 +2,27 @@ $(document).ready(function() {
     $.zui.store.set("user", "");
     $.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");
+    var bg_width = window.innerWidth * 0.25;
+    var bg_height = bg_width;
+    $("#bg").css("height", bg_height);
+    $("#bg").css("width", bg_width);
 
 
-   $("#bg").css("font-size",window.innerHeight*.02);
-   $(".p").css("margin-top",window.innerHeight*.035+"px");
+    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");
 
 
-  $(".login").css("bottom",window.innerHeight*.15+"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) {
     $('html').bind('keydown', function(e) {
         if (e.keyCode == 13) {
         if (e.keyCode == 13) {
-            // alert('enter'); 
+            // alert('enter');
             $('#loadingBtn').click();
             $('#loadingBtn').click();
         }
         }
     });
     });
@@ -42,12 +43,11 @@ $(document).ready(function() {
             // host = "http://"+window.location.host+"/";
             // host = "http://"+window.location.host+"/";
             // base_image_server_url = host;
             // base_image_server_url = host;
             // base_ui_url = host;
             // base_ui_url = host;
-            window.location.href = base_ui_url + "view/main.html?time="+(Date.parse(new Date()))
+            window.location.href = base_ui_url + "view/main.html?time=" + (Date.parse(new Date()))
 
 
         }, function(error) {
         }, function(error) {
             $btn.button('reset');
             $btn.button('reset');
             layer.alert('用户名或密码错误');
             layer.alert('用户名或密码错误');
         });
         });
     });
     });
-});
-
+});

+ 23 - 15
VisualInspection/view/user/login.html

@@ -11,40 +11,48 @@
 <body>
 <body>
     <!--<link rel="import" href="/view/common/login_head.html?__inline">-->
     <!--<link rel="import" href="/view/common/login_head.html?__inline">-->
 
 
+
     <div id="main" class="container-fluid main">
     <div id="main" class="container-fluid main">
+
         <div class="bg" id="bg">
         <div class="bg" id="bg">
+
             <div class="row login">
             <div class="row login">
-      
-                    <!--<div class="form-group">
+
+                <!--<div class="form-group">
                         <label for="exampleInputAccount4" class="col-sm-2">账号</label>
                         <label for="exampleInputAccount4" class="col-sm-2">账号</label>
                         <div class="input-group">
                         <div class="input-group">
                             <span class="input-group-addon fix-border input_login"><i class="icon icon-envelope icon-1x"></i></span>
                             <span class="input-group-addon fix-border input_login"><i class="icon icon-envelope icon-1x"></i></span>
                             <input id="username" type="text" class="form-control input_login" placeholder="用户账号">
                             <input id="username" type="text" class="form-control input_login" placeholder="用户账号">
                         </div>
                         </div>
                     </div>-->
                     </div>-->
-                     <!--<div class="row" style="margin-top:20px">
+                <!--<div class="row" style="margin-top:20px">
                     <div class="input-group">
                     <div class="input-group">
                         <span class="input-group-addon fix-border input_login"><i class="icon icon-lock icon-1x"></i></span>
                         <span class="input-group-addon fix-border input_login"><i class="icon icon-lock icon-1x"></i></span>
                         <input id="password" type="password" class="form-control input_login" placeholder="密码">
                         <input id="password" type="password" class="form-control input_login" placeholder="密码">
                     </div>
                     </div>
                 </div>-->
                 </div>-->
+                <div class="row" style="text-align: center; margin-bottom: 39px;margin-top: 10px;font-size: 22px;">
+                    <label style="    letter-spacing: 8px;">用户登录</label>
 
 
-                    <div class="row">
-                        <label for="exampleInputAccount4" class="col-md-3  ll">用户名:</label>
-                        <div class="col-md-9 lll">
-                            <input type="text" id="username" class="form-control" autofocus placeholder="用户账号">
-                        </div>
+                </div>
+
+                <div class="row">
+
+                    <label for="exampleInputAccount4" class="col-md-3  ll">用户名:</label>
+                    <div class="col-md-9 lll">
+                        <input type="text" id="username" class="form-control" autofocus placeholder="用户账号">
                     </div>
                     </div>
+                </div>
 
 
-                    <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="密码">
-                        </div>
+                <div class="row p" style="margin-top:9%">
+                    <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="密码">
                     </div>
                     </div>
+                </div>
+
 
 
-               
-                <div class="row p" style="margin-top:13%">
+                <div class="row p" style="margin-top:9%">
                     <button id="loadingBtn" type="button" class="btn btn-primary  btn-block login_btn" data-loading-text="正在登录...">登录</button>
                     <button id="loadingBtn" type="button" class="btn btn-primary  btn-block login_btn" data-loading-text="正在登录...">登录</button>
                 </div>
                 </div>
             </div>
             </div>