From dc1347a887b9edbb6931aafa3ff27f78a2e9a589 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.33>
Date: 星期四, 13 十二月 2018 11:19:24 +0800
Subject: [PATCH] 手机 删除单条电池组 ，修改
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 3 +++
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 9 +++++----
gx_tieta/WebRoot/mobil/batt-unapproved.html | 32 ++++++++++++++++++++------------
3 files changed, 28 insertions(+), 16 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";
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index d43af6d..9b5b62e 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -458,12 +458,15 @@
console.info(model);
if(model.code ==1){
alert("淇敼鎴愬姛");
+ window.location.href="batt-unapproved.html"
}else{
alert("淇敼澶辫触!");
+ window.location.href="batt-unapproved.html"
}
},
error:function(){
alert("淇敼鐢垫睜缁勫け璐�!");
+ window.location.href="batt-unapproved.html"
}
});
}
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index f11065a..cedb5cc 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -162,16 +162,14 @@
$("#edit").click(function(){
-
-
//searchHomeInfoByName(homename);
- window.location.href="batt-infor-unapproved-edit.html";
+ //window.location.href="batt-infor-unapproved-edit.html";
});
$("#delete").click(function(){ //鍒犻櫎鐢垫睜缁�
var parm = battDeleteparm();
console.info(parm);
delBatt(parm);
- window.location.href="batt-unapproved.html";
+ //window.location.href="batt-unapproved.html";
});
var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鎿嶄綔'];
@@ -309,7 +307,7 @@
}
arrcookie.push($("#newbattnum").val());
var id = arrcookie[0];
- console.info(id);
+ //console.info(id);
searchHomeInfoByName(id);
var json=window.JSON.stringify(arrcookie);
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
@@ -323,9 +321,17 @@
data:"json="+JSON.stringify(parm),
success: function(data){
console.info(data);
- alert("鍒犻櫎鎴愬姛");
+ data = JSON.parse(data.result);
+ if(data.code==1){
+ alert("鍒犻櫎鎴愬姛");
+ window.location.href="batt-unapproved.html";
+ }else{
+ alert("鍒犻櫎澶辫触");
+ window.location.href="batt-unapproved.html";
+ }
}
});
+
}
function battDeleteparm(){
var arr = new Array();
@@ -335,12 +341,14 @@
temp=JSON.parse(temp);
tempindex = JSON.parse(tempindex);
tempnum =JSON.parse(tempnum);
- console.info(temp);
- for(var i=0;i<tempindex.length;i++){
+ //console.info(temp);
+ //var numinsert;
+ console.info(temp[12]);
+ //for(var i=0;i<tempindex.length;i++){
//console.info(battString);
var obj = {
//apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
- num : tempnum[i],
+ num : tempnum[temp[12]],
binf:{
StationId : temp[0], // 鏈烘埧缂栧彿
StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]), // 鎷兼帴鏈烘埧鍚嶇О
@@ -355,10 +363,10 @@
FbsDeviceIp_YM : temp[9], // 璁惧鎺╃爜
FbsDeviceIp_WG : temp[10], // 缃戝叧
FBSDeviceName : temp[11], //璁惧鍚嶇О
- GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
+ GroupIndexInFBSDevice : temp[12], //fbs璁惧绱㈠紩
BattGroupId : temp[13], //鐢垫睜缁刬d
BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿
- BattGroupName : tempindex[i], //鐢垫睜缁勭储寮�
+ BattGroupName : temp[15], //鐢垫睜缁勭储寮�
FloatVolLevel : temp[16], //娴厖鐢靛帇闃�鍊�
OfflineVolLevel : temp[17], //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : temp[18], //娴厖鐢垫祦闃�鍊�
@@ -381,7 +389,7 @@
}
}
arr.push(obj);
- }
+ //}
console.info(arr);
return arr;
--
Gitblit v1.9.1