1.8 version

This commit is contained in:
zhengjie
2019-05-14 09:09:20 +08:00
parent bd385f642f
commit 2d9864f603
18 changed files with 223 additions and 248 deletions

View File

@@ -50,7 +50,7 @@ export default {
},
methods: {
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
this.$store.dispatch('closeSideBar', { withoutAnimation: false })
}
}
}

View File

@@ -5,9 +5,6 @@
<div class="right-menu">
<template v-if="device!=='mobile'">
<el-tooltip content="更新公告" effect="dark" placement="bottom">
<Placard class="screenfull right-menu-item"/>
</el-tooltip>
<el-tooltip content="全屏" effect="dark" placement="bottom">
<screenfull class="screenfull right-menu-item"/>
</el-tooltip>
@@ -47,13 +44,11 @@ import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import Placard from '@/components/placard'
export default {
components: {
Breadcrumb,
Hamburger,
Placard,
Screenfull
},
computed: {

View File

@@ -17,6 +17,11 @@
<el-switch v-model="sidebarLogo" class="drawer-switch" />
</div>
<div class="drawer-item">
<span>显示 SettingBtn</span>
<el-switch v-model="settingBtn" class="drawer-switch" />
</div>
</div>
</div>
</template>
@@ -59,6 +64,17 @@ export default {
value: val
})
}
},
settingBtn: {
get() {
return this.$store.state.settings.settingBtn
},
set(val) {
this.$store.dispatch('changeSetting', {
key: 'settingBtn',
value: val
})
}
}
}
}

View File

@@ -27,7 +27,7 @@
<script>
import ScrollPane from '@/components/ScrollPane'
import path from 'path'
import { constantRouterMap } from '@/router'
import { constantRouterMap } from '@/router/routers'
export default {
components: { ScrollPane },
data() {

View File

@@ -32,8 +32,8 @@ export default {
data() {
return {
loginForm: {
username: '',
password: '',
username: 'admin',
password: '123456',
rememberMe: false
},
loginRules: {

View File

@@ -137,5 +137,4 @@ export default {
</script>
<style scoped>
</style>