From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:41:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-unapproved.html | 222 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 173 insertions(+), 49 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 7b503aa..8bd9940 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>
@@ -144,14 +148,29 @@
<script type="text/javascript">
/* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
- function getButIndex(t){
- //console.warn($(t).attr("but-index"));
+
+ function getDeleteButIndex(t){
+ console.warn($(t).attr("but-index")+' 鍒犻櫎');
+ 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";
return ;
}
-
+ var delindex=0;
var arrTd=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
var tblCon = $('.tbl-container');
var Page = {
@@ -159,20 +178,14 @@
pageCurr:1, //褰撳墠椤电爜鏁�
pageAll:0,
};
-
-
- $("#edit").click(function(){
- //searchHomeInfoByName(homename);
- 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";
+ $("#delete").click(function(delindex){ //鍒犻櫎鐢垫睜缁�
+ var delindex = $("#delete").val();
+ //console.info($("#delete").val());
+ //console.info(delindex);
+ battDeleteparm(delindex);
});
- var arrTh = [ '鏈烘埧缂栧彿', '鐪�', '鍩庡競','鍖哄幙','鏈烘埧鍚嶇О','璁惧鍚嶇О','鏈烘埧IP','FBS璁惧ID(閲嶈)','FBS璁惧IP(閲嶈)','瀛愮綉鎺╃爜','缃戝叧','FBS璁惧鍚嶇О','FBS鐢垫睜绱㈠紩(0-3)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(V)','绂荤嚎鐢靛帇闃�鍊�(V)','娴厖鐢垫祦闃�鍊�(A)','鍗曚綋鏁伴噺','鏍囩О瀹归噺(AH)','鏍囩О鍗曚綋鐢靛帇(V)','鏍囩О鍗曚綋鍐呴樆(m惟)','鏍囩О鍗曚綋鐢靛','鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�(V)','璐熻浇鐢垫祦(A)','鏈�澶ф牳瀹圭數娴�(A)','鍩虹珯鍙风爜','鐢垫睜鍝佺墝','鐢垫睜鍨嬪彿','鐢垫睜鐢熶骇鏃ユ湡','鎶曞叆浣跨敤鏃ユ湡','瀹夎浜哄憳','鎿嶄綔'];
+ 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');
@@ -194,7 +207,7 @@
}
// 鏌ヨ鍐呭
function searchBattLife(){
- var temp = JSON.stringify(getcreatArr());
+ var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
var index = 0;
@@ -243,21 +256,24 @@
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);
}
- });
- }
-
+ });
+ }
+
+ //鏌ヨ褰撳墠鏈烘埧鏈夊嚑涓數姹犵粍锛屽苟set鍏OOKIE
function searchHomeInfoByName(id) {
var groupName = new Array();
- var index = 0;
+ //var index = 0;
var num =new Array();
- var index1 = 0;
+ var groupId = new Array();
+ var eleditparm = new Array();
+ //var index1 = 0;
var temp = {
binf:{
StationId:id, // 鐪�
@@ -277,20 +293,37 @@
success: function(data){
var data = JSON.parse(data.result)
console.info(data);
- 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;
- }
+ 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);
- setCookie("eleparmindex",json);
- setCookie("eleparmnum",json1);
- console.info(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();
@@ -306,11 +339,12 @@
}
}
arrcookie.push($("#newbattnum").val());
- var id = arrcookie[0];
+ var id = arrcookie[0]; //鏈烘埧ID
//console.info(id);
- searchHomeInfoByName(id);
var json=window.JSON.stringify(arrcookie);
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ searchHomeInfoByName(id);
+
}
function delBatt(parm){
$.ajax({
@@ -330,19 +364,25 @@
window.location.href="batt-unapproved.html";
}
}
- });
-
+ });
}
- function battDeleteparm(){
- var arr = new Array();
+ function battDeleteparm(index){
+ console.info(arrTh.length);
+ console.info(index);
+ var delindex = Math.ceil(arrTh.length*index);
+ 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);
- //console.info(temp);
- //var numinsert;
+ tempid = JSON.parse(tempgroupid);
+
console.info(temp[12]);
//for(var i=0;i<tempindex.length;i++){
//console.info(battString);
@@ -364,7 +404,7 @@
FbsDeviceIp_WG : temp[10], // 缃戝叧
FBSDeviceName : temp[11], //璁惧鍚嶇О
GroupIndexInFBSDevice : temp[12], //fbs璁惧绱㈠紩
- BattGroupId : temp[13], //鐢垫睜缁刬d
+ BattGroupId : tempid[temp[12]], //鐢垫睜缁刬d
BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : temp[15], //鐢垫睜缁勭储寮�
FloatVolLevel : temp[16], //娴厖鐢靛帇闃�鍊�
@@ -390,11 +430,94 @@
}
arr.push(obj);
//}
- console.info(arr);
- return arr;
+ //console.info(arr);
+ return arr;*/
}
+ function searchdelnum(id,index,delindex) {
+ var groupName = new Array();
+ //var index = 0;
+ var num =new Array();
+ var groupId = new Array();
+ //var index1 = 0;
+ var temp = {
+ binf:{
+ StationId:id,
+ }
+ ,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 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() {
//鐐瑰嚮涓婁竴椤�
$('.pre-page').on('click', 'a', function() {
@@ -437,6 +560,7 @@
}else{
$('.pre-page').show();
}
+
var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
if(Page.pageCurr < pageNum){
@@ -449,4 +573,4 @@
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1