From cb44cab30ca6b51d4488c66d7db911deecf4dbea Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 09:35:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/view/index.vue |  106 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/src/view/index.vue b/src/view/index.vue
index fcdc5f9..09cfbd5 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -5,7 +5,6 @@
   background-size: 100% 100%;
   display: flex;
   flex-wrap: wrap;
-  overflow: hidden;
 }
 
 .title {
@@ -55,13 +54,13 @@
 }
 
 .left {
-  width: 92px;
   height: calc(100vh - 58px - 40px);
   background-color: #004ea2;
   display: flex;
   align-items: center;
   flex-direction: column;
   padding: 20px 0;
+  transition: 0.3s;
   overflow-y: auto;
 }
 
@@ -126,8 +125,8 @@
 }
 
 .right {
-  width: calc(100% - 92px);
   height: calc(100vh - 58px);
+  transition: 0.3s;
 }
 
 .tag {
@@ -142,7 +141,8 @@
   font-size: 14px;
 }
 
-.tag .el-icon-s-unfold {
+.tag > .el-icon-s-unfold,
+.el-icon-s-fold {
   font-size: 18px;
   cursor: pointer;
   margin: 0 8px;
@@ -188,6 +188,7 @@
   width: calc(100% - 48px);
   padding: 11px 24px;
   background: rgb(245, 247, 251);
+  overflow-y: auto;
 }
 
 .com_index {
@@ -202,14 +203,14 @@
       <div class="logo">
         <img src="../../static/img/logo 1.png" />
       </div>
-      <div class="label">鐢电紗闄勪欢鏂颁竴浠om绯荤粺</div>
+      <div class="label">涓ぉ娴锋磱鏂颁竴浠om绯荤粺</div>
       <div class="user">
         <el-avatar :size="24">{{ userName.substring(0, 1) }}</el-avatar>
         <span>{{ userName }}</span>
         <img src="../../static/img/閫�鍑�.png" @click="out" />
       </div>
     </div>
-    <div class="left">
+    <div class="left" :style="`width: ${leftOpen ? '92' : '0'}px;`">
       <div
         :class="`box ${activeBox == 0 ? 'active_box' : ''}`"
         @click="addTab(menu[0].c[0])"
@@ -253,9 +254,15 @@
         </div>
       </el-popover>
     </div>
-    <div class="right">
+    <div
+      class="right"
+      :style="`width: calc(100% - ${leftOpen ? '92' : '0'}px);`"
+    >
       <div class="tag">
-        <i class="el-icon-s-unfold"></i>
+        <i
+          :class="`${leftOpen ? 'el-icon-s-unfold' : 'el-icon-s-fold'}`"
+          @click="leftOpen = !leftOpen"
+        ></i>
         <div class="tabs">
           <div
             :class="`tab ${tabActive == a.k ? 'active_tab' : ''}`"
@@ -264,7 +271,11 @@
             @click="upTabActive(a.k)"
           >
             {{ a.v }}
-            <i class="el-icon-close" @click="removeTab(ai)"></i>
+            <i
+              class="el-icon-close"
+              @click="removeTab(ai)"
+              v-if="tabActive != 0"
+            ></i>
           </div>
         </div>
       </div>
@@ -298,6 +309,7 @@
   data() {
     return {
       userName: "value",
+      leftOpen: true,
       menu: [
         {
           k: 0,
@@ -326,9 +338,28 @@
           ]
         },
         {
+          k: 1,
+          v: "鎶�鏈鐞�",
+          i: "font icon-ic_form_set24px",
+          c: [
+            {
+              k: 1,
+              v: "鏍囧噯BOM",
+              i: "font icon-shouye",
+              u: "standard"
+            },
+            {
+              k: 2,
+              v: "璁㈠崟BOM",
+              i: "font icon-shouye",
+              u: "technical"
+            }
+          ]
+        },
+        {
           k: 4,
           v: "鐢熶骇绠＄悊",
-          i: "font icon-shouye",
+          i: "font icon-shengchanguanli",
           c: [
             {
               k: 12,
@@ -353,7 +384,7 @@
         {
           k: 5,
           v: "WMS绠＄悊",
-          i: "font icon-shouye",
+          i: "font icon-a-Inventorydumprequest",
           c: [
             {
               k: 15,
@@ -394,28 +425,9 @@
           ]
         },
         {
-          k: 1,
-          v: "鎶�鏈鐞�",
-          i: "font icon-shouye",
-          c: [
-            {
-              k: 1,
-              v: "鏍囧噯BOM",
-              i: "font icon-shouye",
-              u: "standard"
-            },
-            {
-              k: 2,
-              v: "璁㈠崟Bom",
-              i: "font icon-shouye",
-              u: "technicalaa"
-            }
-          ]
-        },
-        {
           k: 2,
           v: "QMS绠＄悊",
-          i: "font icon-shouye",
+          i: "font icon-xunhuan",
           c: [
             {
               k: 3,
@@ -461,12 +473,6 @@
             },
             {
               k: 10.1,
-              v: "宸℃",
-              i: "font icon-shouye",
-              u: ""
-            },
-            {
-              k: 10.2,
               v: "涓嶅悎鏍煎搧澶勭疆",
               i: "font icon-shouye",
               u: "Processingproducts"
@@ -476,7 +482,7 @@
         {
           k: 6,
           v: "鏍哥畻绠＄悊",
-          i: "font icon-shouye",
+          i: "font icon-caiwuhesuanxitong",
           c: [
             {
               k: 21,
@@ -495,17 +501,17 @@
         {
           k: 7,
           v: "鍩虹鏁版嵁",
-          i: "font icon-shouye",
+          i: "font icon-a-ziyuan20",
           c: [
             {
               k: 23,
-              v: "宸ュ簭缁存姢",
+              v: "鐢熶骇璁板綍缁存姢",
               i: "font icon-shouye",
-              u: ""
+              u: "record-content"
             },
             {
               k: 24,
-              v: "鑷缁存姢",
+              v: "鑷椤圭洰缁存姢",
               i: "font icon-shouye",
               u: "self-inspection"
             },
@@ -513,7 +519,7 @@
               k: 25,
               v: "鎶�鏈寚鏍囩淮鎶�",
               i: "font icon-shouye",
-              u: ""
+              u: "Technicalindex"
             },
             {
               k: 26,
@@ -532,6 +538,18 @@
               v: "鐗╂枡娓呭崟缁存姢",
               i: "font icon-shouye",
               u: "mbom"
+            },
+            // {
+            // 	k: 29,
+            // 	v: "宸℃椤圭洰缁存姢",
+            // 	i: "font icon-shouye",
+            // 	u: "routinginspection"
+            // },
+            {
+              k: 30,
+              v: "鐢熶骇宸ヨ壓缁存姢",
+              i: "font icon-shouye",
+              u: "equipmentmaintain"
             }
           ]
         }
@@ -597,7 +615,7 @@
         this.activeBox = 5;
       } else if (num > 20 && num <= 22) {
         this.activeBox = 6;
-      } else if (num > 22 && num <= 28) {
+      } else if (num > 22 && num <= 30) {
         this.activeBox = 7;
       }
     },

--
Gitblit v1.9.3