From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/WebRoot/mobil/batt-unapproved.html | 333 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 195 insertions(+), 138 deletions(-) diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html index f11065a..0584ca9 100644 --- a/gx_tieta/WebRoot/mobil/batt-unapproved.html +++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html @@ -87,12 +87,16 @@ margin: 0; padding-top: 0.1em; padding-bottom: 0.1em; + background-color: #dddddd4d!important; } .ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{ width:35%; } .tbl-container td { color: #fb0909a3; + } + .fr{ + float:right; } </style> <link rel="stylesheet" href="css/fgpanel.css"> @@ -126,8 +130,8 @@ </div> <div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b"> <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a> - <a href="" id="edit" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-edit" >淇敼</a> - <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍒犻櫎</a> + <a href="" id="delete" value="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >纭畾鍒犻櫎</a> + <a href="" id="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍙栨秷鍒犻櫎</a> </div> </div> @@ -143,15 +147,24 @@ <script type="text/javascript"> - /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */ - function getButIndex(t){ - //console.warn($(t).attr("but-index")); - var index = $(t).attr("but-index"); - setcookiedit(index); - return ; - } + /* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */ + + function getDeleteButIndex(t){ + console.warn($(t).attr("but-index")+' 鍒犻櫎'); + var index = $(t).attr("but-index"); + //delindex = index; + $("#delete").attr("value",index); + return ; + } + function getEditButIndex(t){ + console.warn($(t).attr("but-index")+' 淇敼'); + var index = $(t).attr("but-index"); + var parm = seteditparm(index); + window.location.href="batt-infor-unapproved-edit2.html"; + return ; + } - + var delindex=0; var arrTd=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁 var tblCon = $('.tbl-container'); var Page = { @@ -159,22 +172,15 @@ pageCurr:1, //褰撳墠椤电爜鏁� pageAll:0, }; - - - $("#edit").click(function(){ - - - //searchHomeInfoByName(homename); - window.location.href="batt-infor-unapproved-edit.html"; + $("#delete").click(function(delindex){ //鍒犻櫎鐢垫睜缁� + var delindex = $("#delete").val(); + //console.info($("#delete").val()); + //console.info(delindex); + battDeleteparm(delindex); }); - $("#delete").click(function(){ //鍒犻櫎鐢垫睜缁� - var parm = battDeleteparm(); - console.info(parm); - delBatt(parm); - 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)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鎿嶄綔']; + + 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"; var endTime = new Date().format('yyyy-MM-dd'); @@ -196,7 +202,7 @@ } // 鏌ヨ鍐呭 function searchBattLife(){ - var temp = JSON.stringify(getcreatArr()); + var temp = JSON.stringify(getcreatArr()); console.info(temp); arrTd = new Array(); var index = 0; @@ -212,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; @@ -245,24 +252,123 @@ arrTd[index++] = data[i].binf.BattProductDate.substr(0,10); arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10); arrTd[index++] = data[i].binf.install_user; - arrTd[index++] = '<a onclick="getButIndex(this)" href="#myPopup" id="butt" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼鎴栧垹闄�</a>';continue; - } + arrTd[index++]='<a onclick="getEditButIndex(this)" id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼</a>'+'<a onclick="getDeleteButIndex(this)" href="#myPopup" id="" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鍒犻櫎</a>'; + } } setPage(); createTbl(tblCon, arrTh, arrTd); } - }); + }); + } + + 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 = { + num :arrdata[i].num, + 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.StationName4, // 璁惧鍚嶇О + 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, //鐢垫睜鐢熶骇鏃ユ湡 + BattInUseDate : arrdata[i].binf.BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡 + install_user : arrdata[i].binf.install_user, //瀹夎浜哄憳 + } + + } + 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", + url: "Battinf_applyAction!del", + async:true, + dataType:'json', + data:"json="+JSON.stringify(parm), + success: function(data){ + console.info(data); + 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(index){ + console.info(arrTh.length); + console.info(index); + var delindex = Math.ceil(arrTh.length*index);//鍦ˋRRTD涓婄鍑犲垪 + var stationid = arrTd[delindex]; + console.info(stationid); + searchdelnum(stationid,index,delindex); + } - function searchHomeInfoByName(id) { + function searchdelnum(id,index,delindex) {//鍒犻櫎鏈鎵癸紝鏋勯�犱紶鍙� var groupName = new Array(); - var index = 0; + //var index = 0; var num =new Array(); - var index1 = 0; + var groupId = new Array(); + //var index1 = 0; var temp = { binf:{ - StationId:id, // 鐪� + StationId:id, } ,page: { pageCurr: 1 @@ -279,114 +385,64 @@ 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[index++] = data[i].binf.BattGroupName; - num[index1++] = data[i].num; + console.info(data[i]); + groupName[i] = data[i].binf.BattGroupName; + num[i] = data[i].num; + groupId[i] = data[i].binf.BattGroupId; } - var json = JSON.stringify(groupName); - var json1 =JSON.stringify(num); - setCookie("eleparmindex",json); - setCookie("eleparmnum",json1); - console.info(groupName); + var arr = new Array(); + var obj = { + //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"), + num : num[arrTd[delindex+12]], + binf:{ + StationId : arrTd[delindex++], // 鏈烘埧缂栧彿 + StationName : (arrTd[delindex]+"-"+arrTd[delindex+1]+"-"+arrTd[delindex+3]+"-"+arrTd[delindex+4]), // 鎷兼帴鏈烘埧鍚嶇О + StationName1 :arrTd[delindex++], // 鐪� + StationName2 : arrTd[delindex++], // 甯� + StationName5 : arrTd[delindex++], // 鍖�/鍘� + StationName3 : arrTd[delindex++], // 鏈烘埧鍚嶇О + StationName4 :arrTd[delindex++], // 璁惧鍚嶇О + StationIp : arrTd[delindex++], //鏈烘埧ip + FBSDeviceId : arrTd[delindex++], //璁惧id + FbsDeviceIp : arrTd[delindex++], //璁惧ip + FbsDeviceIp_YM : arrTd[delindex++], // 璁惧鎺╃爜 + FbsDeviceIp_WG : arrTd[delindex++], // 缃戝叧 + FBSDeviceName : arrTd[delindex++], //璁惧鍚嶇О + GroupIndexInFBSDevice : arrTd[delindex++], //fbs璁惧绱㈠紩 + BattGroupId : arrTd[delindex++], //鐢垫睜缁刬d + BattGroupNum : arrTd[delindex++], //鏈烘埧鍐呯數姹犵粍缂栧彿 + BattGroupName : arrTd[delindex++], //鐢垫睜缁勭储寮� + FloatVolLevel : arrTd[delindex++], //娴厖鐢靛帇闃�鍊� + OfflineVolLevel : arrTd[delindex++], //绂荤嚎鐢靛帇闃�鍊� + BattFloatCurrent : arrTd[delindex++], //娴厖鐢垫祦闃�鍊� + MonCount : arrTd[delindex++], //鍗曚綋鏁伴噺 + MonCapStd : arrTd[delindex++], //鏍囩О瀹归噺 + MonVolStd : arrTd[delindex++], //鏍囩О鐢靛帇 + MonResStd : arrTd[delindex++], //鏍囩О鍐呴樆 + MonSerStd : arrTd[delindex++], //鏍囩О鐢靛 + MonVolLowToAvg : arrTd[delindex++], //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲� + + Load_curr : arrTd[delindex++], //璐熻浇鐢垫祦 + DisCurrMax : arrTd[delindex++], //鏈�澶ф牳瀹圭數娴� + station_phone : arrTd[delindex++], //鍩虹珯鍙风爜 + + BattProducer : arrTd[delindex++], //鐢垫睜鍝佺墝 + BattModel : arrTd[delindex++], //鐢垫睜鍨嬪彿 + BattProductDate : arrTd[delindex++]+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡 + BattInUseDate : arrTd[delindex++]+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡 + install_user : arrTd[delindex++], //瀹夎浜哄憳 + } + } + arr.push(obj); + console.info(arr); + delBatt(arr); + } } - }) - - } - 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]; - console.info(id); - searchHomeInfoByName(id); - var json=window.JSON.stringify(arrcookie); - setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗� - } - function delBatt(parm){ - $.ajax({ - type: "post", - url: "Battinf_applyAction!del", - async:true, - dataType:'json', - data:"json="+JSON.stringify(parm), - success: function(data){ - console.info(data); - alert("鍒犻櫎鎴愬姛"); - } - }); - } - function battDeleteparm(){ - var arr = new Array(); - var temp = getCookie("eleparm"); - var tempindex = getCookie("eleparmindex"); - var tempnum = getCookie("eleparmnum"); - 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(battString); - var obj = { - //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"), - num : tempnum[i], - 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 : i, //fbs璁惧绱㈠紩 - BattGroupId : temp[13], //鐢垫睜缁刬d - BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿 - BattGroupName : tempindex[i], //鐢垫睜缁勭储寮� - 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() { //鐐瑰嚮涓婁竴椤� $('.pre-page').on('click', 'a', function() { @@ -429,6 +485,7 @@ }else{ $('.pre-page').show(); } + var pageNum = Math.ceil(Page.pageAll/Page.pageSize); if(Page.pageCurr < pageNum){ @@ -441,4 +498,4 @@ </script> -</html> \ No newline at end of file +</html> -- Gitblit v1.9.1