From 961b5df477111a5e59b778b4d5ea89e0b8842624 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期五, 21 十二月 2018 09:27:22 +0800
Subject: [PATCH] BUG修改
---
gx_tieta/WebRoot/mobil/batt-approved.html | 91 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index a3790d1..a588c78 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%;
@@ -122,7 +123,7 @@
</div>
</div>
-
+
</div>
</div>
</body>
@@ -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');
@@ -166,11 +167,43 @@
createTbl(tbl, arrTh, dataArr);
$(document).ready(function(){
setPage();
-
- Page.pageCurr=1;
- searchBattLife();
+ getnumber();
+ Page.pageCurr=1;
+ searchBattLife();
+ //console.info($("#getnumber").val());
});
+ function getnumber(){ //鍚戣幏鍙栨墍鏈夐�氳璁℃暟骞跺瓨鍏ョ紦瀛�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!devCommNum',
+ data: null,
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ if(data.code==1){
+ var json =JSON.stringify(data.data);
+ setCookie("numberget",json);
+ }
+ }
+ });
+ }
+ function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
+ //id = 0;
+ var number = getCookie("numberget");
+ number = JSON.parse(number);
+ //console.info(number);
+ if(number[0].dev_id){
+ //console.info(number);
+ for(var i =0; i<number.length;i++){
+ if(id == number[i].dev_id){
+ return number[i].dev_commcount;
+ }
+ }
+ }
+ return 0;
+ }
function getcreatArr(){
obj = {
@@ -181,12 +214,22 @@
}
return obj;
}
+
+ function yanshou(check_en){
+ if(check_en==0){
+ return "鏈獙鏀�";
+ }else{
+ return "宸查獙鏀�";
+ }
+ }
// 鏌ヨ鍐呭
-/* function searchBattLife(){
+ function searchBattLife(){
var temp = JSON.stringify(getcreatArr());
- console.info(temp);
+ //console.info(temp);
arrTd = new Array();
+ getnumber();
var index = 0;
+ getCookienumber();
$.ajax({
type: 'post',
async: true,
@@ -232,14 +275,19 @@
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++] = getCookienumber(data[i].binf.FBSDeviceId);
+ arrTd[index++] = yanshou(data[i].check_en);
+ 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>';
}
}
- createTbl(tblCon, arrTh, arrTd);
+ console.info(arrTd);
+ createTbl(tblCon, arrTh, arrTd);
+ timeer = window.setTimeout(function() {
+ searchBattLife();
+ }, 5000);
}
});
- }*/
+ }
function setcookiedit(index){
var arrcookie = new Array();
@@ -319,25 +367,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