From b66ed691935b9369cb93c5397d562128591b09d7 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期五, 11 一月 2019 19:33:33 +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 | 27 ++++++
/dev/null | 153 --------------------------------------
gx_tieta/WebRoot/mobil/iframe/searchBatt.html | 23 +++++
3 files changed, 44 insertions(+), 159 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 74553c3..469d37d 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">
@@ -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>
@@ -223,6 +223,7 @@
<div id="homeLocation"></div>
<!-- 瀛樺湪鏈烘埧淇℃伅 -->
<div id="homeInfoIframe"></div>
+ <input id="handle_status" value="" hidden="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>
@@ -281,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();
+
+ }
+ }
});
});
@@ -806,6 +815,18 @@
}
+
+
+
+
+
+
+
+
+
+
+
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/iframe/searchBatt.html b/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
index 47678b1..b519e42 100644
--- a/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
+++ b/gx_tieta/WebRoot/mobil/iframe/searchBatt.html
@@ -11,8 +11,8 @@
<link rel="stylesheet" href="../app/css/map.css">
<link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.css">
</head>
-<body class="full-height">
- <div class="rel-full">
+<body class="full-height" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-285" data-genuitec-path="/gx_tieta/WebRoot/mobil/iframe/searchBatt.html">
+ <div class="rel-full" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-285" data-genuitec-path="/gx_tieta/WebRoot/mobil/iframe/searchBatt.html">
<div class="page-header bg-gay3">
<div class="layui-row h40">
<div class="layui-col-xs12 layui-col-md12 full-height line-height40">
@@ -42,6 +42,8 @@
<script src="../js/jquery-1.8.3.js"></script>
<script src="../src/layui.js"></script>
<script src="../app/js/common.js"></script>
+ <script type="text/javascript" src="../js/tbl.js"></script>
+ <script type="text/javascript" src="../mobilJs/base.js"></script>
<script>
// layui妯″潡
layui.use(['layer', 'laytpl', 'form'], function() {
@@ -70,6 +72,7 @@
$(this).data('homeInfo', '');
// console.log($(this).data('homeInfo'));
var data = checkHomeData.getData(_val);
+ //console.info(data);
createHomeList($('#homeList'), data);
});
@@ -87,7 +90,16 @@
parent.layer.close(index);
//searchBattLife()
}else {
- layer.msg('璇烽�夋嫨涓嬫柟鐨勬満鎴�');
+ //console.info(homeSource);
+ var input = $('#searchInput').val();//杈撳叆鍏抽敭瀛�
+ var data = checkHomeData.getData(input);//涓嬫柟鏄惁鏈夌粨鏋�
+ if(data.length>0){
+ layer.msg('璇烽�夋嫨涓嬫柟鐨勬満鎴�');
+ }else{
+ layer.confirm('鎮ㄨ緭鍏ョ殑鏈烘埧涓嶅瓨鍦紒鏄惁瑕佽鏂板缓鏈烘埧锛�',{btn:['鏂板缓','鍙栨秷']},function(){
+ setV();
+ });
+ }
}
});
@@ -141,6 +153,11 @@
ele.append('<hr class="layui-bg-gray">')
}
}
+
+ function setV(){
+ parent.$("#handle_status").val('1');
+ parent.layer.close(index);
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/mobil/selectbatt.html b/gx_tieta/WebRoot/mobil/selectbatt.html
deleted file mode 100644
index ad3d038..0000000
--- a/gx_tieta/WebRoot/mobil/selectbatt.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf-8">
-<title></title>
-<meta name="viewport" content="width=device-width,initial-scale=1">
-<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
-<link rel="stylesheet" href="css/breadcrumb.css">
-<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
-<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
-<script type="text/javascript" src="mobilJs/base.js"></script>
-</head>
- <body>
- <!-- 涓夌骇鑿滃崟鍐呭 -->
- <div data-role="page">
- <div data-role="header" data-position="fixed">
- <a href="selectcounty.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
- <h1>鏈烘埧</h1>
- </div>
-
- <div data-role="content">
- <ul class="breadcrumb"></ul>
- <div id="battList2"></div>
- </div>
- <div data-role="footer" data-position="fixed">
- <!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
- </div>
- </div>
- </body>
- <script type="text/javascript" src="js/battNav.js"></script>
- <script type="text/javascript">
-
- var battinlist = new Array(); //鎵�鏈夌數姹犵粍鐨勬暟缁�
- var temp = getCookie("county");
- $(document).ready(function(){
- setCookie('batt', '');
- init();
- //searchkBattByStationid();
- });
-
- function init(){
- //var temp = getCookie("county");
-
- console.info(temp);
- if(temp != '' || temp != undefined) {
- temp = JSON.parse(temp);
- //temp = eval('('+temp+')');
-
- var data = [
- {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
- {url: 'javascript:JumpFirstPage();', txt:temp.StationName1},
- {url: 'javascript:JumpcityPage();', txt: temp.StationName2},
- {url: 'machineroomM.html', txt: temp.StationName5 },
- {url: 'javascript:;', txt: '鏈烘埧'}
- ];
- addBreadCrumb($('.breadcrumb').eq(0),data);
-
- searchkBattByStationid();
- }else {
- window.location.href="machineroomM.html";
- }
- }
-
-
- //鏍规嵁鏈烘埧id鏌ヨ鐢垫睜缁�
- function searchkBattByStationid(){
- loadshow();
- var data = {
- StationName1: temp.StationName1,
- StationName2: temp.StationName2,
- StationName5: temp.StationName5
- };
- $.ajax({
- type: "post",
- url: "BattInfAction!serchStationName3",
- async:true,
- dataType:'text',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- console.info(model);
- if(model.code == 1){
- battinlist = model.data;
- createUl($('#battList2'), model.data);
- }
- loadclose();
- },
- error:function(){
- loadclose();
- }
- });
- }
-
- /*
- 澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
- @param ulCon ul鐨勫鍣�
- @param dataList ul鐨勬暟鎹唴瀹�
- */
- function createUl(ulCon, dataList) {
- // 娓呯悊瀹瑰櫒涓嬬殑ul
- ulCon.find('ul').remove();
-
- // 鍒涘缓ul
- var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
-
- // 閬嶅巻dataList鐢熸垚li鍜宎
- for (var i = 0; i < dataList.length; i++){
- var _li = $('<li></li');
-
- var _a = $('<a href="javascript:void(0);" target="_top" data-ajax="false" value="" data-transition="slide">'+dataList[i].StationName3+'</a>');
- // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
- _li.append(_a);
- _ul.append(_li);
- }
-
- // 灏哶ul娣诲姞鍒板鍣ㄤ腑
- ulCon.append(_ul).trigger('create');
- loadclose();
- }
-
- $(document).ready(function () {
- var aLi = -1;
- $('#battList2').on('click', 'ul li', function () {
- aLi = $(this).index();
- batt = getbatt(battinlist,aLi);
- var json=window.JSON.stringify(batt);
- setCookie("battselect",json);
- window.location.href="battM.html";
- });
- });
-
-
-
- //鑾峰彇褰撳墠閫変腑鐨刡att
- function getbatt(arr,index){
- console.log(arr);
- console.log(index);
- if(arr.length>index){
- return arr[index];
- }
- return undefined;
- };
-
- $(function(){
- $('.breadcrumb').on('tap', 'a[href="#page0"]', function() {
- list=getList(battinlist,0,batt);
- //init();
- });
- });
- </script>
-
-</html>
\ No newline at end of file
--
Gitblit v1.9.1