From 6699f159bf34b079e7b67f4712f7ed610c1e5411 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 14:26:57 +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-unapproved-edit.html | 37 +++----
gx_tieta/WebRoot/mobil/batt-unapproved.html | 221 ++++++++++++++-----------------------------
2 files changed, 87 insertions(+), 171 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index 1906444..7ad3d62 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -349,30 +349,23 @@
console.warn(opstring+'ttt');
return $('#newbattnum').html(opstring);
}
- var temp = getCookie("eleparm");
- var tempindex = getCookie("eleparmindex");
- var tempnum = getCookie("eleparmnum");
- //var temp
- //console.info(temp);
+
var tempgroupid = getCookie("elegroupid");
- console.info(tempgroupid);
- tempgroupid = JSON.parse(tempgroupid);
- console.info(tempindex);
- console.info(tempnum);
- temp=JSON.parse(temp);
- tempindex = JSON.parse(tempindex);
- tempnum =JSON.parse(tempnum);
- var suoyin = temp[33];
- var addbattnum = tempindex.length;
+ var temp = getCookie("eleparm");
+ temp = JSON.parse(temp);
+ console.info(temp);
+ var tempgroupid = new Array() ;
+ for(var i=0;i<temp.length;i++){
+ tempgroupid.push(temp[i].binf.BattGroupId);
+ }
+ console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
+ var addbattnum = temp.length;
$(function(){
- creatAllView(tempindex.length).trigger('create');
- creatBa(tempindex.length).trigger('create');
+ creatAllView(temp.length).trigger('create');
+ creatBa(temp.length).trigger('create');
});
-
-
-
-
+
</script>
<script type="text/javascript">
@@ -421,9 +414,9 @@
setTimes($("#startTestrecord"),temp[30]);
setTimes($("#endTestrecord"),temp[31]);
document.getElementById("install_user").value = temp[32];
- for(var i=0;i<tempindex.length;i++){
+ for(var i=0;i<temp.length;i++){
battname = "#battname"+i;
- $(battname).val(tempindex[i]);
+ //$(battname).val(tempindex[i]);
}
}
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 8bd9940..7be611a 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -154,19 +154,13 @@
var index = $(t).attr("but-index");
//delindex = index;
$("#delete").attr("value",index);
- //setCookie("delindex",index);
- //setcookiedit(index);
- //delparm = battDeleteparm(index);
- //var parm = battDeleteparm();
- //console.info(parm);
- //delBatt(parm);
return ;
}
function getEditButIndex(t){
console.warn($(t).attr("but-index")+' 淇敼');
var index = $(t).attr("but-index");
- setcookiedit(index);
- //window.location.href="batt-infor-unapproved-edit.html";
+ var parm = seteditparm(index);
+ window.location.href="batt-infor-unapproved-edit.html";
return ;
}
@@ -184,7 +178,8 @@
//console.info(delindex);
battDeleteparm(delindex);
});
-
+
+ var arrdata = new Array();
var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳',''];
dataArr = [];
var startTime = "1980-01-01";
@@ -223,6 +218,7 @@
data=data.data
console.info(data);
for(var i=0;i<data.length;i++){
+ arrdata.push(data[i]);//瀛樺偍鏁版嵁
arrTd[index++] = data[i].binf.StationId;
arrTd[index++] = data[i].binf.StationName1;
arrTd[index++] = data[i].binf.StationName2;
@@ -266,86 +262,72 @@
});
}
- //鏌ヨ褰撳墠鏈烘埧鏈夊嚑涓數姹犵粍锛屽苟set鍏OOKIE
- function searchHomeInfoByName(id) {
- var groupName = new Array();
- //var index = 0;
- var num =new Array();
- var groupId = new Array();
- var eleditparm = new Array();
- //var index1 = 0;
- var temp = {
+ function seteditparm(index){
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ console.info(arrdata);
+ var arr= creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+ return arr;
+ }else{
+ alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
+ }
+ }
+
+ 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:id, // 鐪�
+ 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, //瀹夎浜哄憳
}
- ,page: {
- pageCurr: 1
- ,pageSize: 100
- }
- };
- // 璇锋眰鍚庡彴
- $.ajax({
- type: "post",
- url: "Battinf_applyAction!serchbystationId",
- async:true,
- dataType:'json',
- data:"json="+JSON.stringify(temp),
- success: function(data){
- var data = JSON.parse(data.result)
- console.info(data);
- if(data.code!=0){
- data = data.data;
- for(var i=0;i<data.length;i++){
- console.info(data[i]);
- groupName[i] = data[i].binf.BattGroupName;
- num[i] = data[i].num;
- groupId[i] = data[i].binf.BattGroupId;
- var eleditparmarr={
- groupname : data[i].binf.BattGroupName,
- num : data[i].num,
- groupId :data[i].binf.BattGroupId,
- }
- eleditparm.push(eleditparmarr);
- }
- console.info(eleditparm);
- }
- var json = JSON.stringify(groupName);
- var json1 =JSON.stringify(num);
- var json2 = JSON.stringify(groupId);
-
- //console.info(eleditparm)
- var jsonedit = JSON.stringify(eleditparm);
- setCookie("eleditparm",jsonedit);
- setCookie("eleparmindex",json); //鐢垫睜缁勫悕绉�
- setCookie("eleparmnum",json1); //鐢垫睜缁勭紪鍙�
- console.info(groupName);
- setCookie("elegroupid",json2);
- console.info(json2);
- window.location.href="batt-infor-unapproved-edit.html";
- }
- });
- }
- function setcookiedit(index){
- var arrcookie = new Array();
- for(var i=0;i<33;i++){//鍏�35椤� ,33鏁版嵁鏈夌敤
- var value = Math.floor((arrTh.length)*index); //35
- //console.info(value);
- value = Math.floor(value+i);
- if(i==13){//鏂板缓鍔熻兘锛岀數姹犵粍ID榛樿涓哄綋椤垫渶鍚庝竴涓數姹犵粍ID鍙峰姞1
- var groupid = Math.floor(arrTd[value]+1);
- arrcookie.push(groupid);
- }else{
- arrcookie.push(arrTd[value]);
- }
- }
- arrcookie.push($("#newbattnum").val());
- var id = arrcookie[0]; //鏈烘埧ID
- //console.info(id);
- var json=window.JSON.stringify(arrcookie);
- setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
- searchHomeInfoByName(id);
-
- }
+ }
+ arr.push(obj);
+ }
+ }
+ console.info(arr);
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ var json=window.JSON.stringify(arr);
+ setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ return arr;
+ }
+
function delBatt(parm){
$.ajax({
type: "post",
@@ -369,73 +351,14 @@
function battDeleteparm(index){
console.info(arrTh.length);
console.info(index);
- var delindex = Math.ceil(arrTh.length*index);
+ var delindex = Math.ceil(arrTh.length*index);//鍦ˋRRTD涓婄鍑犲垪
var stationid = arrTd[delindex];
console.info(stationid);
searchdelnum(stationid,index,delindex);
- /*var arr = new Array();
- var temp = getCookie("eleparm");
- var tempindex = getCookie("eleparmindex");
- var tempnum = getCookie("eleparmnum");
- var tempgroupid = getCookie("elegroupid");
- temp=JSON.parse(temp);
- tempindex = JSON.parse(tempindex);
- tempnum =JSON.parse(tempnum);
- tempid = JSON.parse(tempgroupid);
-
- 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[temp[12]],
- 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], //瀹夎浜哄憳
- }
- }
- arr.push(obj);
- //}
- //console.info(arr);
- return arr;*/
-
+
}
- function searchdelnum(id,index,delindex) {
+ function searchdelnum(id,index,delindex) {//鍒犻櫎鏈鎵癸紝鏋勯�犱紶鍙�
var groupName = new Array();
//var index = 0;
var num =new Array();
--
Gitblit v1.9.1