Merge branch 'dev' into dev_zyh

src/components/FliterTags/src/FilterTags.vue

@@ -109,7 +109,7 @@ const checkedBox = (i: any, name: any, checked: any) => {
   font-size: var(--font-size-2);
   margin-left: 6px;
   border-radius: 6px;
-  padding: 3px;
+  padding: 3px 4px;
   text-align: center;
 }
 .v-tag__all {

src/components/ScoringGrade/src/ScoringGrade.vue

@@ -394,6 +394,9 @@ const mouseout = (item: any) => {
   box-shadow: none;
   filter: drop-shadow(-2px 2px 12px rgba(0, 0, 0, 0.15));
   right: 0 !important;
+  height: 0;
+  background: transparent;
+  border: none;
 }
 .el-dialog.scoreDialog {
   position: absolute;

src/views/Dashboard/src/DashboardView.vue

@@ -784,7 +784,7 @@ const ClickParams = (val: any) => {
             v-else-if="
               item.title === 'Recent Status' && item.switchValue && RecentStatusList.length != 0
             "
-            class="KPI_Pending"
+            style="display: flex; width: 100%; margin-bottom: 8px"
           >
             <!-- Recent Status -->
             <VBox_Dashboard @changeCancel="changeCancel(item.id)" style="width: 100%">
@@ -910,8 +910,7 @@ const ClickParams = (val: any) => {
           <!-- Top10 Origin/Top 10 Destination -->
           <div
             v-else-if="item.title === 'Top 10 Origin/Destination' && item.switchValue"
-            class="KPI_Pending"
-            style="margin-bottom: 8px"
+            style="display: flex; width: 100%; margin-bottom: 8px"
           >
             <VBox_Dashboard @changeCancel="changeCancel(item.id)" style="width: 100%">
               <template #header>
@@ -1177,13 +1176,14 @@ const ClickParams = (val: any) => {
 .KPI_Pending {
   display: flex;
   width: 100%;
+  margin-bottom: 8px;
 }
 .filters_left {
   border-radius: var(--border-radius-6);
   margin-bottom: 8px;
   flex: 1 48%;
 }
-.filters_left:nth-child(odd) {
+:nth-of-type(odd).filters_left {
   margin-right: 8px;
 }
 .KPI_title {

src/views/Dashboard/src/components/BarChart.vue

@@ -97,6 +97,7 @@ const initOption = reactive({
     formatter: function (params: any) {
       let str: any = ''
       let allnum: any = 0
+      str += '<div style= ' + 'color:#FFF;font-family: Lato-Light>' + params[0].name + '</div>'
       params.forEach((item: any) => {
         allnum += item.value
         str +=

src/views/Dashboard/src/components/PieChart.vue

@@ -66,11 +66,15 @@ const initOption: any = reactive({
     trigger: 'item', // 触发类型，轴触发，axis为鼠标移到坐标轴显示
     backgroundColor: '#2b2f36',
     borderColor: '#2b2f36',
+    padding: 8,
+    borderRadius: 12,
     formatter: function (params: any) {
       var str =
+        '<div style= ' +
+        'color:#FFF;font-weight:700;font-size:14px;font-family:>' +
         params.name +
         '<div style= ' +
-        'color:#FFF>' +
+        'color:#FFF;font-size:12px>' +
         params.marker +
         params.percent +
         '% (' +
@@ -82,7 +86,7 @@ const initOption: any = reactive({
       color: '#FFF',
       fontWeight: 700,
       fontFamily: 'Lato-Light',
-      fontSize: '14px'
+      fontSize: '12px'
     }
   },
   toolbox: {