修改顶层菜单样式

src/assets/icons/index.js

@@ -126,6 +126,9 @@ export { default as Reports } from './menu/ReportForms.vue'
 export { default as ShipmentMag } from './menu/Shipment.vue'
 export { default as Inventory } from './menu/Stock.vue'
 export { default as Service } from './menu/Service.vue'
+export { default as Bom } from './menu/Bom.vue'
+export { default as Warehouse } from './menu/Warehouse.vue'
+export { default as AdvancedSetting } from './menu/AdvancedSetting.vue'
 // 二层菜单
 export { default as Controller } from './childMenu/Console.vue'
 export { default as CostFeeRecords } from './childMenu/CostControl.vue'

src/assets/icons/menu/AdvancedSetting.vue

@@ -0,0 +1,23 @@
+<template>
+	<svg width="20" height="20" viewBox="0 0 20 20"  xmlns="http://www.w3.org/2000/svg">
+		<g clip-path="url(#clip0_3723_15703)">
+			<path d="M15.4084 15.7264C14.3139 15.8625 13.3137 15.1042 13.1816 14.0154C13.0495 12.9267 13.8233 11.9157 14.9178 11.7796C16.0123 11.6435 17.0125 12.4017 17.1446 13.4905C17.2767 14.5793 16.503 15.5903 15.4084 15.7264ZM15.5405 16.7179C17.1823 16.5041 18.3523 15.007 18.1448 13.3738C17.9372 11.7407 16.4464 10.5741 14.8234 10.788C13.1816 11.0019 12.0116 12.4989 12.2192 14.1321C12.4079 15.7653 13.8987 16.9318 15.5405 16.7179ZM10.1623 15.1042C10.1056 15.0459 10.0679 14.9876 10.049 14.9098L9.9358 13.9377C9.9358 13.7627 10.0679 13.6071 10.2377 13.5877L10.7661 13.5099C10.9926 13.4711 11.1813 13.2961 11.2379 13.0628L11.4266 12.3628C11.5021 12.1295 11.4266 11.8962 11.2568 11.7407L10.8416 11.4101C10.6906 11.2935 10.6718 11.0796 10.785 10.9241L11.3511 10.2047C11.4266 10.1269 11.521 10.0881 11.6153 10.0686C11.7097 10.0492 11.804 10.0686 11.8795 10.1269L12.2947 10.4575C12.4645 10.5936 12.7665 10.5936 12.9363 10.4769L13.5591 10.1075C13.7666 9.99085 13.8799 9.77698 13.861 9.54367L13.8044 8.99929C13.7855 8.90207 13.8233 8.8243 13.8799 8.74653C13.9365 8.66876 14.012 8.62988 14.1063 8.61044L15.031 8.49378C15.2197 8.4549 15.3896 8.59099 15.4084 8.76598L15.4839 9.32981C15.5028 9.56312 15.7104 9.75754 15.9368 9.79643L16.6351 9.99085C16.8615 10.0686 17.1068 9.99085 17.2578 9.81587L17.5786 9.38813C17.6352 9.31036 17.7296 9.29092 17.8239 9.27148C17.9183 9.25204 18.0127 9.27148 18.0881 9.32981L18.8052 9.8742C18.9562 9.99085 18.9751 10.2047 18.8619 10.3603L18.5411 10.788C18.3901 10.963 18.3901 11.2546 18.5222 11.4296L18.8807 12.0518C18.994 12.2656 19.2015 12.4017 19.4469 12.3823L19.9753 12.3045C20.0696 12.2851 20.164 12.3045 20.2206 12.3628C20.2961 12.4212 20.3338 12.4989 20.3527 12.5961L20.4093 13.5099C20.4282 13.7044 20.3149 13.8599 20.1262 13.8988L19.5412 14.0154C19.3148 14.0543 19.1261 14.2293 19.0694 14.4626L18.8807 15.1625C18.8052 15.3959 18.8807 15.6292 19.0506 15.7847L19.4657 16.1152C19.6167 16.2319 19.6356 16.4457 19.5224 16.6013L18.9751 17.3012C18.8619 17.4568 18.6354 17.4762 18.4844 17.3595L18.0693 17.029C17.8994 16.8929 17.5975 16.8929 17.4277 17.0096L16.8049 17.379C16.5973 17.4762 16.4652 17.7095 16.4841 17.9428L16.5407 18.4872C16.5596 18.5844 16.5218 18.6622 16.4652 18.74C16.4086 18.8177 16.3331 18.8566 16.2388 18.8761L15.3141 18.9927C15.2197 19.0122 15.1254 18.9927 15.0688 18.9344C14.9933 18.8761 14.9555 18.7983 14.9367 18.7011L14.88 18.1567C14.8423 17.9234 14.6725 17.7289 14.446 17.6901L13.7478 17.4956C13.5213 17.4179 13.276 17.4956 13.125 17.6706L12.8042 18.0984C12.691 18.2539 12.4645 18.2733 12.3136 18.1567L11.5965 17.6123C11.4455 17.4956 11.4266 17.2818 11.5398 17.1262L11.8607 16.6985C12.0116 16.5235 12.0116 16.2319 11.8795 16.0569L11.521 15.4347C11.4078 15.2209 11.1813 15.0848 10.9548 15.1042L10.4076 15.1625C10.3321 15.182 10.2377 15.1625 10.1623 15.1042Z" fill=""/>
+			<path d="M16.6162 2H2.70814C1.74571 2 0.953125 2.81658 0.953125 3.80815V17.1846C0.953125 18.1761 1.74571 18.9927 2.70814 18.9927H10.1056V16.9318H4.06687C3.50073 16.9318 3.02895 16.4457 3.02895 15.8625V8.70765C3.02895 8.12437 3.50073 7.63831 4.06687 7.63831H15.2575C15.7859 7.63831 16.2199 8.0466 16.2765 8.57155H18.3523V3.78871C18.3523 2.79714 17.5786 2 16.6162 2ZM4.87833 5.55797C4.87833 5.81072 4.68962 6.00515 4.44429 6.00515H3.42525C3.17992 6.00515 2.99121 5.81072 2.99121 5.55797V4.60529C2.99121 4.35254 3.17992 4.15811 3.42525 4.15811H4.44429C4.68962 4.15811 4.87833 4.35254 4.87833 4.60529V5.55797ZM9.52063 5.55797C9.52063 5.81072 9.33192 6.00515 9.0866 6.00515H6.61447C6.36915 6.00515 6.18044 5.81072 6.18044 5.55797V4.60529C6.18044 4.35254 6.36915 4.15811 6.61447 4.15811H9.0866C9.33192 4.15811 9.52063 4.35254 9.52063 4.60529V5.55797Z" fill=""/>
+		</g>
+		<defs>
+			<clipPath id="clip0_3723_15703">
+				<rect width="20" height="20" fill=""/>
+			</clipPath>
+		</defs>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "AdvancedSetting"
+}
+</script>
+
+<style scoped>
+
+</style>

