From 52637917ddd991d35c37b64faddc2187ff736482 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.29>
Date: 星期一, 15 十月 2018 16:35:49 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-station-update.jsp | 341 ++++++++++++++++++++++++++++++++++++++++++
gx_tieta/src/com/fgkj/actions/Batt_devalarm_data_historyAction.java | 2
gx_tieta/WebRoot/batt-state-statistical.jsp | 101 +++++++++---
3 files changed, 417 insertions(+), 27 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index d3dd83a..c1df1cf 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -70,10 +70,9 @@
<td><input type="text" id="startalm" readonly="readonly" name="bmd.adata.alm_start_time" value="2000-1-1" /></td>
<td><input type="text" id="endTalm" readonly="readonly" name="bmd.adata.alm_start_time1" /></td>
<td>
- <select>
- <option>鏃�</option>
- <option>鎸夊勾缁熻</option>
- <option>鎸夋湀缁熻</option>
+ <select id="statistics">
+ <option value=3>鎸夊勾缁熻</option>
+ <option value=1>鎸夋湀缁熻</option>
</select>
</td>
</tr>
@@ -83,20 +82,20 @@
<tr>
<td>
- <input type="checkbox" id="" name="" checked="checked" value="" class="" />鍋滅數 <!-- 鍋滅數 -->
+ <input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" checked="checked" value="" class="" />鍋滅數 <!-- 鍋滅數 -->
</td>
<td>
- <input type="checkbox" id="" name="" checked="checked" value="" class="" />鍙戠數 <!-- 鍙戠數 -->
+ <input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" checked="checked" value="" class="" />鍙戠數 <!-- 鍙戠數 -->
</td>
<td>
- <input type="checkbox" id="" name="" checked="checked" value="" class="">鎺夌珯 <!-- 鎺夌珯 -->
+ <input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" checked="checked" value="" class="">鎺夌珯 <!-- 鎺夌珯 -->
</td>
- <td><input type="checkbox" id="" name="" value="" class="" checked="checked">寮�闂ㄥ紓甯�</td> <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">娓╁害涓婇檺鍛婅</td>
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">娓╁害涓嬮檺鍛婅</td> <!-- 娓╁害寮傚父 -->
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">婀垮害涓婇檺鍛婅</td>
- <td><input type="checkbox" name="" id="" checked="checked" value="" class="">婀垮害涓嬮檺鍛婅</td> <!-- 婀垮害寮傚父 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value="" class="" checked="checked">寮�闂ㄥ紓甯�</td> <!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_TEMPUP_ComError" name="" checked="checked" value="" class="">娓╁害涓婇檺鍛婅</td>
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_TEMPLOW_ComError" name="" checked="checked" value="" class="">娓╁害涓嬮檺鍛婅</td> <!-- 娓╁害寮傚父 -->
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DAMPUP_ComError" name="" checked="checked" value="" class="">婀垮害涓婇檺鍛婅</td>
+ <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DAMPLOW_ComError" name="" checked="checked" value="" class="">婀垮害涓嬮檺鍛婅</td> <!-- 婀垮害寮傚父 -->
</tr>
</table>
</div>
@@ -161,7 +160,7 @@
$(function () {
// 鍒濆鍖栭〉闈㈢殑鏁版嵁
//鑷畾涔夋暟缁勫彉閲忥紝鏁扮粍鐨勫�间负鐢垫睜鍛婅琛ㄦ牸鐨勮〃澶� 缂栧彿 鏈烘埧鍚嶇О 鐢垫睜缁勫悕绉� 鍛婅鍚嶇О 鍗曚綋缂栧彿 鍛婅鍊� 鍛婅绛夌骇 鍛婅纭 鍛婅纭鏃堕棿 鍛婅寮�濮嬫椂闂� 鍛婅鎴鏃堕棿
- ArrWarnTh = ['鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
+ ArrWarnTh = ['鍛婅鏃堕棿娈�','鏈烘埧鍚嶇О','鍋滅數娆℃暟','鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅'];
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
@@ -255,33 +254,83 @@
$(function(){
//鐐瑰嚮鏌ヨ鎸夐挳
$('#paging .search').click(function(){
-
+ //var check = $("#ALM_TYPE_BTS9100S_FADIAN_ComError").attr("checked");
+ //console.info(check);
+ serachBattStatistical();
});
});
var formjson;
-
-
+ function serachBattStatistical(){
+ var temp = createSearchForm();
+ var json = JSON.stringify(temp);
+ ArrWarnTb = new Array();
+ $.ajax({
+ type:"post",
+ url:"Batt_devalarm_data_historyAction!serchStateBydev_id",
+ async:true,
+ dataType:'json',
+ data:"json="+json,
+ success:function(data){
+ var data=JSON.parse(data.result);
+ var index=0;
+ //console.info(data);
+ if(data.code==1&&data!=null){
+ data=data.data;
+ Page.pageAll = data.length;
+ var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
+ $('#total').text(Page.pageAll);
+ $('#current').text(Page.pageCurr+"/"+pageNum);
+ var currentStartdata=Math.ceil((Page.pageCurr-1)*Page.pageSize);
+ var currenEnddata = 0;
+ if(Math.ceil(Page.pageAll-(Page.pageCurr-1)*Page.pageSize)<Page.pageSize){
+ currenEnddata = Math.ceil((Page.pageAll-(Page.pageCurr-1)*Page.pageSize)+(Page.pageCurr-1)*Page.pageSize);
+ }else{
+ currenEnddata = Math.ceil((Page.pageCurr)*Page.pageSize);
+ }
+ console.info(currenEnddata);
+ for(i=currentStartdata;i<currenEnddata;i++){
+ console.info(data);
+ ArrWarnTb[index++]=data[i].dev_ip; //鍛婅鏃堕棿娈�
+ ArrWarnTb[index++]=data[i].stationName; //鏈烘埧鍚嶇О
+ ArrWarnTb[index++]=data[i].num; //鍋滅數
+ ArrWarnTb[index++]=data[i].record_id; //鍙戠數娆℃暟
+ ArrWarnTb[index++]=data[i].alm_type; //鎺夌珯娆℃暟
+ ArrWarnTb[index++]=data[i].alm_level; //寮�闂ㄥ紓甯�
+ ArrWarnTb[index++]=data[i].alm_is_confirmed;//娓╁害涓婇檺
+ ArrWarnTb[index++]=data[i].alm_cleared_type;//娓╁害涓嬮檺
+ ArrWarnTb[index++]=data[i].usr_id; //婀垮害涓婇檺
+ ArrWarnTb[index++]=data[i].note; //婀垮害涓嬮檺
+ }
+ createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
+ }
+ }
+ })
+ }
//鏋勯�犳煡璇㈡潯浠跺璞�
+ // function creatArrTb(var arr,int){
+ // var arr = new Array();
+
+ // return arr;
+ // }
function createSearchForm(){
+ var stationid = $('#station_name3').find("option:selected").attr('Stationid');
var temp={
- page:Page,
- binf:{
StationName1:$('#station_name1').val(), // 鐪�
StationName2:$('#city').val(), // 甯�
- StationName:$('#station_name').val(), //鏈烘埧鍚嶇О
-
- }
-
+ StationName3:$('#station_name3').val(), //鏈烘埧鍚嶇О
+ StationId: stationid?stationid:0,
+ BattInUseDate:$('#startalm').val(),
+ BattInUseDate1:$('#endTalm').val(),
+ BattGroupNum:$('#statistics').val()
};
+ //console.info(temp);
return temp;
}
-
-
-
+
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
@@ -371,7 +420,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
optsList.push(tmp);
}
diff --git a/gx_tieta/WebRoot/batt-station-update.jsp b/gx_tieta/WebRoot/batt-station-update.jsp
new file mode 100644
index 0000000..6110f9b
--- /dev/null
+++ b/gx_tieta/WebRoot/batt-station-update.jsp
@@ -0,0 +1,341 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <base href="<%=basePath%>">
+
+ <title>鏈烘埧绔欑偣鍗囩骇鍔熻兘</title> <!--鏈烘埧绔欑偣鍗囩骇鍔熻兘-->
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link href="css/basic.css" rel="stylesheet">
+ <link rel="stylesheet" href="css/BrdwMaint.css">
+ <link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
+ <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+ <meta http-equiv="description" content="This is my page">
+ <style type="text/css">
+ body {
+ overflow-x: hidden !important;
+ }
+ #tbHead table{
+ width: 100%;
+ }
+ #tbBrdw {
+ overflow: auto;
+ }
+ #tbBrdw tbody tr:hover {
+ background-color: #DDDDDD;
+ }
+ #cardOption .con_table {
+ overflow: auto;
+ }
+ #tbBrdw table {
+ width: 100%;
+ }
+ #cardOption input[type="checkbox"] {
+ vertical-align: middle;
+ }
+ #cardOption table thead input[type="checkbox"]{
+ margin-left: 4px;
+ }
+ </style>
+ </head>
+ <body>
+ <!--澶撮儴鍐呭寮�濮�-->
+ <jsp:include page="Top.jsp" flush="true"/>
+ <!--澶撮儴鍐呭缁撴潫-->
+ <!--瀵艰埅寮�濮�-->
+ <jsp:include page="nav.jsp" flush="true"/>
+ <!-- 涓讳綋鍐呭 -->
+ <div id="main">
+ <div id="eleInfor">
+ <span class="summary">鏈烘埧绔欑偣鍗囩骇</span>
+ <div class="checkCon">
+ <!-- 缁存姢鍖轰俊鎭� -->
+ <form action="" id="search_form">
+ <table>
+ <tr class="fWeight">
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
+
+ </tr>
+ <tr>
+ <td>
+ <select id="station_name1">
+
+ </select>
+ </td>
+ <td>
+ <select id="city">
+
+ </select>
+ </td>
+ <td>
+ <select id="station_name">
+
+ </select>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </div>
+ <!-- 琛ㄦ牸鍥哄畾鐨勫ご閮� -->
+ <div id="tbHead"></div>
+ <!-- 琛ㄦ牸婊氬姩鐨勯儴鍒� -->
+ <div id="tbBrdw"></div>
+
+
+
+ <!-- 鎸夐挳鍐呭 -->
+ <div id="paging">
+ <a href="javascript:" class="add">娣诲姞<!--娣诲姞--></a>
+ <a href="javascript:" id="update">鍗囩骇<!-- 鍗囩骇 --></a>
+ </div>
+ </div>
+
+ <!-- 鏁翠綋鐏拌壊閬僵灞� -->
+ <div id="allShade"></div>
+ <script type="text/javascript" src="js/loading.js"></script>
+ <script type="text/javascript" src="js/createTab.js"></script>
+ <script type="text/javascript">
+
+
+ var arrTh = new Array(); // 琛ㄦ牸鐨勫ご閮�
+ var arrTd = new Array(); // 琛ㄦ牸鐨勮〃浣�
+ var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
+ var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
+ var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
+ arrTh = ['鏈烘埧ID', '鏈烘埧鍚嶇О','璁惧ID','璁惧鍚嶇О'];
+ //arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
+ //tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
+ tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
+ var tblHd = $('#tbHead');
+ var tblBd = $('#tbBrdw');
+
+ // 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
+ $(function() {
+ centerDiv($('#cardOption'));
+ // 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
+ for(var i = 0; i < arrTh.length; i++) {
+ tblStatus.push(1);
+ var temp = new Array();
+ temp.push(i+1);
+ temp.push(arrTh[i]);
+ temp.push('<input type="checkbox" checked="checked"/>');
+
+ tblOptsBd.push(temp);
+ }
+ var cardHd = $('#cardOption .tbHead');
+ var cardBd = $('#cardOption .con_table');
+ createCard(cardHd, tblOptsHd, tblOptsBd);
+ createCard(cardBd, tblOptsHd, tblOptsBd);
+ });
+
+ // 鐢熸垚琛ㄦ牸
+ $(function() {
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ // 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
+ $('#paging .card-opt').click(function() {
+ var checkboxList = $('#cardOption .con_table table tbody').find('input[type="checkbox"]');
+ // 鏍规嵁鐘舵�佹暟缁勪慨鏀硅〃鏍奸�夐」澶嶉�夋鐨勭姸鎬�
+ for(var i = 0; i < tblStatus.length; i++) {
+ if(tblStatus[i] == 1) {
+ checkboxList.eq(i).prop('checked', true);
+ }else{
+ checkboxList.eq(i).prop('checked', false);
+ }
+ }
+ $('#cardOption').show();
+ $('#allShade').show();
+ });
+
+ // 鐐瑰嚮鍙栨秷鍜岀‘瀹氶殣钘忚〃鏍奸�夐」绐楀彛鍜岄伄缃╁眰
+ $('#cardOption .en-card-opts').click(function() {
+ // 鏍规嵁琛ㄦ牸閫夐」鐨勫閫夋璁剧疆鐘舵�佹暟缁�
+ var checkboxList = $('#cardOption .con_table table tbody').find('input[type="checkbox"]');
+ checkboxList.each(function(i) {
+ if($(this).is(':checked')) {
+ tblStatus[i] = 1;
+ }else{
+ tblStatus[i] = 0;
+ }
+ });
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ $('#cardOption').hide();
+ $('#allShade').hide();
+ });
+ $('#cardOption .out-card-opts').click(function() {
+ $('#cardOption').hide();
+ $('#allShade').hide();
+ });
+ });
+
+ // 鏍规嵁琛ㄦ牸鐨勭殑澶撮儴鐢熸垚
+ $(function() {
+ $('#endtime').val(new Date().format('yyyy-MM-dd'));
+ });
+
+ // 鍒濆鍖栭〉闈㈤珮搴�
+ $(function() {
+ pageInit();
+ $(window).resize(function() {
+ pageInit();
+ });
+ });
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ function pageInit() {
+ var winHt = $(window).height();
+ var bodyHt = $('body').height();
+ var tblHt = $('#tbBrdw').height();
+ var shiftHt = winHt - bodyHt - 32;
+ if(shiftHt > 0) {
+ $('#tbBrdw').height(shiftHt + tblHt);
+ }
+ }
+
+ // 鐢熸垚琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋
+ function createAllTbl (header, body, arrTh, arrTd, status) {
+ //console.info(status);
+ var newArrTh = new Array();
+ var newArrTd = new Array();
+ newArrTh = getArrTh(status, arrTh);
+ newArrTd = getArrTd(status, arrTd);
+ createTablenew(header, newArrTh, newArrTd);
+ createTablenew(body, newArrTh, newArrTd);
+ // 瀹氫箟琛ㄦ牸鐨勫ご閮ㄥ拰琛ㄤ綋瀹藉害涓�鑷�
+ var bdWidth = body.find('table').width();
+ header.find('table').width(bdWidth);
+ }
+
+ //瀵逛簬寮瑰嚭涓插彛杩涜瀹氫綅(position:fixed)
+ function centerDiv(ele){
+ //鑾峰彇灞忓箷鐨勯珮搴﹀寮瑰嚭绐楀彛杩涜瀹氫綅
+ var srnHei=$(window).height(); //灞忓箷鐨勯珮搴�
+ var eleHei=ele.height(); //寮瑰嚭绐楀彛鐨勯珮搴�
+ var topHei=parseInt((srnHei-eleHei)/2); //鑾峰彇灞呬腑楂樺害
+ ele.css({
+ 'top':topHei
+ });
+ }
+
+
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function(){
+ //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
+ data=data.result;
+ data=eval("("+data+")");
+ //console.info(data);
+ if(data.code==1 && data.data.length>0){
+ var $select = $("#station_name1");
+ $select.text('');
+ for(var i=0;i<=data.data.length;i++){
+ $option=$("<option></option>");
+ if(i==0){
+ $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
+ $option.attr("value", "");
+ }else{
+ $option.text(data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
+ }
+ $select.append($option);
+ }
+ }else{
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ }
+ findCity();
+ });
+ });
+
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+ $('#station_name1').change(function(){
+ findCity();
+ });
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findStationNamebyStationname1();
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1(){
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
+ };
+ //var selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
+ var $select = $("#station_name");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ });
+ }
+
+
+
+
+
+
+ </script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_devalarm_data_historyAction.java b/gx_tieta/src/com/fgkj/actions/Batt_devalarm_data_historyAction.java
index b930b1e..dad7bed 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_devalarm_data_historyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_devalarm_data_historyAction.java
@@ -33,7 +33,7 @@
}
//缁熻鏈烘埧鐘舵�佸巻鍙�(鏈烘埧鐘舵��)
public String serchStateBydev_id(){
- BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ BattInf binf=getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
ServiceModel model=service.serchStateBydev_id(binf);
result=tojson(model);
return SUCCESS;
--
Gitblit v1.9.1