From d839edf15d110f25cb05b76c10b861d96996e1ee Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 19 十一月 2018 16:41:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/machineroomM.html | 2
gx_tieta/WebRoot/mobil/selectcounty.html | 150 +++++++++++++++++++++++++
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 3
gx_tieta/WebRoot/mobil/js/battNav.js | 4
gx_tieta/WebRoot/mobil/selectcity.html | 149 ++++++++++++++++++++++++
5 files changed, 306 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/js/battNav.js b/gx_tieta/WebRoot/mobil/js/battNav.js
index 12caf90..78867f6 100644
--- a/gx_tieta/WebRoot/mobil/js/battNav.js
+++ b/gx_tieta/WebRoot/mobil/js/battNav.js
@@ -15,6 +15,10 @@
setCookie("pages","1");
window.location.href="machineroomM.html";
}
+function JumpcityPage(){
+ setCookie("pages","3");
+ window.location.href="selectcity.html";
+}
//璺宠浆鍒扮數姹犵粍灞�
function JumpThirdPage(){
diff --git a/gx_tieta/WebRoot/mobil/machineroomM.html b/gx_tieta/WebRoot/mobil/machineroomM.html
index c771bae..d4602ea 100644
--- a/gx_tieta/WebRoot/mobil/machineroomM.html
+++ b/gx_tieta/WebRoot/mobil/machineroomM.html
@@ -124,7 +124,7 @@
for (var i = 0; i < dataList.length; i++){
var _li = $('<li></li');
- var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName1+'</a>');
// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
_li.append(_a);
diff --git a/gx_tieta/WebRoot/mobil/selectcity.html b/gx_tieta/WebRoot/mobil/selectcity.html
new file mode 100644
index 0000000..8c330d6
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/selectcity.html
@@ -0,0 +1,149 @@
+<!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">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.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" tabindex="0" id="page0">
+ <div data-role="header" data-position="fixed">
+ <a href="machineroomM.html" 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="battList"></div>
+ </div>
+ <div data-role="popup" id="myPopup" class="defined-popup">
+ <div class="popup-container">
+ <div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+ <div class="popup-content">
+ <div class="set-option">
+ <p>璇疯缃尯/鍘�</p>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <div class="footer-float footer-left">
+ <button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+ </div>
+ <div class="footer-float footer-right">
+ <button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+ </div>
+ </div>
+ </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 citylist = new Array();
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ $(document).ready(function(){
+ setCookie("city",null);
+ setCookie("county",null);
+ seachAllCity();
+ });
+
+ // 鐐瑰嚮鍩庡競浜嬩欢
+ $(function () {
+ var aLi = -1;
+ $('#battList').on('click', 'ul li', function () {
+ aLi = $(this).index();
+ city = getbatt(citylist,aLi);
+
+ var json=window.JSON.stringify(city);
+ setCookie("city",json);
+ window.location.href="selectcounty.html";
+ });
+
+ });
+
+ // 瀹氫箟闈㈠寘灞戝鑸潯
+ $(function(){
+ var data = [
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'javascript:JumpFirstPage();', txt: '鐪�'},
+ {url: 'javascript:;', txt: '甯�'}
+ ];
+ addBreadCrumb($('.breadcrumb').eq(0),data);
+ });
+
+ //鏌ヨ鎵�鏈夋満鎴�
+ function seachAllCity(){
+ loadshow();
+ $.ajax({
+ type: "post",
+ url: "",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(model.code == 1){
+ citylist = model.data;
+ createUl($('#battList'),model.data);
+ }else {
+ //alert(213);
+ $('#myPopup').popup('open');
+ }
+ loadclose();
+ },
+ error:function(){
+ loadclose();
+ }
+ });
+ }
+
+ /*
+ 澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
+ @param ulCon ul鐨勫鍣�
+ @param dataList ul鐨勬暟鎹唴瀹�
+ */
+ function createUl(ulCon, dataList) {
+ //console.info(index);
+ // 娓呯悊瀹瑰櫒涓嬬殑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="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
+ //鑾峰彇褰撳墠閫変腑鐨刢ity
+ function getbatt(arr,index){
+ if(arr.length>index){
+ return arr[index];
+ }
+ return undefined;
+ };
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/selectcounty.html b/gx_tieta/WebRoot/mobil/selectcounty.html
new file mode 100644
index 0000000..ddfba49
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/selectcounty.html
@@ -0,0 +1,150 @@
+<!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">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.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" tabindex="0" id="page0">
+ <div data-role="header" data-position="fixed">
+ <a href="selectcity.html" 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="battList"></div>
+ </div>
+ <div data-role="popup" id="myPopup" class="defined-popup">
+ <div class="popup-container">
+ <div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+ <div class="popup-content">
+ <div class="set-option">
+ <p>璇疯缃寘鏈虹粍</p>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <div class="footer-float footer-left">
+ <button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+ </div>
+ <div class="footer-float footer-right">
+ <button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+ </div>
+ </div>
+ </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 countylist = new Array();
+
+ // 鍒濆鍖栭〉闈㈠唴瀹�
+ $(document).ready(function(){
+ setCookie("county",null);
+ setCookie("batt",null);
+ seachAllCounty();
+ });
+
+ // 鐐瑰嚮鍩庡競浜嬩欢
+ $(function () {
+ var aLi = -1;
+ $('#battList').on('click', 'ul li', function () {
+ aLi = $(this).index();
+ county = getbatt(countrylist,aLi);
+
+ var json=window.JSON.stringify(county);
+ setCookie("county",json);
+ window.location.href="battM.html";
+ });
+
+ });
+
+ // 瀹氫箟闈㈠寘灞戝鑸潯
+ $(function(){
+ var data = [
+ {url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+ {url: 'javascript:JumpFirstPage();', txt: '鐪�'},
+ {url: 'javascript:JumpcityPage();', txt: '甯�'},
+ {url: 'javascript:;', txt: '鍖�/鍘�'}
+ ];
+ addBreadCrumb($('.breadcrumb').eq(0),data);
+ });
+
+ //鏌ヨ鎵�鏈夋満鎴�
+ function seachAllCounty(){
+ loadshow();
+ $.ajax({
+ type: "post",
+ url: "",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ console.info(model);
+ if(model.code == 1){
+ countylist = model.data;
+ createUl($('#battList'),model.data);
+ }else {
+ //alert(213);
+ $('#myPopup').popup('open');
+ }
+ loadclose();
+ },
+ error:function(){
+ loadclose();
+ }
+ });
+ }
+
+ /*
+ 澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
+ @param ulCon ul鐨勫鍣�
+ @param dataList ul鐨勬暟鎹唴瀹�
+ */
+ function createUl(ulCon, dataList) {
+ //console.info(index);
+ // 娓呯悊瀹瑰櫒涓嬬殑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="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
+ //鑾峰彇褰撳墠閫変腑鐨刢ounty
+ function getbatt(arr,index){
+ if(arr.length>index){
+ return arr[index];
+ }
+ return undefined;
+ };
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index dae6701..6cbe6d7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -309,7 +309,7 @@
Page page=bmd.getPage();
Connection conn= DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName,FBSDeviceId " +
+ String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationId_ex,StationName1,StationName2,StationName3,StationName5,StationName,FBSDeviceId " +
" From db_battinf.tb_battinf " +
" limit ?,?";
List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
@@ -325,6 +325,7 @@
binf.setStationName1(rs.getString("stationName1"));
binf.setStationName2(rs.getString("stationName2"));
binf.setStationName3(rs.getString("stationName3"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
binf.setStationName(rs.getString("stationName"));
binf.setStationId_ex(rs.getString("stationId_ex"));
--
Gitblit v1.9.1