From 43d0c4cc8eb7364415ce4b7e358a10747c6cfe1d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 17:48:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 512da1e..69cafc8 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -163,7 +163,7 @@
,{field:'station_event_type_tempup', title:'娓╁害涓婇檺鍛婅', align:'center'}
,{field:'station_event_type_templow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
,{field:'station_event_type_dampup', title:'婀垮害涓婇檺鍛婅', align:'center'}
- ,{field:'station_event_type_damplow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
+ ,{field:'station_event_type_damplow', title:'婀垮害涓嬮檺鍛婅', align:'center'}
,{fixed: 'right', title:'璇︽儏', toolbar: '#toolBar', width: 70}
]]
,data:[]
@@ -252,9 +252,10 @@
dataType:'json',
data:"json="+json,
success:function(data){
+ console.info(data);
var data=JSON.parse(data.result);
if(data.code==1&&data!=null){
- //console.log(data.data);
+ console.log(data.data);
tOptions.data = data.data;
}else {
tOptions.data = [];
@@ -271,7 +272,7 @@
var temp={
StationName1:$('#station_name1').val(), // 鐪�
StationName2:$('#city').val(),
- Stationname5:$('#county').val(), // 甯�
+ StationName5:$('#county').val(), // 甯�
StationName3:$('#station_name3').val(), //鏈烘埧鍚嶇О
StationId: stationid?stationid:0,
BattInUseDate:$('#startalm').val()+" 00:00:00",
--
Gitblit v1.9.1