From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/WebRoot/mobil/batt-approved1.html | 510 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 269 insertions(+), 241 deletions(-) diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html index 1de45c5..abdd2a6 100644 --- a/gx_tieta/WebRoot/mobil/batt-approved1.html +++ b/gx_tieta/WebRoot/mobil/batt-approved1.html @@ -27,17 +27,17 @@ white-space: nowrap; } .uncheck{ - background-color: #dddddde0!important; + background-color: #ddd!important; color: #000!important; } .ui-btn-icon-right { padding-right: 8.5em; } .hbg{ - background-color:#ddd9; + background-color:#ddd; } #battdata { - background-color:#dddddd54 + background-color:#eee; } .ui-select .ui-btn select{ width:77%; @@ -54,196 +54,149 @@ </head> <body> <div data-role="page"> - <!-- 澶撮儴鍐呭 --> <div data-role="header" data-position="fixed"> <a href="batt-approve-index.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> <h1>宸插鎵归�氳繃鏈烘埧璇︽儏</h1> - <fieldset data-role="controlgroup" class="ptr0" > - </fieldset> - + <fieldset data-role="controlgroup" class="ptr0" ></fieldset> </div> <!-- 涓讳綋鍐呭 --> <div data-role="main"> <!-- <div class="set-option"> --> - <table class="layout-set"> - <tbody> - <tr> - <td>鐪�</td> - <td> - <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/> - </td> - </tr> - <tr> - <td>鍩庡競</td> - <td> - <input type="text" id="city" class="unable" data-mini="true" onfocus="this.blur()"/> - </td> - </tr> - <tr> - <td>鍖哄幙</td> - <td> - <input type="text" id="country" class="unable" data-mini="true" onfocus="this.blur()"/> - </td> - </tr> - <tr> - <td>鏈烘埧鍚嶇О</td> - <td> - <input type="text" id="homeName" class="unable" data-mini="true"> - </td> - </tr> - <tr> - <td>鏈烘埧缂栧彿</td> - <td> - <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/> - </td> - </tr> - <tr> - <td>FBS璁惧ID(閲嶈)</td> - <td> - <input type="text" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/> - </td> - </tr> - <tr> - <td>FBS璁惧IP(閲嶈)</td> - <td> - <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" /> - </td> - </tr> - - - <input type="hidden" id="StationName4" data-mini="true" /> - - <input type="hidden" id="StationIp" data-mini="true" /> - - <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/> - - <input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/> - - <input type="hidden" id="FBSDeviceName" data-mini="true" /> - - <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" /> - - <input type="hidden" id="FloatVolLevel" data-mini="true" /> - - <input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" /> - - <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" /> - - <input type="hidden" id="MonResStd" data-mini="true" /> - - <input type="hidden" id="MonSerStd" data-mini="true" /> - - <input type="hidden" id="MonVolLowToAvg" data-mini="true" /> - - <tr> - <td>*璐熻浇鐢垫祦(A)</td> - <td> - <input type="text" id="Load_curr" class="unable" data-mini="true" /> - </td> - </tr> - <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" /> - - <tr> - <td>鍩虹珯鐢佃瘽鍙风爜</td> - <td> - <input type="text" id="station_phone" class="unable" data-mini="true" /> - </td> - </tr> - - <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" /> - - <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01" /> - - <tr> - <td>*瀹夎浜哄憳</td> - <td> - <input type="text" id="install_user" class="unable" data-mini="true" /> - </td> - </tr> - - <tr> - <td>*閫氳璁℃暟</td> - <td> - <input type="text" id="tongxunnumber" class="unable" data-mini="true" /> - </td> - </tr> - - <tr> - <td>*涓㈠寘鐜�</td> - <td> - <input type="text" id="diubaonumber" class="unable" data-mini="true" /> - </td> - </tr> - - <tr> - <td>*鏄惁楠屾敹</td> - <td> - <input type="text" id="check_en" class="unable" data-mini="true" /> - </td> - </tr> - </tbody> - </table> - <!-- </div> --> - <div id="battdata"> - <!-- <div> - <h1 class="hbg">鐢垫睜缁�1</h1> - <table class="layout-set"> - <tbody> - <tr> - <td>璁惧绱㈠紩</td> - <td> - <fieldset data-role="controlgroup" data-type="horizontal"> - <select> - <option value="">0</option> - <option value="mon">1</option> - <option value="mon">2</option> - <option value="mon">3</option> - - </select> - </fieldset> - </td> - </tr> - <tr> - <td>鐢垫睜缁勫悕绉�</td> - <td><input type="text" id="" data-mini="true" /></td> - </tr> - </tbody> - </table> - </div> --> - </div> - + <table class="layout-set"> + <tbody> + <tr> + <td>鐪�</td> + <td> + <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/> + </td> + </tr> + <tr> + <td>鍩庡競</td> + <td> + <input type="text" id="city" class="unable" data-mini="true" onfocus="this.blur()"/> + </td> + </tr> + <tr> + <td>鍖哄幙</td> + <td> + <input type="text" id="country" class="unable" data-mini="true" onfocus="this.blur()"/> + </td> + </tr> + <tr> + <td>鏈烘埧鍚嶇О</td> + <td> + <textarea id="homeName" class="unable" data-mini="true"></textarea> + </td> + </tr> + <tr> + <td>鏈烘埧缂栧彿</td> + <td> + <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/> + </td> + </tr> + <tr> + <td>FBS璁惧ID(閲嶈)</td> + <td> + <input type="text" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/> + </td> + </tr> + <tr> + <td>FBS璁惧IP(閲嶈)</td> + <td> + <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" /> + </td> + </tr> + + + <input type="hidden" id="StationName4" data-mini="true" /> + + <input type="hidden" id="StationIp" data-mini="true" /> + + <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/> + + <input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/> + + <input type="hidden" id="FBSDeviceName" data-mini="true" /> + + <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" /> + + <input type="hidden" id="FloatVolLevel" data-mini="true" /> + + <input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" /> + + <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" /> + <input type="hidden" id="MonResStd" data-mini="true" /> + + <input type="hidden" id="MonSerStd" data-mini="true" /> + + <input type="hidden" id="MonVolLowToAvg" data-mini="true" /> + + <tr> + <td>*璐熻浇鐢垫祦(A)</td> + <td> + <input type="text" id="Load_curr" class="unable" data-mini="true" /> + </td> + </tr> + <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" /> + + <tr> + <td>*鍩虹珯鐢佃瘽鍙风爜</td> + <td> + <input type="text" id="station_phone" class="unable" data-mini="true" /> + </td> + </tr> + + <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" /> + + <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01" /> + + <tr> + <td>*瀹夎浜哄憳</td> + <td> + <input type="text" id="install_user" class="unable" data-mini="true" /> + </td> + </tr> + <tr> + <td>*鏄惁楠屾敹</td> + <td> + <input type="text" id="check_en" class="unable" data-mini="true" /> + </td> + </tr> + </tbody> + </table> + <div id="battdata"></div> </div> <div data-role="footer" data-position="fixed" data-theme="a"> <div data-role="navbar"> <ul> <li><a href="" id="applyyanshou"class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">鐢宠楠屾敹</a></li> + <li><a href="javascript:;" id="homeInfoIframeBtn" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="home" data-role="button">鏈烘埧淇℃伅</a></li> <li><a href="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="star" data-role="button">瀹炴椂鏁版嵁</a></li> </ul> </div> </div> <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b"> - <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a> - <h1>閫夋嫨鏌ョ湅鐢垫睜缁�</h1> - <fieldset data-role="controlgroup" > - <select id="newbattnum" data-mini="true"> - <option value="1">鐢垫睜缁�1</option> - - </select> - </fieldset> - - <div data-role="controlgroup" data-type="horizontal" class="mt6"> - <a href="" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check pl5" >纭畾</a> - <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete pl5" >鍙栨秷</a> - </div> + <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a> + <h1>閫夋嫨鏌ョ湅鐢垫睜缁�</h1> + <fieldset data-role="controlgroup" > + <select id="newbattnum" data-mini="true"> + <option value="1">鐢垫睜缁�1</option> + </select> + </fieldset> + + <div data-role="controlgroup" data-type="horizontal" class="mt6"> + <a href="" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check pl5" >纭畾</a> + <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete pl5" >鍙栨秷</a> + </div> </div> <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b"> - <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a> - <a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a> - <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a> - </div> + <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a> + <a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a> + <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a> + </div> </div> <!-- 瀛樺偍homeinfo鐨勫�� --> <div id="homeInfoIframe"></div> @@ -264,15 +217,18 @@ function battnumber(){ var selected='' - for(var i=1;i<=temp.length;i++){ - selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>'; + console.info(temp); + if(temp.length>0){ + for(var i=0;i<temp.length;i++){ + selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>'; + } + return $('#newbattnum').html(selected); } - return $('#newbattnum').html(selected); } function creatBattView(index){ var count=index+1 - ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+ + ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupName+'</h1>'+ '<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>' ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/ ,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</td>'+'</tr>' @@ -289,11 +245,11 @@ return battTitle+battBrand+battType+battNum+MonVolStd+nomCap+battIndex+battName; } function selectedNum(index){ - var selected=''; + var selected=''; if(temp[index].binf.MonCount==4){ - return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>'; + return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>'; }else{ - return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>'; + return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>'; } } @@ -315,10 +271,10 @@ var arr = temp; function setcookieCreat(i){ - var index=Math.ceil(i-1); - arrdata = temp[index].binf; - //console.info(index); - //console.info(temp); + console.info(temp); + console.info(i) + //var index=Math.ceil(i-1); + arrdata = temp[i].binf; console.info(arrdata); var json = JSON.stringify(arrdata); setCookie("batt",json); @@ -326,7 +282,45 @@ } // 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘 $("#applyyanshou").on('click',function(){ - console.info(temp); + //console.info(temp); + if(temp.length == 0) { + layer.msg('鑾峰彇鏁版嵁澶辫触锛侊紒'); + return ; + } + + // 瀛樺偍鎵�鏈夌殑鏁版嵁 + $('#homeInfoIframeAll').data('allData', temp); + var _data = temp[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' + ,success: function() { + $('div[data-role=page]').hide(); + } + ,end: function() { + $('div[data-role=page]').show(); + } + }); + layer.full(iframePopup); + }); + + // 鏄剧ず鏈烘埧闈㈡澘淇℃伅 + $('#homeInfoIframeBtn').click(function() { if(temp.length == 0) { layer.msg('鑾峰彇鏁版嵁澶辫触锛侊紒'); return ; @@ -347,16 +341,23 @@ $('#homeInfoIframe').data('homeInfo', _temp); iframePopup = layer.open({ - type: 2 - ,closeBtn: 0 - ,title: false - ,area: ['100%', '100%'] - ,full: true - ,anim: 4 - ,content: 'iframe/homeinfo1.html' - }); + type: 2 + ,closeBtn: 0 + ,title: false + ,area: ['100%', '100%'] + ,full: true + ,anim: 4 + ,content: 'iframe/seenhomeinfo.html' + ,success: function() { + $('div[data-role=page]').hide(); + } + ,end: function() { + $('div[data-role=page]').show(); + } + }); layer.full(iframePopup); - }) + }); + var tempgroupid = new Array() ; for(var i=0;i<temp.length;i++){ tempgroupid.push(temp[i].binf.BattGroupId); @@ -364,8 +365,8 @@ console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級; var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁� var moncount = 0; - var fuchongfazhi = [0,0,0,0]; - var lixiandianyafazhi = [0,0,0,0]; + //var fuchongfazhi = [0,0,0,0]; + //var lixiandianyafazhi = [0,0,0,0]; battnumber(); $(function(){ creatAllView(temp.length).trigger('create'); @@ -374,11 +375,47 @@ $(function () { //setTimes($("#startTestrecord"),'2000-01-01'); - //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd')); - - installstartdata(temp); + //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd')); + installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊� + //getnewnumber(temp[0].binf.FBSDeviceId); + updateinstalldata(); }); + var timeer = ''; + + function updateinstalldata(){ + console.info(temp); + // 娓呴櫎璁℃椂鍣� + clearInterval(updateinstalldata.timer); + var data=temp[0].binf.StationId; + var _data ={ binf:{ + StationId:data + } + } + data=JSON.stringify(_data); + //console.info(data); + $.ajax({ //鐢宠楠屾敹 + type: 'post', + async: true, + url: 'Battinf_applyAction!serchById', + data: "json="+data, + dataType: 'json', + success:function(data) { + data = JSON.parse(data.result); + console.info(data); + if(data.code==1&&data.data.length>0){ + data = data.data; + //console.info(data[0].check_en); + document.getElementById("check_en").value = yanshou(data[0].check_en); + } + + // 鏇存柊鍐呭 + updateinstalldata.timer = setTimeout(function() { + updateinstalldata(); + }, 4000); + } + }); + } function applyendyanshou(arr){ //鐢宠楠屾敹 var temp = JSON.stringify(arr); $.ajax({ //鐢宠楠屾敹 @@ -397,7 +434,7 @@ }); } - // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� // + // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� // function setFloatAndoutLine(index) { var monvolstd = "#MonVolStd"+index; var MonCount = "#MonCount" +index; @@ -453,8 +490,7 @@ //setTimes($("#startTestrecord"),data.productDate); //setTimes($("#endTestrecord"),data.useDate); document.getElementById("install_user").value = data.install_user; - document.getElementById("tongxunnumber").value = getCookienumber(data.StationId); - document.getElementById("diubaonumber").value = getCookiediubao(data.StationId) + for(var i=0;i<temp.length;i++){ data=temp[i]; @@ -476,41 +512,40 @@ } } - 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){ - return number[i].dev_commcount; - } - } - } - } - return 0; + + function getnewnumber(id){//涓㈠寘鐜囷紝閫氳璁℃暟 + $.ajax({ + type: 'post', + async: true, + url: 'Battinf_applyAction!devCommNum', + data: null, + dataType: 'json', + success:function(data) { + console.info(data); + data = JSON.parse(data.result); + if(data.code==1){ + console.info(data.data); + data=data.data; + console.info(data[0]); + for(var i=0;i<data.length;i++){ + console.info(data[i].dev_id); + console.info(id) + if(data[i].dev_id==id){ + console.info(id); + document.getElementById("tongxunnumber").value = data[i].dev_commcount; + var errorCount = data[i].dev_errcommcount; + var allCount = data[i].dev_commcount+errorCount; + var parcent = (allCount==0?0:errorCount/allCount*100); + console.info(parcent); + document.getElementById("diubaonumber").value = parcent; + } + } + } + } + }); } - 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 getUpdateArr(){ mon=$('#MonVolStd').val(); @@ -590,13 +625,6 @@ }); }); - function nullOrn(){ - - return true; - - - } - function editBatt(){// console.info(getUpdateArr()); var temp = JSON.stringify(getUpdateArr()); -- Gitblit v1.9.1