From ff26de8e5fe1acfbbe30e92164fd565c3911b561 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.27>
Date: 星期五, 14 十二月 2018 13:57:45 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 13 ++----
gx_tieta/WebRoot/mobil/batt-approved.html | 30 ++++++++-------
gx_tieta/WebRoot/mobil/control.html | 19 ++++++++-
3 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index e4bb200..99d1651 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -139,10 +139,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 ;
}
@@ -182,7 +182,7 @@
return obj;
}
// 鏌ヨ鍐呭
-/* function searchBattLife(){
+ function searchBattLife(){
var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
@@ -232,14 +232,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,29 +320,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;
- }
- if(i=13){
+
+ } if(i==13){
arrTd[i]=1002102;
- }else{
- arrTd[i]=i;
+ }else{
+ arrTd[i]=i*10;
}
}
createTbl(tblCon, arrTh, arrTd);
/* 妯℃嫙鏁版嵁鍋氬ソ灏卞垹锛侊紒锛侊紒锛侊紒锛侊紒 */
- }
+ //}
function getUpdateArr(temp){
var arr = new Array();
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index 6c7b6aa..c6286f1 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -439,12 +439,7 @@
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$("#sure").click(function(){
editParm();
- /* function backpage(){window.location.href="ele-param1.html";}
- setTimeout(backpage,500);
- });
- $("#cancel").click(function(){
- window.location.href="ele-param1.html";
- */
+
});
});
function editParm(){
@@ -462,15 +457,15 @@
console.info(model);
if(model.code ==1){
alert("淇敼鎴愬姛");
- //window.location.href="batt-unapproved.html"
+ window.location.href="batt-unapproved.html"
}else{
alert("淇敼澶辫触!");
- //window.location.href="batt-unapproved.html"
+ window.location.href="batt-unapproved.html"
}
},
error:function(){
alert("淇敼鐢垫睜缁勫け璐�!");
- //window.location.href="batt-unapproved.html"
+ window.location.href="batt-unapproved.html"
}
});
}
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 3658a99..db8c133 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -18,7 +18,7 @@
<body>
<div data-role="page">
<div data-role="header" data-position="fixed">
- <a href="testdata.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <a id= "return" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
<h1>瀹炴椂鈥旀娴嬫暟鎹�</h1>
</div>
@@ -61,7 +61,16 @@
//findrtstate();
searchBattInfo();
});
-
+ $("#return").click(function(){
+ var temp = getCookie("batt");
+ var batt = JSON.parse(temp);
+ console.info(batt);
+ if(batt.install_user){
+ window.location.href="batt-approved.html";
+ }else{
+ window.location.href="testdata.html";
+ }
+ });
var timeer ;
//鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勪俊鎭�
/* function findrtstate(){
@@ -191,7 +200,11 @@
{url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 鐢垫睜缁勬暟鎹�
{url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'} // 鐢垫睜缁勬暟鎹�
];*/
- addBreadCrumb($('.breadcrumb').eq(0), data);
+ if(batt.install_user){
+
+ }else{
+ addBreadCrumb($('.breadcrumb').eq(0), data);
+ }
});
function sethoubeiTime(value){
--
Gitblit v1.9.1