From fd80cd75de579505b2adc294b3cbf7796e2fe1fa Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期四, 20 十二月 2018 13:54:31 +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 | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index ddb2acf..b6f878d 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -123,7 +123,7 @@
</div>
</div>
-
+ <input style="visibility:hidden" id="getnumber" type="text" name="customer_area_id" >
</div>
</div>
</body>
@@ -167,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 = {
@@ -182,12 +214,22 @@
}
return obj;
}
+
+ function yanshou(check_en){
+ if(check_en==0){
+ return "鏈獙鏀�";
+ }else{
+ return "宸查獙鏀�";
+ }
+ }
// 鏌ヨ鍐呭
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,
@@ -233,12 +275,16 @@
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++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</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>';
}
}
console.info(arrTd);
- createTbl(tblCon, arrTh, arrTd);
+ createTbl(tblCon, arrTh, arrTd);
+ timeer = window.setTimeout(function() {
+ searchBattLife();
+ }, 5000);
}
});
}
--
Gitblit v1.9.1