From aed278d1c7c678903c8f9a4b35f20ab98f1d2754 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期四, 27 十二月 2018 00:02:04 +0800
Subject: [PATCH] 11
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 201 ++++++++++++++++++++++++++++++--------------------
1 files changed, 121 insertions(+), 80 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 0483c82..14ef5dd 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -143,10 +143,10 @@
<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,7 +173,7 @@
</select>
</fieldset>
</td>
- </tr>
+ </tr> -->
<input type="hidden" id="MonResStd" data-mini="true" />
<input type="hidden" id="MonSerStd" data-mini="true" />
@@ -209,31 +209,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,18 +247,39 @@
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>';
@@ -314,8 +311,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);
+ });
//椤甸潰鍔犺浇鏃舵煡璇㈢渷
@@ -392,7 +393,7 @@
//console.info(data);
//console.info(data.code);
if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#country");
+ var $Ostation_name1=$("#county");
$Ostation_name1.text("");
var arr = new Array();
for(var i=0;i<data.data.length;i++)
@@ -425,7 +426,7 @@
binf:{
StationName1:$('#mainteArea').val(),
StationName2:$('#city').val(),
- StationName5: $('#country').val(),
+ StationName5: $('#county').val(),
StationName:$('#homeName').val(),
},
};
@@ -439,7 +440,7 @@
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
- creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
+ //creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D;
installstartdata(temp);
});
@@ -488,22 +489,27 @@
return ip;
}
// 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
- function setFloatAndoutLine() {
- 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(){
+ /* $('#MonVolStd').change(function(){
setFloatAndoutLine();
});
$('#MonCount').change(function(){
setFloatAndoutLine();
- })
+ })*/
function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
}
@@ -567,8 +573,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,18 +588,27 @@
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
document.getElementById("install_user").value = data.install_user;
-
- setFloatAndoutLine();
+ setFloatAndoutLine(1);
+ //setFloatAndoutLine();
}
- // 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
+
function getUpdateArr(){
+ mon=$('#MonVolStd').val();
+ var moncount = 0;
+ if(mon==12){
+ moncount=4;
+ }else if(mon==2){
+ moncount==24;
+ }
var arr = new Array();
+
for(var i=0;i<suoyin;i++){
+ setFloatAndoutLine(i);
var battString = "#battname"+i;
var battModel = "#batttype"+i;
var battproducer ="#battproducer"+i;
- var id = $('fieldset input[data-cacheval=\'true\']').val();
+ var id = $('fieldset div div input[data-cacheval=\'true\']').val();
var inputVal = $(id).val();
//var input =$(four).option()
console.info(inputVal)
@@ -607,7 +622,7 @@
StationName1 : $("#mainteArea").val(), // 鐪�
StationName2 : $("#city").val(), // 甯�
StationName5 : $("#county").val(), // 鍖�/鍘�
- homeName : $("#homeName").val(), // 鏈烘埧鍚嶇О
+ StationName3 : $("#homeName").val(), // 鏈烘埧鍚嶇О
StationName4 : $("#StationName4").val(), // 璁惧鍚嶇О
StationIp : $("#StationIp").val(), //鏈烘埧ip
FBSDeviceId : $("#FBSDeviceId").val(), //璁惧id
@@ -619,10 +634,10 @@
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").val(), //鍗曚綋鏁伴噺
+ MonCount : moncount, //鍗曚綋鏁伴噺
MonCapStd : $("#MonCapStd").val(), //鏍囩О瀹归噺
MonVolStd : $("#MonVolStd").val(), //鏍囩О鐢靛帇
MonResStd : $("#MonResStd").val(), //鏍囩О鍐呴樆
@@ -633,8 +648,8 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : battproducer, //鐢垫睜鍝佺墝
- BattModel : battModel, //鐢垫睜鍨嬪彿
+ BattProducer : $(battproducer).find("option:selected").val(), //鐢垫睜鍝佺墝
+ BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
install_user : $("#install_user").val(), //瀹夎浜哄憳
@@ -682,7 +697,6 @@
console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
- /*
$.ajax({
type: 'post',
async: true,
@@ -694,38 +708,65 @@
console.info(data);
if(data.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";
}
}
- });*/
+ });
}
- $('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(){
+
+
+
+ function creatMonCapOpt(suoyin){
+
var k,optionStr='',allString;
- for(var i=1;i<11;i++){
+
+ 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);
+
+ //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 setMonVolStd(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)
+
+ }
+ }
+ setMonVolStd(suoyin);
+
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
鎿嶄綔澶辫触
--
Gitblit v1.9.1