From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-edit2.html | 222 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 131 insertions(+), 91 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index f996126..686e3ad 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -78,30 +78,14 @@
<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" 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>
- <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>
- <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" />
+
<td>鐪�</td>
<td>
<input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -160,10 +144,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>
@@ -191,7 +175,7 @@
</select>
</fieldset>
</td>
- </tr>
+ </tr> -->
<input type="hidden" id="MonResStd" data-mini="true" />
<input type="hidden" id="MonSerStd" data-mini="true" />
@@ -290,16 +274,29 @@
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"id="battproducer'+index+'">'+'<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>'
+ ,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(index)+'</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='';
+ 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 creatBa(a){
var battnum=4-a,
opstring='';
@@ -316,32 +313,25 @@
function selectedIndex(index){
var selected='',
i=0;
- selected+= '<option '+'value='+'鐞嗗＋'+'>'+'鐞嗗＋'+'</option>';
- selected+= '<option '+'value='+'鍦ｉ槼'+'>'+'鍦ｉ槼'+'</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>';
+ var battproducer = ["鐞嗗＋","鍦ｉ槼","鍙岀櫥","SENRY","鍗楅兘","鐖遍粯鐢�","绉戝＋杈�","閾舵嘲","涓版棩","涓叴鑳芥淳","鍏夊畤",
+ "鑹捐鏂崕杈�","闆勯煬","椋庡竼","鏂囬殕","涓北"];
+ selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';
+ for(var i=0;i<battproducer.length;i++){
+ if(temp[index].binf.BattProducer!=battproducer[i]){
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
+ }
+
return selected;
}
var temp = getCookie("eleparm");
//console.info(temp);
temp=JSON.parse(temp);
console.info(temp);
+ var moncount = 0;
var tempgroupid = new Array() ;
+ var fuchongfazhi = [0,0,0,0];
+ var lixiandianyafazhi = [0,0,0,0];
for(var i=0;i<temp.length;i++){
tempgroupid.push(temp[i].binf.BattGroupId);
}
@@ -349,7 +339,10 @@
var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
$(function(){
creatAllView(temp.length).trigger('create');
+ //creatMonCapOpt(temp.length);
+ setchangedMonVolStd(temp.length);
creatBa(temp.length).trigger('create');
+
});
@@ -408,21 +401,26 @@
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);
+ return (Array(length).join('0') + num).slice(-length);
}
+
function creatBa(a){
var battnum=4-a,
opstring='';
@@ -437,6 +435,7 @@
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
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; //甯�
@@ -457,8 +456,7 @@
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;
@@ -474,6 +472,10 @@
document.getElementById("install_user").value = data.install_user;
for(var i=0;i<temp.length;i++){
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 battproducer = "#battproducer"+i
@@ -488,17 +490,12 @@
// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
function getUpdateArr(){
mon=$('#MonVolStd').val();
- var moncount = 0;
- if(mon==12){
- console.info("aa");
- moncount=4;
- }else if(mon==2){
- moncount==24;
- }
+
+
var arr = new Array();
for(var i=0;i<temp.length;i++){
- setFloatAndoutLine(moncount);
+ setFloatAndoutLine(i);
var battString = "#battname"+i;
var battModel = "#batttype"+i;
var battproducer ="#battproducer"+i;
@@ -528,12 +525,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(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
@@ -542,7 +539,7 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : $(battproducer).val(), //鐢垫睜鍝佺墝
+ BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
@@ -561,7 +558,7 @@
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$(function(){
-
+
})
$("#sure").click(function(){
if(nullOrn()){
@@ -577,10 +574,7 @@
});
function nullOrn(){
-
- return true;
-
-
+ return true;
}
function editBatt(){//
@@ -623,22 +617,16 @@
if ($this.attr("checked")) {
銆�銆�銆�銆�銆�銆� if($this.val()==4){
$mon.val("12");
-
+ moncount = 12;
};
- if($this.val()==24){$mon.val("2");}
+ if($this.val()==24){
+ $mon.val("2");
+ moncount = 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);
- }
- creatMonCapOpt();
+
$('#newbattnum').change(function(){
var numbattnum = parseInt($('#newbattnum').val());
@@ -648,6 +636,58 @@
creatAllView(addbattnum).trigger('create');
creatBattGroupId(addbattnum);
});
+ /*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 creatMonCapOpt(index){
+ var selected='',
+ i=0;
+ 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 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)
+
+ }
+ }
+ function setMonVolStd(index){
+ for(var i=0;i<index;i++){
+ var s='#MonVolStd'+i;
+ $(s).val(12);
+ }
+
+ }
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
鎿嶄綔澶辫触
--
Gitblit v1.9.1