Merge branch 'develop' into 'test'

.env

-VUE_APP_BASE_URL=/systemManageShell/
+VUE_APP_BASE_URL=/
 VUE_APP_LIB_BASE_URL=/systemManageShell/
 VUE_APP_CUSTOMER_MENU_CODE=0001
 VUE_APP_BASE_MENU_CODE=0002

public/index.html

@@ -9,7 +9,7 @@
   <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="/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>
   <script src="<%= VUE_APP_LIB_MANAGER %>/systemManage/lib/systemManage.umd.min.js"></script>
@@ -17,7 +17,7 @@
   <script src="<%= VUE_APP_LIB_MANAGER %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
   <script src="<%= VUE_APP_LIB_MANAGER %>/deviceManage/lib/deviceManage.umd.min.js"></script>
 
-  <link rel="stylesheet" href="<%= VUE_APP_LIB_MANAGER %><%= VUE_APP_LIB_BASE_URL %>lib/manageShell.css" />
+  <link rel="stylesheet" href="/lib/manageShell.css" />
   <title>多彩综合管理系统</title>
 </head>
 

src/containers/Dashboard/SeviceRatio/SeviceRatioChart.vue

@@ -67,7 +67,7 @@ export default {
                 class="g2-legend-marker"
                 style="display:inline-block;margin-right:10px;background-color:${color};"
               ></i>
-              <span class="g2-legend-text">${value}： </span>
+              <span class="g2-legend-text" title="${value}">${value}： </span>
               <span class="g2-legend-price">${price}</span>
             </li>
             `;
@@ -144,6 +144,14 @@ export default {
 <style lang="scss">
 @import '@/assets/styles/variables.scss';
 #SeviceRatio {
+  .g2-legend-text {
+    display: inline-block;
+    width: 46px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+  }
   .SeviceRatio-centerText {
     color: #333;
     font-size: 20px;