From b56adb397d5ba2d20f9f2a689a0cba2bf398a6cb Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 11:35:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 90 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index b0b5b1b..d524359 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>娴侀噺缁熻</title> <!--娴侀噺缁熻-->
+ <title>鏈烘埧娴侀噺缁熻鏌ヨ</title> <!--娴侀噺缁熻-->
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.min.js">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -31,12 +31,13 @@
<div class="layui-page-container">
<!-- 鏉′欢绛涢�� -->
<div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight">娴侀噺缁熻</div>
+ <div class="page-filter-header layui-page-filter-fweight">鏈烘埧娴侀噺缁熻鏌ヨ</div>
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
<td>缁熻鏂瑰紡</td>
<td colspan="2">鏃堕棿娈�</td>
@@ -64,6 +65,19 @@
</div>
</div>
</td>
+
+ <td>
+ <div class="layui-form" lay-filter="countyFilter">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <select name="county" id="county" lay-filter="county">
+ <option value="">璇烽�夋嫨鍖�/鍘�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ </td>
+
<td>
<div class="layui-form" lay-filter="homeFilter">
<div class="layui-form-item">
@@ -236,15 +250,69 @@
createLayuiSelect(ele, list);
form.render('select', 'cityFilter');
+ // 鏌ヨ鍖哄幙
+ searchCounty();
+ }
+ });
+ }
+
+ // 鍒囨崲甯�-鍖哄幙
+ form.on('select(city)', function(data) {
+ // 鏌ヨ鍖哄幙
+ searchCounty();
+ });
+
+
+ // 鏌ヨ鍖�/鍘�
+ function searchCounty(isLoad) {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1: $("#province").val(),
+ StationName2: $("#city").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName5',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ //console.info(rs);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#county'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+ //console.info(_tmp);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'countyFilter');
+
// 鏌ヨ鏈烘埧
searchHome();
}
});
}
- // 鍒囨崲甯�-鏈烘埧
- form.on('select(city)', function(data) {
- // 鏌ヨ鏈烘埧
+ // 鍒囨崲甯�-鍖哄幙
+ form.on('select(county)', function(data) {
+ // 鏌ヨ鍖哄幙
searchHome();
});
@@ -253,7 +321,8 @@
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#province").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
};
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
@@ -298,9 +367,9 @@
,cellMinWidth: 80
,cols: [[
{field:'timeSlot', title:'缁熻鏃堕棿娈�', align:'center', width: 380}
- ,{field:'province', title:'鐪�', align:'center'}
- ,{field:'city', title:'甯�', align:'center'}
- ,{field:'home', title:'鏈烘埧鍚嶇О', align:'center'}
+ ,{field:'province', title:'鐪�', align:'center',width:200}
+ ,{field:'city', title:'甯�', align:'center',width:200}
+ ,{field:'home', title:'鏈烘埧鍚嶇О', align:'center',width:600}
,{field:'flowSize', title:'娴侀噺', align:'center'}
]]
,data:[]
@@ -338,6 +407,7 @@
layer.close(loading);
// 瑙ｆ瀽鑾峰彇鐨刯son
var rs = JSON.parse(result.result);
+ console.info(rs);
// 鍒濆鍖栨暟鎹粨鏋�
tOptions.data = [];
if(rs.code == 1) {
@@ -350,7 +420,7 @@
tmp.province = _data.stationName1;
tmp.city = _data.stationName2;
tmp.home = _data.stationName;
- tmp.flowSize = tranfficCount(_data.nowflow);
+ tmp.flowSize = tranfficCount(_data.dayflow);
tOptions.data.push(tmp);
}
}else {
--
Gitblit v1.9.1