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/src/com/fgkj/dao/impl/StationtrafficImpl.java | 16 ++--
gx_tieta/src/global_zh_CN.properties | 3 +
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 3
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 90 ++++++++++++++++++++++++++---
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 16 +++++
5 files changed, 108 insertions(+), 20 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 {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
index f423ae4..f7606c3 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -225,7 +225,7 @@
//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
public List serchInBattMapByUid3(Object obj) {
BattMap_information binfor=(BattMap_information) obj;
- String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3 " +
+ String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
" from web_site.tb_battmap_information,db_battinf.tb_battinf " +
" where tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
" and tb_battmap_information.StationId in (" +
@@ -249,6 +249,7 @@
binformation.setStationName1(rs.getString("stationName1"));
binformation.setStationName2(rs.getString("stationName2"));
binformation.setStationName3(rs.getString("stationName3"));
+ binformation.setStationName5(rs.getString("stationName5"));
binformation.setAddress(rs.getString("address"));
binformation.setLongitude(rs.getDouble("longitude"));
binformation.setLatitude(rs.getDouble("latitude"));
diff --git a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
index 4cbec20..2a134f2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
@@ -66,11 +66,11 @@
// 鏃堕棿娈�
String perid_Time = "";
Calendar now = Calendar.getInstance();
- int nowflow=0;
+ int dayflow=0;
try {
while(rs.next()){
- int nowflows=rs.getInt("nowflow");
+ int dayflows=rs.getInt("dayflow");
// 骞翠唤锛屽搴︼紝鏈堜唤
Date dev_recordtime = rs.getTimestamp("record_time");
// 鑾峰彇鍏蜂綋骞翠唤锛屾湀浠藉拰璇ユ湀鐨勬�诲ぉ鏁�
@@ -97,16 +97,16 @@
}
//System.out.println(perid_Times+" "+perid_Time+" "+nowflows);
if(perid_Times.equals(perid_Time)){
- nowflow+=nowflows;
+ dayflow+=dayflows;
}else{
if(perid_Time.equals("")){
perid_Time=perid_Times;
- nowflow+=nowflows;
+ dayflow+=dayflows;
continue;
}
Stationtraffic st=new Stationtraffic();
st.setDev_id(rs.getInt("dev_id"));
- st.setNowflow(nowflow);
+ st.setDayflow(dayflow);
st.setStationName(rs.getString("stationName"));
st.setStationName1(rs.getString("stationName1"));
st.setStationName2(rs.getString("stationName2"));
@@ -114,15 +114,15 @@
st.setStationName5(rs.getString("stationName5"));
st.setNote(perid_Time);
list.add(st);
- nowflow=0;
- nowflow+=nowflows;
+ dayflow=0;
+ dayflow+=dayflows;
perid_Time=perid_Times;
}
if(rs.isLast()){
Stationtraffic st=new Stationtraffic();
st.setDev_id(rs.getInt("dev_id"));
- st.setNowflow(nowflow);
+ st.setDayflow(dayflow);
st.setStationName(rs.getString("stationName"));
st.setStationName1(rs.getString("stationName1"));
st.setStationName2(rs.getString("stationName2"));
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 111b6f0..7e10eef 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -15,6 +15,7 @@
private String stationName1;
private String stationName2;
private String stationName3;
+ private String stationName5;
public BattMap_information() {
super();
@@ -110,6 +111,8 @@
}
+
+
@Override
public String toString() {
return "BattMap_information [num=" + num + ", StationId=" + StationId
@@ -118,7 +121,8 @@
+ ", information=" + information + ", FBSDeviceId="
+ FBSDeviceId + ", page=" + page + ", stationName1="
+ stationName1 + ", stationName2=" + stationName2
- + ", stationName3=" + stationName3 + "]";
+ + ", stationName3=" + stationName3 + ", stationName5="
+ + stationName5 + "]";
}
@@ -152,6 +156,16 @@
}
+ public String getStationName5() {
+ return stationName5;
+ }
+
+
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
+
+
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index bef158f..0958021 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1098,4 +1098,7 @@
################## batt-fault-manage.jsp ##############################
Problem_feedback = \u95ee\u9898\u53cd\u9988
+Station_problem_record = \u673a\u623f\u95ee\u9898\u8bb0\u5f55
+################## batt-traffic-statistics1.jsp ##############################
+Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2
\ No newline at end of file
--
Gitblit v1.9.1