From 6fc40df03a5fc40a2bae976ed8fdedc4946dc584 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.21>
Date: 星期二, 20 十一月 2018 17:27:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/base-station-info.html | 222 +++++++++++++++++++++++++++
gx_tieta/WebRoot/mobil/ele-infor-search2.html | 221 ++++++++++++++++++---------
gx_tieta/WebRoot/mobil/testdata.html | 3
gx_tieta/WebRoot/mobil/mobilJs/base.js | 20 ++
4 files changed, 390 insertions(+), 76 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/base-station-info.html b/gx_tieta/WebRoot/mobil/base-station-info.html
new file mode 100644
index 0000000..dcf396a
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/base-station-info.html
@@ -0,0 +1,222 @@
+<!doctype html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<title>鍩虹珯淇℃伅</title>
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" type="text/css" href="mobilCss/scrollbar.css">
+<link rel="stylesheet" type="text/css" href="mobilCss/indexslider.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>
+ <style>
+
+ td{
+ border:1px solid #ddd;
+ }
+ th{
+ border:1px solid #ddd;
+ background-color: #e9e9e9;
+ }
+ </style>
+</head>
+<body>
+ <div data-role="page">
+ <div data-role="header">
+ <a href="testdata.html" class="ui-btn ui-corner-all ui-shadow ui-icon-arrow-l ui-btn-icon-left" target="_top" style="padding-bottom:0.7em; padding-top:0.7em;">杩斿洖</a>
+ <h1>鍩虹珯淇℃伅</h1>
+ </div>
+
+ <div data-role="main" class="ui-content">
+ <table data-role="table" data-mode="" class="ui-responsive" id="myTable">
+ <thead>
+ <tr>
+ <th data-priority="1">鍚嶇О</th>
+ <th data-priority="1">鍙傛暟鍊�</th>
+ </tr>
+ </thead>
+ <tbody id="t_body">
+ <tr>
+ <td>绔欑偣ID</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欑偣鍚嶇О</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鏈烘埧ID</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鎵�灞炵粍缁�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鏁版嵁鏉ユ簮</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃绫诲瀷</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>缁忕含搴�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鎵�鍦ㄥ湴鍧�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鐘舵��</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>缁存姢鍗曚綅</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍦烘櫙</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃浜ф潈</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>浣跨敤鍗曚綅</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鐗╃悊绔欏潃缂栫爜</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍐呴儴缂栧彿</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎷奸煶绠�绉�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>涓枃绠�绉�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鏄惁寮�閫氫笟鍔�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>褰曞叆浜哄憳</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>褰曞叆鏃堕棿</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>淇敼浜�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>淇敼鏃堕棿</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>绉诲姩绔欏潃鍚嶇О</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鐢典俊绔欏潃鍚嶇О</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鑱旈�氱珯鍧�鍚嶇О</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鍝佺墝</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻鏃堕暱</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻绫诲埆</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>缁埅鍙戠敓鏃堕棿</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鍏变韩鎯呭喌</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔＄姸鍐�</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>鏄惁鍏峰鍙戠數鏉′欢</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>涓婄珯璺▼</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>涓婄珯闅炬槗绋嬪害</td>
+ <td id=""></td>
+ </tr>
+ <tr>
+ <td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+ <td id=""></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <!-- <div data-role="footer" data-position="fixed">
+ <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1>
+ </div> -->
+ </div>
+</body>
+<script type="text/javascript">
+ $(function(){
+ var batt=eval("("+getCookie('batt')+")");
+ console.info(batt);
+ $.ajax({
+ url : "Battinf_exAction!serchByCondition",
+ async: true,
+ type : "POST",
+ data : "json="+JSON.stringify(batt),
+ dataType : "json",
+ success : function(data){
+ var model=eval("("+data.result+")");
+ console.info(model);
+ },
+ error : function(er) {
+ console.info(er);
+ }
+ });
+ });
+</script>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/ele-infor-search2.html b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
index a1f3336..d02f5f5 100644
--- a/gx_tieta/WebRoot/mobil/ele-infor-search2.html
+++ b/gx_tieta/WebRoot/mobil/ele-infor-search2.html
@@ -287,9 +287,7 @@
arr[index++]=data[i].binf.MonVolStd; //鏍囩О鍗曚綋鐢靛帇
arr[index++]=data[i].binf.BattProducer; //鐢垫睜鍝佺墝
arr[index++]=data[i].binf.BattProductDate.substr(0,10); //鐢垫睜鐢熶骇鏃ユ湡
- arr[index++]=data[i].binf.BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡
-
-
+ arr[index++]=data[i].binf.BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡
}
console.info(Page);
createTbl(tbl, arrTh, arr);
@@ -357,7 +355,6 @@
data = eval("("+data+")");
//console.info(data);
console.info(data.code);
-
if(data.code==1&&data.data.length>0){
var $Ostation_name1=$("#mainteArea");
$Ostation_name1.text("");
@@ -378,15 +375,16 @@
}
updataSel($Ostation_name1, arr);
}
- findStationNamebyStationname1();
+ findCity();
});
//褰撶渷鏀瑰彉鏃舵洿鏂板競
function findCity(){
var data = {
- StationName1: $("#station_name1").val()
+ StationName1: $("#mainteArea").val()
};
+ console.info(data);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -408,94 +406,169 @@
if(i == 0){
arr.push({
val:"",
- txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
});
}else{
arr.push({
- val:data.data[i-1].StationName1,
- txt:data.data[i-1].StationName1,
+ val:data.data[i-1].StationName2,
+ txt:data.data[i-1].StationName2,
});
}
}
updataSel($Ostation_name1, arr);
}
- findStationNamebyStationname1();
+ 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 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();
+ for(var i=0;i<=data.data.length;i++)
+ {
+ if(i == 0){
+ arr.push({
+ val:0,
+ txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+ });
+ }else{
+ arr.push({
+ val:data.data[i-1].StationId,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ console.info(111111111111111);
+ updataSelStation($Ostation_name1, arr);
+ }
+
+ findserchByBattGroupNamebystationname();
+ }
+ });
+ }
+
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
+ function findserchByBattGroupNamebystationname(){
+
+ var data = {
+ StationName1: $("#mainteArea").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#country").val(),
+ StationName: $("#homeName").text(),
+ StationId: $("#homeName").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.warn();
+ console.info(data);
+ console.info(data.code);
+ if(data.code==1&&data.data.length>0){
+ var $Ostation_name1=$("#battgroup_name");
+ $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].StationName3,
+ txt:data.data[i-1].StationName3,
+ });
+ }
+ }
+ updataSel($Ostation_name1, arr);
+ }
+
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鏀瑰彉鏃舵洿鏂扮珯鐐�
$('#mainteArea').change(function(){
findCity();
findStationNamebyStationname1();
- });
-
- function findStationNamebyStationname1(){
- var selectvalue=$("#mainteArea option:selected").val();
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- data=data.result;
- data=eval("("+data+")");
- console.info(data);
- if(data.code==1 && data.data.length>0){
- 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].StationName,
- txt:data.data[i].StationName
- });
- //}
-
- }
- updataSel($("#homeName"), arr);
- }
- findserchByBattGroupNamebystationname();
- });
-
- }
-
+ });
$('#homeName').change(function(){
findserchByBattGroupNamebystationname();
});
-
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var station_name1=$("#mainteArea option:selected").val();
- var station_name=$("#homeName option:selected").val();
-
- $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
- data=data.result;
- //console.info(data);
- data=eval("("+data+")");
- console.info(data.data.length);
- if(data.code==1 && data.data.length>0){
- var $Obattgroup_name = $("#battgroup_name");
- var arr = new Array();
-
- for(var i=0;i<=data.data.length;i++) {
- if(i == 0) {
- arr.push({
- val: "0",
- txt: "鍏ㄩ儴(鍏�"+data.sum+"涓�)"
- });
- }else {
- arr.push({
- val: data.data[i-1].BattGroupId,
- txt: data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"鑺�"
- });
- }
- }
- updataSel($Obattgroup_name, arr);
- };
- });
- }
//鏌ヨ鐢垫睜鍝佺墝
$.post("BattInfAction_serchByBattProducer",null,function(data){
diff --git a/gx_tieta/WebRoot/mobil/mobilJs/base.js b/gx_tieta/WebRoot/mobil/mobilJs/base.js
index 15337e3..71d2dae 100644
--- a/gx_tieta/WebRoot/mobil/mobilJs/base.js
+++ b/gx_tieta/WebRoot/mobil/mobilJs/base.js
@@ -338,20 +338,36 @@
opts涓や釜蹇呭灞炴�� val鍜� txt
*/
function updataSel(element, opts) {
-
+ //console.warn(3636);
element.siblings('span').text(opts[0].txt); // 璁剧疆榛樿鏄剧ず鐨勫唴瀹�
// 娓呯悊element鐨刼ption
element.text('');
-
+ //console.warn(opts);
// 鏍规嵁vals鍜宼xt鍊肩敓鎴恛ption
for(var i = 0; i < opts.length; i++) {
+
var opt = $('<option value="'+opts[i].val+'">'+opts[i].txt+'</option>');
element.append(opt);
}
}
+function updataSelStation(element, opts) {
+
+ element.siblings('span').text(opts[0].txt); // 璁剧疆榛樿鏄剧ず鐨勫唴瀹�
+
+ // 娓呯悊element鐨刼ption
+ element.text('');
+ //console.warn(opts);
+ // 鏍规嵁vals鍜宼xt鍊肩敓鎴恛ption
+ for(var i = 0; i < opts.length; i++) {
+
+ var opt = $('<option value="'+opts[i].txt+'" stationid="'+opts[i].val+'">'+opts[i].txt+'</option>');
+ element.append(opt);
+ }
+ }
+
/**
*ele JQuery瀵硅薄
*input 榛樿鍊�
diff --git a/gx_tieta/WebRoot/mobil/testdata.html b/gx_tieta/WebRoot/mobil/testdata.html
index 8def9de..dff2546 100644
--- a/gx_tieta/WebRoot/mobil/testdata.html
+++ b/gx_tieta/WebRoot/mobil/testdata.html
@@ -49,6 +49,9 @@
<li>
<a href="battinfors.html" target="_top" data-ajax="false">鐢垫睜缁勪俊鎭�</a>
</li>
+ <li>
+ <a href="base-station-info.html" target="_top" data-ajax="false">鍩虹珯淇℃伅</a>
+ </li>
</ul>
</div>
--
Gitblit v1.9.1