merge master

This commit is contained in:
花裤衩 2019-10-12 18:26:30 +08:00
commit fb2c852a0c
9 changed files with 82 additions and 13 deletions

View File

@ -2,8 +2,9 @@
<el-breadcrumb class="app-breadcrumb" separator="/"> <el-breadcrumb class="app-breadcrumb" separator="/">
<transition-group name="breadcrumb"> <transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path"> <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">
generateTitle(item.meta.title) }}</span> {{ generateTitle(item.meta.title) }}
</span>
<a v-else @click.prevent="handleLink(item)">{{ generateTitle(item.meta.title) }}</a> <a v-else @click.prevent="handleLink(item)">{{ generateTitle(item.meta.title) }}</a>
</el-breadcrumb-item> </el-breadcrumb-item>
</transition-group> </transition-group>

View File

@ -6,7 +6,11 @@
</el-button> </el-button>
</el-badge> </el-badge>
<el-dialog :visible.sync="dialogTableVisible" title="Error Log" width="80%" append-to-body> <el-dialog :visible.sync="dialogTableVisible" width="80%" append-to-body>
<div slot="title">
<span style="padding-right: 10px;">Error Log</span>
<el-button size="mini" type="primary" icon="el-icon-delete" @click="clearAll">Clear All</el-button>
</div>
<el-table :data="errorLogs" border> <el-table :data="errorLogs" border>
<el-table-column label="Message"> <el-table-column label="Message">
<template slot-scope="{row}"> <template slot-scope="{row}">
@ -54,6 +58,12 @@ export default {
errorLogs() { errorLogs() {
return this.$store.getters.errorLogs return this.$store.getters.errorLogs
} }
},
methods: {
clearAll() {
this.dialogTableVisible = false
this.$store.dispatch('errorLog/clearErrorLog')
}
} }
} }
</script> </script>

View File

