From f55be3227bfe7dfa13c45d014d6fc8cfc16dff42 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:08:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 229ea51..d977595 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -956,6 +956,8 @@
Almarr.push(/*{
name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId) // 瀹归噺鍛婅鍛婅
} ,*/{
+ name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id), // 鍦ㄧ嚎鐢靛帇
+ },{
name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum), // 缁勭鐢靛帇
},{
name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id), // 鍏呯數鐢垫祦
@@ -1079,7 +1081,8 @@
}
$.ajax({
type: "post",
- url: "BattPower_offAction!serchPowerOff",
+ //url: "BattPower_offAction!serchPowerOff",
+ url: "Bts_station_stateAction_action_serchPowerOff",
async:true,
dataType:'text',
data:null,
--
Gitblit v1.9.1