From f196bbea81977c5e0cf5906cba2609a547fd6a3b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期六, 29 十二月 2018 15:30:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index 99d31c9..782da9b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -84,7 +84,7 @@
<select id="newbattnum" data-mini="true">
- <option value="0">鏂板缓鐢垫睜缁�</option>
+ <option value=0>鏂板缓鐢垫睜缁�</option>
</select>
@@ -349,30 +349,23 @@
console.warn(opstring+'ttt');
return $('#newbattnum').html(opstring);
}
- var temp = getCookie("eleparm");
- var tempindex = getCookie("eleparmindex");
- var tempnum = getCookie("eleparmnum");
- //var temp
- //console.info(temp);
+
var tempgroupid = getCookie("elegroupid");
- console.info(tempgroupid);
- tempgroupid = JSON.parse(tempgroupid);
- console.info(tempindex);
- console.info(tempnum);
- temp=JSON.parse(temp);
- tempindex = JSON.parse(tempindex);
- tempnum =JSON.parse(tempnum);
- var suoyin = temp[33];
-
+ var temp = getCookie("eleparm");
+ temp = JSON.parse(temp);
+ console.info(temp);
+ var tempgroupid = new Array() ;
+ for(var i=0;i<temp.length;i++){
+ tempgroupid.push(temp[i].binf.BattGroupId);
+ }
+ console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
+ var addbattnum = temp.length;
$(function(){
- creatAllView(tempindex.length).trigger('create');
- creatBa(tempindex.length).trigger('create');
+ creatAllView(temp.length).trigger('create');
+ creatBa(temp.length).trigger('create');
});
-
-
-
-
+
</script>
<script type="text/javascript">
@@ -421,24 +414,23 @@
setTimes($("#startTestrecord"),temp[30]);
setTimes($("#endTestrecord"),temp[31]);
document.getElementById("install_user").value = temp[32];
- for(var i=0;i<tempindex.length;i++){
+ for(var i=0;i<temp.length;i++){
battname = "#battname"+i;
- $(battname).val(tempindex[i]);
+ //$(battname).val(tempindex[i]);
}
}
// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍淇敼
function getUpdateArr(){
var arr = new Array();
-
- for(var i=0;i<tempindex.length;i++){
+ console.info(addbattnum);
+ for(var i=0;i<addbattnum;i++){
var battString = "#battname"+i;
var index = String(i);
console.info(battString);
var obj = {
apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
num : tempnum[i],
-
binf:{
StationId : $("#StationId").val(), // 鏈烘埧缂栧彿
StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
@@ -501,7 +493,7 @@
type: "post",
url: "Battinf_applyAction!updatePro",
async:true,
- dataType:'text',
+ dataType:'json',
data:"json="+JSON.stringify(parm),
success: function(data){
data = eval('('+data+')');
@@ -523,15 +515,37 @@
}
-
-
-
-
+ function creatBattGroupId(addbattnum){
+ $.ajax({type: "post",
+ url: "BattInfAction!searchMaxBattgroupId",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data=JSON.parse(data);
+ data=data.result;
+ data =JSON.parse(data);
+ //console.info(data)
+ var groupid = data.data;
+ //console.info(groupid);
+ //tempgroupid.push(groupid);
+ console.info(tempgroupid);
+ for(var i=tempgroupid.length;i<addbattnum;i++){
+ tempgroupid.push(groupid++);
+ console.info(tempgroupid);
+ }
+ }
+ });
+ }
+
$('#newbattnum').change(function(){
- var addbattnum=$('#newbattnum').val()+tempindex.length;
- console.warn(addbattnum+'hihihi');
- creatAllView(3).trigger('create');
+ 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);
});
@@ -542,4 +556,4 @@
$('#changeErr').popup('open'); */
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1