src/assets/icons/menu/Bom.vue

@@ -0,0 +1,15 @@
+<template>
+	<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+		<path d="M3.33268 9.16666H8.4756C8.69452 9.16665 8.9113 9.20977 9.11355 9.29356C9.31581 9.37735 9.49957 9.50016 9.65435 9.65499L10.3443 10.345C10.4991 10.4998 10.6829 10.6226 10.8851 10.7064C11.0874 10.7902 11.3042 10.8333 11.5231 10.8333H16.666C16.8849 10.8333 17.1016 10.8764 17.3038 10.9602C17.506 11.0439 17.6898 11.1667 17.8445 11.3215C17.9993 11.4762 18.1221 11.66 18.2058 11.8622C18.2896 12.0644 18.3327 12.2811 18.3327 12.5V16.6667C18.3327 16.8855 18.2896 17.1023 18.2058 17.3045C18.1221 17.5067 17.9993 17.6904 17.8445 17.8452C17.6898 17.9999 17.506 18.1227 17.3038 18.2065C17.1016 18.2902 16.8849 18.3333 16.666 18.3333H3.33268C3.11381 18.3333 2.89709 18.2902 2.69488 18.2065C2.49267 18.1227 2.30894 17.9999 2.15417 17.8452C1.99941 17.6904 1.87664 17.5067 1.79288 17.3045C1.70913 17.1023 1.66602 16.8855 1.66602 16.6667V10.8333C1.66602 10.6145 1.70913 10.3977 1.79288 10.1955C1.87664 9.99331 1.99941 9.80958 2.15417 9.65481C2.30894 9.50005 2.49267 9.37728 2.69488 9.29352C2.89709 9.20977 3.11381 9.16666 3.33268 9.16666ZM9.30768 12.5C9.0131 12.5 8.75018 12.5312 8.51852 12.5933C8.29824 12.6491 8.09694 12.7629 7.9356 12.9229C7.77852 13.0808 7.65893 13.2937 7.57643 13.5621C7.49393 13.8304 7.45268 14.1708 7.45268 14.5833C7.45268 14.9958 7.49435 15.3362 7.57643 15.6046C7.65893 15.8729 7.77852 16.0858 7.9356 16.2437C8.09711 16.4037 8.29855 16.5173 8.51893 16.5729C8.75018 16.6354 9.0131 16.6667 9.30768 16.6667C9.60602 16.6667 9.8706 16.6354 10.1023 16.5733C10.3227 16.5176 10.5241 16.4038 10.6856 16.2437C10.8423 16.0858 10.961 15.8729 11.0414 15.6046C11.1218 15.3362 11.1623 14.9958 11.1623 14.5833C11.1623 14.1708 11.1218 13.8304 11.0414 13.5621C10.961 13.2937 10.8423 13.0808 10.6852 12.9229C10.5238 12.7631 10.3225 12.6494 10.1023 12.5937C9.8706 12.5312 9.60602 12.5 9.30768 12.5ZM5.12727 12.5583H3.74935V16.6083H5.2506C5.54893 16.6083 5.79643 16.5821 5.99227 16.5292C6.18893 16.4771 6.34477 16.4012 6.4606 16.3021C6.57643 16.2029 6.6581 16.08 6.70518 15.9342C6.75226 15.7883 6.77602 15.6242 6.77602 15.4412C6.77602 14.9633 6.56227 14.6579 6.13518 14.5233L6.05727 14.5017V14.4783C6.28102 14.4158 6.43643 14.315 6.52268 14.175C6.60893 14.0346 6.65185 13.8596 6.65185 13.65C6.65185 13.4667 6.62852 13.3071 6.58143 13.1708C6.53506 13.0357 6.45019 12.9171 6.33727 12.8296C6.22143 12.7379 6.06518 12.67 5.86893 12.6254C5.66591 12.5832 5.45921 12.5611 5.25185 12.5596L5.12685 12.5583H5.12727ZM13.4173 12.5583H11.9631V16.6083H12.8343V13.4221H12.8698L13.6468 15.8437H14.5418L15.331 13.4221H15.366V16.6083H16.2493V12.5583H14.8364L14.1298 14.84H14.0943L13.4173 12.5583ZM9.30768 13.2237C9.49602 13.2237 9.65018 13.2479 9.76977 13.2967C9.88935 13.345 9.98268 13.4242 10.0493 13.5329C10.116 13.6417 10.1623 13.7829 10.1877 13.9558C10.2131 14.1292 10.226 14.3383 10.226 14.5833C10.226 14.8325 10.2135 15.0425 10.1877 15.2137C10.1623 15.3846 10.116 15.5229 10.0493 15.6279C9.98268 15.7329 9.88935 15.8087 9.76977 15.8554C9.65018 15.9021 9.49602 15.9254 9.30727 15.9254C9.11893 15.9254 8.96602 15.9021 8.8481 15.8554C8.7337 15.8115 8.63663 15.7317 8.57143 15.6279C8.50477 15.5229 8.45893 15.3846 8.4331 15.2137C8.40768 15.0425 8.39477 14.8325 8.39477 14.5833C8.39477 14.3383 8.40727 14.1292 8.4331 13.9558C8.45852 13.7829 8.50477 13.6417 8.57143 13.5329C8.6381 13.4242 8.7306 13.3454 8.8481 13.2967C8.96602 13.2479 9.11893 13.2237 9.30768 13.2237ZM5.05643 14.8696C5.21352 14.8696 5.34477 14.8779 5.45102 14.8954C5.55685 14.9129 5.64018 14.9421 5.70102 14.9829C5.76185 15.0237 5.80518 15.0775 5.8306 15.1437C5.85643 15.2096 5.86893 15.2896 5.86893 15.3829C5.86893 15.4879 5.85643 15.5733 5.8306 15.6396C5.80571 15.7049 5.75887 15.7596 5.6981 15.7942C5.6205 15.8361 5.53568 15.8629 5.4481 15.8733C5.31826 15.8904 5.18737 15.898 5.05643 15.8962H4.64393V14.8692H5.05643V14.8696ZM4.94477 13.2646C5.08977 13.2646 5.2156 13.2692 5.32143 13.2792C5.42727 13.2887 5.5131 13.3112 5.57768 13.3458C5.64227 13.3812 5.69018 13.43 5.72185 13.4921C5.7531 13.5546 5.76893 13.6379 5.76893 13.7429C5.76893 13.8442 5.7531 13.9258 5.72185 13.9879C5.68962 14.051 5.63809 14.1021 5.57477 14.1337C5.5081 14.1692 5.42268 14.1933 5.31852 14.2071C5.19449 14.2218 5.06966 14.2286 4.94477 14.2275H4.64435V13.2646H4.94435H4.94477ZM14.5827 1.66666C14.8016 1.66666 15.0183 1.70977 15.2205 1.79352C15.4227 1.87728 15.6064 2.00005 15.7612 2.15481C15.916 2.30958 16.0387 2.49331 16.1225 2.69552C16.2062 2.89773 16.2493 3.11445 16.2493 3.33332V9.16666H11.5231L10.8327 8.47624C10.5231 8.16672 10.1557 7.92119 9.75124 7.75368C9.34681 7.58618 8.91334 7.49997 8.4756 7.49999L3.74935 7.49957V3.33332C3.74935 3.11445 3.79246 2.89773 3.87622 2.69552C3.95997 2.49331 4.08274 2.30958 4.2375 2.15481C4.39227 2.00005 4.576 1.87728 4.77821 1.79352C4.98042 1.70977 5.19715 1.66666 5.41602 1.66666H14.5827Z" fill=""/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Bom"
+}
+</script>
+
+<style scoped>
+
+</style>

