From d2b6258c72af99c4c949f423099c36d1569f2937 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 14:34:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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..18a3ddc 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -347,6 +347,7 @@
}
console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
+ var moncount = 0;
$(function(){
creatAllView(temp.length).trigger('create');
creatBa(temp.length).trigger('create');
@@ -488,23 +489,19 @@
// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
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 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 +513,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 +522,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 +539,7 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : $(battproducer).val(), //鐢垫睜鍝佺墝
+ BattProducer : "鍙岀櫥", //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
@@ -591,11 +588,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 +617,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;
+ }
銆�銆�銆�銆�}
});
--
Gitblit v1.9.1