Browse Source

增加显示当前数据的时间,更详细的错误信息

鱼骨剪 11 months ago
parent
commit
0937e1610d
  1. 20
      app.py
  2. 22
      index.html

20
app.py

@ -1,4 +1,5 @@
from flask import Flask, jsonify from flask import Flask, jsonify
from datetime import datetime
from flask_cors import CORS from flask_cors import CORS
import threading import threading
import paramiko import paramiko
@ -121,24 +122,31 @@ def get_all_data():
# 根据key过滤所需的服务器数据 # 根据key过滤所需的服务器数据
def filter_data(title_list: list): def filter_data(title_list: list):
result = dict() result = dict()
server_data = dict()
for title in title_list: for title in title_list:
result[title] = {} server_data[title] = {}
# 不存在该title的数据 # 不存在该title的数据
if title not in data_dict: if title not in data_dict:
result[title]['err_info'] = f'title \'{title}\' not exist!' server_data[title]['err_info'] = f'title \'{title}\' not exist!'
continue continue
# 还没获取到数据 # 还没获取到数据
info_list = data_dict[title].get('info_list', None) info_list = data_dict[title].get('info_list', None)
if info_list is None: if info_list is None:
result[title]['err_info'] = f'\'{title}\' still empty.' err_info = data_dict[title].get('err_info', None)
if err_info is not None:
server_data[title]['err_info'] = data_dict[title]['err_info']
else:
server_data[title]['err_info'] = f'\'{title}\' still empty.'
continue continue
# 记录数据 # 记录数据
data_updated = data_dict[title].get('updated', False) data_updated = data_dict[title].get('updated', False)
err_info = data_dict[title].get('err_info', '') err_info = data_dict[title].get('err_info', '')
result[title]['info_list'] = info_list server_data[title]['info_list'] = info_list
result[title]['updated'] = data_updated server_data[title]['updated'] = data_updated
result[title]['err_info'] = err_info server_data[title]['err_info'] = err_info
result['time'] = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
result['server_data'] = server_data
return result return result
def start_connect(): def start_connect():

22
index.html

@ -38,15 +38,33 @@
displayServerData(data); // 调用显示数据的函数 displayServerData(data); // 调用显示数据的函数
}) })
.catch(error => { .catch(error => {
console.error('Error fetching data:', error); // console.error('Error fetching data:', error);
displayError(error + " (多半是没有正确连接服务器端,可能是没开、网络错误)");
}); });
} }
function displayServerData(serverData) { function displayError(err_info){
let serverDataContainer = document.getElementById('server-data');
serverDataContainer.innerHTML = ''; // 清空容器
let errDiv = document.createElement('div');
errDiv.classList.add('error-info');
errDiv.innerHTML = err_info;
serverDataContainer.appendChild(errDiv);
}
function displayServerData(data) {
// 绘制 ------------------- // 绘制 -------------------
let serverDataContainer = document.getElementById('server-data'); let serverDataContainer = document.getElementById('server-data');
serverDataContainer.innerHTML = ''; // 清空容器 serverDataContainer.innerHTML = ''; // 清空容器
let timeStr = data['time']
let serverData = data['server_data']
let timeDiv = document.createElement('div');
timeDiv.textContent = timeStr;
serverDataContainer.appendChild(timeDiv);
let greenDot = '<span style="color: green;"> 空闲</span>'; let greenDot = '<span style="color: green;"> 空闲</span>';
let yellowDot = '<span style="color: orange;"> 占用</span>'; let yellowDot = '<span style="color: orange;"> 占用</span>';
let redDot = '<span style="color: red;"> 占用</span>'; let redDot = '<span style="color: red;"> 占用</span>';

Loading…
Cancel
Save