From 9e15728d5bae56e687178a8e275ac4087ef10b68 Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.33> Date: 星期五, 02 十一月 2018 09:15:23 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/infor_manage.jsp | 16 +++++++++------- gx_tieta/WebRoot/css/infor.css | 2 ++ gx_tieta/src/global_zh_CN.properties | 4 ++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gx_tieta/WebRoot/css/infor.css b/gx_tieta/WebRoot/css/infor.css index f710f79..bca4899 100644 --- a/gx_tieta/WebRoot/css/infor.css +++ b/gx_tieta/WebRoot/css/infor.css @@ -18,6 +18,7 @@ overflow:hidden; } #tbHead table{ + width: 100%; position:absolute; border-collapse:collapse; } @@ -42,6 +43,7 @@ overflow:scroll; } #staff-infor table{ + width: 100%; position:absolute; border-collapse:collapse; top:-28px; diff --git a/gx_tieta/WebRoot/infor_manage.jsp b/gx_tieta/WebRoot/infor_manage.jsp index 3ab5a2f..8f7de0a 100644 --- a/gx_tieta/WebRoot/infor_manage.jsp +++ b/gx_tieta/WebRoot/infor_manage.jsp @@ -15,6 +15,7 @@ <link href="css/basic.css" type="text/css" rel="stylesheet" /> <link href="css/staffInfor.css" type="text/css" rel="stylesheet" /> <link href="css/confirm.css" type="text/css" rel="stylesheet" /> + <link href="src/css/layui.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="js/jquery-1.8.3.js"></script> <!-- <script type="text/javascript" src="js/base.js"></script> --> <style> @@ -171,6 +172,7 @@ </body> <script type="text/javascript" src="js/createTab.js"></script> <script type="text/javascript" src="js/myConfirm.js"></script> +<script type="text/javascript" src="src/layui.all.js"></script> <script type="text/javascript"> var permits; <% Object obj=session.getAttribute("permits"); @@ -469,14 +471,17 @@ $(document).ready(function(){ searchUser_inf(); + + $(window).resize(function() { + setTblWidth($('#tbHead'), $('#staff-infor')); + }); }); var User_all; function searchUser_inf(){ userlist=new Array(); // 鐢熸垚绛夊緟妗� - //createWait($('#staff-infor')); - //createAllMask($('body'),0); + var load = layer.load(1); $.post("User_infAction!searchAll",$('#search_form').serialize(),function(data){ data=data.result; data=eval("("+data+")"); @@ -525,9 +530,7 @@ //鐢熸垚鐢ㄦ埛琛ㄦ牸 createTable('tbHead','tbFixed',newArrTh.length,newArrTh,newArrTd); createTable('staff-infor','tbScroll',newArrTh.length,newArrTh,newArrTd); - var tblScroll=$('#staff-infor').scrollLeft(); - $('#tbHead table').css('left',-tblScroll); - //console.info(Page); + setTblWidth($('#tbHead'), $('#staff-infor')); }else{ User_all=undefined; uidlist=undefined; @@ -543,8 +546,7 @@ $('#total').text(0); } - //$('#staff-infor .wait').remove(); - //$('body').children('.mask').remove(); + layer.close(load); }); } diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties index accf309..bef158f 100644 --- a/gx_tieta/src/global_zh_CN.properties +++ b/gx_tieta/src/global_zh_CN.properties @@ -1095,3 +1095,7 @@ ################## batt-state-statistical.jsp \u673a\u623f\u72b6\u6001\u7edf\u8ba1 ############################# Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2 + +################## batt-fault-manage.jsp ############################## +Problem_feedback = \u95ee\u9898\u53cd\u9988 + -- Gitblit v1.9.1