From d3e3cf5d58168cad1e2fa3c96e2381c21aabcab4 Mon Sep 17 00:00:00 2001
From: Sun <95302870@qq.com>
Date: Wed, 3 Jan 2024 20:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=B0=86=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=94=BE=E5=9C=A8=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/deskModule/SystemMonitor/index.vue | 7 ++++++-
 src/views/home/index.vue                          | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/deskModule/SystemMonitor/index.vue b/src/components/deskModule/SystemMonitor/index.vue
index 254679a..d2ccc9a 100644
--- a/src/components/deskModule/SystemMonitor/index.vue
+++ b/src/components/deskModule/SystemMonitor/index.vue
@@ -8,6 +8,7 @@ import { bytesToSize } from '@/utils/cmn'
 interface ProgressStyle {
   color: string
   railColor: string
+  height: number
 }
 
 let timer: NodeJS.Timer
@@ -15,6 +16,7 @@ const systemMonitorData = ref<SystemMonitor.GetAllRes | null>(null)
 const progressStyle = ref<ProgressStyle>({
   color: 'white',
   railColor: 'rgba(0, 0, 0, 0.5)',
+  height: 5,
 })
 const svgStyle = {
   width: '25px',
@@ -64,7 +66,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div class="w-full p-5 px-5 bg-[#2a2a2a6b] rounded-2xl system-monitor flex items-center px-2 text-white overflow-auto">
+  <div class="w-full p-5 px-5 bg-[#2a2a2a6b] system-monitor flex items-center px-2 text-white overflow-auto">
     <!-- <div class="flex flex-col items-center justify-center ">
       <div>
         <NProgress type="dashboard" :percentage="correctionNumber(systemMonitorData?.cpuInfo.usages[0] || 0)" :stroke-width="15" style="width: 50px;">
@@ -94,6 +96,7 @@ onUnmounted(() => {
           type="line"
           :color="progressStyle.color"
           :rail-color="progressStyle.railColor"
+          :height="progressStyle.height"
           :percentage="correctionNumber(systemMonitorData?.cpuInfo.usages[0] || 0)"
           :show-indicator="false"
           :stroke-width="15"
@@ -119,6 +122,7 @@ onUnmounted(() => {
           type="line"
           :color="progressStyle.color"
           :rail-color="progressStyle.railColor"
+          :height="progressStyle.height"
           :percentage="systemMonitorData?.memoryInfo.usedPercent"
           :show-indicator="false"
           :stroke-width="15" style="width: 150px;"
@@ -158,6 +162,7 @@ onUnmounted(() => {
           <NProgress
             :color="progressStyle.color"
             :rail-color="progressStyle.railColor"
+            :height="progressStyle.height"
             type="line"
             :percentage="item.usedPercent"
             :show-indicator="false"
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 9d3c46e..0ee1f6d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -333,6 +333,9 @@ function handleAddItem(itemIconGroupId?: number) {
     />
     <div class="mask" :style="{ backgroundColor: `rgba(0,0,0,${panelState.panelConfig.backgroundMaskNumber})` }" />
     <div ref="scrollContainerRef" class="absolute w-full h-full overflow-auto">
+      <div v-if="panelState.panelConfig.searchBoxShow" class="flex mx-auto ">
+        <SystemMonitor @itemSearch="itemFrontEndSearch" />
+      </div>
       <div
         class="p-2.5 mx-auto"
         :style="{
@@ -363,9 +366,9 @@ function handleAddItem(itemIconGroupId?: number) {
 
         <!-- 应用盒子 -->
         <div class="mt-[50px]" :style="{ marginLeft: `${panelState.panelConfig.marginX}px`, marginRight: `${panelState.panelConfig.marginX}px` }">
-          <div v-if="panelState.panelConfig.searchBoxShow" class="flex mt-[20px] mx-auto ">
+          <!-- <div v-if="panelState.panelConfig.searchBoxShow" class="flex mt-[20px] mx-auto ">
             <SystemMonitor @itemSearch="itemFrontEndSearch" />
-          </div>
+          </div> -->
 
           <!-- 组纵向排列 -->
           <div