From d3d3f559854042f8f71ece4e576cced226aa1605 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期三, 19 十二月 2018 17:41:32 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved.html | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index a3790d1..ddb2acf 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -87,6 +87,7 @@
margin: 0;
padding-top: 0.1em;
padding-bottom: 0.1em;
+ margin-left:7em;
}
.ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{
width:35%;
@@ -139,10 +140,10 @@
/* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
function getButIndex(t){
var index = $(t).attr("but-index");
- index=(index/33-1);
+ // index=(index/33-1);
console.info(index);
setcookiedit(index);
- //window.location.href="control.html";
+ window.location.href="control.html";
return ;
}
@@ -158,7 +159,7 @@
- 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');
@@ -182,7 +183,7 @@
return obj;
}
// 鏌ヨ鍐呭
-/* function searchBattLife(){
+ function searchBattLife(){
var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
@@ -232,14 +233,15 @@
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++] = "";
- arrTd[index++] = arrTd[i]='<a href="" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ //arrTd[index++] = "";
+ arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
}
}
+ console.info(arrTd);
createTbl(tblCon, arrTh, arrTd);
}
});
- }*/
+ }
function setcookiedit(index){
var arrcookie = new Array();
@@ -319,25 +321,30 @@
}
// 鏌ヨ鍐呭
- function searchBattLife(){
+ /* function searchBattLife(){
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- for(var i=0;i<340;i++){
+ /* for(var i=0;i<340;i++){
if(i%34==33){
//<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
console.info(i);
- arrTd[i]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ arrTd[i]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+
continue;
- }
- arrTd[i]=i*10;
+
+ } if(i==13){
+ arrTd[i]=1002102;
+ }else{
+ arrTd[i]=i*10;
+ }
}
createTbl(tblCon, arrTh, arrTd);
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- }
+ //}
function getUpdateArr(temp){
var arr = new Array();
--
Gitblit v1.9.1