From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 88bd059..35e43f9 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -363,8 +363,9 @@
,data: null
,dataType: 'json'
,success:function(res) {
- //console.info(res);
+ console.info(res);
var data = JSON.parse(res.result);
+ console.info(data);
if(data.length!=0){
data = data.data;
dev_id = data;
@@ -429,7 +430,7 @@
document.getElementById("FBSDeviceName").value = temp[11];
//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
document.getElementById("BattGroupId").value = temp[13];
- document.getElementById("BattGroupNum").value = temp[14];
+ document.getElementById("BattGroupNum").value = suoyin;
//document.getElementById("BattGroupName").value = temp[15];
document.getElementById("FloatVolLevel").value = temp[16];
document.getElementById("OfflineVolLevel").value = temp[17];
@@ -513,8 +514,8 @@
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$("#sure").click(function(){
addBatt();
- function backpage(){window.location.href="ele-param1.html";}
- setTimeout(backpage,500);
+ //function backpage(){window.location.href="ele-param1.html";}
+ // setTimeout(backpage,500);
});
// $("#cancel").click(function(){
// window.location.href="ele-param1.html";
--
Gitblit v1.9.1