src/assets/icons/menu/Warehouse.vue

@@ -0,0 +1,15 @@
+<template>
+	<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+		<path d="M13.1458 18H5.16388C3.96842 18 3.12649 16.8965 3.12649 15.7235V10.5616H2.18035C1.70829 10.5963 1.26485 10.3307 1.0748 9.89746C0.966497 9.64815 0.878626 9.04736 1.54481 8.35665L7.9921 1.64575C8.3865 1.23296 8.93212 1 9.50226 1C10.0724 1 10.618 1.23296 11.0124 1.64575L17.4577 8.35461C18.1218 9.04532 18.038 9.64611 17.9277 9.89542C17.7376 10.3286 17.2942 10.5943 16.8221 10.5596H15.878V15.7215C15.878 16.8924 15.0361 17.998 13.8406 17.998H13.1458V18ZM5.63797 10.2081C5.5358 10.2081 5.43771 10.2489 5.36414 10.3205C5.29262 10.392 5.25175 10.4921 5.25175 10.5943V11.9471C5.25175 12.0493 5.29262 12.1474 5.36414 12.2209C5.43566 12.2925 5.5358 12.3333 5.63797 12.3333H7.90219C8.00436 12.3333 8.10245 12.2925 8.17602 12.2209C8.24754 12.1494 8.28841 12.0493 8.28841 11.9471V10.5943C8.28841 10.4921 8.24754 10.394 8.17602 10.3205C8.1045 10.2489 8.00436 10.2081 7.90219 10.2081H5.63797ZM5.63797 13.7495C5.5358 13.7495 5.43771 13.7904 5.36414 13.8619C5.29262 13.9334 5.25175 14.0335 5.25175 14.1357V15.4885C5.25175 15.5907 5.29262 15.6888 5.36414 15.7624C5.43566 15.8339 5.5358 15.8747 5.63797 15.8747H7.90219C8.00436 15.8747 8.10245 15.8339 8.17602 15.7624C8.24754 15.6908 8.28841 15.5907 8.28841 15.4885V14.1357C8.28841 14.0335 8.24754 13.9354 8.17602 13.8619C8.1045 13.7904 8.00436 13.7495 7.90219 13.7495H5.63797ZM9.88848 13.7495C9.78631 13.7495 9.68822 13.7904 9.61465 13.8619C9.54313 13.9334 9.50226 14.0335 9.50226 14.1357V15.4885C9.50226 15.5907 9.54313 15.6888 9.61465 15.7624C9.68618 15.8339 9.78631 15.8747 9.88848 15.8747H12.1527C12.2549 15.8747 12.353 15.8339 12.4265 15.7624C12.4981 15.6908 12.5389 15.5907 12.5389 15.4885V14.1357C12.5389 14.0335 12.4981 13.9354 12.4265 13.8619C12.355 13.7904 12.2549 13.7495 12.1527 13.7495H9.88848Z" fill=""/>
+	</svg>
+</template>
+
+<script>
+export default {
+	name: "Warehouse"
+}
+</script>
+
+<style scoped>
+
+</style>

