Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/ScoringGrade/src/ScoringGrade.vue

@@ -291,7 +291,7 @@ const mouseout = (item: any) => {
       custom-class="my-dialog"
       :close-on-click-modal="false"
     >
-      <div v-if="isshowDetails" style="margin-top: 16px">
+      <div v-if="isshowDetails">
         <DialogUe content="How satisfied are you with this system ?" dialogWidth="298px"></DialogUe>
         <DialogColorful
           :colorfulSrc="colorfulSrc"

src/styles/elementui.scss

@@ -213,7 +213,7 @@ footer.el-dialog__footer {
   border-top: 1px solid var(--color-border);
 }
 div.el-dialog__body {
-  padding: 0 16px;
+  padding: 16px;
 }
 
 // radio

src/views/Dashboard/src/DashboardView.vue

@@ -689,7 +689,7 @@ const ClickParams = (val: any) => {
     <!-- 图表 -->
     <div class="echarts">
       <VueDraggable
-        style="display: flex; flex-wrap: wrap; justify-content: space-between"
+        style="display: flex; flex-wrap: wrap; justify-content: space-between; gap: 8px"
         ref="infoContentRef"
         ghost-class="ghost-class"
         :forceFallback="true"
@@ -784,7 +784,7 @@ const ClickParams = (val: any) => {
             v-else-if="
               item.title === 'Recent Status' && item.switchValue && RecentStatusList.length != 0
             "
-            style="display: flex; width: 100%; margin-bottom: 8px"
+            class="KPI_Pending"
           >
             <!-- Recent Status -->
             <VBox_Dashboard @changeCancel="changeCancel(item.id)" style="width: 100%">
@@ -910,7 +910,7 @@ const ClickParams = (val: any) => {
           <!-- Top10 Origin/Top 10 Destination -->
           <div
             v-else-if="item.title === 'Top 10 Origin/Destination' && item.switchValue"
-            style="display: flex; width: 100%; margin-bottom: 8px"
+            class="KPI_Pending"
           >
             <VBox_Dashboard @changeCancel="changeCancel(item.id)" style="width: 100%">
               <template #header>
@@ -1176,16 +1176,11 @@ 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%;
 }
-:nth-of-type(odd).filters_left {
-  margin-right: 8px;
-}
 .KPI_title {
   border-bottom: 1px solid var(--color-border);
   height: 48px;

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

@@ -70,23 +70,16 @@ const initOption: any = reactive({
     borderRadius: 12,
     formatter: function (params: any) {
       var str =
-        '<div style= ' +
-        'color:#FFF;font-weight:700;font-size:14px;font-family:>' +
+        '<div style="color:#FFF;font-weight:700;font-size:14px">' +
         params.name +
-        '<div style= ' +
-        'color:#FFF;font-size:12px>' +
+        '</div>' +
+        '<div style="color:#FFF;font-weight:700;font-size:12px">' +
         params.marker +
         params.percent +
         '% (' +
         params.value +
         ')</div>'
       return str
-    },
-    textStyle: {
-      color: '#FFF',
-      fontWeight: 700,
-      fontFamily: 'Lato-Light',
-      fontSize: '12px'
     }
   },
   toolbox: {