From f29ad417607d9213ec17c633648b011bc61bcc59 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 16:13:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-edit2.html | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index a3b10e8..1f540b2 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -290,7 +290,7 @@
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>'
@@ -341,6 +341,7 @@
//console.info(temp);
temp=JSON.parse(temp);
console.info(temp);
+ var moncount = 0;
var tempgroupid = new Array() ;
for(var i=0;i<temp.length;i++){
tempgroupid.push(temp[i].binf.BattGroupId);
@@ -488,13 +489,8 @@
// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
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++){
@@ -516,7 +512,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
@@ -592,11 +588,14 @@
url: "Battinf_applyAction!addPro",
async:true,
dataType:'text',
- data:"json="+JSON.stringify(temp),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- console.info(model);
+ data:"json="+temp,
+ success: function(data){
+ console.info(data);
+ data =JSON.parse(data);
+ //var model= JSON.parse(data.result);
+ data = JSON.parse(data.result);
+ console.info(data);
+ var model =data;
if(model.code ==1){
alert("淇敼鎴愬姛");
window.location.href="batt-unapproved.html"
@@ -620,9 +619,12 @@
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;
+ }
銆�銆�銆�銆�}
});
--
Gitblit v1.9.1