From 99ed6cd7dc00f90b6161fbc44fc878f18ee248c2 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 18 十二月 2018 15:55:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-unapproved.html | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 7b503aa..1cb5ba3 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" 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,10 +148,21 @@
<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");
+ console.info(index);
+ setcookiedit(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 ;
}
@@ -163,7 +178,7 @@
$("#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();
@@ -172,7 +187,7 @@
//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 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 +209,7 @@
}
// 鏌ヨ鍐呭
function searchBattLife(){
- var temp = JSON.stringify(getcreatArr());
+ var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
var index = 0;
@@ -243,21 +258,23 @@
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 index1 = 0;
var temp = {
binf:{
StationId:id, // 鐪�
@@ -280,14 +297,20 @@
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;
+ 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 json1 =JSON.stringify(num);
+ var json2 = JSON.stringify(groupId);
+ setCookie("eleparmindex",json); //鐢垫睜缁勫悕绉�
+ setCookie("eleparmnum",json1); //鐢垫睜缁勭紪鍙�
+ console.info(groupName);
+ setCookie("elegroupid",json2);
+ console.info(json2)
+ window.location.href="batt-infor-unapproved-edit.html";
}
})
@@ -306,11 +329,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({
@@ -390,7 +414,7 @@
}
arr.push(obj);
//}
- console.info(arr);
+ //console.info(arr);
return arr;
}
--
Gitblit v1.9.1