merge

src/components/Breadcrumb/index.vue

@@ -2,8 +2,9 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <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>
       </el-breadcrumb-item>
     </transition-group>

src/components/ErrorLog/index.vue

@@ -6,7 +6,11 @@
       </el-button>
     </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-column label="Message">
           <template slot-scope="{row}">
@@ -54,6 +58,12 @@ export default {
     errorLogs() {
       return this.$store.getters.errorLogs
     }
+  },
+  methods: {
+    clearAll() {
+      this.dialogTableVisible = false
+      this.$store.dispatch('errorLog/clearErrorLog')
+    }
   }
 }
 </script>

src/layout/components/AppMain.vue

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

src/layout/components/Settings/index.vue

@@ -22,6 +22,13 @@
         <span>{{ $t('settings.sidebarLogo') }}</span>
         <el-switch v-model="sidebarLogo" class="drawer-switch" />
       </div>
+      <a v-if="isShowJob" href="https://panjiachen.github.io/vue-element-admin-site/zh/job/" target="_blank" class="job-link">
+        <el-alert
+          title="部门目前非常缺人！有兴趣的可以点击了解详情。坐标: 字节跳动"
+          type="success"
+          :closable="false"
+        />
+      </a>
 
     </div>
   </div>
@@ -36,6 +43,9 @@ export default {
     return {}
   },
   computed: {
+    isShowJob() {
+      return this.$store.getters.language === 'zh'
+    },
     fixedHeader: {
       get() {
         return this.$store.state.settings.fixedHeader
@@ -104,5 +114,13 @@ export default {
   .drawer-switch {
     float: right
   }
+
+  .job-link{
+    display: block;
+    position: absolute;
+    width: 100%;
+    left: 0;
+    bottom: 0;
+  }
 }
 </style>

src/store/modules/errorLog.js

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

src/views/dashboard/admin/components/PanelGroup.vue

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

src/views/dashboard/admin/components/PieChart.vue

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

src/views/dashboard/admin/index.vue

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

src/views/documentation/index.vue

@@ -1,8 +1,20 @@
 <template>
   <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="系列文章" />
     <a
       class="document-btn"
@@ -11,6 +23,7 @@
     >内推招聘</a>
   </div>
 </template>
+
 <script>
 import DropdownMenu from '@/components/Share/DropdownMenu'