From e978f1eb746dd9814c3680bb35e890b15498a6df Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.14>
Date: 星期三, 28 十一月 2018 13:32:48 +0800
Subject: [PATCH] 设备变迁的查询修改
---
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 95 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index 52079ba..b814785 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.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -41,7 +41,7 @@
<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">
@@ -149,6 +149,13 @@
<!-- 琛ㄦ牸鍐呭 -->
<table id="pageTbl" lay-filter="pageTbl"></table>
</div>
+ <div id="echarts-container" class="abs abs-top220 bg-red abs-index1n abs-bottom70">
+ <div class="abs-container">
+ <div class="graph">
+ <div class="graph-content" id="lineGraph"></div>
+ </div>
+ </div>
+ </div>
<!-- 鍒嗛〉鍐呭 -->
<div id="paging">
<a href="javascript:" class="search"><s:text name="Search"/><!-- 鏌ヨ --></a>
@@ -162,12 +169,22 @@
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="src/layui.js"></script>
<script type="text/javascript" src="pages/js/mylayui.js"></script>
+ <script type="text/javascript" src="pages/js/pages/control-common.js"></script>
<script type="text/javascript">
layui.use(['form', 'table', 'layer', 'laydate', 'element'], function() {
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
var laydate = layui.laydate; // 鑾峰彇鏃ユ湡妯″潡
+ var createLine = GLOBAL.eleDataGraph.createLine; // 鐢熸垚鎶樼嚎鍥�
+ var $lineGraph = $('#lineGraph').get(0);
+ var lineGraph = echarts.init($lineGraph);
+ createLine(lineGraph, {});
+
+ // 椤甸潰澶у皬鏀瑰彉妯″潡
+ $(window).resize(function() {
+ lineGraph.resize();
+ });
// 瀹氫箟鏃堕棿妯″潡
var date = new Date();
@@ -193,6 +210,9 @@
});
+ var isNewLoad = true;
+
+ var pre_province = getQueryString('province');
// 鏌ヨ鐪佷笅鎷夋
searchProvince();
// 鏌ヨ鐪�
@@ -215,6 +235,9 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = getLayuiSelect(_data, _data, {}, {});
+ if(pre_province == _data && isNewLoad){
+ _tmp = getLayuiSelect(_data, _data, {}, {},true);
+ }
list.push(_tmp);
}
}else {
@@ -243,6 +266,7 @@
var tmp = {
StationName1: $("#province").val()
};
+ var pre_city = getQueryString('city');
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -261,6 +285,9 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+ if(pre_city == _data.StationName2 && isNewLoad){
+ _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
+ }
list.push(_tmp);
}
}else {
@@ -295,6 +322,7 @@
if(isLoad) {
filterLoad = layer.load();
}
+ var pre_county = getQueryString('county');
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -314,6 +342,9 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+ if(pre_county == _data.StationName5 && isNewLoad){
+ _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
+ }
//console.info(_tmp);
list.push(_tmp);
}
@@ -345,6 +376,8 @@
StationName2:$("#city").val(),
StationName5:$("#county").val(),
};
+ var pre_home = getQueryString('home');
+ var auto_seach = false;
// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -367,15 +400,23 @@
dev_id: _data.FBSDeviceId
};
var _tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data);
+ if(pre_home == _data.StationName && isNewLoad){
+ _tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data,true);
+ auto_seach = true;
+ }
list.push(_tmp);
}
}else {
list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
}
-
// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
createLayuiSelect(ele, list);
form.render('select', 'homeFilter');
+ if(auto_seach){
+ var temp = createSearchForm();
+ sTblData(temp);
+ }
+ isNewLoad = false;
}
});
@@ -413,12 +454,12 @@
});
// 鍒囨崲鏁版嵁鏄剧ず绫诲瀷
+ var echartsCont = $('#echarts-container');
form.on('switch(dataType)', function(data){
- console.log(this.checked);
if(this.checked) {
- layer.msg('鎴戞槸鎶樼嚎鍥�');
+ echartsCont.removeClass('abs-index1n');
}else {
- layer.msg('鎴戞槸琛ㄦ牸锛�');
+ echartsCont.addClass('abs-index1n');
}
});
@@ -440,7 +481,7 @@
layer.close(loading);
// 瑙ｆ瀽鑾峰彇鐨刯son
var rs = JSON.parse(result.result);
- console.info(rs);
+ //console.info(rs);
// 鍒濆鍖栨暟鎹粨鏋�
tOptions.data = [];
if(rs.code == 1) {
@@ -469,7 +510,12 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
- console.log(getLineData());
+
+ // 鑾峰彇绫诲瀷
+ var type = sData.num;
+ var lineData = getLineData(type);
+ var lineGraphOpts = getlineGraphOpts(lineData, type)
+ createLine(lineGraph, lineGraphOpts);
}
});
}
@@ -487,12 +533,12 @@
}
// 澶勭悊骞惰繑鍥炵敓鎴愭姌绾垮浘鐨勬暟鎹�
- function getLineData() {
+ function getLineData(type) {
var rs = {
x: [],
y:[]
};
- var type = $('#statistics').val();
+
// 閬嶅巻allData鐨勫��
for(var i=0; i<allData.length; i++) {
var _allData = allData[i];
@@ -544,6 +590,35 @@
return rs;
}
+
+ // 鑾峰彇鐢熸垚鎶樼嚎鍥剧殑閰嶇疆椤�
+ function getlineGraphOpts(data, type) {
+ //console.log(data);
+ var rs = {
+ xdata:[],
+ sdata: [],
+ };
+ rs.xdata = data.x;
+ rs.sdata.push(data.y);
+ rs.tname = '娴侀噺缁熻';
+ rs.lname = ["浣跨敤娴侀噺"];
+ switch(type) {
+ case '3':
+ rs.subtxt = '鎸夊勾缁熻';
+ rs.unit = "G";
+ break;
+ case '1':
+ rs.subtxt = '鎸夋湀缁熻';
+ rs.unit = "M";
+ break;
+ default:
+ rs.subtxt = '鎸夊ぉ缁熻';
+ rs.unit = "M";
+ break;
+ }
+ //console.log(rs);
+ return rs;
+ }
});
</script>
</body>
--
Gitblit v1.9.1