Skip to content

G
gavel-erp-vue
Commit 1193ac74 authored by 李苏's avatar 李苏 💬
Browse files
Options

ERP 定制图标 layout调整

parent 12237578
Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 272 deletions
public/favicon.png
View replaced file @ 12237578 View file @ 1193ac74
public/favicon.png

442 KB | W: | H:

public/favicon.png

177 KB | W: | H:

public/favicon.png
public/favicon.png
public/favicon.png
public/favicon.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/logo/logo.png
View replaced file @ 12237578 View file @ 1193ac74
src/assets/logo/logo.png

442 KB | W: | H:

src/assets/logo/logo.png

177 KB | W: | H:

src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
src/assets/logo/logo.png
  • 2-up
  • Swipe
  • Onion skin
src/layout/components/Navbar.vue
View file @ 1193ac74
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/user/profile"> <!--<router-link to="/user/profile">-->
<el-dropdown-item>个人中心</el-dropdown-item> <!--<el-dropdown-item>个人中心</el-dropdown-item>-->
</router-link> <!--</router-link>-->
<span @click="showItem"> <span @click="showItem">
<el-dropdown-item>修改密码</el-dropdown-item> <el-dropdown-item>修改密码</el-dropdown-item>
</span> </span>
......
src/layout/components/Sidebar/Logo.vue
View file @ 1193ac74
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
}, },
watch:{ watch:{
title(){ title(){
} }
}, },
......
src/layout/components/TagsView/index.vue
View file @ 1193ac74
<template> <template>
<div id="tags-view-container" class="tags-view-container"> <div id="tags-view-container" class="tags-view-container" style="position: relative;">
<scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll"> <!-- 过长切换-->
<router-link <div v-show="moveShow" class="moveLeft">
v-for="tag in visitedViews" <i @click="moveLeft" class="fa fa-chevron-circle-left" aria-hidden="true" /></i>
ref="tag" </div>
:key="tag.path" <div v-show="moveShow" class="moveRight">
:class="isActive(tag)?'active':''" <i @click="moveRight" class="fa fa-chevron-circle-right" aria-hidden="true" /></i>
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" </div>
tag="span" <scroll-pane id='scrollPane' ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
class="tags-view-item" <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag)?'active':''"
:style="activeStyle(tag)" :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''" :style="activeStyle(tag)" @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)" @contextmenu.prevent.native="openMenu(tag,$event)">
>
{{ tag.title }} {{ tag.title }}
<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" /> <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
</router-link> </router-link>
...@@ -29,298 +28,382 @@ ...@@ -29,298 +28,382 @@
</template> </template>
<script> <script>
import ScrollPane from './ScrollPane' import ScrollPane from './ScrollPane'
import path from 'path' import path from 'path'
export default { export default {
components: { ScrollPane }, components: {
data() { ScrollPane
return {
visible: false,
top: 0,
left: 0,
selectedTag: {},
affixTags: []
}
},
computed: {
visitedViews() {
return this.$store.state.tagsView.visitedViews
},
routes() {
return this.$store.state.permission.routes
}, },
theme() { data() {
return this.$store.state.settings.theme;
}
},
watch: {
$route() {
this.addTags()
this.moveToCurrentTag()
},
visible(value) {
if (value) {
document.body.addEventListener('click', this.closeMenu)
} else {
document.body.removeEventListener('click', this.closeMenu)
}
}
},
mounted() {
this.initTags()
this.addTags()
},
methods: {
isActive(route) {
return route.path === this.$route.path
},
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return { return {
"background-color": this.theme, moveShow:false,
"border-color": this.theme visible: false,
}; top: 0,
}, left: 0,
isAffix(tag) { selectedTag: {},
return tag.meta && tag.meta.affix affixTags: []
},
isFirstView() {
try {
return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
} catch (err) {
return false
} }
}, },
isLastView() { computed: {
try { /* 宽度*/
return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath visitedViews() {
} catch (err) { return this.$store.state.tagsView.visitedViews
return false },
routes() {
return this.$store.state.permission.routes
},
theme() {
return this.$store.state.settings.theme;
} }
}, },
filterAffixTags(routes, basePath = '/') { watch: {
let tags = [] $route() {
routes.forEach(route => { this.addTags()
if (route.meta && route.meta.affix) { this.moveToCurrentTag()
const tagPath = path.resolve(basePath, route.path) },
tags.push({ visible(value) {
fullPath: tagPath, if (value) {
path: tagPath, document.body.addEventListener('click', this.closeMenu)
name: route.name, } else {
meta: { ...route.meta } document.body.removeEventListener('click', this.closeMenu)
})
}
if (route.children) {
const tempTags = this.filterAffixTags(route.children, route.path)
if (tempTags.length >= 1) {
tags = [...tags, ...tempTags]
}
}
})
return tags
},
initTags() {
const affixTags = this.affixTags = this.filterAffixTags(this.routes)
for (const tag of affixTags) {
// Must have tag name
if (tag.name) {
this.$store.dispatch('tagsView/addVisitedView', tag)
} }
} }
}, },
addTags() { mounted() {
const { name } = this.$route this.initTags()
if (name) { this.addTags()
this.$store.dispatch('tagsView/addView', this.$route) /* 监听*/
}
return false
}, },
moveToCurrentTag() { updated() {
const tags = this.$refs.tag let spans=$('#scrollPane').find('.el-scrollbar__view>span')
this.$nextTick(() => { let allWidth=$('.navbar').width()
for (const tag of tags) { let width=0
if (tag.to.path === this.$route.path) { spans.each((inex,item)=>{
this.$refs.scrollPane.moveToTarget(tag) width=width+$(item).width()+5+16
// when query is different then update
if (tag.to.fullPath !== this.$route.fullPath) {
this.$store.dispatch('tagsView/updateVisitedView', this.$route)
}
break
}
}
}) })
if(width>allWidth){
this.moveShow=true
}else{
this.moveShow=false
}
}, },
refreshSelectedTag(view) { methods: {
this.$tab.refreshPage(view); moveLeft(){
}, const element =this.$refs.scrollPane.$el
closeSelectedTag(view) { const event = new WheelEvent('wheel', {
this.$tab.closePage(view).then(({ visitedViews }) => { deltaY: -200, // 设置滚动值
if (this.isActive(view)) { bubbles: true,
this.toLastView(visitedViews, view) cancelable: true
});
element.dispatchEvent(event);
},
moveRight(){
const element =this.$refs.scrollPane.$el
const event = new WheelEvent('wheel', {
deltaY: 200, // 设置滚动值
bubbles: true,
cancelable: true
});
element.dispatchEvent(event);
},
isActive(route) {
return route.path === this.$route.path
},
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return {
"background-color": this.theme,
"border-color": this.theme
};
},
isAffix(tag) {
return tag.meta && tag.meta.affix
},
isFirstView() {
try {
return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
} catch (err) {
return false
} }
}) },
}, isLastView() {
closeRightTags() { try {
this.$tab.closeRightPage(this.selectedTag).then(visitedViews => { return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) { } catch (err) {
this.toLastView(visitedViews) return false
} }
}) },
}, filterAffixTags(routes, basePath = '/') {
closeLeftTags() { let tags = []
this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => { routes.forEach(route => {
if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) { if (route.meta && route.meta.affix) {
this.toLastView(visitedViews) const tagPath = path.resolve(basePath, route.path)
tags.push({
fullPath: tagPath,
path: tagPath,
name: route.name,
meta: {
...route.meta
}
})
}
if (route.children) {
const tempTags = this.filterAffixTags(route.children, route.path)
if (tempTags.length >= 1) {
tags = [...tags, ...tempTags]
}
}
})
return tags
},
initTags() {
const affixTags = this.affixTags = this.filterAffixTags(this.routes)
for (const tag of affixTags) {
// Must have tag name
if (tag.name) {
this.$store.dispatch('tagsView/addVisitedView', tag)
}
} }
}) },
}, addTags() {
closeOthersTags() { const {
this.$router.push(this.selectedTag).catch(()=>{}); name
this.$tab.closeOtherPage(this.selectedTag).then(() => { } = this.$route
this.moveToCurrentTag() if (name) {
}) this.$store.dispatch('tagsView/addView', this.$route)
},
closeAllTags(view) {
this.$tab.closeAllPage().then(({ visitedViews }) => {
if (this.affixTags.some(tag => tag.path === this.$route.path)) {
return
} }
this.toLastView(visitedViews, view) return false
}) },
}, moveToCurrentTag() {
toLastView(visitedViews, view) { const tags = this.$refs.tag
const latestView = visitedViews.slice(-1)[0] this.$nextTick(() => {
if (latestView) { for (const tag of tags) {
this.$router.push(latestView.fullPath) if (tag.to.path === this.$route.path) {
} else { this.$refs.scrollPane.moveToTarget(tag)
// now the default is to redirect to the home page if there is no tags-view, // when query is different then update
// you can adjust it according to your needs. if (tag.to.fullPath !== this.$route.fullPath) {
if (view.name === 'Dashboard') { this.$store.dispatch('tagsView/updateVisitedView', this.$route)
// to reload home page }
this.$router.replace({ path: '/redirect' + view.fullPath }) break
}
}
})
},
refreshSelectedTag(view) {
this.$tab.refreshPage(view);
},
closeSelectedTag(view) {
this.$tab.closePage(view).then(({
visitedViews
}) => {
if (this.isActive(view)) {
this.toLastView(visitedViews, view)
}
})
},
closeRightTags() {
this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
this.toLastView(visitedViews)
}
})
},
closeLeftTags() {
this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
this.toLastView(visitedViews)
}
})
},
closeOthersTags() {
this.$router.push(this.selectedTag).catch(() => {});
this.$tab.closeOtherPage(this.selectedTag).then(() => {
this.moveToCurrentTag()
})
},
closeAllTags(view) {
this.$tab.closeAllPage().then(({
visitedViews
}) => {
if (this.affixTags.some(tag => tag.path === this.$route.path)) {
return
}
this.toLastView(visitedViews, view)
})
},
toLastView(visitedViews, view) {
const latestView = visitedViews.slice(-1)[0]
if (latestView) {
this.$router.push(latestView.fullPath)
} else { } else {
this.$router.push('/') // now the default is to redirect to the home page if there is no tags-view,
// you can adjust it according to your needs.
if (view.name === 'Dashboard') {
// to reload home page
this.$router.replace({
path: '/redirect' + view.fullPath
})
} else {
this.$router.push('/')
}
} }
} },
}, openMenu(tag, e) {
openMenu(tag, e) { const menuMinWidth = 105
const menuMinWidth = 105 const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
const offsetLeft = this.$el.getBoundingClientRect().left // container margin left const offsetWidth = this.$el.offsetWidth // container width
const offsetWidth = this.$el.offsetWidth // container width const maxLeft = offsetWidth - menuMinWidth // left boundary
const maxLeft = offsetWidth - menuMinWidth // left boundary const left = e.clientX - offsetLeft + 15 // 15: margin right
const left = e.clientX - offsetLeft + 15 // 15: margin right
if (left > maxLeft) { if (left > maxLeft) {
this.left = maxLeft this.left = maxLeft
} else { } else {
this.left = left this.left = left
} }
this.top = e.clientY this.top = e.clientY
this.visible = true this.visible = true
this.selectedTag = tag this.selectedTag = tag
}, },
closeMenu() { closeMenu() {
this.visible = false this.visible = false
}, },
handleScroll() { handleScroll() {
this.closeMenu() this.closeMenu()
}
} }
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.tags-view-container { .moveLeft{
height: 34px; display: none;
width: 100%; }
background: #fff; .moveRight{
border-bottom: 1px solid #d8dce5; display: none;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04); }
.tags-view-wrapper { .tags-view-container:hover{
.tags-view-item { .moveLeft {
display: inline-block; display: block;
position: relative; line-height: 34px;
color: #666;
position: absolute;
left: 0;
cursor: pointer; cursor: pointer;
height: 26px; z-index: 9999;
line-height: 26px; }
border: 1px solid #d8dce5; .moveRight {
color: #495060; display: block;
background: #fff; line-height: 34px;
padding: 0 8px; color: #666;
font-size: 12px; position: absolute;
margin-left: 5px; right: 0;
margin-top: 4px; cursor: pointer;
&:first-of-type { z-index: 9999;
margin-left: 15px;
}
&:last-of-type {
margin-right: 15px;
}
&.active {
background-color: #42b983;
color: #fff;
border-color: #42b983;
&::before {
content: '';
background: #fff;
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
position: relative;
margin-right: 2px;
}
}
} }
} }
.contextmenu {
margin: 0; .tags-view-container {
height: 34px;
width: 100%;
background: #fff; background: #fff;
z-index: 3000; border-bottom: 1px solid #d8dce5;
position: absolute; box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
list-style-type: none;
padding: 5px 0; .tags-view-wrapper {
border-radius: 4px; .tags-view-item {
font-size: 12px; display: inline-block;
font-weight: 400; position: relative;
color: #333; cursor: pointer;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); height: 26px;
li { line-height: 26px;
border: 1px solid #d8dce5;
color: #495060;
background: #fff;
padding: 0 8px;
font-size: 12px;
margin-left: 5px;
margin-top: 4px;
&:first-of-type {
margin-left: 15px;
}
&:last-of-type {
margin-right: 15px;
}
&.active {
background-color: #42b983;
color: #fff;
border-color: #42b983;
&::before {
content: '';
background: #fff;
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
position: relative;
margin-right: 2px;
}
}
}
}
.contextmenu {
margin: 0; margin: 0;
padding: 7px 16px; background: #fff;
cursor: pointer; z-index: 3000;
&:hover { position: absolute;
background: #eee; list-style-type: none;
padding: 5px 0;
border-radius: 4px;
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
&:hover {
background: #eee;
}
} }
} }
} }
}
</style> </style>
<style lang="scss"> <style lang="scss">
//reset element css of el-icon-close //reset element css of el-icon-close
.tags-view-wrapper { .tags-view-wrapper {
.tags-view-item { .tags-view-item {
.el-icon-close { .el-icon-close {
width: 16px; width: 16px;
height: 16px; height: 16px;
vertical-align: 2px; vertical-align: 2px;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
transition: all .3s cubic-bezier(.645, .045, .355, 1); transition: all .3s cubic-bezier(.645, .045, .355, 1);
transform-origin: 100% 50%; transform-origin: 100% 50%;
&:before {
transform: scale(.6); &:before {
display: inline-block; transform: scale(.6);
vertical-align: -3px; display: inline-block;
} vertical-align: -3px;
&:hover { }
background-color: #b4bccc;
color: #fff; &:hover {
background-color: #b4bccc;
color: #fff;
}
} }
} }
} }
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment