aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-02-20 18:10:28 +08:00
parent f2d1b675b1
commit 631fecf446
18 changed files with 97 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/assets/styles/custom.scss
View File

@ -173,7 +173,7 @@
/** 表格更多操作下拉样式 */ /** 表格更多操作下拉样式 */
.el-table .el-dropdown-link { .el-table .el-dropdown-link {
cursor: pointer; cursor: pointer;
color: #0028ff; color: #B12D29;
// 5373ff // 5373ff
margin-left: 5px; margin-left: 5px;
} }
@ -365,9 +365,10 @@
} }
.main-container{ .main-container{
margin-top: 6px; // margin-top: 6px;
margin-top: 0px;
// margin-right: 6px; // margin-right: 6px;
padding: 6px; // padding: 6px;
// border: 1px dashed #e0e0e0; // border: 1px dashed #e0e0e0;
} }

2
src/assets/styles/element-variables.scss
View File

@ -5,7 +5,7 @@
/* theme color */ /* theme color */
// $--color-primary: #1890ff; // $--color-primary: #1890ff;
$--color-primary: #0028ff; $--color-primary: #B12D29;
$--color-success: #13ce66; $--color-success: #13ce66;
$--color-warning: #ffba00; $--color-warning: #ffba00;
$--color-danger: #ff4949; $--color-danger: #ff4949;

4
src/assets/styles/header-top.scss
View File

@ -4,8 +4,8 @@
position: relative; position: relative;
height: 50px; height: 50px;
// box-shadow: 0 1px 0px 0 rgb(0 0 0 / 5%); // box-shadow: 0 1px 0px 0 rgb(0 0 0 / 5%);
box-shadow: 0px 2px 2px 0 rgb(2 2 2 / 5%); // box-shadow: 0px 2px 2px 0 rgb(2 2 2 / 5%);
background: #ffffff; // background: #ffffff;
// background: linear-gradient(90deg,#1d42ab,#2173dc,#1e93ff); // background: linear-gradient(90deg,#1d42ab,#2173dc,#1e93ff);
// border-bottom: 1px solid #c1c1c1; // border-bottom: 1px solid #c1c1c1;
} }

5
src/assets/styles/index.scss
View File

@ -15,7 +15,8 @@ body {
// font-family: Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif; // font-family: Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;
// font-family: PingFang SC,Hiragino Sans GB,Arial,Microsoft YaHei,Verdana,Roboto,Noto,Helvetica Neue,sans-serif!important; // font-family: PingFang SC,Hiragino Sans GB,Arial,Microsoft YaHei,Verdana,Roboto,Noto,Helvetica Neue,sans-serif!important;
// font-family: Microsoft YaHei,PingFang SC,Hiragino Sans GB,Arial,Verdana,Roboto,Noto,Helvetica Neue,sans-serif!important; // font-family: Microsoft YaHei,PingFang SC,Hiragino Sans GB,Arial,Verdana,Roboto,Noto,Helvetica Neue,sans-serif!important;
background-color: #eff0f4; // background-color: #eff0f4;
background-color: #F6F6F6;
// background-color: #f7f7f7; // background-color: #f7f7f7;
// background-color: #e9e8f1; // background-color: #e9e8f1;
color:#000000 color:#000000
@ -182,7 +183,7 @@ aside {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #0028ff; color: #B12D29;
} }
} }

22
src/assets/styles/sidebar.scss
View File

