From b145b99800586988532fdda4d72c0fd86da4efaa Mon Sep 17 00:00:00 2001
From: bwcx_jzy <bwcx_jzy@163.com>
Date: Thu, 18 Aug 2022 08:26:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=9A=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=B7=E6=96=B0=E9=A2=91=E7=8E=87=E3=80=81=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E8=87=AA=E5=8A=A8=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   1 +
 web-vue/src/api/node-stat.js                  |   1 +
 web-vue/src/api/node.js                       |   6 +-
 web-vue/src/components/customSelect/index.vue |  14 +-
 .../src/pages/node/node-layout/node-top.vue   |  13 +-
 .../src/pages/node/node-layout/welcome.vue    | 137 ++++++++++++------
 6 files changed, 117 insertions(+), 55 deletions(-)

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 @@
   <div @mousedown="setSelectOpen(true)">
     <Select
       :getPopupContainer="
-        (triggerNode) => {
-          return triggerNode.parentNode || document.body;
-        }
+        this.popupContainerParent
+          ? (triggerNode) => {
+              return triggerNode.parentNode || document.body;
+            }
+          : null
       "
       v-model="selected"
       :style="selStyle"
@@ -50,7 +52,7 @@
 </template>
 
 <script>
-import {Select} from "ant-design-vue";
+import { Select } from "ant-design-vue";
 
 export default {
   components: {
@@ -95,6 +97,10 @@ export default {
       type: Number,
       default: 200,
     },
+    popupContainerParent: {
+      type: Boolean,
+      default: true,
+    },
   },
   watch: {
     value: {
diff --git a/web-vue/src/pages/node/node-layout/node-top.vue b/web-vue/src/pages/node/node-layout/node-top.vue
index 6962328c7..8337dfab8 100644
--- a/web-vue/src/pages/node/node-layout/node-top.vue
+++ b/web-vue/src/pages/node/node-layout/node-top.vue
@@ -39,12 +39,16 @@ export default {
     return {
       timeRange: null,
       historyData: [],
+      historyChart: null,
     };
   },
   mounted() {
     this.handleFilter();
+    window.addEventListener("resize", this.resize);
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.resize);
   },
-  destroyed() {},
   watch: {},
   methods: {
     moment,
@@ -58,13 +62,16 @@ export default {
       nodeMonitorData(params).then((res) => {
         if (res.code === 200) {
           if (this.type === "networkTime") {
-            drawChart(res.data, "historyChart", generateNodeNetworkTimeChart);
+            this.historyChart = drawChart(res.data, "historyChart", generateNodeNetworkTimeChart);
           } else {
-            drawChart(res.data, "historyChart", generateNodeTopChart);
+            this.historyChart = drawChart(res.data, "historyChart", generateNodeTopChart);
           }
         }
       });
     },
+    resize() {
+      this.historyChart?.resize();
+    },
   },
 };
 </script>
diff --git a/web-vue/src/pages/node/node-layout/welcome.vue b/web-vue/src/pages/node/node-layout/welcome.vue
index 2c9d1a187..5540c2292 100644
--- a/web-vue/src/pages/node/node-layout/welcome.vue
+++ b/web-vue/src/pages/node/node-layout/welcome.vue
@@ -9,29 +9,43 @@
     <div id="top-chart">loading...</div>
     <a-divider>进程监控表格</a-divider>
     <!-- 进程表格数据 -->
-    <div ref="filter" class="filter">
-      <a-space>
-        <custom-select
-          class="search-input-item"
-          selStyle="width: 200px !important"
-          @change="loadNodeProcess"
-          @addOption="addNodeProcess"
-          v-model="processName"
-          :data="processNames"
-          inputPlaceholder="自定义进程类型"
-          selectPlaceholder="选择进程名"
-          suffixIcon=""
-        >
-          <template slot="suffixIcon"> <a-icon type="down" /></template>
-        </custom-select>
-        <div>
-          <a-tooltip title="重置自定义的进程名信息">
-            <a-icon type="rest" @click="restProcessNames" />
-          </a-tooltip>
-        </div>
-      </a-space>
-    </div>
+
     <a-table size="middle" :locale="tableLocale" :loading="loading" :columns="columns" :data-source="processList" bordered rowKey="pid" class="node-table" :pagination="false">
+      <template #title>
+        <a-row>
+          <a-col :span="18">
+            <a-space>
+              <custom-select
+                class="search-input-item"
+                selStyle="width: 200px !important"
+                @change="loadNodeProcess"
+                @addOption="addNodeProcess"
+                v-model="processName"
+                :data="processNames"
+                :popupContainerParent="false"
+                inputPlaceholder="自定义进程类型"
+                selectPlaceholder="选择进程名"
+                suffixIcon=""
+              >
+                <template slot="suffixIcon"> <a-icon type="down" /></template>
+              </custom-select>
+              <div>
+                <a-tooltip title="重置自定义的进程名信息">
+                  <a-icon type="rest" @click="restProcessNames" />
+                </a-tooltip>
+              </div>
+              <a-select placeholder="刷新周期" v-model="refreshInterval" style="width: 120px" @change="pullNodeData">
+                <a-select-option v-for="item in [5, 10, 15, 20, 25, 30]" :key="item"> {{ item }}秒 </a-select-option>
+              </a-select>
+            </a-space>
+          </a-col>
+          <a-col :span="6">
+            <a-row justify="end" type="flex">
+              <a-statistic-countdown format=" s 秒" title="刷新倒计时" :value="countdownTime" @finish="pullNodeData" />
+            </a-row>
+          </a-col>
+        </a-row>
+      </template>
       <!-- <a-tooltip slot="port" slot-scope="text" placement="topLeft" :title="text">
         <span>{{ text }}</span>
       </a-tooltip>
@@ -70,7 +84,6 @@ export default {
   },
   data() {
     return {
-      topChartTimer: null,
       loading: false,
       tableLocale: {
         emptyText: "",
@@ -96,16 +109,27 @@ export default {
         { title: "共享内存", dataIndex: "shr", width: 100, ellipsis: true, scopedSlots: { customRender: "tooltip" } },
         { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, align: "center", width: 80, fixed: "right" },
       ],
+      refreshInterval: 20,
+      historyChart: null,
+      countdownTime: Date.now(),
     };
   },
   mounted() {
     this.processNames = Object.assign([], this.defaultProcessNames);
     this.initData();
+    window.addEventListener("resize", this.resize);
   },
   destroyed() {
-    clearInterval(this.topChartTimer);
+    window.removeEventListener("resize", this.resize);
+  },
+  watch: {
+    refreshInterval: {
+      deep: false,
+      handler() {
+        this.cacheNodeProcess();
+      },
+    },
   },
-  watch: {},
   methods: {
     addNodeProcess(v) {
       this.processNames = v;
@@ -119,27 +143,31 @@ export default {
     },
     // 初始化页面
     initData() {
-      const cacheJson = this.getCacheNodeProcess();
-      const nodeCache = cacheJson[this.node.id];
+      const nodeCache = this.getCacheNodeProcess();
+
       this.processName = nodeCache?.processName || this.processName;
       this.processNames = nodeCache?.processNames || this.processNames;
-      if (this.topChartTimer == null) {
-        this.loadNodeTop();
-        this.loadNodeProcess();
-        // 计算多久时间绘制图表
-        // const millis = this.node.cycle < 30000 ? 30000 : this.node.cycle;
-        // console.log(millis);
-        this.topChartTimer = setInterval(() => {
-          this.loadNodeTop();
-          this.loadNodeProcess();
-        }, 20000);
-      }
+      // 加载缓存信息
+      this.refreshInterval = this.getCacheNode("refreshInterval", this.refreshInterval);
+      //
+      // console.log(this.refreshInterval);
+      this.pullNodeData();
+    },
+    pullNodeData() {
+      this.loadNodeTop();
+      this.loadNodeProcess();
+      // 重新计算倒计时
+      this.countdownTime = Date.now() + this.refreshInterval * 1000;
+    },
+
+    resize() {
+      this.historyChart?.resize();
     },
     // 请求 top 命令绘制图表
     loadNodeTop() {
-      nodeMonitorData({ nodeId: this.node.id }).then((res) => {
+      nodeMonitorData({ nodeId: this.node.id }, false).then((res) => {
         if (res.code === 200) {
-          drawChart(res.data, "top-chart", generateNodeTopChart);
+          this.historyChart = drawChart(res.data, "top-chart", generateNodeTopChart);
         }
       });
     },
@@ -191,13 +219,18 @@ export default {
       this.monitorVisible = true;
     },
     cacheNodeProcess() {
-      const cacheJson = this.getCacheNodeProcess();
-      //console.log(this.processNames);
+      const cacheJson = this.getCacheAllNode();
+      // console.log(cacheJson);
       cacheJson[this.node.id].processNames = this.processNames;
       cacheJson[this.node.id].processName = this.processName;
+      cacheJson["refreshInterval"] = this.refreshInterval;
       localStorage.setItem("node-process-name", JSON.stringify(cacheJson));
     },
     getCacheNodeProcess() {
+      return this.getCacheNode(this.node.id, {});
+    },
+
+    getCacheAllNode() {
       const str = localStorage.getItem("node-process-name") || "";
       let cacheJson;
       try {
@@ -205,9 +238,14 @@ export default {
       } catch (e) {
         cacheJson = {};
       }
-      cacheJson[this.node.id] = cacheJson[this.node.id] || {};
       return cacheJson;
     },
+
+    getCacheNode(key, defaultValue) {
+      const cacheJson = this.getCacheAllNode();
+
+      return cacheJson[key] || defaultValue;
+    },
   },
 };
 </script>
@@ -216,10 +254,6 @@ export default {
   height: calc((100vh - 70px) / 2);
 }
 
-.filter {
-  margin-bottom: 10px;
-}
-
 .search-input-item {
   width: 200px !important;
   margin-right: 10px;
@@ -228,4 +262,13 @@ export default {
 #history-chart {
   height: 60vh;
 }
+
+/deep/ .ant-statistic div {
+  display: inline-block;
+}
+
+/deep/ .ant-statistic-content-value,
+/deep/ .ant-statistic-content {
+  font-size: 16px;
+}
 </style>