From 6d0d9ee5e761d990449be40b9d579e3bdb2b6acf Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期三, 26 十二月 2018 11:50:48 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/ele-param2.html | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 1acfb26..f5cbe0e 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -238,7 +238,7 @@
var index = $(t).attr("but-index");
var parm = seteditparm(index);
// console.info(getCookie("eleparm"));
- window.location.href="batt-edit.html";
+ window.location.href="batt-edit2.html";
return ;
}
@@ -257,7 +257,7 @@
$(document).ready(function(){
//setPage();
- $("#submit").click(function(){
+ $("#submit").off('click').on('click.cjj',function(){
//newbattnum;
//Page.pageCurr=1;
@@ -373,7 +373,7 @@
function seteditparm(index){
if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
console.info(arrdata);
- var arr= creatYanshouObj(arrdata,index);//鐢宠楠屾敹鏂规硶銆�
+ var arr= creatYanshouObj(arrdata,index);
return arr;
}else{
alert("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
@@ -394,7 +394,7 @@
StationName2 : arrdata[i].StationName2, // 甯�
StationName5 : arrdata[i].StationName5, // 鍖�/鍘�
StationName3 : arrdata[i].StationName3, // 鏈烘埧鍚嶇О
- StationName4 : arrdata[i].StationName5, // 璁惧鍚嶇О
+ StationName4 : arrdata[i].StationName4, // 璁惧鍚嶇О
StationIp :arrdata[i].StationIp, //鏈烘埧ip
FBSDeviceId : arrdata[i].FBSDeviceId, //璁惧id
FbsDeviceIp : arrdata[i].FbsDeviceIp, //璁惧ip
@@ -421,8 +421,8 @@
BattProducer : arrdata[i].BattProducer, //鐢垫睜鍝佺墝
BattModel : arrdata[i].BattModel, //鐢垫睜鍨嬪彿
- BattProductDate : arrdata[i].BattProductDate+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
- BattInUseDate : arrdata[i].BattInUseDate+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ BattProductDate : arrdata[i].BattProductDate, //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : arrdata[i].BattInUseDate, //鐢垫睜浣跨敤鏃ユ湡
install_user : arrdata[i].install_user, //瀹夎浜哄憳
}
}
@@ -679,6 +679,7 @@
//褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
function findStationNamebyStationname1(){
+ var jifang = new Array();
var data = {
StationName1: $("#mainteArea").val(),
StationName2:$("#city").val(),
@@ -700,19 +701,26 @@
var $Ostation_name1=$("#homeName");
$Ostation_name1.text("");
var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
+ data=data.data
+ for(var i=0;i<data.length;i++){
+ if(data[i].Station_install==0){
+ jifang.push(data[i]);
+ }
+ }
+
+ for(var i=0;i<=jifang.length;i++)
{
if(i == 0){
arr.push({
val:"",
stationid:"",
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ txt:"鍏ㄩ儴(鍏�"+jifang.length+"涓�)",
});
}else{
arr.push({
- val:data.data[i-1].StationName3,
- stationid:data.data[i-1].StationId,
- txt:data.data[i-1].StationName3,
+ val:jifang[i-1].StationName3,
+ stationid:jifang[i-1].StationId,
+ txt:jifang[i-1].StationName3,
});
}
}
--
Gitblit v1.9.1