Merge branch 'dev_g' of United_Software/k_online_ui into dev

package.json

@@ -26,6 +26,7 @@
     "axios": "^1.7.5",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.13",
+    "decimal.js": "^10.4.3",
     "echarts": "^5.5.1",
     "element-plus": "^2.8.1",
     "exceljs": "^4.4.0",

src/views/Dashboard/src/DashboardView.vue

@@ -391,7 +391,11 @@ const RevenueObj = reactive({
   isShowTooltips: true
 })
 const RevenueLoading = ref(true)
+const revenue_date_start = ref()
+const revenue_date_end = ref()
 const GetRevenueEcharts = (val: any) => {
+  revenue_date_start.value = val.date_start
+  revenue_date_end.value = val.date_end
   dashboardObj.RevenueDefaultData = val
   $api
     .GetRevenueEcharts({
@@ -1187,8 +1191,8 @@ const ClickParams = (val: any) => {
                   :BarData="RevenueObj"
                   :isRevenue="false"
                   v-vloading="RevenueLoading"
-                  :RevenueStartDate="dashboardObj.RevenueDefaultData.date_start"
-                  :RevenueEndDate="dashboardObj.RevenueDefaultData.date_end"
+                  :RevenueStartDate="revenue_date_start"
+                  :RevenueEndDate="revenue_date_end"
                   style="height: 300px"
                   :barHeight="{ height: '300px' }"
                 ></BarChart>

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

@@ -181,6 +181,7 @@ const initOption = reactive({
       str += '<div style= ' + 'color:#FFF;font-family: Lato-Light>' + params[0].name + '</div>'
       params.forEach((item: any) => {
         allnum += item.value
+        allnum = Number(allnum.toFixed(2))
         str +=
           '<div style= ' +
           'color:#FFF>' +
@@ -190,6 +191,7 @@ const initOption = reactive({
           item.value +
           '</div>'
       })
+      allnum = allnum.toFixed(2)
       str += '<div style= ' + 'color:#FFF;font-family: Lato-Light>Total: ' + allnum + '</div>'
       return str
     },