From ed1aa3e700505e9c768c90e17bfbfa8e47b943d4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 14 一月 2019 16:23:02 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/mobil/ele-param2.html | 105 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 36 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 1acfb26..f7778ab 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -118,8 +118,8 @@
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
-<body >
- <div class="fg-panel">
+<body data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-258" data-genuitec-path="/gx_tieta/WebRoot/mobil/ele-param2.html">
+ <div class="fg-panel" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-258" data-genuitec-path="/gx_tieta/WebRoot/mobil/ele-param2.html">
<form>
<div class="fg-panel-header">绛涢��</div>
<div class="fg-panel-content">
@@ -172,7 +172,7 @@
<div class="layui-form-item">
<label class="layui-form-label"><i class="fa fa-search"></i></label>
<div class="layui-input-block">
- <input type="text" name="title" id="searchInput1" autocomplete="off" placeholder="鏈烘埧鎼滅储" class="layui-input">
+ <input type="text" name="title" id="searchInput1" autocomplete="off" placeholder="璇疯緭鍏ユ柊寤烘満鎴垮悕" class="layui-input">
</div>
</div>
</div>
@@ -195,7 +195,7 @@
<div data-role="navbar">
<ul>
<li><a href="index.html" id="cancel" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-delete" data-position-to="window" data-icon="home" data-role="button">棣栭〉</a></li>
- <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">鏂板缓</a></li>
+ <li><a href="#yourPopup" data-rel="popup" id="creatn" class="ui-btn ui-btn-inline ui-corner-all ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">鏂板缓</a></li>
</ul>
</div>
</div>
@@ -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">
@@ -227,6 +223,7 @@
<div id="homeLocation"></div>
<!-- 瀛樺湪鏈烘埧淇℃伅 -->
<div id="homeInfoIframe"></div>
+ <input id="handle_status" value="" type="hidden">
<script src="src/layui.all.js"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
@@ -235,10 +232,11 @@
var iframePopup = '';
function getEditButIndex(t){
console.warn($(t).attr("but-index")+' 淇敼');
- var index = $(t).attr("but-index");
- var parm = seteditparm(index);
+ var index = $(t).attr("but-index");
+
+ var parm = seteditparm(t);
// console.info(getCookie("eleparm"));
- window.location.href="batt-edit.html";
+ window.location.href="batt-edit2.html";
return ;
}
@@ -257,11 +255,17 @@
$(document).ready(function(){
//setPage();
- $("#submit").click(function(){
+ $("#submit").off('click').on('click.cjj123',function(){
//newbattnum;
-
+ //var homename= $('#homename').val()
//Page.pageCurr=1;
- SearchParam();
+ //console.info(homename);
+ //console.info($('#homeName').val());
+ if($('#homeName').val()&&$('#homeName').val()!=""){
+ SearchParam();
+ }else{
+ alert("璇烽�夋嫨涓�涓満鎴�");
+ }
});
});
@@ -278,6 +282,14 @@
,full: true
,anim: 5
,content: 'iframe/searchBatt.html'
+ ,success:function(layero,index){}
+ ,end:function(){
+ var handle_status = $("#handle_status").val();
+ if ( handle_status == '1' ) {
+ $("#creatn").click();
+
+ }
+ }
});
});
@@ -288,8 +300,8 @@
StationName1:'',
StationName2: '',
StationName5:''
- };
-
+ };
+ loadshow();
// 鏌ヨ鏈烘埧淇℃伅
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
var rs = JSON.parse(result.result);
@@ -313,13 +325,12 @@
//console.log(homeSource)
// 璁剧疆璧勬簮鍐呭
$('#searchHomeIframe').data('homeSource', homeSource);
+ loadclose();
}
});
}
-
-
-
+
//
$('#homeLocation').off('click').on('click.cjj', function() {
@@ -347,7 +358,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 +384,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("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
@@ -381,6 +392,8 @@
}
function creatYanshouObj(arrdata,index){
+ console.info(arrdata[0]);
+ console.info(index);
var StationId = arrdata[index].StationId;
//console.info(StationId);
var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
@@ -394,7 +407,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 +434,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, //瀹夎浜哄憳
}
}
@@ -461,9 +474,7 @@
},
};
console.info(temp);
- searchBattLife(temp)
-
-
+ searchBattLife(temp);
}
// 鏌ヨ鍐呭
function searchBattLife(temp){
@@ -528,7 +539,8 @@
arrTd.push(data[i].BattProductDate.substr(0,10)); //鐢垫睜鐢熶骇鏃ユ湡
arrTd.push(data[i].BattInUseDate.substr(0,10)); //鎶曞叆浣跨敤鏃ユ湡
arrTd.push(data[i].install_user); // 璁惧瀹夎浜哄憳
- arrTd.push('<a onclick="getEditButIndex(this)" id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼</a>');
+ arrTd.push("");
+ //arrTd.push('<a onclick="getEditButIndex(this)" id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>淇敼</a>');
Page.pageAll = data[i].num;
num.push(data.length);
@@ -539,7 +551,8 @@
Page.pageAll = 0;
}
setPage();
- createTbl(tblCon, arrTh, arrTd);
+ //createTbl(tblCon, arrTh, arrTd);
+ getEditButIndex(0);
}
});
@@ -679,6 +692,7 @@
//褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
function findStationNamebyStationname1(){
+ var jifang = new Array();
var data = {
StationName1: $("#mainteArea").val(),
StationName2:$("#city").val(),
@@ -700,19 +714,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,
});
}
}
@@ -795,6 +816,18 @@
}
+
+
+
+
+
+
+
+
+
+
+
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1