From 151f5ce0301ec2129cbc44e21b1f7ba5302de840 Mon Sep 17 00:00:00 2001
From: cjj <Administrator@192.168.10.33>
Date: 星期四, 13 十二月 2018 17:03:26 +0800
Subject: [PATCH] 申请，实时数据连接
---
gx_tieta/WebRoot/mobil/batt-unapproved.html | 78 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index f11065a..6579a86 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>
@@ -143,13 +147,20 @@
<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");
+ //setcookiedit(index);
+ 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 arrTd=new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
@@ -162,8 +173,6 @@
$("#edit").click(function(){
-
-
//searchHomeInfoByName(homename);
window.location.href="batt-infor-unapproved-edit.html";
});
@@ -171,10 +180,10 @@
var parm = battDeleteparm();
console.info(parm);
delBatt(parm);
- window.location.href="batt-unapproved.html";
+ //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');
@@ -196,7 +205,7 @@
}
// 鏌ヨ鍐呭
function searchBattLife(){
- var temp = JSON.stringify(getcreatArr());
+ /* var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
var index = 0;
@@ -252,7 +261,20 @@
setPage();
createTbl(tblCon, arrTh, arrTd);
}
- });
+ }); */
+
+ for(i=0;i<340;i++){
+ if(i%34==33){
+ arrTd[i]='<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>';
+
+ continue;
+
+ }
+
+ arrTd[i]=i*10;
+ }
+
+ createTbl(tblCon, arrTh, arrTd);
}
function searchHomeInfoByName(id) {
@@ -309,7 +331,7 @@
}
arrcookie.push($("#newbattnum").val());
var id = arrcookie[0];
- console.info(id);
+ //console.info(id);
searchHomeInfoByName(id);
var json=window.JSON.stringify(arrcookie);
setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
@@ -323,9 +345,17 @@
data:"json="+JSON.stringify(parm),
success: function(data){
console.info(data);
- alert("鍒犻櫎鎴愬姛");
+ 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(){
var arr = new Array();
@@ -335,12 +365,14 @@
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(temp);
+ //var numinsert;
+ 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[i],
+ num : tempnum[temp[12]],
binf:{
StationId : temp[0], // 鏈烘埧缂栧彿
StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]), // 鎷兼帴鏈烘埧鍚嶇О
@@ -355,10 +387,10 @@
FbsDeviceIp_YM : temp[9], // 璁惧鎺╃爜
FbsDeviceIp_WG : temp[10], // 缃戝叧
FBSDeviceName : temp[11], //璁惧鍚嶇О
- GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
+ GroupIndexInFBSDevice : temp[12], //fbs璁惧绱㈠紩
BattGroupId : temp[13], //鐢垫睜缁刬d
BattGroupNum : temp[14], //鏈烘埧鍐呯數姹犵粍缂栧彿
- BattGroupName : tempindex[i], //鐢垫睜缁勭储寮�
+ BattGroupName : temp[15], //鐢垫睜缁勭储寮�
FloatVolLevel : temp[16], //娴厖鐢靛帇闃�鍊�
OfflineVolLevel : temp[17], //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : temp[18], //娴厖鐢垫祦闃�鍊�
@@ -381,7 +413,7 @@
}
}
arr.push(obj);
- }
+ //}
console.info(arr);
return arr;
--
Gitblit v1.9.1