From e2853ac645999c72097be2bd58541621183de85f Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期三, 26 十二月 2018 19:52:49 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 46 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 616f3b3..4bde9de 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -290,15 +290,14 @@
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>'
,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+nomCap+battIndex+battName;
}
function creatBa(a){
var battnum=4-a,
@@ -313,28 +312,17 @@
}
- function selectedIndex(index){
+ 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");
@@ -347,6 +335,7 @@
}
console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
+ var moncount = 0;
$(function(){
creatAllView(temp.length).trigger('create');
creatBa(temp.length).trigger('create');
@@ -437,6 +426,7 @@
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
+
document.getElementById("StationId").value = data.StationId;
document.getElementById("mainteArea").value = data.StationName1;
document.getElementById("city").value = data.StationName2; //甯�
@@ -465,7 +455,8 @@
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;
+ //document.getElementById(battproducer).value = data.BattProducer;
+ //$(battproducer).val(data.BattProducer);
//document.getElementById("BattModel").value = data.BattModel;
document.getElementById("startTestrecord").value = data.BattProductDate;
document.getElementById("endTestrecord").value = data.BattInUseDate;
@@ -473,38 +464,37 @@
//setTimes($("#endTestrecord"),data.useDate);
document.getElementById("install_user").value = data.install_user;
for(var i=0;i<temp.length;i++){
+ var battproducer ="#battproducer"+i;
data=temp[i].binf;
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($(battproducer).val());
+ //$(battModel).val(data.BattModel);
+ //$(battproducer).val(data.BattProducer);
+ //console.info(data.BattProducer);
+ console.info($(battproducer)[0]);
}
}
// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
function getUpdateArr(){
mon=$('#MonVolStd').val();
- var moncount = 0;
- if(mon==12){
- moncount=4;
- }else if(mon==2){
- moncount==24;
- }
+ //moncount = ;
var arr = new Array();
for(var i=0;i<temp.length;i++){
setFloatAndoutLine(moncount);
+
var battString = "#battname"+i;
var battModel = "#batttype"+i;
var battproducer ="#battproducer"+i;
- var id = $('fieldset div div input[data-cacheval=\'true\']').val();
- var inputVal = $(id).val();
+ var nomCap = "#nomCap"+i;
+ //var id = $('fieldset div div input[data-cacheval=\'true\']').val();
+ //var inputVal = $(id).val();
//var input =$(four).option()
- console.info(inputVal)
+ //console.info(inputVal)
var index = String(i);
console.info(battString);
var obj = {
@@ -516,7 +506,7 @@
StationName1 : $("#mainteArea").val(), // 鐪�
StationName2 : $("#city").val(), // 甯�
StationName5 : $("#country").val(), // 鍖�/鍘�
- homeName : $("#homeName").val(), // 鏈烘埧鍚嶇О
+ StationName3 : $("#homeName").val(), // 鏈烘埧鍚嶇О
StationName4 : $("#StationName4").val(), // 璁惧鍚嶇О
StationIp : $("#StationIp").val(), //鏈烘埧ip
FBSDeviceId : $("#FBSDeviceId").val(), //璁惧id
@@ -525,7 +515,7 @@
FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(), // 缃戝叧
FBSDeviceName : $("#FBSDeviceName").val(), //璁惧鍚嶇О
GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
- BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
+ BattGroupId : tempgroupid[i], //鐢垫睜缁刬d
BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : $(battString).val(),
FloatVolLevel : $("#FloatVolLevel").val(), //娴厖鐢靛帇闃�鍊�
@@ -542,7 +532,7 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : $(battproducer).val(), //鐢垫睜鍝佺墝
+ BattProducer :getSelected(battproducer) , //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
@@ -591,11 +581,11 @@
type: "post",
url: "Battinf_applyAction!updatePro",
async:true,
- dataType:'text',
- data:"json="+JSON.stringify(temp),
+ dataType:'json',
+ data:"json="+temp,
success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
+ var model = JSON.parse(data.result);
+ //var model = eval('('+data.result+')');
console.info(model);
if(model.code ==1){
alert("淇敼鎴愬姛");
@@ -620,9 +610,12 @@
if ($this.attr("checked")) {
銆�銆�銆�銆�銆�銆� if($this.val()==4){
$mon.val("12");
-
+ moncount =4;
};
- if($this.val()==24){$mon.val("2");}
+ if($this.val()==24){
+ $mon.val("2");
+ moncount = 24;
+ }
銆�銆�銆�銆�}
});
@@ -645,6 +638,24 @@
creatAllView(addbattnum).trigger('create');
creatBattGroupId(addbattnum);
});
+
+
+
+ function getSelected(id){
+ /* var s;
+ $(id).change(function(){
+
+ var g=$(this).find("option:selected").val();
+ console.warn(g);
+ s=g
+ });
+ if(!s){s=$(id).find("option:selected").val()} */
+ var s=$(id).find("option:selected").val();
+ return s;
+ }
+
+
+
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
鎿嶄綔澶辫触
--
Gitblit v1.9.1