From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +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 | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 374 insertions(+), 41 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index d7929a5..68d8bfe 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -15,6 +15,41 @@
<script src="js/jquery-1.8.3.js"></script>
<script src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<style type="text/css">
+ /*瑙勫畾闈㈡澘鐨勬牱寮�*/
+ .ui-panel {
+ width: 80%;
+ }
+ .ui-panel-dismiss{
+ width: 20%;
+ }
+ .ui-panel-inner{
+ padding:0 !important;
+ }
+ .ui-collapsible-heading-toggle{
+ padding-left: 1em !important;
+ }
+ .panel-header{
+ padding: 8px 0;
+ font-size: 1.2em;
+ text-indent: 1em;
+ background-color: #DFDCDC;
+ }
+ /*瑙勫畾寮�鍏崇殑浣嶇疆*/
+ .ui-flipswitch {
+ margin-left: 0.5em;
+ }
+
+ .ui-field-contain{
+ padding: 0 0.6em ;
+ }
+ .ui-field-contain {
+ border-bottom-color: #828282;
+ border-bottom-color: rgba(0,0,0,.15);
+ border-bottom-width: 1px;
+ border-bottom-style: none;
+ }
+
+
.checkdata{
@@ -81,9 +116,41 @@
margin-top:8em;
}
</style>
+ <link rel="stylesheet" href="css/fgpanel.css">
</head>
-<body >
-
+<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">
+ <fieldset data-role="controlgroup">
+ <p>鐪�</p>
+ <select id="mainteArea" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="">涓�鏋㈢航</option>
+ <option value="">浜屾灑绾�</option>
+ <option value="">鏋㈢航妤�</option>
+ </select>
+ <p>甯�</p>
+ <select id="city" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鍖�/鍘�</p>
+ <select id="country" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ <p>鏈烘埧绔欑偣</p>
+ <select id="homeName" data-mini="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+
+ </fieldset>
+ </div>
+ <div class="fg-panel-btn">
+ <a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
+ </div>
+ </form>
+ </div>
<div class="abs">
<div class="rel-full">
<div class="page-header bg-gay3">
@@ -93,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 class="layui-btn layui-btn-primary layui-btn-sm mrr8" id="homeInfo"><i class="fa fa fa-bars mrr4"></i>鍔熻兘</button> -->
+ <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>
@@ -105,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>
@@ -128,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>
@@ -136,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">
@@ -160,17 +223,21 @@
<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>
+ <script type="text/javascript" src="js/panel.js"></script>
<script>
var iframePopup = '';
function getEditButIndex(t){
console.warn($(t).attr("but-index")+' 淇敼');
- var index = $(t).attr("but-index");
- var parm = seteditparm(index);
- console.info(getCookie("eleparm"));
- //window.location.href="batt-edit.html";
+ var index = $(t).attr("but-index");
+
+ var parm = seteditparm(t);
+ // console.info(getCookie("eleparm"));
+ window.location.href="batt-edit2.html";
return ;
}
@@ -187,6 +254,23 @@
+ $(document).ready(function(){
+ //setPage();
+ $("#submit").off('click').on('click.cjj123',function(){
+ //newbattnum;
+ //var homename= $('#homename').val()
+ //Page.pageCurr=1;
+ //console.info(homename);
+ //console.info($('#homeName').val());
+ if($('#homeName').val()&&$('#homeName').val()!=""){
+ SearchParam();
+ }else{
+ alert("璇烽�夋嫨涓�涓満鎴�");
+ }
+ });
+ });
+
+
// 鎼滅储鏈烘埧鑾峰彇鐒︾偣
$('#searchInput1').off('focus.alert').on('focus.alert', function() {
$(this).blur();
@@ -199,6 +283,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();
+
+ }
+ }
});
});
@@ -209,8 +301,8 @@
StationName1:'',
StationName2: '',
StationName5:''
- };
-
+ };
+ loadshow();
// 鏌ヨ鏈烘埧淇℃伅
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
var rs = JSON.parse(result.result);
@@ -234,19 +326,19 @@
//console.log(homeSource)
// 璁剧疆璧勬簮鍐呭
$('#searchHomeIframe').data('homeSource', homeSource);
+ loadclose();
}
});
}
-
-
-
+
//
$('#homeLocation').off('click').on('click.cjj', function() {
var homeInfo = $(this).data('homeInfo');
console.warn(homeInfo);
- searchBattLife();
+ var temp=createSearchParam();
+ searchBattLife(temp);
});
@@ -267,13 +359,18 @@
};
- $("#sure").click(function(){
+ $("#sure").off('click').on('click.cjj123',function(){
var currentlength = Math.floor(arrTd.length/34);
if(currentlength<Page.pageSize){
setcookieCreat(currentlength-1);
}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";
});
@@ -284,6 +381,7 @@
var endTime = new Date().format('yyyy-MM-dd');
var tbl = $('.tbl-container');
createTbl(tbl, arrTh, dataArr);
+ serchProducer();
$(document).ready(function(){
setPage();
//newbattnum;
@@ -293,7 +391,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("璇风瓑寰呭嚑绉掑悗鍐嶆彁浜ょ敵璇�");
@@ -301,6 +399,8 @@
}
function creatYanshouObj(arrdata,index){
+ console.info(arrdata[0]);
+ console.info(index);
var StationId = arrdata[index].StationId;
//console.info(StationId);
var arr = new Array(); //鍒濆鍖栦紶鍙傛暟缁�
@@ -314,7 +414,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
@@ -341,8 +441,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, //瀹夎浜哄憳
}
}
@@ -370,10 +470,22 @@
setCookie("eleparm",json);
}
-
+ function SearchParam(){
+ var temp = {
+ page:Page,
+ binf:{
+ StationName1:$('#mainteArea').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#country').val(),
+ StationName:$('#homeName').val(),
+ },
+ };
+ console.info(temp);
+ searchBattLife(temp);
+ }
// 鏌ヨ鍐呭
- function searchBattLife(){
- var temp = createSearchParam();
+ function searchBattLife(temp){
+ //var temp = createSearchParam();
var json = JSON.stringify(temp);
var num =new Array();
var groupId = new Array();
@@ -434,27 +546,23 @@
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;
- groupName.push(data[i].BattGroupName);
+
num.push(data.length);
- groupId.push(data[i].BattGroupId);
+
}
- var json = JSON.stringify(groupName);
- var json1 =JSON.stringify(num);
- var json2 = JSON.stringify(groupId);
-
- setCookie("eleparmindex",json); //鐢垫睜缁勫悕绉�
- setCookie("eleparmnum",json1); //鐢垫睜缁勭紪鍙�
-
- setCookie("elegroupid",json2);
+
}else{
Page.pageAll = 0;
}
setPage();
- createTbl(tblCon, arrTh, arrTd);
+ //createTbl(tblCon, arrTh, arrTd);
+ getEditButIndex(0);
}
});
+
}
//鏋勯�犳煡璇㈡潯浠�
@@ -474,6 +582,195 @@
return temp;
}
+
+
+
+
+ //椤甸潰鍔犺浇鏃舵煡璇㈢渷
+ $.post("BattInfAction_serchByStation",null,function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#mainteArea");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName1,
+ txt:data.data[i-1].StationName1,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCity();
+ });
+
+
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+ function findCity(){
+ var data = {
+ StationName1: $("#mainteArea").val()
+ };
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#city");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName2,
+ txt:data.data[i-1].StationName2,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findCounty();
+ }
+ });
+ }
+
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+ function findCounty(){
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName5",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#country");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:"",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationName5,
+ txt:data.data[i-1].StationName5,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧
+ function findStationNamebyStationname1(){
+ var jifang = new Array();
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val()
+ };
+ //console.info(data);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName3",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ data = data.result;
+ data = eval("("+data+")");
+ //console.info(data);
+ //console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#homeName");
+ $Ostation_name1.text("");
+ var arr = new Array();
+ 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:"鍏ㄩ儴(鍏�"+jifang.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:jifang[i-1].StationName3,
+ stationid:jifang[i-1].StationId,
+ txt:jifang[i-1].StationName3,
+ });
+ }
+ }
+ //console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+
+ }
+ });
+ }
+
+
+
+ //褰撶渷鏀瑰彉鏃舵洿鏂板競
+ $('#mainteArea').change(function(){
+ findCity();
+ });
+ //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+ $('#country').change(function(){
+ findStationNamebyStationname1();
+ });
+
+
+
$(function() {
@@ -527,6 +824,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