From e80575bf12eb2fe248043549ebf2d3057f114d22 Mon Sep 17 00:00:00 2001
From: ubuntu <ubuntu@ubuntu.com>
Date: Wed, 29 Aug 2018 13:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=A2=9E=E5=8A=A0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=A2=E5=8C=85=E7=8E=87=E5=95=8A,=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=BE=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/css/dark.css       |  4 ++++
 web/css/light.css      |  4 ++++
 web/index.html         |  1 +
 web/js/serverstatus.js | 17 +++++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/web/css/dark.css b/web/css/dark.css
index bdcf3fa..c6a2091 100644
--- a/web/css/dark.css
+++ b/web/css/dark.css
@@ -25,17 +25,20 @@ tr.odd.expandRow > :hover { background: #000 !important; }
 @media only screen and (max-width: 720px) {
 	#type, tr td:nth-child(4)			{ display:none; visibility:hidden; }
 	#location, tr td:nth-child(5)		{ display:none; visibility:hidden; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
 @media only screen and (max-width: 600px) {
 	#type, tr td:nth-child(4)			{ display:none; visibility:hidden; }
 	#location, tr td:nth-child(5)		{ display:none; visibility:hidden; }
 	#uptime, tr td:nth-child(6)			{ display:none; visibility:hidden; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
 @media only screen and (max-width: 533px) {
 	#type, tr td:nth-child(4)			{ display:none; visibility:hidden; }
 	#location, tr td:nth-child(5)		{ display:none; visibility:hidden; }
 	#uptime, tr td:nth-child(6)			{ display:none; visibility:hidden; }
 	#network, tr td:nth-child(8)		{ display:none; visibility:hidden; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
 @media only screen and (max-width: 450px) {
 	body								{ font-size: 10px; }
@@ -46,4 +49,5 @@ tr.odd.expandRow > :hover { background: #000 !important; }
 	#uptime, tr td:nth-child(6)			{ display:none; visibility:hidden; }
 	#network, tr td:nth-child(8)		{ display:none; visibility:hidden; }
 	#cpu, #ram, #hdd { min-width: 25px; max-width: 50px; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
\ No newline at end of file
diff --git a/web/css/light.css b/web/css/light.css
index 5819497..a443104 100644
--- a/web/css/light.css
+++ b/web/css/light.css
@@ -22,17 +22,20 @@ tr.odd.expandRow > :hover { background: #FFF !important; }
 @media only screen and (max-width: 720px) {
 	#type, tr td:nth-child(4)			{ display:none; visibility:hidden; }
 	#location, tr td:nth-child(5)		{ display:none; visibility:hidden; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
 @media only screen and (max-width: 600px) {
 	#type, tr td:nth-child(4)			{ display:none; visibility:hidden; }
 	#location, tr td:nth-child(5)		{ display:none; visibility:hidden; }
 	#uptime, tr td:nth-child(6)			{ display:none; visibility:hidden; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
 @media only screen and (max-width: 533px) {
 	#type, tr td:nth-child(4)			{ display:none; visibility:hidden; }
 	#location, tr td:nth-child(5)		{ display:none; visibility:hidden; }
 	#uptime, tr td:nth-child(6)			{ display:none; visibility:hidden; }
 	#network, tr td:nth-child(8)		{ display:none; visibility:hidden; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
 @media only screen and (max-width: 450px) {
 	body								{ font-size: 10px; }
@@ -43,4 +46,5 @@ tr.odd.expandRow > :hover { background: #FFF !important; }
 	#uptime, tr td:nth-child(6)			{ display:none; visibility:hidden; }
 	#network, tr td:nth-child(8)		{ display:none; visibility:hidden; }
 	#cpu, #ram, #hdd { min-width: 25px; max-width: 50px; }
+	#ping, tr td:nth-child(13)          { display:none; visibility:hidden; }
 }
\ No newline at end of file
diff --git a/web/index.html b/web/index.html
index 6cb0ed6..6d4609c 100644
--- a/web/index.html
+++ b/web/index.html
@@ -90,6 +90,7 @@
 					<th id="cpu">处理器</th>
 					<th id="ram">内存</th>
 					<th id="hdd">硬盘</th>
+					<th id="ping">丢包率(CU|CT|CM)</th>
 				</tr>
 				</thead>
 				<tbody id="servers">
diff --git a/web/js/serverstatus.js b/web/js/serverstatus.js
index 6d36404..66a3e25 100644
--- a/web/js/serverstatus.js
+++ b/web/js/serverstatus.js
@@ -97,6 +97,7 @@ function uptime() {
 						"<td id=\"cpu\"><div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
 						"<td id=\"memory\"><div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
 						"<td id=\"hdd\"><div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
+						"<td id=\"ping\"><div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
 					"</tr>" +
 					"<tr class=\"expandRow " + hack + "\"><td colspan=\"12\"><div class=\"accordian-body collapse\" id=\"rt" + i + "\">" +
 						"<div id=\"expand_mem\">加载中</div>" +
@@ -165,6 +166,9 @@ function uptime() {
 					TableRow.children["hdd"].children[0].children[0].className = "progress-bar progress-bar-danger";
 					TableRow.children["hdd"].children[0].children[0].style.width = "100%";
 					TableRow.children["hdd"].children[0].children[0].innerHTML = "<small>关闭</small>";
+					TableRow.children["ping"].children[0].children[0].className = "progress-bar progress-bar-danger";
+					TableRow.children["ping"].children[0].children[0].style.width = "100%";
+					TableRow.children["ping"].children[0].children[0].innerHTML = "<small>关闭</small>";
 					if(ExpandRow.hasClass("in")) {
 						ExpandRow.collapse("hide");
 					}
@@ -267,6 +271,16 @@ function uptime() {
 				TableRow.children["hdd"].children[0].children[0].innerHTML = HDD + "%";
 				ExpandRow[0].children["expand_hdd"].innerHTML = "硬盘: " + bytesToSize(result.servers[i].hdd_used*1024*1024, 2) + " / " + bytesToSize(result.servers[i].hdd_total*1024*1024, 2);
 
+                // ping
+                var PING_10010 = result.servers[i].ping_10010.toFixed(2);
+                var PING_189 = result.servers[i].ping_189.toFixed(2);
+                var PING_10086 = result.servers[i].ping_10086.toFixed(2);
+                if (PING_10010 >= 5.0 || PING_189 >= 5.0 || PING_10086 >= 5.0)
+                    TableRow.children["ping"].children[0].children[0].className = "progress-bar progress-bar-danger";
+                else
+                    TableRow.children["ping"].children[0].children[0].className = "progress-bar progress-bar-success";
+				TableRow.children["ping"].children[0].children[0].innerHTML = PING_10010 + "% 💻 " + PING_189 + "% 💻 " + PING_10086 + "%";
+
 				// Custom
 				if (result.servers[i].custom) {
 					ExpandRow[0].children["expand_custom"].innerHTML = result.servers[i].custom
@@ -302,6 +316,9 @@ function uptime() {
 				TableRow.children["hdd"].children[0].children[0].className = "progress-bar progress-bar-error";
 				TableRow.children["hdd"].children[0].children[0].style.width = "100%";
 				TableRow.children["hdd"].children[0].children[0].innerHTML = "<small>错误</small>";
+				TableRow.children["ping"].children[0].children[0].className = "progress-bar progress-bar-error";
+				TableRow.children["ping"].children[0].children[0].style.width = "100%";
+				TableRow.children["ping"].children[0].children[0].innerHTML = "<small>错误</small>";
 				if(ExpandRow.hasClass("in")) {
 					ExpandRow.collapse("hide");
 				}