From deab7d04e83c1eada95ff1474b4fe272b907a06f Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期三, 16 一月 2019 16:31:19 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-approved.html | 101 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index c99c308..f39a91b 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -10,6 +10,7 @@
<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="css/tbl.css">
+ <link rel="stylesheet" type="text/css" href="src/css/layui.css">
<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<style type="text/css">
@@ -129,6 +130,9 @@
</div>
</div>
+ <!-- 瀛樺偍homeinfo鐨勫�� -->
+ <div id="homeInfoIframe"></div>
+ <div id="homeInfoIframeAll"></div>
</body>
<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
@@ -137,7 +141,7 @@
<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
-
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
/* 鑾峰彇鐐瑰嚮鐨勬槸鍝釜鎸夐挳 */
@@ -149,14 +153,52 @@
window.location.href="control.html";
return ;
}
+
+ var iframePopup = ''; // 寮瑰嚭闈㈡澘鏍囪瘑绗�
function getApplyYanshouIndex(t){
var index = $(t).attr("but-index");
console.info(index);
- setApplyYanshou(index);
+ var arr=setApplyYanshou(index);
+ console.log(arr); //鏂规硶涓�锛�1鎸夐挳鎼炲畾鎵�鏈夈�傝鍦ㄦ瀵规帴鍔犲叆寮瑰嚭妗嗭紝涓婁紶瑙嗛缁忕含搴︾瓑
- return ;
+ if(arr.length == 0) {
+ layer.msg('鑾峰彇鏁版嵁澶辫触锛侊紒');
+ return ;
+ }
+
+ // 瀛樺偍鎵�鏈夌殑鏁版嵁
+ $('#homeInfoIframeAll').data('allData', arr);
+ var _data = arr[0];
+ var temp = {
+ homeId: _data.binf.StationId
+ ,homeName: _data.binf.StationName
+ ,addr: ''
+ ,lng: 0
+ ,lat: 0
+ }
+ // 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
+ $('#homeInfoIframe').data('homeInfo', temp);
+
+ iframePopup = layer.open({
+ type: 2
+ ,closeBtn: 0
+ ,title: false
+ ,area: ['100%', '100%']
+ ,full: true
+ ,anim: 4
+ ,content: 'iframe/homeinfo1.html'
+ });
+ layer.full(iframePopup);
+
+ // applyendyanshou(arr);
+
}
-
+ function getApplyYanshoupicture(t){
+ var index = $(t).attr("but-index");
+ console.info(index);//鏂规硶2
+ var arr=setApplyYanshou(index);
+ //璇峰湪姝ゅ鎺ュ姞鍏ュ脊鍑烘
+ }
var arrTd = new Array(); //褰撳墠琛ㄦ牸td鏁版嵁
var tblCon = $('.tbl-container');
var Page = {
@@ -168,7 +210,7 @@
var arrdata = new Array();
- 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');
@@ -192,16 +234,21 @@
success:function(data) {
data = JSON.parse(data.result);
if(data.code==1){
+ console.info(data.data);
var json =JSON.stringify(data.data);
setCookie("numberget",json);
+ //return data.data;
}
}
});
}
function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
+ //var a = getnumber();
+ //console.info(a);
if(getCookie("numberget")){
var number = getCookie("numberget");
number = JSON.parse(number);
+ console.info(number);
if(number[0]){
for(var i =0; i<number.length;i++){
if(id == number[i].dev_id){
@@ -212,7 +259,24 @@
}
return 0;
}
-
+ function getCookiediubao(id){
+ if(getCookie("numberget")){
+ var number = getCookie("numberget");
+ number = JSON.parse(number);
+ console.info(number);
+ if(number[0]){
+ for(var i =0; i<number.length;i++){
+ if(id == number[i].dev_id){
+ var errorCount = number[i].dev_errcommcount;
+ var allCount = number[i].dev_commcount+errorCount;
+ //var parcent = (allCount==0?0:errCount/allCount*100)
+ //return parcent;
+ }
+ }
+ }
+ }
+ return 0;
+ }
function getcreatArr(){
obj = {
apply_en : 1,
@@ -226,8 +290,10 @@
function yanshou(check_en){
if(check_en==0){
return "鏈獙鏀�";
- }else{
- return "宸查獙鏀�";
+ }else if(check_en==2){
+ return "宸茬敵璇烽獙鏀�";
+ }else if(check_en==1){
+ return"宸插畬鎴愰獙鏀�";s
}
}
// 鏌ヨ鍐呭
@@ -287,9 +353,12 @@
arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
arrTd[index++] = data[i].binf.install_user;
arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
+ arrTd[index++] = getCookiediubao(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>'+
'<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>鐢宠楠屾敹</a>';
+ //鏂规硶2 2鎸夐挳瑙ｅ紑浠ヤ笅涓�鏉℃敞閲婃寜閽�
+ //'<a onclick="getApplyYanshoupicture(this)" href="#myPopup" id="apply_yanshou" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>缁忕含搴﹀浘鐗囦笂浼�</a>'
}
}
console.info(arrTd);
@@ -307,9 +376,9 @@
function setApplyYanshou(index){
console.info(arrdata);
- if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
- //璇峰湪姝ゅ鎺ュ姞鍏ュ璇濇锛屾渶鍚庤皟鐢ㄧ敵璇烽獙鏀舵柟娉曪紝浼犲叆arrdata,index鍙傛暟
- creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+ if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
+ var arr= creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+ return arr;
}else{
alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
}
@@ -365,7 +434,14 @@
}
}
console.info(arr);
- var temp = JSON.stringify(arr);
+
+
+ return arr;
+ //applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
+ }
+
+ function applyendyanshou(arr){
+ var temp = JSON.stringify(arr);
$.ajax({ //鐢宠楠屾敹
type: 'post',
async: true,
@@ -380,6 +456,7 @@
}
}
});
+
}
function setcookiedit(index){
var arrcookie = new Array();
--
Gitblit v1.9.1