1

src/components/work/bonus.vue

@@ -35,8 +35,8 @@
           </div>
         </div>
         <div class="row items-center q-my-lg">
-          <div class="col flex q-pl-lg">
-            <img src="../../assets/images/newindex/bonus.png" alt="">
+          <div class="col no-wrap flex q-pl-lg">
+            <img src="../../assets/images/newindex/bonus.png" alt="" style="width:62px;height:62px;">
             <div class="flex content-between q-pl-lg">
               <div class="full-width block-name">{{tab==1?"月":"年"}}度总奖金</div>
               <div class="block-num flex items-baseline"><span class="block-icon">¥</span>
@@ -44,7 +44,7 @@
             </div>
           </div>
           <div class="q-pr-md">
-            <VueApexCharts width="105" height="105" :options="chartOptions4" :series="series4"></VueApexCharts>
+            <VueApexCharts width="80%" height="105" :options="chartOptions4" :series="series4"></VueApexCharts>
           </div>
         </div>
         <template v-if="tab==1">
@@ -172,6 +172,10 @@
             fixed: {
               enabled: false
             }
+          },
+          legend: {
+            position: 'right',
+            show: true,
           }
         },
         //查询参数
@@ -255,6 +259,7 @@
       }
     }
   };
+
 </script>
 <style lang="scss" scoped>
   .bonus {
@@ -374,6 +379,7 @@
         font-size: 14px;
         font-weight: 500;
         color: #999999;
+        white-space:nowrap;
       }
     }
   }
@@ -394,4 +400,5 @@
     color: #2961FE !important;
     font-size: 12px;
   }
-</style>
+
\ No newline at end of file
+</style>

src/components/work/commission.vue

@@ -282,9 +282,7 @@
       getData() {
         GetSellStatistics(this.msg).then(res => {
           this.commissionData = res.Data
-
           this.series4 = [res.Data.NewSaleMoney, res.Data.RenewSaleMoney]
-          console.log(321, this.series4)
         })
       },
       getList() {

src/utils/formatPrice.js

@@ -13,12 +13,14 @@ export const formatPrice = (price, type = 1) => {
 }
 
 export const formatInt = (price) => {
-    if (price < 9999) {
+    if (price < 10000) {
         return parseInt(price)
-    } else {
+    } else if (price >= 10000){
         const s = parseInt(price).toString().slice(0, -4);
         const e = parseInt(price).toString().slice(-4, -3)
         return s + '.' + e
+    } else {
+        return 0
     }
 }
 export const formatDecimal = (price=0) => {