@ -20,14 +20,16 @@
background-color:#fff!important; background-color:#fff!important;
// background-color: #ffffff3b !important; // background-color: #ffffff3b !important;
// background-color:transparent !important; // background-color:transparent !important;
margin-top: 12px; // margin-top: 12px;
margin-left: 8px; margin-top: 0px;
// height: 100%; margin-left: 0px;
height: 100%;
float: left; float: left;
font-weight: 400; font-weight: 400;
z-index: 1001; z-index: 1001;
// overflow: hidden; // overflow: hidden;
border-radius: 3px; border-radius: 3px;
border-radius: 0px;
font-family: Helvetica Neue, Helvetica, PingFang SC,Microsoft YaHei, Hiragino Sans GB, Arial, sans-serif; font-family: Helvetica Neue, Helvetica, PingFang SC,Microsoft YaHei, Hiragino Sans GB, Arial, sans-serif;
@ -125,14 +127,14 @@
background: #f0faff96!important; background: #f0faff96!important;
font-weight: 600; font-weight: 600;
// border-left: 2px solid #1890ff!important; // border-left: 2px solid #1890ff!important;
border-left: 2px solid #0027ff!important; border-left: 2px solid #B12D29!important;
// color: #1890ff!important; // color: #1890ff!important;
color: black ; color: black ;
} }
&.is-active { &.is-active {
// color: #000!important; // color: #000!important;
color: #0027ff!important; color: #B12D29!important;
font-weight: 600; font-weight: 600;
// background: #fff!important; // background: #fff!important;
background: transparent!important; background: transparent!important;
@ -142,7 +144,7 @@
.el-menu-item.is-active { .el-menu-item.is-active {
// color: #000!important; // color: #000!important;
color: #0027ff!important; color: #B12D29!important;
font-weight: 600; font-weight: 600;
// background: #fff!important; // background: #fff!important;
background: transparent!important; background: transparent!important;
@ -200,10 +202,10 @@
background: #e8f4ff; background: #e8f4ff;
border: 1px solid #a3d3ff1c; border: 1px solid #a3d3ff1c;
.svg-icon { .svg-icon {
color:#0028ff!important; color:#B12D29!important;
} }
.name { .name {
color:#0028ff!important; color:#B12D29!important;
} }
} }
@ -273,10 +275,10 @@
background: #e8f4ff; background: #e8f4ff;
border: 1px solid #a3d3ff1c; border: 1px solid #a3d3ff1c;
.svg-icon { .svg-icon {
color:#0027ff!important; color:#B12D29!important;
} }
.name { .name {
color:#0027ff!important; color:#B12D29!important;
} }
} }

4
src/assets/styles/variables.scss
View File

