From 59f3c1b0960dcd0ebf03b6133bfe3dafa6edca8c Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期一, 24 十二月 2018 16:01:56 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-approved.html | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index 737ce6a..05f3e7e 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -248,7 +248,7 @@
data=data.data
console.info(data);
for(var i=0;i<data.length;i++){
- arrdata.push(data[i].binf);//瀛樺偍鏁版嵁
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
arrTd[index++] = data[i].binf.StationId;
arrTd[index++] = data[i].binf.StationName1;
arrTd[index++] = data[i].binf.StationName2;
@@ -291,9 +291,9 @@
console.info(arrTd);
console.info(arrdata);
createTbl(tblCon, arrTh, arrTd);
- timeer = window.setTimeout(function() {
+ /*timeer = window.setTimeout(function() {
searchBattLife();
- }, 5000);
+ }, 5000); */
}
});
}
@@ -301,57 +301,80 @@
function setApplyYanshou(index){
//var value = Math.floor(34*index);
console.info(arrdata);
- if(arrdata){
- creatYanshouObj(arrdata);
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ creatYanshouObj(arrdata,index);
}else{
alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
}
}
- function creatYanshouObj(arrdata){
- for(var i=0;i<tempindex.length;i++){
- var obj = {
- binf:{
- StationId : temp[0], // 鏈烘埧缂栧彿
- StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]), // 鎷兼帴鏈烘埧鍚嶇О
- StationName1 :temp[1], // 鐪�
- StationName2 : temp[2], // 甯�
- StationName5 : temp[3], // 鍖�/鍘�
- StationName3 : temp[4], // 鏈烘埧鍚嶇О
- StationName4 :temp[5], // 璁惧鍚嶇О
- StationIp : temp[6], //鏈烘埧ip
- FBSDeviceId : temp[7], //璁惧id
- FbsDeviceIp : temp[8], //璁惧ip
- FbsDeviceIp_YM : temp[9], // 璁惧鎺╃爜
- FbsDeviceIp_WG : temp[10], // 缃戝叧
- FBSDeviceName : temp[11], //璁惧鍚嶇О
- GroupIndexInFBSDevice : temp[12], //fbs璁惧绱㈠紩
- BattGroupId : tempid[temp[12]], //鐢垫睜缁刬d
- BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿
- BattGroupName : temp[15], //鐢垫睜缁勭储寮�
- FloatVolLevel : temp[16], //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : temp[17], //绂荤嚎鐢靛帇闃�鍊�
- BattFloatCurrent : temp[18], //娴厖鐢垫祦闃�鍊�
- MonCount : temp[19], //鍗曚綋鏁伴噺
- MonCapStd : temp[20], //鏍囩О瀹归噺
- MonVolStd : temp[21], //鏍囩О鐢靛帇
- MonResStd : temp[22], //鏍囩О鍐呴樆
- MonSerStd : temp[23], //鏍囩О鐢靛
- MonVolLowToAvg : temp[24], //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-
- Load_curr : temp[25], //璐熻浇鐢垫祦
- DisCurrMax : temp[26], //鏈�澶ф牳瀹圭數娴�
- station_phone : temp[27], //鍩虹珯鍙风爜
-
- BattProducer : temp[28], //鐢垫睜鍝佺墝
- BattModel : temp[29], //鐢垫睜鍨嬪彿
- BattProductDate : temp[30]+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
- BattInUseDate : temp[31]+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
- install_user : temp[32], //瀹夎浜哄憳
+ function creatYanshouObj(arrdata,index){
+ var StationId = arrdata[index].binf.StationId;
+ console.info(StationId);
+ var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
+ for(var i=0;i<arrdata.length;i++){
+ if(StationId == arrdata[i].binf.StationId){
+
+ var obj = {
+ binf:{
+ StationId : arrdata[i].binf.StationId, // 鏈烘埧缂栧彿
+ StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 :arrdata[i].binf.StationName1, // 鐪�
+ StationName2 : arrdata[i].binf.StationName2, // 甯�
+ StationName5 : arrdata[i].binf.StationName5, // 鍖�/鍘�
+ StationName3 : arrdata[i].binf.StationName3, // 鏈烘埧鍚嶇О
+ StationName4 : arrdata[i].binf.StationName5, // 璁惧鍚嶇О
+ StationIp :arrdata[i].binf.StationIp, //鏈烘埧ip
+ FBSDeviceId : arrdata[i].binf.FBSDeviceId, //璁惧id
+ FbsDeviceIp : arrdata[i].binf.FbsDeviceIp, //璁惧ip
+ FbsDeviceIp_YM : arrdata[i].binf.FbsDeviceIp_YM, // 璁惧鎺╃爜
+ FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG , // 缃戝叧
+ FBSDeviceName : arrdata[i].binf.FBSDeviceName, //璁惧鍚嶇О
+ GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice, //fbs璁惧绱㈠紩
+ BattGroupId : arrdata[i].binf.BattGroupId, //鐢垫睜缁刬d
+ BattGroupNum : arrdata[i].binf.BattGroupNum , //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName :arrdata[i].binf.BattGroupName, //鐢垫睜缁勭储寮�
+ FloatVolLevel : arrdata[i].binf.FloatVolLevel, //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : arrdata[i].binf.OfflineVolLevel, //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : arrdata[i].binf.BattFloatCurrent, //娴厖鐢垫祦闃�鍊�
+ MonCount : arrdata[i].binf.MonCount, //鍗曚綋鏁伴噺
+ MonCapStd : arrdata[i].binf.MonCapStd, //鏍囩О瀹归噺
+ MonVolStd : arrdata[i].binf.MonVolStd, //鏍囩О鐢靛帇
+ MonResStd : arrdata[i].binf.MonResStd, //鏍囩О鍐呴樆
+ MonSerStd : arrdata[i].binf.MonSerStd, //鏍囩О鐢靛
+ MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg, //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : arrdata[i].binf.Load_curr, //璐熻浇鐢垫祦
+ DisCurrMax : arrdata[i].binf.DisCurrMax, //鏈�澶ф牳瀹圭數娴�
+ station_phone : arrdata[i].binf.station_phone, //鍩虹珯鍙风爜
+
+ BattProducer : arrdata[i].binf.BattProducer, //鐢垫睜鍝佺墝
+ BattModel : arrdata[i].binf.BattModel, //鐢垫睜鍨嬪彿
+ BattProductDate : arrdata[i].binf.BattProductDate+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].binf.BattInUseDate+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ install_user : arrdata[i].binf.install_user, //瀹夎浜哄憳
+ }
+ }
+ arr.push(obj);
+ //console.info(obj)
+ }
+ }
+ console.info(obj);
+ var temp = JSON.stringify(arr);
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!checkPro',
+ data: "json="+temp,
+ dataType: 'json',
+ success:function(data) {
+ console.info(data);
+ data = JSON.parse(data.result);
+ if(data.code==1){
+ alert("鐢宠楠屾敹鎴愬姛");
}
}
- arr.push(obj);
- }
+ });
}
function setcookiedit(index){
var arrcookie = new Array();
--
Gitblit v1.9.1