From f7e1fb87573dcaaa3ee1f3d90d84bfec88a44be9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 四月 2024 08:51:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/layout/MainErpView.vue |   92 +++++++++++++++++++++++-----------------------
 1 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index bc44154..4638722 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -6,13 +6,13 @@
 import {ElMessage} from "element-plus";
 import {ref, watch} from "vue"
 import deepClone from "@/utils/deepClone"
-
+ 
 const store = userInfo()
-
+ 
 const router = useRouter()
 const userStore = useUserInfoStore()
 const user = userStore.user.userName
-
+ 
 // store.createWebSocket();
 function quit() {
   userStore.$patch({
@@ -20,8 +20,8 @@
   })
   router.push("/login")
 }
-
-
+ 
+ 
 //鎻愬彇妯″潡鍒楄〃
 let menuList = $ref([])
 request.get('/menu/sysMenu/list').then((res) => {
@@ -32,7 +32,7 @@
     router.push('/login')
   }
 })
-
+ 
 //鑾峰彇鑿滃崟鍒楄〃
 // let menuItemList = $ref([])
 // request.get('/menuItem').then((res) => {
@@ -43,14 +43,14 @@
 //     router.push('/login')
 //   }
 // })
-
+ 
 const menu = ref(null)
 let indexKey = ref(null)
-
+ 
 function handleOpen(key) {
   indexKey.value = key
 }
-
+ 
 watch(indexKey, (newVal, oldVal) => {
       if (oldVal !== newVal && oldVal !== null) {
         menu.value.close(oldVal)
@@ -58,12 +58,12 @@
 },
     {deep:true}
 )
-
+ 
 router.beforeEach((to, from) => {
   //return false
 })
-
-
+ 
+ 
 let openFlag = $ref(null)
 //鍘熷鑿滃崟鎵撳紑
 const openMenu = (menuID) => {
@@ -73,10 +73,10 @@
       openFlag = menuID
     }
 }
-
-
+ 
+ 
 </script>
-
+ 
 <template>
   <div id="all">
     <el-container>
@@ -107,30 +107,30 @@
               </div>
               <ul class='enter-x-left'
                   v-show="openFlag==items.id">
-
+ 
                 <li v-for="menuItem in items.children"
                     style="margin-bottom:2px">
                   <router-link :to="{path:menuItem.url}">
                     {{ menuItem.menuName }}
                   </router-link>
-
+ 
                 </li>
               </ul>
             </div>
           </div>
         </el-aside>
-
+ 
         <el-main>
           <div id="main">
             <router-view></router-view>
           </div>
         </el-main>
-
+ 
       </el-container>
     </el-container>
   </div>
 </template>
-
+ 
 <style scoped>
 #all{
   background-color: #eee;
@@ -140,7 +140,7 @@
   height: 100vh;
   width: 99vw
 }
-
+ 
 *{
   padding: 0;
   margin: 0;
@@ -163,7 +163,7 @@
 }
 :deep(span){
   margin-right: 0;
-
+ 
 }
 .el-collapse{
   font-size: 16px;
@@ -176,9 +176,9 @@
   background-color: #fff;
 }
 /*------------*/
-
+ 
 /* .menu div div{
-
+ 
   width: 138px;
   height: 35px;
   line-height: 35px;
@@ -200,29 +200,29 @@
   /* background-color:#5CADFE; */
   /* box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19); */
 /* } */
-
+ 
 .menu {
   width: 138px;
   height: 33px;
   line-height: 25px;
-
+ 
   color: #000000;
   font-size: 16px;
   padding-left: 15px;
   padding-right: 2px;
-
-
-
+ 
+ 
+ 
 }
-
+ 
 ul {
   height: auto;
   margin: 1px auto;
   text-align: center;
 }
-
+ 
 ul li {
-
+ 
   height: 28px;
   line-height: 30px;
   /* background: rgb(128, 128, 128); */
@@ -233,26 +233,26 @@
   text-align: left;
   /* border-radius:8px; */
   /*   outline: none; */
-
+ 
   /* background: #5CADFE; */
   /* box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19); */
 }
-
+ 
 ul li:hover {
   /* background:#5CADFE ; */
   color: #ffffff;
 }
-
+ 
 ul li a {
   text-decoration: none;
   color: #000000;
   font-size: 14px;
 }
 ul li a:hover {
-
+ 
   color: #1087ff;
 }
-
+ 
 .item_divider {
   width: 118px;
   height: 0px;
@@ -270,7 +270,7 @@
   font-size: 14px;
   text-decoration: none;
 }
-
+ 
 .menu_title {
   width: 140px;
   height: 45px;
@@ -284,14 +284,14 @@
   position: relative;
   font-weight: bold;
   overflow: hidden;
-
+ 
 }
-
+ 
 .menu_title:hover {
   /* background: #dedede; */
   color: #3b9af9;
 }
-
+ 
 .indicator {
   display: block;
   width: 40px;
@@ -303,9 +303,9 @@
   transition: all 0.3s ease;
   text-align: center;
 }
-
-
-
+ 
+ 
+ 
 /* 鍔ㄧ敾鏁堟灉 */
 .enter-x-left {
   z-index: 9;
@@ -333,6 +333,6 @@
     transform: translateX(0);
   }
 }
-
-
+ 
+ 
 </style>
\ No newline at end of file

--
Gitblit v1.8.0