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/ele-param2.html | 100 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 18 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 16c3da1..33f142b 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -90,7 +90,7 @@
width:100%;
}
.mt6{
- margin:6em 0 0 0;
+ margin:16em 0 0 0;
}
.pl5{
padding-left:5.9em;
@@ -113,13 +113,13 @@
}
.mt7{
- margin-top:8em;
+ margin-top:18em;
}
</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">
@@ -160,7 +160,7 @@
</div>
<div class="layui-col-xs6 layui-col-md10 full-height line-height40">鐢宠鐢垫睜缁勫畨瑁�</div>
<div class="layui-col-xs3 layui-col-md1 full-height line-height40 t-align-right t-align-right">
- <button onclick="javascript:panel.show();" class="layui-btn layui-btn-primary layui-btn-sm mrr8" id="screen"><i class="fa fa fa-bars mrr4"></i>绛涢��</button>
+
</div>
</div>
</div>
@@ -172,11 +172,12 @@
<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>
</div>
+ <button onclick="javascript:panel.show();" class="layui-btn layui-btn-primary layui-btn-sm mrr8" id="screen"><i class="fa fa fa-bars mrr4"></i>绛涢��</button>
</div>
</div>
</div>
@@ -195,7 +196,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>
@@ -223,6 +224,8 @@
<div id="homeLocation"></div>
<!-- 瀛樺湪鏈烘埧淇℃伅 -->
<div id="homeInfoIframe"></div>
+ <input id="handle_status" value="" type="hidden">
+ <input id="jifangname" 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>
@@ -231,8 +234,9 @@
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-edit2.html";
return ;
@@ -255,9 +259,15 @@
//setPage();
$("#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("璇烽�夋嫨涓�涓満鎴�");
+ }
});
});
@@ -274,6 +284,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();
+
+ }
+ }
});
});
@@ -284,8 +302,8 @@
StationName1:'',
StationName2: '',
StationName5:''
- };
-
+ };
+ loadshow();
// 鏌ヨ鏈烘埧淇℃伅
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
var rs = JSON.parse(result.result);
@@ -309,6 +327,7 @@
//console.log(homeSource)
// 璁剧疆璧勬簮鍐呭
$('#searchHomeIframe').data('homeSource', homeSource);
+ loadclose();
}
});
@@ -348,6 +367,11 @@
}else{
setcookieCreat(Page.pageSize-1);
}
+ var test=getCookie("eleparm2newbatt");
+ console.info(test);
+ var jiafangname = $("#jifangname").val();
+ console.info($("#jifangname").val());
+ console.info(test);
window.location.href="batt-infor-conf-temp1.html";
});
@@ -358,6 +382,7 @@
var endTime = new Date().format('yyyy-MM-dd');
var tbl = $('.tbl-container');
createTbl(tbl, arrTh, dataArr);
+ serchProducer();
$(document).ready(function(){
setPage();
//newbattnum;
@@ -375,6 +400,8 @@
}
function creatYanshouObj(arrdata,index){
+ console.info(arrdata[0]);
+ console.info(index);
var StationId = arrdata[index].StationId;
//console.info(StationId);
var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
@@ -455,9 +482,7 @@
},
};
console.info(temp);
- searchBattLife(temp)
-
-
+ searchBattLife(temp);
}
// 鏌ヨ鍐呭
function searchBattLife(temp){
@@ -522,7 +547,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);
@@ -533,9 +559,11 @@
Page.pageAll = 0;
}
setPage();
- createTbl(tblCon, arrTh, arrTd);
+ //createTbl(tblCon, arrTh, arrTd);
+ getEditButIndex(0);
}
});
+
}
//鏋勯�犳煡璇㈡潯浠�
@@ -797,6 +825,42 @@
}
+ function serchProducer(){
+ var battproducer = new Array();
+ $.ajax({
+ type: 'post'
+ ,async: false
+ ,url: 'BattInfAction!serchByBattProducer'
+ ,data: null
+ ,dataType: 'json'
+ ,success:function(res) {
+ //console.info(res);
+ data = JSON.parse(res.result);
+ console.info(data.data);
+ if(data.code==1&&data.data.length>0){
+ data = data.data;
+ for(var i=0;i<data.length;i++){
+ //console.info(data);
+ battproducer.push(data[i].BattProducer);
+ }
+ }
+ var json = window.JSON.stringify(battproducer);
+ setCookie("producer",json);
+ //var battproduce = getCookie("producer");
+ //battproduce1 = JSON.parse(battproduce);
+ //console.info(battproduce1);
+ }
+ });
+ }
+
+
+
+
+
+
+
+
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1