From 0b30ecf9d6581b4e7a6f7b397ced716acaeaefc0 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 三月 2024 14:15:37 +0800
Subject: [PATCH] 更新冲突
---
UI-Project/src/layout/MainErpView.vue | 120 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index 20334e7..3c66a15 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -8,7 +8,7 @@
import userInfo from '@/stores/userInfo'
import {Close, Grid, Histogram, MessageBox, SwitchButton} from "@element-plus/icons-vue";
const store=userInfo()
-
+
const router = useRouter()
const userStore = useUserInfoStore()
const user = userStore.user.userName
@@ -19,8 +19,8 @@
})
router.push("/login")
}
-
-
+
+
//鎻愬彇妯″潡鍒楄〃
let menuList=$ref([])
request.get("/menu").then((res) => {
@@ -31,7 +31,7 @@
router.push("/login")
}
})
-
+
//鑾峰彇鑿滃崟鍒楄〃
let menuItemList=$ref([])
request.get("/menuItem").then((res) => {
@@ -42,7 +42,7 @@
router.push("/login")
}
})
-
+
const menu = ref(null)
let indexKey = ref(null)
function handleOpen(key) {
@@ -55,12 +55,12 @@
},
{deep:true}
)
-
+
router.beforeEach((to, from) => {
//return false
})
-
-
+
+
let openFlag = $ref(null)
//鍘熷鑿滃崟鎵撳紑
const openMenu = (menuID) => {
@@ -70,10 +70,10 @@
openFlag = menuID
}
}
-
-
+
+
</script>
-
+
<template>
<div>
<el-container>
@@ -82,12 +82,12 @@
<img src="../assets/northGlass.ico" alt="" style="max-width: 100%;max-height: 100%">
<h3 style="margin: 1rem ;font-weight: bold;width: 20vw;"> 娆㈣繋{{ user }}浣跨敤鍖楃幓ERP绯荤粺锛�</h3>
<span style="height: 70%;width: 78vw;margin-top: 1rem;" >
-
+
<el-button class="sys-quit" @click="quit" type="info" round>
<el-icon size="large"><SwitchButton size=""/></el-icon>
</el-button>
</span>
-
+
</div>
</el-header>
<el-container >
@@ -101,7 +101,7 @@
default-active="2"
text-color="#fff">
<el-sub-menu
-
+
v-for="items in menuList"
:index="items.id"
:key="items.id">
@@ -119,14 +119,14 @@
{{ menuItem.itemName}}
</el-menu-item>
</router-link>
-
+
</el-sub-menu>
</el-menu>-->
<div class="menu" >
<div v-for="items in menuList">
<div class='menu_title' @click="openMenu(items.id)" >{{items.menuName}}<span class='indicator' >鈻�</span></div>
<ul class='enter-x-left' v-show="openFlag==items.id">
-
+
<li v-for="menuItem in menuItemList"
v-show="items.id==menuItem.menuID"
style="margin-bottom: 2px"
@@ -135,30 +135,30 @@
:to="{path:menuItem.url}">
{{ menuItem.itemName}}
</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>
.el-container{
height: 100vh;
width: 100vw
}
-
+
*{
padding: 0;
margin: 0;
@@ -167,11 +167,11 @@
float: right;
margin-right: 1rem;
width: 5rem;
-
+
}
:deep(span){
margin-right: 0;
-
+
}
.el-collapse{
font-size: 16px;
@@ -182,17 +182,17 @@
float: right;
height: 99%;
}
-
-
-
-
+
+
+
+
/*------------*/
-
-
-
-
+
+
+
+
.menu div div{
-
+
width: 138px;
height: 35px;
line-height: 35px;
@@ -211,36 +211,36 @@
cursor: pointer;
border-radius:8px;
/* outline: none; */
-
+
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);
@@ -251,26 +251,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: #ffffff;
}
-
+
.item_divider {
width: 118px;
height: 0px;
@@ -287,7 +287,7 @@
font-size: 14px;
text-decoration: none;
}
-
+
.menu_title {
width: 138px;
height: 35px;
@@ -301,14 +301,14 @@
position: relative;
font-weight: bold;
overflow: hidden;
-
+
}
-
+
.menu_title:hover {
/* background: #dedede; */
color: #ffffff;
}
-
+
.indicator {
display: block;
width: 50px;
@@ -320,9 +320,9 @@
transition: all 0.3s ease;
text-align: center;
}
-
-
-
+
+
+
/* 鍔ㄧ敾鏁堟灉 */
.enter-x-left {
z-index: 9;
@@ -344,14 +344,14 @@
.enter-x-left:nth-child(4){
animation-delay: 0.4s;
}
-
-
+
+
@keyframes enter-x-left {
to {
opacity: 1;
transform: translateX(0);
}
}
-
-
+
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0