src/layout/components/NavMenu.vue

@@ -3,9 +3,9 @@
 		<el-alert title="无子集菜单" center type="info" :closable="false"></el-alert>
 	</div>
 	<template v-for="navMenu in navMenus" v-bind:key="navMenu">
-		<el-menu-item v-if="!hasChildren(navMenu)" :index="navMenu.path">
+		<el-menu-item :class="{'nav-top-menu':['warehouse','bom','advanced'].indexOf(navMenu.name)!=-1}" v-if="!hasChildren(navMenu)" :index="navMenu.path">
 			<a v-if="navMenu.meta && navMenu.meta.type=='link'" :href="navMenu.path" target="_blank" @click.stop='()=>{}'></a>
-<!--			<el-icon v-if="navMenu.meta & &navMenu.meta.icon"><component :is="navMenu.meta.icon || 'el-icon-menu'"/></el-icon>-->
+			<el-icon v-if="navMenu.meta && navMenu.meta.icon && ['warehouse','bom','advanced'].indexOf(navMenu.name)!=-1" ><component :is="navMenu.meta.icon || 'el-icon-menu'"/></el-icon>
 			<template #title>
 				<span>{{navMenu.meta.title}}</span>
 				<span v-if="navMenu.meta.tag" class="menu-tag">{{navMenu.meta.tag>99?'99+':navMenu.meta.tag}}</span>

