From 9f65a78e9534b717b74b1b11c09966484b503205 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:31:43 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 307 ++++++++++++++++++++++-----------------------------
1 files changed, 132 insertions(+), 175 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 4bde9de..98df240 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -47,9 +47,6 @@
right: 0;
margin:0!important;
}
- #newbattnum-button{
- padding: 1em 1.9em;
- }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -58,31 +55,18 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
- <a href="ele-param2.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" >
-
-
- <select id="newbattnum" data-mini="true">
- <option value=0>鏂板缓鐢垫睜缁�</option>
-
- </select>
-
-
- </fieldset>
-
+ <a href="batt-unapproved-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>
</div>
<!-- 涓讳綋鍐呭 -->
<div data-role="main">
<!-- <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>
+ <input type="hidden" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+
<tr>
<td>FBS璁惧ID(閲嶈)</td>
<td>
@@ -95,12 +79,9 @@
<input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />
</td>
</tr>
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
- </td>
- </tr>
+
+ <input type="hidden" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
+
<tr>
<td>鐪�</td>
<td>
@@ -122,77 +103,20 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
+ <input type="text" class="unable" class="unable" id="homeName" data-mini="true">
</td>
</tr>
-
- <input type="hidden" id="StationName4" data-mini="true" />
-
-
- <input type="hidden" id="StationIp" data-mini="true" />
-
-
-
-
-
+ <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" />
-
-
- <tr>
- <td>*鍗曚綋鏁伴噺</td>
- <td>
- <!-- <input type="text" id="MonCount" data-mini="true" /> -->
-
- <fieldset data-role="controlgroup" data-type="horizontal">
- <label for="four">4 涓�</label>
- <input type="radio" name="battnum" id="four" value="4">
- <label for="twentyfour">24涓�</label>
- <input type="radio" name="battnum" id="twentyfour" value="24">
- </fieldset>
-
-
-
- </td>
- </tr>
- <tr>
- <td>鏍囩О鍗曚綋鐢靛帇(V)</td>
- <td>
- <input type="text" id="MonVolStd" class="unable" data-mini="true" />
- </td>
- </tr>
- <tr>
- <td>*鏍囩О瀹归噺(AH)</td>
- <td>
- <fieldset data-role="controlgroup" >
- <select id="MonCapStd" data-mini="true">
-
- </select>
- </fieldset>
- </td>
- </tr>
-
+ <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" />
@@ -200,17 +124,17 @@
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
<td>
- <input type="text" id="Load_curr" data-mini="true" />
+ <input type="text" id="Load_curr" class="unable" data-mini="true" />
</td>
</tr>
- <input type="hidden" id="DisCurrMax" data-mini="true" />
+ <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
<tr>
<td>鍩虹珯鐢佃瘽鍙风爜</td>
<td>
- <input type="text" id="station_phone" data-mini="true" />
+ <input type="text" id="station_phone" class="unable" data-mini="true" />
</td>
</tr>
@@ -221,7 +145,7 @@
<tr>
<td>*瀹夎浜哄憳</td>
<td>
- <input type="text" id="install_user" data-mini="true" />
+ <input type="text" id="install_user" class="unable" data-mini="true" />
</td>
</tr>
</tbody>
@@ -261,8 +185,8 @@
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
- <li><a href="#yourPopup" data-rel="popup" 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="" id="cancel" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
+ <li><a href="batt-approve-index.html" target="_top" 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="batt-unapproved-index.html" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
</ul>
</div>
</div>
@@ -290,27 +214,26 @@
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" data-type="horizontal" >'+'<select id="battproducer'+index+'">'
+ '<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>'
- ,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>'
- ,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;
+ ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'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+' class="unable" '+'>'
+ ,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"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'
+ +'</fieldset>'+'</td>'+'</tr>'
+ ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' class="unable" '+' />'+'</tr>'
+ ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' class="unable" '+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
+ return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;
}
- function creatBa(a){
- var battnum=4-a,
- opstring='';
- if(a>4&&battnum<=0){return false;}
- for(var i=0;i<=battnum;i++){
-
- opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
- }
- console.warn(opstring+'ttt');
- return $('#newbattnum').html(opstring);
- }
-
+ function selectedNum(index){
+ var selected='';
+ if(temp[index].binf.MonCount==4){
+ 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>';
+ }
+ }
function selectedIndex(index){
var selected='',
@@ -336,15 +259,13 @@
console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
var moncount = 0;
+ var fuchongfazhi = [0,0,0,0];
+ var lixiandianyafazhi = [0,0,0,0];
$(function(){
creatAllView(temp.length).trigger('create');
- creatBa(temp.length).trigger('create');
+ setMonVolStd(temp.length);
});
-
-
-
-
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
@@ -397,36 +318,31 @@
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);
}
function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
}
- function creatBa(a){
- var battnum=4-a,
- opstring='';
- if(a>4&&battnum<=0){return false;}
- for(var i=0;i<=battnum;i++){
-
- opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
- }
- console.warn(opstring+'ttt');
- return $('#newbattnum').html(opstring);
- }
+
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
-
+ setMonVolStd(temp.length);
document.getElementById("StationId").value = data.StationId;
document.getElementById("mainteArea").value = data.StationName1;
document.getElementById("city").value = data.StationName2; //甯�
@@ -447,34 +363,35 @@
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("MonResStd").value = data.MonResStd;
document.getElementById("MonSerStd").value = data.MonSerStd;
document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
document.getElementById("Load_curr").value = data.Load_curr;
document.getElementById("DisCurrMax").value = data.DisCurrMax;
document.getElementById("station_phone").value = data.station_phone;
- //document.getElementById(battproducer).value = data.BattProducer;
- //$(battproducer).val(data.BattProducer);
+ //document.getElementById("BattProducer").value = data.BattProducer;
//document.getElementById("BattModel").value = data.BattModel;
document.getElementById("startTestrecord").value = data.BattProductDate;
document.getElementById("endTestrecord").value = data.BattInUseDate;
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
- document.getElementById("install_user").value = data.install_user;
+ document.getElementById("install_user").value = data.install_user;
for(var i=0;i<temp.length;i++){
- var battproducer ="#battproducer"+i;
- data=temp[i].binf;
+ data=temp[i].binf;
+ document.getElementById("MonCapStd"+i).value = data.MonCapStd;
+ document.getElementById("MonVolStd"+i).value = data.MonVolStd;
+ console.info(data.MonCount);
+ $("#MonCount"+i).find("option:selected").val(data.MonCount);
var battString = "#battname"+i;
- //var battModel = "#batttype"+i;
+ var battModel = "#batttype"+i;
var battproducer = "#battproducer"+i
//var battproducer ="#battproducer"+i;
$(battString).val(data.BattGroupName);
- //$(battModel).val(data.BattModel);
- //$(battproducer).val(data.BattProducer);
- //console.info(data.BattProducer);
- console.info($(battproducer)[0]);
+ $(battModel).val(data.BattModel);
+ $(battproducer).val(data.BattProducer);
+ console.info($(battproducer).val());
}
}
@@ -485,7 +402,7 @@
var arr = new Array();
for(var i=0;i<temp.length;i++){
- setFloatAndoutLine(moncount);
+ setFloatAndoutLine(i);
var battString = "#battname"+i;
var battModel = "#batttype"+i;
@@ -518,12 +435,12 @@
BattGroupId : tempgroupid[i], //鐢垫睜缁刬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(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -532,7 +449,7 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer :getSelected(battproducer) , //鐢垫睜鍝佺墝
+ BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
@@ -597,7 +514,7 @@
},
error:function(){
alert("淇敼鐢垫睜缁勫け璐�!");
- //window.location.href="batt-unapproved.html"
+ window.location.href="batt-unapproved.html"
}
});
}
@@ -619,7 +536,7 @@
銆�銆�銆�銆�}
});
- function creatMonCapOpt(){
+ /*function creatMonCapOpt(){
var k,optionStr='',allString;
for(var i=1;i<11;i++){
k=i*50;
@@ -629,17 +546,20 @@
$("#MonCapStd").html(allString);
}
creatMonCapOpt();
-
- $('#newbattnum').change(function(){
- var numbattnum = parseInt($('#newbattnum').val());
- var index =parseInt(tempindex.length);
- addbattnum=Math.floor((numbattnum)+(tempindex.length));
- console.warn(addbattnum);
- creatAllView(addbattnum).trigger('create');
- creatBattGroupId(addbattnum);
- });
-
-
+ */
+ function creatMonCapOpt(index){
+ var selected='',
+ i=0;
+ //console.info(temp[index.binf.MonCapStd]);
+ var battproducer = ["50","100","150","200","250","300","350","400","450","500","1000"];
+ selected+= '<option '+'value='+temp[index].binf.MonCapStd+'>'+temp[index].binf.MonCapStd+'</option>';
+ for(var i=0;i<battproducer.length;i++){
+ if(temp[index].binf.MonCapStd!=battproducer[i]){
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
+ }
+ return selected;
+ }
function getSelected(id){
/* var s;
@@ -653,8 +573,45 @@
var s=$(id).find("option:selected").val();
return s;
}
-
-
+ /* function creatMonCapOpt(suoyin){
+ var optionStr,allString;
+
+ for(var i=1;i<11;i++){
+
+ k=i*50;
+
+ //optionStr+='<option'+' value='+k+'>'+k+'</option>';
+ optionStr+='<option'+' value='+k+'>'+k+'</option>';
+
+
+
+ }
+ allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
+ return allString;
+
+
+ }*/
+ 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)
+
+ }
+ }
+ function setMonVolStd(index){
+ for(var i=0;i<index;i++){
+ var s='#MonVolStd'+i;
+ $(s).val(12);
+ }
+
+ }
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
--
Gitblit v1.9.1