From 9fe08c85d2199ef3b4754a055e2ebad90a2d42b3 Mon Sep 17 00:00:00 2001
From: JINGYJ <1458671527@qq.com>
Date: Fri, 1 Mar 2024 17:57:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ui=E8=B5=B0=E6=9F=A5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dataScreen/views/home/homeIndex.vue | 90 +++++++++----------
 .../views/modelList/components/ModelBox.vue   |  2 +-
 .../dataScreen/views/modelList/modelList.scss |  4 +-
 .../views/serverList/components/ServerBox.vue |  2 +-
 .../views/serverList/serverList.scss          |  6 +-
 .../views/serverList/serverList.vue           |  2 +-
 6 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/pages/dataScreen/views/home/homeIndex.vue b/src/pages/dataScreen/views/home/homeIndex.vue
index 7f0b8b2..e8c7f67 100644
--- a/src/pages/dataScreen/views/home/homeIndex.vue
+++ b/src/pages/dataScreen/views/home/homeIndex.vue
@@ -151,51 +151,51 @@ const randomIntFn = (min: number, max: number) => {
 };
 
 onMounted(() => {
-  intervalId.value = setInterval(() => {
-    defectData.value = [
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500)
-    ];
-    alarmData.value.thread = [
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500)
-    ];
-    alarmData.value.PIN = [
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500)
-    ];
-    alarmData.value.plate = [
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500)
-    ];
-    alarmData.value.scratched = [
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500)
-    ];
-    alarmData.value.workpieceSize = [
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500),
-      randomIntFn(0, 500)
-    ];
-    // console.log(defectData.value);
-  }, 2000);
+  // intervalId.value = setInterval(() => {
+  //   defectData.value = [
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500)
+  //   ];
+  //   alarmData.value.thread = [
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500)
+  //   ];
+  //   alarmData.value.PIN = [
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500)
+  //   ];
+  //   alarmData.value.plate = [
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500)
+  //   ];
+  //   alarmData.value.scratched = [
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500)
+  //   ];
+  //   alarmData.value.workpieceSize = [
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500),
+  //     randomIntFn(0, 500)
+  //   ];
+  //   // console.log(defectData.value);
+  // }, 2000);
 });
 onUnmounted(() => {
   clearInterval(intervalId.value); // 清除定时器
diff --git a/src/pages/dataScreen/views/modelList/components/ModelBox.vue b/src/pages/dataScreen/views/modelList/components/ModelBox.vue
index 05606b5..547affe 100644
--- a/src/pages/dataScreen/views/modelList/components/ModelBox.vue
+++ b/src/pages/dataScreen/views/modelList/components/ModelBox.vue
@@ -132,7 +132,7 @@ const handleClickDetail = (modelData: CardProductType) => {
   position: relative;
   padding: 65px 20px 24px;
   margin-top: 40px;
-  margin-bottom: 24px;
+  margin-bottom: 4px;
   width: 100%;
   height: 172px;
   background: linear-gradient(
diff --git a/src/pages/dataScreen/views/modelList/modelList.scss b/src/pages/dataScreen/views/modelList/modelList.scss
index 65729f2..541c24e 100644
--- a/src/pages/dataScreen/views/modelList/modelList.scss
+++ b/src/pages/dataScreen/views/modelList/modelList.scss
@@ -1,5 +1,5 @@
 .modelList {
-  padding: 45px 32px;
+  padding: 32px;
   .banner_side {
     width: 29px;
     height: 870px;
@@ -35,7 +35,7 @@
         position: relative;
         padding: 65px 20px 24px;
         margin-top: 40px;
-        margin-bottom: 24px;
+        margin-bottom: 4px;
         width: 100%;
         height: 172px;
         background: linear-gradient(
diff --git a/src/pages/dataScreen/views/serverList/components/ServerBox.vue b/src/pages/dataScreen/views/serverList/components/ServerBox.vue
index 36e7e26..0740556 100644
--- a/src/pages/dataScreen/views/serverList/components/ServerBox.vue
+++ b/src/pages/dataScreen/views/serverList/components/ServerBox.vue
@@ -105,7 +105,7 @@ const progressData = ref([
 <style lang="scss" scoped>
 .server-box {
   box-sizing: border-box;
-  margin-bottom: 24px;
+  margin-bottom: 4px;
   width: 404px;
   // height: 214px;
   .server-box-title {
diff --git a/src/pages/dataScreen/views/serverList/serverList.scss b/src/pages/dataScreen/views/serverList/serverList.scss
index 2ce3835..d1909c5 100644
--- a/src/pages/dataScreen/views/serverList/serverList.scss
+++ b/src/pages/dataScreen/views/serverList/serverList.scss
@@ -1,5 +1,5 @@
 .serverList {
-  padding: 45px 0px;
+  padding: 32px 0px;
   .banner_side {
     width: 130px;
     height: 855px;
@@ -13,7 +13,7 @@
     flex: 1;
     display: flex;
     flex-direction: column;
-    justify-content: center;
+    justify-content: flex-start;
     align-items: center;
     .server-list-title {
       margin-bottom: 24px;
@@ -36,7 +36,7 @@
     }
     .server-list-box {
       .server-box {
-        margin-bottom: 24px;
+        margin-bottom: 4px;
         box-sizing: border-box;
         width: 404px;
         // height: 214px;
diff --git a/src/pages/dataScreen/views/serverList/serverList.vue b/src/pages/dataScreen/views/serverList/serverList.vue
index 59fd78f..4a71d46 100644
--- a/src/pages/dataScreen/views/serverList/serverList.vue
+++ b/src/pages/dataScreen/views/serverList/serverList.vue
@@ -104,7 +104,7 @@ onMounted(() => {
     <div class="server-list-mid">
       <div class="server-list-title ff1"><span>服务器运行状态</span></div>
       <div class="server-list-box w-full">
-        <el-scrollbar height="704px" class="content">
+        <el-scrollbar height="744px" class="content">
           <Waterfall :list="list" v-bind="options">
             <template #item="{ item }">
               <ServerBox :serverData="item" />