From 6699f159bf34b079e7b67f4712f7ed610c1e5411 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 14:26:57 +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-edit.html | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index 1906444..7ad3d62 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -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 addbattnum = tempindex.length;
+ 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,9 +414,9 @@
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]);
}
}
--
Gitblit v1.9.1