Merge remote-tracking branch 'origin/ld_databoard_fix' into ld_databoard_fix

# Conflicts:
#	src/module/api/apiList.js
#	src/module/databoard/databoard/turnover-detail.vue
#	src/module/databoard/index.vue

src/module/api/apiList.js

@@ -30,7 +30,7 @@ export const getBusinessConditionDatas = (cur_day) => fetch('/api/query/*/action
 //明细页营业额汇月 -汇总
 export const getBusinessConditionDataByMonth = (cur_day) => fetch('/api/query/*/action/get_business_condition_datas_by_month', {
   aux: {
-    cur_day: cur_dayS
+    cur_day: cur_day
   }
 }, 'POST');
 
@@ -38,7 +38,7 @@ export const getBusinessConditionDataByMonth = (cur_day) => fetch('/api/query/*/
 //明细页营业额汇年 -汇总
 export const getBusinessConditionDatasByYear = (cur_day) => fetch('/api/query/*/action/get_business_condition_datas_by_year', {
   aux: {
-    cur_day: cur_dayS
+    cur_day: cur_day
   }
 }, 'POST');
 
@@ -62,6 +62,49 @@ export const arMonthlyBar = () => fetch("/api/query/dash_board/action/get_ar_mon
 export const arCompanyMonthlyBar = (company) => fetch("/api/query/dash_board/action/get_ar_company_monthly_bar", {aux: {company: company}}, "POST")
 // 开票月份 应收账款（结算单位）
 export const arMonthlyCompanyBar = (month) => fetch("/api/query/dash_board/action/get_ar_monthly_company_bar", {aux: {month: month}}, "POST")
+//明细页营业额汇月 -汇总
+export const getAllTypeBusinessConditionDatas = (cur_day) => fetch('/api/query/*/action/get_all_type_business_condition_datas', {
+  aux: {
+    cur_day: cur_day
+  }
+}, 'POST');
+
+
+//明细页各种运输类型营业额明细
+export const getAllTypeBusinessConditionDetailByDay = (cur_day) => fetch('/api/query/*/action/get_all_type_business_condition_detail_by_day', {
+  aux: {
+    cur_day: cur_day
+  }
+}, 'POST');
+
+//明细页各种运输类型营业额汇总-月维度
+export const getAllTypeBusinessConditionDatasByMonth = (cur_day) => fetch('/api/query/*/action/get_all_type_business_condition_datas_by_month', {
+  aux: {
+    cur_day: cur_day
+  }
+}, 'POST');
+
+//明细页各种运输类型营业额汇总-年维度
+export const getAllTypeBusinessConditionDatasByYear = (cur_day) => fetch('/api/query/*/action/get_all_type_business_condition_datas_by_year', {
+  aux: {
+    cur_day: cur_day
+  }
+}, 'POST');
+
+//明细页各种运输类型营业额明细-月维度
+export const getAllTypeBusinessConditionDetailByMonth = (cur_day) => fetch('/api/query/*/action/get_all_type_business_condition_detail_by_month', {
+  aux: {
+    cur_day: cur_day
+  }
+}, 'POST');
+
+//明细页各种运输类型营业额明细-年维度
+export const getAllTypeBusinessConditionDetailByYear = (cur_day) => fetch('/api/query/*/action/get_all_type_business_condition_detail_by_year', {
+  aux: {
+    cur_day: cur_day
+  }
+}, 'POST');
+
 
 export const transportTypeOrderFinishPie = (date) => fetch("/api/query/dash_board/action/get_order_finish_data_by_transport_type_day", {aux: {"cur_day":date}}, "POST")
 export const customerOrderFinishPie = (date) => fetch("/api/query/dash_board/action/get_order_finish_data_by_customer_day", {aux: {"cur_day":date}}, "POST")

src/module/databoard/index.vue

@@ -4,7 +4,7 @@
       <display-board class="trade_left" title="营业情况">
         <div
           style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;">
-          <contrast-card v-for="data in yyqk" style="height: 28%;" @click.native="routerTo(paths[data.title])">
+          <contrast-card v-for="data in yyqk" style="height: 28%;" @click.native="routerTo1(paths[data.title])">
             <title-content-mark style="width: 40%;color: #369afa;float: left;" :title="data.title"
                                 :content="data.amount" :mark="data.unit"/>
             <div
@@ -133,8 +133,8 @@
       </div>
       <display-board class="trade_right" title="当日订单量占比">
         <div style="height: 100%; display: flex; flex-direction: column; justify-content: space-around; padding: 0 1rem 0 1rem;">
-          <ring-pie-chart ref="transportTypeChart" style="width: 100%;height: 50%;z-index: 999" name="运输类型占比" :data="transportTypeOrderFinishPie" @click.native="routerTo('/order-proportion')"/>
-          <ring-pie-chart ref="customerChart" style="width: 100%;height: 50%;" name="公司占比" :data="customerOrderFinishPie" @click.native="routerTo('/order-proportion')"/>
+          <ring-pie-chart ref="transportTypeChart" style="width: 100%;height: 50%;z-index: 999" name="运输类型占比" :data="transportTypeOrderFinishPie" @click.native="routerTo1('/order-proportion')"/>
+          <ring-pie-chart ref="customerChart" style="width: 100%;height: 50%;" name="公司占比" :data="customerOrderFinishPie" @click.native="routerTo1('/order-proportion')"/>
         </div>
       </display-board>
     </div>
@@ -168,6 +168,7 @@ export default {
   },
   data() {
     return {
+      today: '2023-05-19',
       // today: moment().format("yyyy-MM-DD"),
       today: '2023-06-19',
       yyqk: {
@@ -398,9 +399,9 @@ export default {
         },
       },
       paths: {
-        "营业额": "/turnover-detail",
-        "成本": "/turnover-detail",
-        "毛利": "/turnover-detail",
+        "营业额": "yye",
+        "成本": "cb",
+        "毛利": "ml",
       },
       dataset:{},
       transportTypeOrderFinishPie:[],
@@ -414,7 +415,6 @@ export default {
     },
     cellStyleFunction(data) {
       let res = {color: '#33ff66'};
-      // console.log(data + ":" + data.indexOf('+'))
       if (data.indexOf('-') !== -1) {
         res.color = '#ff3300'
       }
@@ -425,7 +425,10 @@ export default {
         this.charts[chartsKey].resize();
       }
     },
-    routerTo(path){
+    routerTo(code) {
+      this.$router.push({path: "/turnover-detail", query: {code: code}});
+    },
+    routerTo1(path){
       this.$router.push({path: path});
     },
     //营业情况

src/module/index/index.vue

@@ -24,7 +24,7 @@ export default {
   name: 'app',
   data() {
     return {
-      countDown: 10,
+      countDown: 10000,
       isRouterAlive: true,
       countDownTimer: null,
     }

src/module/utils/numUtil.js

@@ -18,10 +18,19 @@ export const conver_num_rate = function (amont) {
   if (amont > 0) {
     return "+" + amont + "%"
   } else {
-    return "-" + amont + "%"
+    return amont + "%"
   }
 };
 
+/**
+ * 保留两位小数
+ * @param amont
+ * @returns {string|*}
+ */
+export const conver_num_retain = function (amont) {
+  return formater(amont)
+}
+
 
 //数字金额显示
 function formater(data) {