@ -23,7 +23,7 @@ $panGreen: #30B08F;
// 自定义erp风格 // 自定义erp风格
$base-menu-color:#161616; $base-menu-color:#161616;
$base-menu-color-active:#0028ff; $base-menu-color-active:#B12D29;
$base-menu-background:transparent; $base-menu-background:transparent;
$base-logo-title-color: #ffffff; $base-logo-title-color: #ffffff;
@ -32,7 +32,7 @@ $base-menu-light-background:#ffffff;
$base-logo-light-title-color: #001529; $base-logo-light-title-color: #001529;
$base-sub-menu-background:inherit; $base-sub-menu-background:inherit;
$base-sub-menu-hover:#1890FF; $base-sub-menu-hover:#B12D29;
// 自定义暗色菜单风格 // 自定义暗色菜单风格
/** /**

2
src/components/CardWithHeader/index.vue
View File

@ -55,7 +55,7 @@ export default {
width: 3px; width: 3px;
height: 14px; height: 14px;
content: ''; content: '';
background: #0028ff; background: #B12D29;
// background: #409EFF; // background: #409EFF;
border-radius: 2px; border-radius: 2px;
} }

43
src/components/HeaderSearch/index.vue
View File

@ -1,20 +1,30 @@
<template> <template>
<div :class="{'show':show}" class="header-search"> <el-popover
<svg-icon class-name="search-icon" icon-class="search" @click.stop="click" /> :width="330"
<el-select trigger="click"
ref="headerSearchSelect" transition="el-zoom-in-top"
v-model="search" popper-class="ele-notice-pop">
:remote-method="querySearch" <div slot="reference" >
filterable <div>
default-first-option <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
remote </div>
placeholder="Search" </div>
class="header-search-select" <div :class="{'show':show}" class="header-search">
@change="change" <el-select
> ref="headerSearchSelect"
<el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" /> v-model="search"
</el-select> :remote-method="querySearch"
</div> filterable
default-first-option
remote
placeholder="Search"
class="header-search-select"
@change="change"
>
<el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
</el-select>
</div>
</el-popover>
</template> </template>
<script> <script>
@ -27,6 +37,7 @@ export default {
name: 'HeaderSearch', name: 'HeaderSearch',
data() { data() {
return { return {
visible: false,
search: '', search: '',
options: [], options: [],
searchPool: [], searchPool: [],

2
src/components/SlideVerify/index.vue
View File

@ -347,7 +347,7 @@ export default {
color: #fff; color: #fff;
text-align: center; text-align: center;
line-height: 30px; line-height: 30px;
background-color: #1890ff; background-color: #B12D29;
opacity: 0; opacity: 0;
} }
.slide-verify-info.fail { .slide-verify-info.fail {

7
src/layout/components/Navbar.vue
View File

@ -7,8 +7,6 @@
<!-- <top-nav id="topmenu-container" class="topmenu-container" /> --> <!-- <top-nav id="topmenu-container" class="topmenu-container" /> -->
<div style="line-height: 46px;cursor: pointer;height: 100%;float: left; position: relative;"> <div style="line-height: 46px;cursor: pointer;height: 100%;float: left; position: relative;">
<template v-if="device!=='mobile'"> <template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> --> <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
<!-- <el-tooltip content="布局大小" effect="dark" placement="bottom"> <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
@ -23,6 +21,11 @@
<div class="right-menu"> <div class="right-menu">
<!-- 搜索 -->
<div class="right-menu-item hover-effect" style="padding: 0 20px;">
<search id="header-search"/>
</div>
<!-- 消息通知 --> <!-- 消息通知 -->
<div class="right-menu-item hover-effect" style="padding: 0 20px;"> <div class="right-menu-item hover-effect" style="padding: 0 20px;">
<top-notice/> <top-notice/>

2
src/layout/components/Settings/index.vue
View File

@ -223,7 +223,7 @@ export default {
height: 100%; height: 100%;
padding-top: 15px; padding-top: 15px;
padding-left: 24px; padding-left: 24px;
color: #1890ff; color: #B12D29;
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
} }

18
src/layout/components/Sidebar/Logo.vue
View File

@ -2,19 +2,21 @@
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"> <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> -->
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<div style="background: #fff url('../../assets/logo/left_logo_bg.png') no-repeat;background-size: cover;">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1> <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</div>
</router-link> </router-link>
</transition> </transition>
</div> </div>
</template> </template>
<script> <script>
import logoImg from '@/assets/logo/logo2.png' import logoImg from '@/assets/logo/left_logo.png'
import variables from '@/assets/styles/variables.scss' import variables from '@/assets/styles/variables.scss'
export default { export default {
@ -55,8 +57,8 @@ export default {
.sidebar-logo-container { .sidebar-logo-container {
position: relative; position: relative;
width: 100%; width: 100%;
height: 50px; // height: 50px;
line-height: 50px; // line-height: 50px;
background: #2b2f3a; background: #2b2f3a;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;
@ -66,8 +68,10 @@ export default {
width: 100%; width: 100%;
& .sidebar-logo { & .sidebar-logo {
width: 60px; // width: 60px;
height: 60px; // height: 60px;
margin-top: 20px;
height: 80px;
vertical-align: middle; vertical-align: middle;
margin-right: 12px; margin-right: 12px;
} }

7
src/layout/components/Sidebar/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"> <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
<!-- <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper"> --> <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<div > <div >
<logo :collapse="isCollapse" />
<biz-nav id="bizNav" v-if="this.sidebar.opened" style="padding: 0px 0px;width:100%"/> <biz-nav id="bizNav" v-if="this.sidebar.opened" style="padding: 0px 0px;width:100%"/>
<el-menu <el-menu
:default-active="activeMenu" :default-active="activeMenu"
@ -25,7 +26,7 @@
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
</div> </div>
</div> </div>
<!-- </el-scrollbar> --> </el-scrollbar>
</div> </div>
</template> </template>

3
src/layout/components/TagsView/index.vue
View File

@ -282,7 +282,8 @@ export default {
.tags-view-inner{ .tags-view-inner{
background: #fff; // background: #fff;
background: transparent;
// border-bottom: 1px solid #d8dce5; // border-bottom: 1px solid #d8dce5;
// box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); // box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
} }

9
src/layout/components/TopHeader/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<div class="top-header-logo" style="text-align: left;" v-if="this.sidebar.opened"> <!-- <div class="top-header-logo" style="text-align: left;" v-if="this.sidebar.opened">
<div> <div>
<img style="height: 50px;margin-left: 2px;padding: 6px 0px;" :src="zoneConfig.logoInner"> <img style="height: 50px;margin-left: 2px;padding: 6px 0px;" :src="zoneConfig.logoInner">
</div> </div>
@ -9,7 +9,7 @@
<div> <div>
<img style="height: 50px;margin-left: 2px;padding: 6px 0px;" :src="zoneConfig.logoInner"> <img style="height: 50px;margin-left: 2px;padding: 6px 0px;" :src="zoneConfig.logoInner">
</div> </div>
</div> </div> -->
<div class="top-header-right" v-if="this.sidebar.opened"> <div class="top-header-right" v-if="this.sidebar.opened">
<navbar /> <navbar />
@ -61,11 +61,12 @@
} }
.top-header-right{ .top-header-right{
margin-left: 180px; // margin-left: 180px;
margin-left: 0px;
} }
.top-header-right-small{ .top-header-right-small{
margin-left: 100px!important; margin-left: 0px!important;
} }
</style> </style>

20
src/layout/components/TopTagsView/index.vue
View File

@ -279,10 +279,12 @@ export default {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
// border: 1px solid #d8dce5; // border: 1px solid #d8dce5;
color: #495060; color: black;
background: #fff; background:transparent;
// color: #495060;
// background: #fff;
padding: 0 8px; padding: 0 8px;
font-size: 14px; font-size: 12px;
margin-left: 5px; margin-left: 5px;
margin-top: 4px; margin-top: 4px;
border-radius: 3px 3px 0px 0px; border-radius: 3px 3px 0px 0px;
@ -293,10 +295,10 @@ export default {
margin-right: 15px; margin-right: 15px;
} }
&.active { &.active {
// background-color: #42b983; background-color: transparent;
// color: #fff; color: #B12D29;
color: #161616; // color: ;
font-size: 14px; font-size: 12px;
font-weight: bold; font-weight: bold;
// border-color: #42b983; // border-color: #42b983;
// &::before { // &::before {
@ -335,7 +337,9 @@ export default {
.tags-view-inner{ .tags-view-inner{
background: #fff; // background: #fff;
background: transparent;
// border-bottom: 1px solid #d8dce5; // border-bottom: 1px solid #d8dce5;
// box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); // box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
} }

3
src/layout/index.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<TopHeader class="erp-header"></TopHeader>
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/> <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container" /> <sidebar v-if="!sidebar.hide" class="sidebar-container" />
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container"> <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<TopHeader class="erp-header"></TopHeader>
<app-main /> <app-main />
<!-- <div class="signfooter"> <!-- <div class="signfooter">
<div class="auto clearfix"> <div class="auto clearfix">

2
src/views/demo/printDesigner/index.vue
View File

@ -261,7 +261,7 @@ export default {
.title { .title {
text-align: center; text-align: center;
font-size: 24px; font-size: 24px;
color: #1890ff; color: #B12D29;
margin: 20px; margin: 20px;
font-weight: bold; font-weight: bold;
} }