diff --git a/CHANGELOG.md b/CHANGELOG.md index 40593b4ea..9f768837d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ 2. 【agent】优化检查 jps 异常,调整为实时检查(感谢[@傲梅科技](https://gitee.com/aomeitech) [Gitee issues I5MTA4](https://gitee.com/dromara/Jpom/issues/I5MTA4) ) 3. 【server】修复登录后跳转到上次使用到工作空间中问题 (感谢@木迷榖) 4. 【server】缓存日志弹窗相关操作配置 (感谢[@我已经没有头发了](https://gitee.com/christina204) [Gitee issues I5MANC](https://gitee.com/dromara/Jpom/issues/I5MANC) ) +5. 【server】优化节点首页:支持自定义刷新频率、图标自动缩放 (感谢@ccx2480) ------ diff --git a/web-vue/src/api/node-stat.js b/web-vue/src/api/node-stat.js index 1cde4f435..f48d64ead 100644 --- a/web-vue/src/api/node-stat.js +++ b/web-vue/src/api/node-stat.js @@ -195,6 +195,7 @@ export function drawChart(data, domId, parseFn) { // 绘制图表 const historyChart = echarts.init(historyChartDom); historyChart.setOption(option); + return historyChart; } export const status = { diff --git a/web-vue/src/api/node.js b/web-vue/src/api/node.js index c2777dff5..23d4919bb 100644 --- a/web-vue/src/api/node.js +++ b/web-vue/src/api/node.js @@ -210,6 +210,7 @@ export function getProcessList(data) { data: data, headers: { loading: "no", + tip: "no", }, }); } @@ -233,11 +234,14 @@ export function killPid(params) { * time: 时间段,格式:yyyy-MM-dd HH:mm:ss ~ yyyy-MM-dd HH:mm:ss * } params */ -export function nodeMonitorData(params) { +export function nodeMonitorData(params, loading) { return axios({ url: "/node/node_monitor_data.json", method: "post", data: params, + headers: { + loading: loading === false ? "no" : "", + }, }); } diff --git a/web-vue/src/components/customSelect/index.vue b/web-vue/src/components/customSelect/index.vue index 0940f30cf..c8964c78f 100644 --- a/web-vue/src/components/customSelect/index.vue +++ b/web-vue/src/components/customSelect/index.vue @@ -2,9 +2,11 @@