Merge branch 'test' into 'master'

src/components/input/AreaDashboard/AreaSelect.vue

 <template>
   <el-select
+    :class="{'no-show-last':selectedAll}"
     popper-class="dashboard-area-popper"
     :clearable="clearable"
     :disabled="disabled"
@@ -142,4 +143,13 @@ export default {
     line-height: inherit;
   }
 }
+.el-select.no-show-last {
+  .el-select__tags {
+    .el-tag.el-tag--info {
+      &:last-child {
+        display: none;
+      }
+    }
+  }
+}
 </style>

src/containers/Dashboard/SeviceRatio/SeviceRatioChart.vue

@@ -33,7 +33,7 @@ export default {
         container: 'SeviceRatio',
         forceFit: true,
         height: this.height - 30,
-        padding: [0, 220, 0, 0],
+        padding: [0, 240, 0, 0],
       });
       this.chart.source(this.data);
       this.chart.coord('theta', {
@@ -74,8 +74,8 @@ export default {
             `;
         },
         'g2-legend': {
-          width: '215px',
-          'max-width': '215px',
+          width: '235px',
+          'max-width': '235px',
           'max-height': this.height - 30 + 'px',
           // left: '-20px',
         },

src/mixins/admins/admins.js

@@ -6,9 +6,7 @@ export default {
     store.install(this.$store);
   },
   mounted() {
-    if (!this.AdminList.length) {
     this.fetchAdminList();
-    }
   },
   computed: {
     ...mapGetters('admins', ['AdminList']),

src/utils/errorHandler.js

+export default (err, vm, info) => {
+  console.table([err, { info: info }]);
+  return false;
+};

src/utils/extends.js

@@ -10,6 +10,8 @@ import {
 import rymUi from 'rym-element-ui';
 import 'rym-element-ui/lib/rymUi.css';
 
+import errorHandler from './errorHandler';
+
 import HeaderImg from '../components/HeaderImg/HeaderImg.vue';
 import UserWithContent from '../components/UserCard/UserWithContent.vue';
 import UserCard from '../components/UserCard/UserCard.vue';
@@ -35,6 +37,8 @@ const extendVue = Vue => {
   Vue.prototype.$formatterMoneyToDouble = formatterMoneyToDouble;
   Vue.prototype.$formatPrice = formatPrice;
 
+  Vue.config.errorHandler = errorHandler;
+
   Vue.component('UserCard', UserCard);
   Vue.component('UserInfo', UserInfo);
   Vue.component(UserWithContent.name, UserWithContent);