From 08ecf68a7136e81421b41d1323e6f1c519d3b973 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 05 十一月 2018 17:31:41 +0800
Subject: [PATCH] 开启重新启动
---
gx_tieta/WebRoot/control.jsp | 4 +-
gx_tieta/WebRoot/batt-traffic-statistics1.jsp | 87 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 87 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-traffic-statistics1.jsp b/gx_tieta/WebRoot/batt-traffic-statistics1.jsp
index d524359..52079ba 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>
@@ -138,6 +158,7 @@
<!-- 鏁翠綋鐏拌壊閬僵灞� -->
<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>
@@ -391,10 +412,22 @@
}
});
+ // 鍒囨崲鏁版嵁鏄剧ず绫诲瀷
+ form.on('switch(dataType)', function(data){
+ console.log(this.checked);
+ if(this.checked) {
+ layer.msg('鎴戞槸鎶樼嚎鍥�');
+ }else {
+ layer.msg('鎴戞槸琛ㄦ牸锛�');
+ }
+ });
+
// 鏌ヨ琛ㄦ牸鏁版嵁
+ var allData = [];
function sTblData(sData) {
// 寮�鍚瓑寰呮
- var loading = layer.load();
+ var loading = layer.load(1);
+ allData = [];
// 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
$.ajax({
type: 'post',
@@ -422,6 +455,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 +469,7 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ console.log(getLineData());
}
});
}
@@ -451,6 +486,26 @@
return temp;
}
+ // 澶勭悊骞惰繑鍥炵敓鎴愭姌绾垮浘鐨勬暟鎹�
+ function getLineData() {
+ var rs = {
+ x: [],
+ y:[]
+ };
+ var type = $('#statistics').val();
+ // 閬嶅巻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 +516,34 @@
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;
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 10b3efc..02536cb 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -4516,9 +4516,9 @@
cmd: sysCMD.restart
};
- console.log(temp);
+ /* console.log(temp);
layer.msg('鍔熻兘寮�鍙戜腑...');
- return;
+ return; */
// 閲嶅惎
restartSys(temp);
}else {
--
Gitblit v1.9.1