From 2b41a088ffcd22a34b24ccb8d96be040de840b79 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期三, 07 十一月 2018 16:03:28 +0800
Subject: [PATCH] 从其他页面跳转到实时告警和历史告警页面选中指定的机房或者电池组
---
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 137 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 135 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index d524359..27174f5 100644
--- a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
+++ b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
@@ -17,9 +17,19 @@
<meta http-equiv="description" content="This is my page">
<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="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
<link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+ <style>
+ .dataTypeCont {
+ width: 160px;
+ text-align: center;
+ }
+ .dataTypeCont .layui-form-switch {
+ min-width: 70px;
+ margin-top: 4px;
+ }
+ </style>
</head>
<body>
<!--澶撮儴鍐呭寮�濮�-->
@@ -41,6 +51,7 @@
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
<td>缁熻鏂瑰紡</td>
<td colspan="2">鏃堕棿娈�</td>
+ <td>鏁版嵁绫诲瀷</td>
</tr>
<tr>
<td>
@@ -120,6 +131,15 @@
</div>
</div>
</td>
+ <td class="dataTypeCont">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <div class="layui-input-block">
+ <input type="checkbox" name="close" lay-skin="switch" lay-filter="dataType" lay-text="鎶樼嚎鍥緗琛ㄦ牸">
+ </div>
+ </div>
+ </div>
+ </td>
</tr>
</table>
</div>
@@ -128,6 +148,13 @@
<div class="layui-page-content">
<!-- 琛ㄦ牸鍐呭 -->
<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">
@@ -138,15 +165,26 @@
<!-- 鏁翠綋鐏拌壊閬僵灞� -->
<div id="allShade"></div>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
+ <script type="text/javascript" src="js/echarts.js"></script>
<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();
@@ -391,10 +429,22 @@
}
});
+ // 鍒囨崲鏁版嵁鏄剧ず绫诲瀷
+ var echartsCont = $('#echarts-container');
+ form.on('switch(dataType)', function(data){
+ if(this.checked) {
+ echartsCont.removeClass('abs-index1n');
+ }else {
+ echartsCont.addClass('abs-index1n');
+ }
+ });
+
// 鏌ヨ琛ㄦ牸鏁版嵁
+ var allData = [];
function sTblData(sData) {
// 寮�鍚瓑寰呮
- var loading = layer.load();
+ var loading = layer.load(1);
+ allData = [];
// 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -422,6 +472,7 @@
tmp.home = _data.stationName;
tmp.flowSize = tranfficCount(_data.dayflow);
tOptions.data.push(tmp);
+ allData.push(_data);
}
}else {
layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
@@ -435,6 +486,12 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+
+ // 鑾峰彇绫诲瀷
+ var type = sData.num;
+ var lineData = getLineData(type);
+ var lineGraphOpts = getlineGraphOpts(lineData, type)
+ createLine(lineGraph, lineGraphOpts);
}
});
}
@@ -451,6 +508,26 @@
return temp;
}
+ // 澶勭悊骞惰繑鍥炵敓鎴愭姌绾垮浘鐨勬暟鎹�
+ function getLineData(type) {
+ var rs = {
+ x: [],
+ y:[]
+ };
+
+ // 閬嶅巻allData鐨勫��
+ for(var i=0; i<allData.length; i++) {
+ var _allData = allData[i];
+ var x = getNeedDate(_allData.note, type);
+ var y = getTranfficCount(_allData.dayflow, type);
+ rs.x.push(x);
+ rs.y.push(y);
+ }
+
+ return rs;
+ }
+
+
// 璁＄畻娴侀噺
function tranfficCount(value){
value = (value/1048576).toFixed(2);
@@ -461,6 +538,62 @@
return value + "M";
}
}
+
+ // 鑾峰彇G/M鍒ゆ柇涓�#statistics涓�鑷�
+ function getTranfficCount(value, type) {
+ var _value = (value/1048576).toFixed(2);
+ if(type == "3") {
+ _value = (_value/1024).toFixed(2);
+ }
+
+ return _value;
+ }
+
+ // 鎴彇鏃ユ湡(浠呬繚鐣欓渶瑕佺殑骞存湀鏃�)case鍊艰涓�#statistics涓�鑷�
+ function getNeedDate(date, type) {
+ var rs = '';
+ switch(type) {
+ case '3':
+ rs = date.slice(0, 4);
+ break;
+ case '1':
+ rs = date.slice(0, 7);
+ break;
+ default:
+ rs = date.slice(0, 10);
+ break;
+ }
+
+ return rs;
+ }
+
+ // 鑾峰彇鐢熸垚鎶樼嚎鍥剧殑閰嶇疆椤�
+ function getlineGraphOpts(data, type) {
+ 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