From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/batt-unapproved.html | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved.html b/gx_tieta/WebRoot/mobil/batt-unapproved.html
index 7be611a..0584ca9 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved.html
@@ -160,7 +160,7 @@
console.warn($(t).attr("but-index")+' 淇敼');
var index = $(t).attr("but-index");
var parm = seteditparm(index);
- window.location.href="batt-infor-unapproved-edit.html";
+ window.location.href="batt-infor-unapproved-edit2.html";
return ;
}
@@ -279,6 +279,7 @@
for(var i=0;i<arrdata.length;i++){//涓�娆￠獙鏀惰鏈烘埧涓嬬殑鎵�鏈夌數姹犵粍鏋勫缓瀵硅薄 銆�
if(StationId == arrdata[i].binf.StationId){
var obj = {
+ num :arrdata[i].num,
binf:{
StationId : arrdata[i].binf.StationId, // 鏈烘埧缂栧彿
StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3), // 鎷兼帴鏈烘埧鍚嶇О
@@ -286,7 +287,7 @@
StationName2 : arrdata[i].binf.StationName2, // 甯�
StationName5 : arrdata[i].binf.StationName5, // 鍖�/鍘�
StationName3 : arrdata[i].binf.StationName3, // 鏈烘埧鍚嶇О
- StationName4 : arrdata[i].binf.StationName5, // 璁惧鍚嶇О
+ StationName4 : arrdata[i].binf.StationName4, // 璁惧鍚嶇О
StationIp :arrdata[i].binf.StationIp, //鏈烘埧ip
FBSDeviceId : arrdata[i].binf.FBSDeviceId, //璁惧id
FbsDeviceIp : arrdata[i].binf.FbsDeviceIp, //璁惧ip
@@ -313,10 +314,11 @@
BattProducer : arrdata[i].binf.BattProducer, //鐢垫睜鍝佺墝
BattModel : arrdata[i].binf.BattModel, //鐢垫睜鍨嬪彿
- BattProductDate : arrdata[i].binf.BattProductDate+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
- BattInUseDate : arrdata[i].binf.BattInUseDate+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ BattProductDate : arrdata[i].binf.BattProductDate, //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].binf.BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡
install_user : arrdata[i].binf.install_user, //瀹夎浜哄憳
}
+
}
arr.push(obj);
}
--
Gitblit v1.9.1