src/style/fix.scss

@@ -91,6 +91,7 @@
 }
 
 .el-menu {border: none!important;}
+.el-menu ::v-deep .nav-top-menu{margin-right: 0 !important;}
 .el-menu .el-menu-item.is-active{background: var(--el-menu-hover-bg-color);position: relative;}
 .el-menu .el-menu-item.is-active:after{content: "";position: absolute;top: 0;right: 0;height: 100%;width: 4px;background: var(--el-color-primary);}
 .el-menu .el-menu-item a {color: inherit;text-decoration: none;display: block;width:100%;height:100%;position: absolute;top:0;left:0;}
@@ -158,6 +159,7 @@
 .el-checkbox-button__inner {font-size: 12px;}
 .el-checkbox .el-checkbox__label{font-weight: 400;font-size: 12px;}
 .el-sub-menu .el-icon {font-size: 16px;color: #aaa;display: flex;align-items: center;justify-content: flex-start;margin-right: 0;}
+.nav-top-menu .el-icon {font-size: 16px;color: #aaa;display: flex;align-items: center;justify-content: flex-start;margin-right: 0;}
 .el-sub-menu.is-active .el-sub-menu__title{color: var(--el-color-primary)}
 .el-sub-menu.is-active .el-sub-menu__title .el-icon{color: var(--el-color-primary)}
 .el-sub-menu .el-sub-menu__icon-arrow {font-size: 12px;}