@ -33,8 +33,6 @@ export default {
.fixed-header+.app-main { .fixed-header+.app-main {
padding-top: 50px; padding-top: 50px;
height: 100vh;
overflow: auto;
} }
.hasTagsView { .hasTagsView {

View File

@ -71,9 +71,9 @@ export const constantRoutes = [
hidden: true hidden: true
}, },
{ {
path: '', path: '/',
component: Layout, component: Layout,
redirect: 'dashboard', redirect: '/dashboard',
children: [ children: [
{ {
path: 'dashboard', path: 'dashboard',
@ -396,6 +396,7 @@ export const asyncRoutes = [
] ]
}, },
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true } { path: '*', redirect: '/404', hidden: true }
] ]

View File

@ -5,12 +5,18 @@ const state = {
const mutations = { const mutations = {
ADD_ERROR_LOG: (state, log) => { ADD_ERROR_LOG: (state, log) => {
state.logs.push(log) state.logs.push(log)
},
CLEAR_ERROR_LOG: (state) => {
state.logs.splice(0)
} }
} }
const actions = { const actions = {
addErrorLog({ commit }, log) { addErrorLog({ commit }, log) {
commit('ADD_ERROR_LOG', log) commit('ADD_ERROR_LOG', log)
},
clearErrorLog({ commit }) {
commit('CLEAR_ERROR_LOG')
} }
} }

View File

@ -73,9 +73,11 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.panel-group { .panel-group {
margin-top: 18px; margin-top: 18px;
.card-panel-col{
.card-panel-col {
margin-bottom: 32px; margin-bottom: 32px;
} }
.card-panel { .card-panel {
height: 108px; height: 108px;
cursor: pointer; cursor: pointer;
@ -86,35 +88,45 @@ export default {
background: #fff; background: #fff;
box-shadow: 4px 4px 40px rgba(0, 0, 0, .05); box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
border-color: rgba(0, 0, 0, .05); border-color: rgba(0, 0, 0, .05);
&:hover { &:hover {
.card-panel-icon-wrapper { .card-panel-icon-wrapper {
color: #fff; color: #fff;
} }
.icon-people { .icon-people {
background: #40c9c6; background: #40c9c6;
} }
.icon-message { .icon-message {
background: #36a3f7; background: #36a3f7;
} }
.icon-money { .icon-money {
background: #f4516c; background: #f4516c;
} }
.icon-shopping { .icon-shopping {
background: #34bfa3 background: #34bfa3
} }
} }
.icon-people { .icon-people {
color: #40c9c6; color: #40c9c6;
} }
.icon-message { .icon-message {
color: #36a3f7; color: #36a3f7;
} }
.icon-money { .icon-money {
color: #f4516c; color: #f4516c;
} }
.icon-shopping { .icon-shopping {
color: #34bfa3 color: #34bfa3
} }
.card-panel-icon-wrapper { .card-panel-icon-wrapper {
float: left; float: left;
margin: 14px 0 0 14px; margin: 14px 0 0 14px;
@ -122,25 +134,48 @@ export default {
transition: all 0.38s ease-out; transition: all 0.38s ease-out;
border-radius: 6px; border-radius: 6px;
} }
.card-panel-icon { .card-panel-icon {
float: left; float: left;
font-size: 48px; font-size: 48px;
} }
.card-panel-description { .card-panel-description {
float: right; float: right;
font-weight: bold; font-weight: bold;
margin: 26px; margin: 26px;
margin-left: 0px; margin-left: 0px;
.card-panel-text { .card-panel-text {
line-height: 18px; line-height: 18px;
color: rgba(0, 0, 0, 0.45); color: rgba(0, 0, 0, 0.45);
font-size: 16px; font-size: 16px;
margin-bottom: 12px; margin-bottom: 12px;
} }
.card-panel-num { .card-panel-num {
font-size: 20px; font-size: 20px;
} }
} }
} }
} }
@media (max-width:550px) {
.card-panel-description {
display: none;
}
.card-panel-icon-wrapper {
float: none !important;
width: 100%;
height: 100%;
margin: 0 !important;
.svg-icon {
display: block;
margin: 14px auto !important;
float: none !important;
}
}
}
</style> </style>

View File

@ -54,7 +54,6 @@ export default {
bottom: '10', bottom: '10',
data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts'] data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
}, },
calculable: true,
series: [ series: [
{ {
name: 'WEEKLY WRITE ARTICLES', name: 'WEEKLY WRITE ARTICLES',

View File

@ -115,4 +115,10 @@ export default {
margin-bottom: 32px; margin-bottom: 32px;
} }
} }
@media (max-width:1024px) {
.chart-wrapper {
padding: 8px;
}
}
</style> </style>

View File

@ -1,8 +1,20 @@
<template> <template>
<div class="app-container documentation-container"> <div class="app-container documentation-container">
<a class="document-btn" target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/">{{ $t('documentation.documentation') }}</a> <a
<a class="document-btn" target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/">{{ $t('documentation.github') }}</a> class="document-btn"
<a class="document-btn" target="_blank" href="https://panjiachen.gitee.io/vue-element-admin-site/zh/">国内文档</a> target="_blank"
href="https://panjiachen.github.io/vue-element-admin-site/"
>Documentation</a>
<a
class="document-btn"
target="_blank"
href="https://github.com/PanJiaChen/vue-element-admin/"
>Github Repository</a>
<a
class="document-btn"
target="_blank"
href="https://panjiachen.gitee.io/vue-element-admin-site/zh/"
>国内文档</a>
<dropdown-menu :items="articleList" style="float:left;margin-left:50px;" title="系列文章" /> <dropdown-menu :items="articleList" style="float:left;margin-left:50px;" title="系列文章" />
<a <a
class="document-btn" class="document-btn"
@ -11,6 +23,7 @@
>内推招聘</a> >内推招聘</a>
</div> </div>
</template> </template>
<script> <script>
import DropdownMenu from '@/components/Share/DropdownMenu' import DropdownMenu from '@/components/Share/DropdownMenu'