From 67f23a8ce1da8e96f4620d3714afec70dd1afbae Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 08:53:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Top.jsp | 2 +-
gx_tieta/WebRoot/batt-state-manage.jsp | 10 ++++++++++
gx_tieta/WebRoot/batt-state-statistical.jsp | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 22a3b2e..2e5de0f 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,7 +64,7 @@
<div class="batt-state">
<div class="list">
- <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
+ <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
</div>
<div class="list">
<div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div> <!-- 鐢垫睜鍛婅鏁� -->
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index a0c154d..ea5903c 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -191,6 +191,16 @@
// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
$(function() {
+
+ //褰撲粠鍏朵粬椤甸潰璺宠浆鍒板綋鍓嶉〉闈㈤�変腑鎸囧畾鐨勫紓甯哥被鍨嬪苟涓旀煡璇㈣褰�
+ var station_state = getQueryString('station_state');
+ if(station_state){
+ //alert(station_state);
+
+ $('#search_form .condi-opt [value='+station_state+']:checkbox').attr("checked", true);
+ }
+
+
centerDiv($('#cardOption'));
// 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
for(var i = 0; i < arrTh.length; i++) {
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 69cafc8..74fd3e5 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -153,8 +153,8 @@
,defaultToolbar: ['exports', 'filter']
,cellMinWidth: 80
,cols: [[
- {field:'note', title:'鍛婅鏃堕棿娈�', align:'center'}
- ,{field:'stationName', title:'鏈烘埧鍚嶇О', align:'center'}
+ {field:'note', title:'鍛婅鏃堕棿娈�', align:'center',width:380}
+ ,{field:'stationName', title:'鏈烘埧鍚嶇О', align:'center',width:450}
,{field:'station_event_type_poff', title:'鍋滅數娆℃暟', align:'center'}
,{field:'station_event_type_fadian', title:'鍙戠數娆℃暟', align:'center'}
,{field:'station_event_type_diaozhan', title:'鎺夌珯娆℃暟', align:'center'}
--
Gitblit v1.9.1