From 07ad76ca66cc831264f2b6adbacc502ad484f283 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期五, 23 十一月 2018 15:16:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index ce24b10..6e01c08 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -105,17 +105,17 @@
<div id="paging">
<a href="javascript:" class="search"><s:text name="Search"/></a> <!-- 鏌ヨ -->
<a href="javascript:" id="export_table"><s:text name="Export"/></a> <!-- 瀵煎嚭 -->
- <span id="current">1/1</span>
- <span><s:text name="Each_page"/><!-- 姣忛〉 --><input type="text" id="number" value="10"/><s:text name="Item"/><!-- 鏉� --></span>
+ <!-- <span id="current">1/1</span>
+ <span><s:text name="Each_page"/>姣忛〉<input type="text" id="number" value="10"/><s:text name="Item"/>鏉�</span> -->
<s:text name="Total_data"/><!-- 鏁版嵁鎬婚噺 --><span id="total">0</span>
- <a href="javascript:" id="home"><s:text name="HomePage"/><!-- 棣栭〉 --></a>
- <a href="javascript:" id="pre"><s:text name="Page_Up"/><!-- 涓婁竴椤� --></a>
- <a href="javascript:" id="next_p"><s:text name="Page_Down"/><!-- 涓嬩竴椤� --></a>
- <a href="javascript:" id="last"><s:text name="End_Page"/><!-- 灏鹃〉 --></a>
+ <!-- <a href="javascript:" id="home"><s:text name="HomePage"/>棣栭〉</a>
+ <a href="javascript:" id="pre"><s:text name="Page_Up"/>涓婁竴椤�</a>
+ <a href="javascript:" id="next_p"><s:text name="Page_Down"/>涓嬩竴椤�</a>
+ <a href="javascript:" id="last"><s:text name="End_Page"/>灏鹃〉</a>
<span id="cont">
- <s:text name="Goto"/><!-- 杞埌 --><input type="text" id="page_num" value="1"/>
- <a href="javascript:" id="go"><s:text name="Jump"/><!-- 璺宠浆 --></a>
- </span>
+ <s:text name="Goto"/>杞埌<input type="text" id="page_num" value="1"/>
+ <a href="javascript:" id="go"><s:text name="Jump"/>璺宠浆</a>
+ </span> -->
</div>
</div>
<div id="details"></div>
@@ -168,7 +168,7 @@
]]
,data:[]
,page: false
- ,height: 'full-280'
+ ,height: 'full-270'
};
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -252,21 +252,24 @@
dataType:'json',
data:"json="+json,
success:function(data){
- //console.info(data);
var data=JSON.parse(data.result);
+ console.info(data);
if(data.code==1&&data!=null){
//console.log(data.data);
tOptions.data = data.data;
+ $('#total').text(data.data.length);
}else {
tOptions.data = [];
+ $('#total').text(0);
}
layer.close(load);
+ tOptions.limit = tOptions.data.length;
table.render(tOptions);
// 瑙﹀彂window鐨剅esize浜嬩欢鏄剧ず鏈�鍙充晶鐨勮鎯呬俊鎭诞鍔�
$(window).resize();
}
- })
+ });
}
// 鏋勯�犳煡璇㈡潯浠�
--
Gitblit v1.9.1