From 6c356c1e4c33af40ad29bc9c74f81078ae82796f Mon Sep 17 00:00:00 2001
From: nagocoler <nagocoler@qq.com>
Date: Mon, 4 Dec 2023 15:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/component/ClientDetails.vue           | 18 +++++--------
 itbaima-monitor-web/src/store/index.js        | 11 +++++++-
 itbaima-monitor-web/src/views/main/Manage.vue | 26 +++++++++++++++++--
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/itbaima-monitor-web/src/component/ClientDetails.vue b/itbaima-monitor-web/src/component/ClientDetails.vue
index 72708f5..a53f601 100644
--- a/itbaima-monitor-web/src/component/ClientDetails.vue
+++ b/itbaima-monitor-web/src/component/ClientDetails.vue
@@ -6,16 +6,10 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import {cpuNameToImage, fitToRightByteUnit, osNameToIcon, percentageToStatus, rename} from "@/tools";
 import RuntimeHistroy from "@/component/RuntimeHistroy.vue";
 import {Delete} from "@element-plus/icons-vue";
+import {useStore} from "@/store";
 
-const locations = [
-  {name: 'cn', desc: '中国大陆'},
-  {name: 'hk', desc: '香港'},
-  {name: 'jp', desc: '日本'},
-  {name: 'us', desc: '美国'},
-  {name: 'sg', desc: '新加坡'},
-  {name: 'kr', desc: '韩国'},
-  {name: 'de', desc: '德国'}
-]
+const store = useStore()
+const locations = store.locations
 
 const props = defineProps({
   id: Number,
@@ -80,8 +74,10 @@ function deleteClient() {
 setInterval(() => {
   if(props.show && details.runtime) {
     get(`/api/monitor/runtime-now?clientId=${props.id}`, data => {
-      details.runtime.list.splice(0, 1)
-      details.runtime.list.push(data)
+      if(details.runtime.list[0].timestamp !== data.timestamp) {
+        details.runtime.list.splice(0, 1)
+        details.runtime.list.push(data)
+      }
     })
   }
 }, 10000)
diff --git a/itbaima-monitor-web/src/store/index.js b/itbaima-monitor-web/src/store/index.js
index 04eb67f..e0cbf18 100644
--- a/itbaima-monitor-web/src/store/index.js
+++ b/itbaima-monitor-web/src/store/index.js
@@ -7,7 +7,16 @@ export const useStore = defineStore('general', {
                 role: '',
                 username: '',
                 email: ''
-            }
+            }, locations: [
+                {name: 'cn', desc: '中国大陆'},
+                {name: 'hk', desc: '香港'},
+                {name: 'jp', desc: '日本'},
+                {name: 'us', desc: '美国'},
+                {name: 'sg', desc: '新加坡'},
+                {name: 'kr', desc: '韩国'},
+                {name: 'de', desc: '德国'}
+            ]
+
         }
     },
     getters: {
diff --git a/itbaima-monitor-web/src/views/main/Manage.vue b/itbaima-monitor-web/src/views/main/Manage.vue
index 1422568..bc01d3d 100644
--- a/itbaima-monitor-web/src/views/main/Manage.vue
+++ b/itbaima-monitor-web/src/views/main/Manage.vue
@@ -1,7 +1,7 @@
 <script setup>
 import PreviewCard from "@/component/PreviewCard.vue";
 import {get} from "@/net";
-import {reactive, ref} from "vue";
+import {computed, reactive, ref} from "vue";
 import ClientDetails from "@/component/ClientDetails.vue";
 import {Plus} from "@element-plus/icons-vue";
 import RegisterCard from "@/component/RegisterCard.vue";
@@ -11,6 +11,8 @@ import {useStore} from "@/store";
 const store = useStore()
 const route = useRoute()
 const list = ref([])
+const checkedNodes = ref([])
+const locations = store.locations
 
 const detail = reactive({
   show: false,
@@ -26,6 +28,14 @@ const register = reactive({
 })
 const refreshToken = () => get('/api/monitor/register', code => register.token = code)
 
+const clientList = computed(() => {
+  if(checkedNodes.value.length === 0) {
+    return list.value
+  } else {
+    return list.value.filter(item => checkedNodes.value.indexOf(item.location) >= 0)
+  }
+})
+
 const updateList = () => {
   if(route.name === 'manage')
   get('/api/monitor/list', data => list.value = data)
@@ -47,8 +57,16 @@ updateList()
       </div>
     </div>
     <el-divider style="margin: 10px 0"/>
+    <div style="margin-bottom: 20px">
+      <el-checkbox-group v-model="checkedNodes">
+        <el-checkbox v-for="node in locations" :key="node" :label="node.name" border>
+          <span :class="`flag-icon flag-icon-${node.name}`"></span>
+          <span style="font-size: 13px;margin-left: 10px">{{node.desc}}</span>
+        </el-checkbox>
+      </el-checkbox-group>
+    </div>
     <div class="card-list">
-      <preview-card :update="updateList" :data="item" v-for="item in list"
+      <preview-card :update="updateList" :data="item" v-for="item in clientList"
                     @click="displayClientDetails(item.id)"/>
     </div>
     <el-drawer size="520" :show-close="false" v-model="detail.show"
@@ -64,6 +82,10 @@ updateList()
 </template>
 
 <style scoped>
+:deep(.el-checkbox-group .el-checkbox) {
+  margin-right: 10px;
+}
+
 :deep(.el-drawer) {
   margin: 10px;
   height: calc(100% - 20px);