Merge branch 'develop' into 'test'

public/index.html

@@ -5,9 +5,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vuex@3.1.0/dist/vuex.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue-router@3.0.1/dist/vue-router.js"></script>
+    <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
+    <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
+    <script src="https://unpkg.com/vue-router@3.0.1/dist/vue-router.js"></script>
     <script src="<%= VUE_APP_LIB_MANAGER %><%= VUE_APP_LIB_BASE_URL %>lib/manageShell.umd.min.js"></script>
     <script src="<%= VUE_APP_LIB_MANAGER %>/customerManage/lib/customerManage.umd.min.js"></script>
     <script src="<%= VUE_APP_LIB_MANAGER %>/baseManage/lib/baseManage.umd.min.js"></script>

src/containers/Dashboard/CustomerConsumption/chart.vue

@@ -29,7 +29,7 @@ export default {
         container: 'CustomerConsumptionChart',
         forceFit: true,
         height: this.height,
-        padding: [50, 50, 50, 100],
+        padding: [50, 60, 50, 100],
       });
       this.chart.source(this.data);
       this.chart

src/containers/Dashboard/CustomerRecharge/chart.vue

@@ -127,7 +127,7 @@ export default {
         container: 'CustomerRechargeChart',
         forceFit: true,
         height: this.height,
-        padding: [50, 50, 20, 120],
+        padding: [30, 50, 20, 120],
       });
 
       this.chart.source(dv, {
@@ -138,6 +138,10 @@ export default {
           alias: '充值人数',
         },
       });
+      // this.chart.tooltip({
+      //   offset: 250,
+      // });
+
       this.chart.axis('areaName', {
         label: {
           offsetX: -80,
@@ -273,8 +277,10 @@ export default {
     transform: translate(100%, -100%);
   }
   .CustomerRechargeChart-areaTitle {
+    color: #666;
     width: 85px;
-    height: 2em;
+    height: 2.4em;
+    line-height: 1.2;
     overflow: hidden;
     display: -webkit-box;
     -webkit-box-orient: vertical;

src/containers/Dashboard/Dashboard.js

@@ -168,8 +168,8 @@ const mutations = {
       : [];
     let campusList = data.list ? data.list : [];
     if (campusList.length > 10) {
-      let arrStart = campusList.slice(0, 10);
-      let arrEnd = campusList.slice(10).reduce(
+      let arrStart = campusList.slice(0, 9);
+      let arrEnd = campusList.slice(9).reduce(
         (item, curentVal) => ({
           ...item,
           count: item.count + curentVal.count,

src/containers/Dashboard/Dashboard.vue

@@ -83,7 +83,7 @@ export default {
   }
   .Dashboard-SearchBar {
     display: flex;
-    padding: 20px 0 50px;
+    padding: 10px 0 20px;
     .el-input,
     .el-input__inner,
     .filter-item {
@@ -98,6 +98,7 @@ export default {
       min-width: 40px;
     }
     .Dashboard-Radio {
+      margin-left: 10px;
       display: flex;
       align-items: center;
       justify-self: flex-end;
@@ -135,13 +136,13 @@ export default {
     }
     .Dashboard-title {
       position: relative;
-      padding: 20px 0 0;
+      padding: 20px 0 12px;
       margin: 0 20px;
     }
     .Dashboard-title::before {
       content: '';
       position: absolute;
-      bottom: -12px;
+      bottom: 0;
       left: 0;
       width: 32px;
       height: 4px;

src/containers/layout/IconMenu/IconMenu.vue

@@ -229,7 +229,7 @@ export default {
       }
     }
     .fastLink.marleft {
-      margin-left: 133px;
+      margin-left: 70px;
     }
     .DashboardButton {
       height: 80px;

src/dev-local/develop.html

@@ -5,8 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vuex@3.1.0/dist/vuex.js"></script>
+    <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
+    <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/vue-router@3.0.1/dist/vue-router.js"></script>
     <title>系统管理</title>
   </head>