From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分
---
src/layout/components/Sidebar/index.vue | 156 +++++++++++++++-------------------------------------
1 files changed, 45 insertions(+), 111 deletions(-)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index c9b7c99..1f1202a 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,8 +1,8 @@
<template>
<div :class="{'has-logo':showLogo}">
- <logo v-if="showLogo" :collapse="isCollapse" />
- <el-scrollbar wrap-class="scrollbar-wrapper" style="margin-top:56px">
+ <logo v-if="showLogo" :collapse="isCollapse"/>
+ <el-scrollbar wrap-class="scrollbar-wrapper" style="margin-top:56px;height: 85%">
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
@@ -13,71 +13,41 @@
:collapse-transition="false"
mode="vertical"
>
- <sidebar-item
- v-for="route in routes"
- :key="route.path"
- class="el-scrollbar-menu"
- :item="route"
- :base-path="route.path"
- />
- <!-- <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />-->
+ <!-- <sidebar-item-->
+ <!-- v-for="route in routes"-->
+ <!-- :key="route.path"-->
+ <!-- class="el-scrollbar-menu"-->
+ <!-- :item="route"-->
+ <!-- :base-path="route.path"-->
+ <!-- />-->
+ <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path"/>
</el-menu>
</el-scrollbar>
- <div style="position: absolute;bottom: 10px;left: 30px;">
- <div><el-button type="text">鏂板嚡杩埗閫燰1.0.01</el-button></div>
+ <div style="position: absolute;bottom: 20px;left: 30px;">
+ <div>
+ <el-button type="text">鏂板嚡杩埗閫燰1.0.01</el-button>
+<!-- <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">鏂板嚡杩埗閫燰1.0.01</a></el-button>-->
+ </div>
</div>
</div>
</template>
<script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
import Logo from './Logo'
import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss'
-import { LoginMenu } from '@/api/user'
-import axios from 'axios'
+import {LoginMenu} from '@/api/user'
+import {removeCookie, setCookie} from '@/utils/auth'
export default {
- components: { SidebarItem, Logo },
+ components: {SidebarItem, Logo},
data() {
return {
routers: []
}
- },
- async created() {
- // const arr = [
- // {
- // name: '绯荤粺棣栭〉'
- // },
- // {
- // name: '鍩虹璁剧疆',
- // children: [
- // { name: '缁勭粐鏋舵瀯' },
- // { name: '瑙掕壊娓呭崟' },
- // { name: '鐢ㄦ埛娓呭崟' }color: $main_color !important;
-
- // ]
- // },
- // {
- // name: '鍒堕�犳ā鍨�',
- // children: [
- // { name: '鍏泭璺嚎' },
- // { name: '鑺傛媿宸ヤ环' },
- // { name: '瀛樿揣妗f' }
- // ]
- // }
- // ]
- // this.routers = arr
- console.log(document.cookie, 777)
-
- const res = await LoginMenu()
- console.log(res, 999)
-
- // axios.get('http://121.196.36.24:8001/api/Login/LoginSave?username=Admin&password=123456').then(res => {
- // console.log(res, 11)
- // })
},
computed: {
...mapGetters([
@@ -85,59 +55,14 @@
'sidebar'
]),
routes() {
- // console.log(this.$router.options.routes, 111)
- // this.$router.options.routes.forEach((item, index) => {
- // if (item.name === 'jcsz') {
- // this.$router.options.routes.slice(index, 1)
- // }
- // })
-
- // return this.$router.options.routes.filter(item => {
- // console.log(item)
- // return item.name === 'jcsz'
- // })
- console.log(this.routers, 99)
- console.log(this.$router.options.routes, 11)
-
- const newArr = []
- this.routers.forEach(item => {
- if (item.name) {
- newArr.push(item.name)
- if (item.children) {
- item.children.forEach(it => {
- if (it.name) {
- newArr.push(it.name)
- }
- })
- }
- }
- })
- console.log(newArr, 333)
- const arr = this.$router.options.routes
- const arr2 = []
- arr.forEach((item, index) => {
- console.log(newArr.includes(item.name), 222)
-
- if (newArr.includes(item.name) && item.children.length === 1) {
- arr2.push(item)
- } else if (newArr.includes(item.name) && item.children.length > 1) {
- const a = []
- item.children.forEach((it, ind) => {
- if (newArr.includes(it.name)) {
- a.push(it)
- }
- })
- item.children = a
-
- arr2.push(item)
- }
- })
- return arr2
+ return this.$router.options.routes
},
activeMenu() {
const route = this.$route
- const { meta, path } = route
+ const {meta, path} = route
// if set path, the sidebar will highlight the path you set
+ removeCookie('ruleCode')
+ setCookie('ruleCode', meta.code)// 灏嗙紪鐮佽鍒檆ode瀛樺埌cookie閲岄潰
if (meta.activeMenu) {
return meta.activeMenu
}
@@ -156,46 +81,55 @@
}
</script>
<style lang="scss">
-$main_color :#42b983;
-.el-button--text, .el-button--text.is-disabled, .el-button--text.is-disabled:focus, .el-button--text.is-disabled:hover, .el-button--text:active{
- color: white ;
- font-size: 18px ;
+$main_color: #42b983;
+.el-button--text, .el-button--text.is-disabled, .el-button--text.is-disabled:focus, .el-button--text.is-disabled:hover, .el-button--text:active {
+ color: white;
+ font-size: 18px;
}
+
+.el-button--text:focus {
+ color: white;
+}
+
#app .sidebar-container .el-submenu .el-menu-item {
background-color: transparent !important;
}
-#app .sidebar-container .el-submenu .el-menu-item.is-active{
+#app .sidebar-container .el-submenu .el-menu-item.is-active {
background: $main_color !important;
color: #fff !important;
}
-#app .sidebar-container .el-submenu .el-menu-item:hover{
+
+#app .sidebar-container .el-submenu .el-menu-item:hover {
background: $main_color !important;
//color: #fff !important;
}
-.el-submenu__title{
+.el-submenu__title {
font-weight: bolder;
}
-.sub-el-icon::before{
+.sub-el-icon::before {
color: $main_color;
}
-.svg-icon{
+
+.svg-icon {
color: $main_color;
}
-.submenu-title-noDropdown{
+
+.submenu-title-noDropdown {
font-weight: bolder;
}
-.router-link-exact-active>.submenu-title-noDropdown{
+
+.router-link-exact-active > .submenu-title-noDropdown {
color: $main_color !important;
}
-.el-menu-item.is-active{
+.el-menu-item.is-active {
color: $main_color !important;
}
-.el-button--text:hover{
+.el-button--text:hover {
color: #ffffff;
cursor: default;
}
--
Gitblit v1.9.3