From 2cf846a88b16e28415025f1dacb247048ae040ed Mon Sep 17 00:00:00 2001
From: JINGYJ <1458671527@qq.com>
Date: Fri, 1 Mar 2024 09:15:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/dataScreen/modelList/inUsed.svg    |  1 +
 .../views/home/components/AlarmLine.vue       | 82 +++++++++++++++++--
 .../dataScreen/views/home/homeIndex.scss      |  4 +-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/src/assets/dataScreen/modelList/inUsed.svg b/src/assets/dataScreen/modelList/inUsed.svg
index aca525f..bc4f762 100644
--- a/src/assets/dataScreen/modelList/inUsed.svg
+++ b/src/assets/dataScreen/modelList/inUsed.svg
@@ -1,4 +1,5 @@
 <svg width="265" height="172" viewBox="0 0 265 172" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="1" width="263" height="169" stroke="#FFCF5F" stroke-opacity="0.4" stroke-width="2"/>
 <rect y="1" width="265" height="171" fill="url(#paint0_linear_9937_75626)"/>
 <path d="M248 170.228H264V156.052" stroke="#FFCF5F" stroke-width="2"/>
 <path d="M17 170.228H1V156.052" stroke="#FFCF5F" stroke-width="2"/>
diff --git a/src/pages/dataScreen/views/home/components/AlarmLine.vue b/src/pages/dataScreen/views/home/components/AlarmLine.vue
index 99464f4..31724e9 100644
--- a/src/pages/dataScreen/views/home/components/AlarmLine.vue
+++ b/src/pages/dataScreen/views/home/components/AlarmLine.vue
@@ -71,15 +71,23 @@ setOptions(
       itemHeight: 8,
       data: [
         {
-          name: "间隙告警",
+          name: "螺纹缺陷",
           icon: "bar" // 图例的图标样式
         },
         {
-          name: "表面缺陷",
+          name: "PIN间距",
           icon: "bar"
         },
         {
-          name: "厚度达标",
+          name: "压板缺陷",
+          icon: "bar"
+        },
+        {
+          name: "划伤缺陷",
+          icon: "bar"
+        },
+        {
+          name: "工件尺寸",
           icon: "bar"
         }
       ]
@@ -150,7 +158,7 @@ setOptions(
       // },
       {
         //折线(右边数据)
-        name: "间隙告警",
+        name: "螺纹缺陷",
         type: "line",
         yAxisIndex: 0,
         data: [246, 246, 246, 180, 160],
@@ -183,7 +191,7 @@ setOptions(
       },
       {
         //折线(右边数据)
-        name: "表面缺陷",
+        name: "PIN间距",
         type: "line",
         yAxisIndex: 0,
         data: [160, 246, 450, 100, 246],
@@ -214,7 +222,7 @@ setOptions(
       },
       {
         //折线(右边数据)
-        name: "厚度达标",
+        name: "压板缺陷",
         type: "line",
         yAxisIndex: 0,
         data: [100, 200, 400, 150, 306],
@@ -242,6 +250,68 @@ setOptions(
         emphasis: {
           focus: "series"
         }
+      },
+      {
+        //折线(右边数据)
+        name: "划伤缺陷",
+        type: "line",
+        yAxisIndex: 0,
+        data: [10, 20, 400, 150, 206],
+        smooth: true,
+        // showSymbol: false,/
+        symbolSize: 8,
+        zlevel: 3,
+        areaStyle: {
+          opacity: 0.8,
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            {
+              offset: 0,
+              color: "rgba(73,194,245,1)"
+            },
+            {
+              offset: 1,
+              color: "rgba(73,194,245,0)"
+            }
+          ])
+        },
+        itemStyle: {
+          //折线颜色
+          color: "#49C2F5"
+        },
+        emphasis: {
+          focus: "series"
+        }
+      },
+      {
+        //折线(右边数据)
+        name: "工件尺寸",
+        type: "line",
+        yAxisIndex: 0,
+        data: [150, 250, 500, 50, 36],
+        smooth: true,
+        // showSymbol: false,/
+        symbolSize: 8,
+        zlevel: 3,
+        areaStyle: {
+          opacity: 0.8,
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            {
+              offset: 0,
+              color: "rgba(193,133,252,1)"
+            },
+            {
+              offset: 1,
+              color: "rgba(193,133,252,0)"
+            }
+          ])
+        },
+        itemStyle: {
+          //折线颜色
+          color: "#972EFF"
+        },
+        emphasis: {
+          focus: "series"
+        }
       }
     ],
     addTooltip: true
diff --git a/src/pages/dataScreen/views/home/homeIndex.scss b/src/pages/dataScreen/views/home/homeIndex.scss
index e2381ac..b97a041 100644
--- a/src/pages/dataScreen/views/home/homeIndex.scss
+++ b/src/pages/dataScreen/views/home/homeIndex.scss
@@ -60,8 +60,8 @@
   .mid_box {
     display: flex;
     justify-content: flex-start;
-    width: 205px;
-    height: 94px;
+    width: 210px;
+    height: 96px;
     background: url("@/assets/svg/screenSmallBgCommon.svg") no-repeat;
     .mid_box_icon {
       width: 76px;