From d245609c9e928670961ae011dd934c0f34cbbfd9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 18 八月 2023 17:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/view/index.vue |  162 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 156 insertions(+), 6 deletions(-)

diff --git a/src/view/index.vue b/src/view/index.vue
index 3d5a9e8..9786b1c 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -67,7 +67,7 @@
   color: #fff;
   width: 68px;
   height: 68px;
-  margin: 20px 0;
+  margin: 8px 0;
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -319,6 +319,74 @@
             }
           ]
         },
+				{
+				  k: 4,
+				  v: "鐢熶骇绠＄悊",
+				  i: "font icon-shouye",
+				  c: [
+				    {
+				      k: 12,
+				      v: "鐢熶骇璁㈠崟",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 13,
+				      v: "鐢熶骇璁″垝",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 14,
+				      v: "鐢熶骇鎶ュ伐",
+				      i: "font icon-shouye",
+				      u: ""
+				    }
+				  ]
+				},
+				{
+				  k: 5,
+				  v: "WMS绠＄悊",
+				  i: "font icon-shouye",
+				  c: [
+				    {
+				      k: 15,
+				      v: "鍘熸潗鏂欏簱瀛�",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 16,
+				      v: "鍥炲崟绠＄悊",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 17,
+				      v: "鍗婃垚鍝佸簱瀛�",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 18,
+				      v: "鎴愬搧搴撳瓨",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 19,
+				      v: "鎴愬搧鍙戣揣",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 20,
+				      v: "鎴愬搧鍏ュ簱",
+				      i: "font icon-shouye",
+				      u: ""
+				    }
+				  ]
+				},
         {
           k: 1,
           v: "鎶�鏈鐞�",
@@ -332,9 +400,9 @@
             },
             {
               k: 2,
-              v: "鎶�鏈枃浠�",
+              v: "璁㈠崟Bom",
               i: "font icon-shouye",
-              u: "technical"
+              u: "technicalaa"
             }
           ]
         },
@@ -390,9 +458,83 @@
               v: "璁￠噺绠＄悊",
               i: "font icon-shouye",
               u: "measurementManagement"
+            },
+            {
+              k: 10.1,
+              v: "宸℃",
+              i: "font icon-shouye",
+              u: ""
+            },
+            {
+              k: 10.2,
+              v: "涓嶅悎鏍煎搧澶勭疆",
+              i: "font icon-shouye",
+              u: "Processingproducts"
             }
           ]
-        }
+        },
+        {
+          k: 6,
+          v: "鏍哥畻绠＄悊",
+          i: "font icon-shouye",
+          c: [
+            {
+              k: 21,
+              v: "浜ч噺宸ヨ祫",
+              i: "font icon-shouye",
+              u: ""
+            },
+            {
+              k: 22,
+              v: "鍛樺伐鍑哄嫟",
+              i: "font icon-shouye",
+              u: ""
+            }
+          ]
+        },
+				{
+				  k: 7,
+				  v: "鍩虹鏁版嵁",
+				  i: "font icon-shouye",
+				  c: [
+				    {
+				      k: 23,
+				      v: "宸ュ簭缁存姢",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 24,
+				      v: "鑷缁存姢",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 25,
+				      v: "鎶�鏈寚鏍囩淮鎶�",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 26,
+				      v: "宸ヨ壓璺嚎缁存姢",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 27,
+				      v: "璁惧缁存姢",
+				      i: "font icon-shouye",
+				      u: ""
+				    },
+				    {
+				      k: 28,
+				      v: "鐗╂枡娓呭崟缁存姢",
+				      i: "font icon-shouye",
+				      u: ""
+				    }
+				  ]
+				}
       ],
       activeBox: 0,
       activeP: 0,
@@ -445,11 +587,19 @@
         this.activeBox = 0;
       } else if (num > 0 && num <= 2) {
         this.activeBox = 1;
-      } else if (num > 2 && num <= 10) {
+      } else if (num > 2 && num < 11) {
         this.activeBox = 2;
       } else if (num == 11) {
         this.activeBox = 3;
-      }
+      } else if (num > 11 && num <=14){
+				this.activeBox = 4;
+			} else if (num>14 && num<=20){
+				this.activeBox = 5
+			} else if (num>20 && num<=22){
+				this.activeBox = 6
+			} else if (num>22 && num<=28){
+				this.activeBox = 7
+			}
     },
     out() {
       sessionStorage.clear();

--
Gitblit v1.9.3