From f0bb5c3c5b95ec825e4e444b7688c595d5ebebc7 Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期六, 29 十二月 2018 14:24:54 +0800 Subject: [PATCH] 修改。 --- gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 290 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 145 insertions(+), 145 deletions(-) diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html index d51dda2..d92f858 100644 --- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html +++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html @@ -33,10 +33,10 @@ 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%; @@ -58,30 +58,15 @@ <!-- <div class="set-option"> --> <table class="layout-set"> <tbody> - <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" /> - </td> - </tr> - <tr> - <td>FBS璁惧IP(閲嶈)</td> - <td> - <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" /> - </td> - </tr> - <tr> - <td>鐢垫睜缁処D</td> - <td> - <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" /> - </td> - </tr> + + <input type="hidden" type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/> + + <input type="hidden" type="text" id="FBSDeviceId" class="unable" data-mini="true" /> + + <input type="hidden" type="text" id="FbsDeviceIp" class="unable" data-mini="true" /> + + <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" /> + <tr> <td>*鐪�</td> <td> @@ -104,7 +89,7 @@ <tr> <td>*鍖哄幙</td> <td> - <select id="county" data-mini="true"> + <select id="county" data-mini="true"> <option value="">鍏ㄩ儴</option> </select> </td> @@ -116,37 +101,30 @@ </td> </tr> - - + <input type="hidden" id="StationName4" data-mini="true" /> - - <input type="hidden" id="StationIp" 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" /> - <tr> + <!-- <tr> <td>*鍗曚綋鏁伴噺</td> <td> - <!-- <input type="text" id="MonCount" data-mini="true" /> --> + <input type="text" id="MonCount" data-mini="true" /> <fieldset data-role="controlgroup" data-type="horizontal"> <label for="four">4 涓�</label> @@ -173,10 +151,12 @@ </select> </fieldset> </td> - </tr> + </tr> --> <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> @@ -197,6 +177,7 @@ </tr> <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01 00:00:00" /> + <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01 00:00:00" /> <tr> @@ -209,31 +190,7 @@ </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> @@ -271,39 +228,50 @@ function creatBattView(index){ var count=index+1 ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+ - '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" id="battproducer" data-type="horizontal">'+'<select>' + '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+'id='+'battproducer'+index+'>' ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>' - ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>' - ,battNum='<tr>'+'<td>'+'鐢垫睜鏁伴噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'battnum'+index+' data-mini="true"'+'value='+'鐢垫睜鏁伴噺'+count+' />'+'</td>'+'</tr>' - ,nomCap='<tr>'+'<td>'+'鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+'id='+'nomCap'+index+' data-mini="true"'+'value='+'鏍囩О瀹归噺'+count+' />'+'</td>'+'</tr>' + ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>' + + ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+'>' + ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>' + + ,MonVolStd='<tr>'+'<td>'+'*鏍囩О鍗曚綋鐢靛帇(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>' + ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+'>'+creatMonCapOpt()+'</select>' + +'</fieldset>'+'</td>'+'</tr>' ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' />'+'</tr>' ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>'; - return battTitle+battBrand+battType+battNum+nomCap+battIndex+battName; + return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName; } + + + function selectedNum(index){ + var selected=''; + return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>'; + } - function selectedIndex(index){ + function selectedIndex(index){ var selected='', i=0; - selected+= '<option '+'value='+'鐞嗗+'+'>'+'鐞嗗+'+'</option>'; - selected+= '<option '+'value='+'鍦i槼'+'>'+'鍦i槼'+'</option>'; - selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>'; - selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>'; - selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>'; - selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>'; - selected+= '<option '+'value='+'绉戝+杈�'+'>'+'绉戝+杈�'+'</option>'; - selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>'; - selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>'; - selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>'; - selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>'; - selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>'; - selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>'; - selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>'; - selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>'; - selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>'; - selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>'; - selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>'; - selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>'; + selected+= '<option '+'value='+'鐞嗗+'+'>'+'鐞嗗+'+'</option>'; + selected+= '<option '+'value='+'鍦i槼'+'>'+'鍦i槼'+'</option>'; + selected+= '<option '+'value='+'鍙岀櫥'+'>'+'鍙岀櫥'+'</option>'; + selected+= '<option '+'value='+'SENRY'+'>'+'SENRY'+'</option>'; + selected+= '<option '+'value='+'鍗楅兘'+'>'+'鍗楅兘'+'</option>'; + selected+= '<option '+'value='+'鐖遍粯鐢�'+'>'+'鐖遍粯鐢�'+'</option>'; + selected+= '<option '+'value='+'绉戝+杈�'+'>'+'绉戝+杈�'+'</option>'; + selected+= '<option '+'value='+'閾舵嘲'+'>'+' 閾舵嘲'+'</option>'; + selected+= '<option '+'value='+'涓版棩'+'>'+' 涓版棩'+'</option>'; + selected+= '<option '+'value='+'涓叴鑳芥淳'+'>'+' 涓叴鑳芥淳'+'</option>'; + selected+= '<option '+'value='+'鍏夊畤'+'>'+' 鍏夊畤'+'</option>'; + selected+= '<option '+'value='+'鑹捐鏂崕杈�'+'>'+'鑹捐鏂崕杈�'+'</option>'; + selected+= '<option '+'value='+'闆勯煬'+'>'+' 闆勯煬'+'</option>'; + selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>'; + selected+= '<option '+'value='+'鏂囬殕'+'>'+' 鏂囬殕'+'</option>'; + selected+= '<option '+'value='+'椋庡竼'+'>'+' 椋庡竼'+'</option>'; + selected+= '<option '+'value='+'涓北'+'>'+' 涓北'+'</option>'; + selected+= '<option '+'value='+'缇庣殑'+'>'+' 缇庣殑'+'</option>'; + selected+= '<option '+'value='+'鏈楄揪'+'>'+' 鏈楄揪'+'</option>'; return selected; } var temp = getCookie("eleparm"); @@ -314,8 +282,12 @@ console.info(temp[33]); console.info(temp[34]); var suoyin = temp[33]; - - $(function(){creatAllView(suoyin).trigger('create')}); + var fuchongfazhi = [0,0,0,0]; + var lixiandianyafazhi = [0,0,0,0]; + $(function(){ + creatAllView(suoyin).trigger('create'); + creatMonCapOpt(suoyin); + }); //椤甸潰鍔犺浇鏃舵煡璇㈢渷 @@ -439,7 +411,7 @@ //setTimes($("#startTestrecord"),'2000-01-01'); //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd')); - creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D; + //creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D; installstartdata(temp); }); @@ -477,8 +449,10 @@ console.info(dev_id); if(ptn.test(dev_id)) { var value = Number(RegExp.$1); - // console.log(value); + console.info(value); + console.info(Math.floor(value/256)); var intNum = prefixInteger(Math.floor(value/256), 3); + console.info(intNum); var resNum = prefixInteger(value%256, 3); ip = '127.000.'+intNum+'.'+resNum; }else { @@ -488,14 +462,19 @@ return ip; } // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� // - function setFloatAndoutLine(monnum) { - var vol = $('#MonVolStd').val(); - //var monnum = $('#MonCount').val(); + function setFloatAndoutLine(index) { + var monvolstd = "#MonVolStd"+index; + var MonCount = "#MonCount" +index; + var vol = $(monvolstd).val(); + var monnum = $(MonCount).val(); var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊� var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊� - $('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊� - $('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊� + //$('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊� + //$('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊� + fuchongfazhi[index] = chargeVol; + lixiandianyafazhi[index] = outlineVol; + console.info(vol); } /* $('#MonVolStd').change(function(){ @@ -504,10 +483,12 @@ $('#MonCount').change(function(){ setFloatAndoutLine(); })*/ - function prefixInteger(num, length) { + /* function prefixInteger(num, length) { return (num/Math.pow(3,length)).toFixed(length).substr(2); + }*/ + function prefixInteger(num, length) { + return (Array(length).join('0') + num).slice(-length); } - //瀵煎叆琛ㄦ牸榛樿鏁版嵁 function installstartdata(temp){ var data = { @@ -546,6 +527,7 @@ ,install_user: 'test' }; console.info(data.StationId); + setMonVolStd(temp.length); creatgroupid(); document.getElementById("StationId").value = data.StationId; // document.getElementById("mainteArea").value = data.StationName1; @@ -567,8 +549,8 @@ document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel; document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent; //document.getElementById("MonCount").value = data.MonCount; - document.getElementById("MonCapStd").value = data.MonCapStd; - document.getElementById("MonVolStd").value = data.MonVolStd; + /* document.getElementById("MonCapStd").value = data.MonCapStd; + document.getElementById("MonVolStd").value = data.MonVolStd; */ document.getElementById("MonResStd").value = data.MonResStd; document.getElementById("MonSerStd").value = data.MonSerStd; document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg; @@ -582,11 +564,10 @@ //setTimes($("#startTestrecord"),data.productDate); //setTimes($("#endTestrecord"),data.useDate); document.getElementById("install_user").value = data.install_user; - + setFloatAndoutLine(1); //setFloatAndoutLine(); } - function getUpdateArr(){ mon=$('#MonVolStd').val(); var moncount = 0; @@ -598,10 +579,10 @@ var arr = new Array(); for(var i=0;i<suoyin;i++){ - setFloatAndoutLine(moncount); + setFloatAndoutLine(i); var battString = "#battname"+i; var battModel = "#batttype"+i; - var battproducer ="#battproducer"+i; + //var battproducer ="#battproducer"+i; var id = $('fieldset div div input[data-cacheval=\'true\']').val(); var inputVal = $(id).val(); //var input =$(four).option() @@ -628,12 +609,12 @@ BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿 BattGroupName : $(battString).val(), - FloatVolLevel : $("#FloatVolLevel").val(), //娴厖鐢靛帇闃�鍊� - OfflineVolLevel : $("#OfflineVolLevel").val(), //绂荤嚎鐢靛帇闃�鍊� + FloatVolLevel : fuchongfazhi[i], //娴厖鐢靛帇闃�鍊� + OfflineVolLevel : lixiandianyafazhi[i], //绂荤嚎鐢靛帇闃�鍊� BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊� - MonCount : moncount, //鍗曚綋鏁伴噺 - MonCapStd : $("#MonCapStd").val(), //鏍囩О瀹归噺 - MonVolStd : $("#MonVolStd").val(), //鏍囩О鐢靛帇 + MonCount :$("#MonCount"+i).val(), //鍗曚綋鏁伴噺 + MonCapStd : $("#MonCapStd"+i).val(), //鏍囩О瀹归噺 + MonVolStd : $("#MonVolStd"+i).val(), //鏍囩О鐢靛帇 MonResStd : $("#MonResStd").val(), //鏍囩О鍐呴樆 MonSerStd : $("#MonSerStd").val(), //鏍囩О鐢靛 MonVolLowToAvg : $("#MonVolLowToAvg").val(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲� @@ -642,10 +623,10 @@ DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴� station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜 - BattProducer : $(battproducer).val(), //鐢垫睜鍝佺墝 + BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝 BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿 - BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡 - BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡 + BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡 + BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡 install_user : $("#install_user").val(), //瀹夎浜哄憳 } } @@ -678,13 +659,13 @@ }); function nullOrn(){ - // if($("#BattFloatCurrent").val()&&$("#MonCapStd").val()){ - return true; - //}else{ - //alert("*椤逛负蹇呭~椤癸紝涓嶈兘涓虹┖锛岃閲嶆柊杈撳叆"); - //return false; - // } - + console.info($("#homeName").val()); + console.info($("#station_phone").val()); + if($("#homeName").val!=""&&$("#station_phone").val()!=""&&$("#install_user").val()!=""){ + return true; + }else{ + alert("璇峰~鍐�*鍐呭"); + } } function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇� @@ -702,38 +683,57 @@ console.info(data); if(data.code==1){ alert("娣诲姞鎴愬姛"); - window.location.href="batt-unapproved.html"; + window.location.href="batt-unapproved-index.html" }else{ alert("娣诲姞澶辫触"); - window.location.href="batt-unapproved.html"; + window.location.href="batt-unapproved-index.html"; } } }); } - $('input:radio[name="battnum"]').click(function(){ - var $this=$(this) - , $mon=$('#MonVolStd') ; - if ($this.attr("checked")) { -銆�銆�銆�銆�銆�銆� if($this.val()==4){ - $mon.val("12"); - - }; - if($this.val()==24){$mon.val("2");} -銆�銆�銆�銆�} - }); - function creatMonCapOpt(){ - var k,optionStr='',allString; - for(var i=1;i<11;i++){ - k=i*50; - optionStr+='<option'+' value='+k+'>'+k+'</option>'; - } - allString=optionStr+'<option'+' value='+1000+'>'+1000+'</option>' - $("#MonCapStd").html(allString); + function creatMonCapOpt(suoyin){ + var k,optionStr='',allString + for(var i=1;i<11;i++){ + k=i*50; + //optionStr+='<option'+' value='+k+'>'+k+'</option>'; + optionStr+='<option'+' value='+k+'>'+k+'</option>'; + } + return allString=optionStr+'<option'+' selected = selected '+' value='+1000+'>'+1000+'</option>'; } - creatMonCapOpt(); + + function getRadioValue(na){ + var str='input[name='+na+']:checked' + return $(str).val(); + } + function setRadioSeleted(v){ + var str='input:radio[value='+v+']'; + return $(str).attr('checked','true'); + } + + function setchangedMonVolStd(suoyin){ + for(var u=0;u<suoyin;u++){ + var id=''; + id='#MonCount'+u; + (function(u){ + var vol='#MonVolStd'+u; + $(document).on("change", id, function () { + if($(this).find("option:selected").val()==4){$(vol).val(12);} + if($(this).find("option:selected").val()==24){$(vol).val(2);} + }) + })(u) + } + } + setchangedMonVolStd(suoyin); + function setMonVolStd(index){ + for(var i=0;i<index;i++){ + var s='#MonVolStd'+i; + $(s).val(12); + } + } + /* 鎿嶄綔鎴愬姛 $('#changeSuc').popup('open'); 鎿嶄綔澶辫触 -- Gitblit v1.9.1