From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 4c2e552..883aacb 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -10,7 +10,7 @@
<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<base href="<%=basePath%>">
- <title><s:text name="Station_statestatistical"/></title> <!-- 鏈烘埧鐘舵�佺粺璁℃煡璇� -->
+ <title><s:text name="Station_histor_events_query"/></title> <!-- 鏈烘埧鍘嗗彶浜嬩欢鏌ヨ -->
<link rel="stylesheet" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -36,7 +36,7 @@
<!--瀵艰埅寮�濮�-->
<jsp:include page="nav.jsp" flush="true"/>
<div class="filter-container">
- <div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--><s:text name="Show/hide_the_query_conditions"/></a></div>
+ <div class="filter-title"><a href="javascript:;"><s:text name="Station_histor_events_query"/>--><s:text name="Show/hide_the_query_conditions"/></a></div>
<div class="filter-content">
<table>
<tbody>
@@ -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>
@@ -151,7 +151,7 @@
elem: '#eleInfoTbl'
,toolbar: false
,defaultToolbar: ['exports', 'filter']
- ,cellMinWidth: 80
+ ,cellMinWidth: 120
,cols: [[
{field:'note', title:'鍛婅鏃堕棿娈�', align:'center',width:380}
,{field:'stationName', title:'鏈烘埧鍚嶇О', align:'center',width:450}
@@ -164,11 +164,11 @@
,{field:'station_event_type_templow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
,{field:'station_event_type_dampup', title:'婀垮害涓婇檺鍛婅', align:'center'}
,{field:'station_event_type_damplow', title:'婀垮害涓嬮檺鍛婅', align:'center'}
- ,{fixed: 'right', title:'璇︽儏', toolbar: '#toolBar', width: 70}
+ ,{fixed: 'right', title:'璇︽儏', toolbar: '#toolBar', width: 70, minWidth: 70}
]]
,data:[]
,page: false
- ,height: 'full-280'
+ ,height: 'full-270'
};
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -252,18 +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();
}
- })
+ });
}
// 鏋勯�犳煡璇㈡潯浠�
@@ -336,11 +342,9 @@
tmp.push(_data.station_event_type_tempup); // 娓╁害涓婇檺
tmp.push(_data.station_event_type_templow); // 娓╁害涓嬮檺
tmp.push(_data.station_event_type_dampup); // 婀垮害涓婇檺
- tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺
-
+ tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺
rs.push(tmp);
- }
-
+ }
return rs;
}
--
Gitblit v1.9.1