From 398be7e48387b49ac209dd5ed5fe7a135f268e5c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 28 十二月 2018 17:38:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/ele-param2.html | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 1acfb26..16c3da1 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -203,16 +203,12 @@
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
<h1>閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�</h1>
<fieldset data-role="controlgroup" >
-
-
+
<select id="newbattnum" data-mini="true">
<option value="1">鏂板缓1涓數姹犵粍</option>
<option value="2">鏂板缓2涓數姹犵粍</option>
- <option value="3">鏂板缓3涓數姹犵粍</option>
- <option value="4">鏂板缓4涓數姹犵粍</option>
</select>
-
-
+
</fieldset>
<div data-role="controlgroup" data-type="horizontal" class="mt6">
@@ -238,7 +234,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 +253,7 @@
$(document).ready(function(){
//setPage();
- $("#submit").click(function(){
+ $("#submit").off('click').on('click.cjj123',function(){
//newbattnum;
//Page.pageCurr=1;
@@ -317,9 +313,7 @@
});
}
-
-
-
+
//
$('#homeLocation').off('click').on('click.cjj', function() {
@@ -347,7 +341,7 @@
};
- $("#sure").click(function(){
+ $("#sure").off('click').on('click.cjj123',function(){
var currentlength = Math.floor(arrTd.length/34);
if(currentlength<Page.pageSize){
setcookieCreat(currentlength-1);
@@ -373,7 +367,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 +388,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 +415,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 +673,7 @@
//褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
function findStationNamebyStationname1(){
+ var jifang = new Array();
var data = {
StationName1: $("#mainteArea").val(),
StationName2:$("#city").val(),
@@ -700,19 +695,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