Merge branch 'dev' of https://github.com/CHN-STUDENT/ServerStatus into dev

README.md

@@ -118,9 +118,9 @@ apt-get -y install python-setuptools python-dev build-essential
 apt-get -y install python-pip
 pip install psutil
 ### for Windows:
-打开网址：https://pypi.python.org/pypi?:action=display&name=psutil#downloads
+安装 Python，并添加到环境变量
-下载psutil for windows程序包
+pip3 install psutil
-安装即可
+嫌慢可以用阿里镜像 pip3 install psutil -i https://mirrors.aliyun.com/pypi/simple/
 ```
 
 打开云探针页面，就可以正常的监控。接下来把服务器和客户端脚本自行加入开机启动，或者进程守护，或以后台方式运行即可！例如： nohup python client-linux.py &  

web/index.html

@@ -55,6 +55,9 @@
 									<li><a href="#" onclick="setActiveStyleSheet('light')">白天</a></li>
 								</ul>
 							</li>
+							<li class="dropdown">
+								<a href="#"  class="dropdown-toggle" onclick="json2Excel()">下载统计报表</a>
+							</li>
 						</ul>
 					</div><!--/.nav-collapse -->
 				</div>
@@ -73,11 +76,12 @@
 				</div>
 				<p></p>
 			</div>
-			<table class="table table-striped table-condensed table-hover">
+			<table class="table table-striped table-condensed table-hover" id="info">
 				<thead>
 				<tr>
 					<th id="status4" style="text-align: center;">协议</th>
-					<th id="ipstatus" style="text-align: center;">Flight</th>
+					<th id="host" style="text-align: center;">地址</th>
+					<th id="ipstatus" style="text-align: center;">连接状态</th>
 					<th id="name">节点名</th>
 					<th id="type">虚拟化</th>
 					<th id="location">位置</th>
@@ -107,5 +111,6 @@
 		<script src="js/jquery.min.js"></script>
 		<script src="js/bootstrap.min.js"></script>
 		<script src="js/serverstatus.js"></script>
+		<script src="js/xlsx.full.min.js"></script>
 	</body>
 </html>

web/js/serverstatus.js

@@ -453,7 +453,6 @@ function json2Excel() {
   
    var elements1 =  document.getElementsByClassName("expandRow even");
    var elements2 =document.getElementsByClassName("expandRow odd");
-   console.log(elements2)
    Array.prototype.forEach.call(elements1, function (element) {
 		element.style.display = 'none';	
    });
@@ -501,5 +500,6 @@ function saveAs(obj, fileName) {//当然可以自定义简单的下载文件实
 	setTimeout(function () { //延时释放
 	URL.revokeObjectURL(obj); //用URL.revokeObjectURL()来释放这个object URL
 	}, 100);
+
 }