From 9c75b94e64efcab5867aeed560827b1538a0409b Mon Sep 17 00:00:00 2001
From: ubuntu <ubuntu@ubuntu.com>
Date: Tue, 29 Jan 2019 19:51:21 +0800
Subject: [PATCH] reduce cpu used

---
 web/index.html         |  7 ++-----
 web/js/serverstatus.js | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/web/index.html b/web/index.html
index 6955cf76..91164dff 100644
--- a/web/index.html
+++ b/web/index.html
@@ -65,14 +65,11 @@
 			<div id="loading-notice">
 				<noscript>
 					<div class="alert alert-danger" style="text-align: center;">
-						<strong>Enable JavaScript</strong> you fucking autist neckbeard, it's not gonna hurt you.
+						<strong>Enable JavaScript</strong> , please do it.
 					</div>
 				</noscript>
-				<div class="progress progress-striped active">
-					<div class="progress-bar progress-bar-warning" style="width: 100%;">加载中...</div>
-				</div>
 				<div style="text-align: center;">
-					如果出现此消息，请确保您已启用Javascript! <br />否则云监控主服务没启动或已关闭.
+					警告:如果出现此消息，请确保您已启用Javascript! <br />否则云监控主服务没启动或已关闭.
 				</div>
 				<p></p>
 			</div>
diff --git a/web/js/serverstatus.js b/web/js/serverstatus.js
index 0d7dcc27..6af157e3 100644
--- a/web/js/serverstatus.js
+++ b/web/js/serverstatus.js
@@ -94,10 +94,10 @@ function uptime() {
 						"<td id=\"load\">加载中</td>" +
 						"<td id=\"network\">加载中</td>" +
 						"<td id=\"traffic\">加载中</td>" +
-						"<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>" +
+						"<td id=\"cpu\"><div class=\"progress\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
+						"<td id=\"memory\"><div class=\"progress\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
+						"<td id=\"hdd\"><div class=\"progress\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
+						"<td id=\"ping\"><div class=\"progress\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-warning\"><small>加载中</small></div></div></td>" +
 					"</tr>" +
 					"<tr class=\"expandRow " + hack + "\"><td colspan=\"16\"><div class=\"accordian-body collapse\" id=\"rt" + i + "\">" +
 						"<div id=\"expand_mem\">加载中</div>" +
@@ -318,10 +318,14 @@ function uptime() {
 				//TableRow.children["online6"].children[0].children[0].innerHTML = "<small>错误</small>";
 				TableRow.children["ip_status"].children[0].children[0].className = "progress-bar progress-bar-error";
 				TableRow.children["ip_status"].children[0].children[0].innerHTML = "<small>错误</small>";
-				TableRow.children["uptime"].innerHTML = "<div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-error\"><small>错误</small></div></div>";
-				TableRow.children["load"].innerHTML = "<div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-error\"><small>错误</small></div></div>";
-				TableRow.children["network"].innerHTML = "<div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-error\"><small>错误</small></div></div>";
-				TableRow.children["traffic"].innerHTML = "<div class=\"progress progress-striped active\"><div style=\"width: 100%;\" class=\"progress-bar progress-bar-error\"><small>错误</small></div></div>";
+				TableRow.children["uptime"].children[0].children[0].className = "progress-bar progress-bar-error";
+				TableRow.children["uptime"].children[0].children[0].innerHTML = "<small>错误</small>";
+				TableRow.children["load"].children[0].children[0].className = "progress-bar progress-bar-error";
+				TableRow.children["load"].children[0].children[0].innerHTML = "<small>错误</small>";
+				TableRow.children["network"].children[0].children[0].className = "progress-bar progress-bar-error";
+				TableRow.children["network"].children[0].children[0].innerHTML = "<small>错误</small>";
+				TableRow.children["traffic"].children[0].children[0].className = "progress-bar progress-bar-error";
+				TableRow.children["traffic"].children[0].children[0].innerHTML = "<small>错误</small>";
 				TableRow.children["cpu"].children[0].children[0].className = "progress-bar progress-bar-error";
 				TableRow.children["cpu"].children[0].children[0].style.width = "100%";
 				TableRow.children["cpu"].children[0].children[0].innerHTML = "<small>错误</small>";