Merge remote-tracking branch 'origin/240806_pro_release' into 240806_pro_release

# Conflicts:
#	src/module/api/apiList.js
#	src/module/databoard/databoard/safe-quality.vue

src/module/api/apiList.js

@@ -22,24 +22,24 @@ export const userLogin = (username, pass, captchaSign, verificationcode, captcha
 
 //首页营业额率值 -汇总
 export const getBusinessConditionDatas = (cur_day) => fetch('/api/query/*/action/get_business_condition_datas', {
-    aux: {
-        cur_day: cur_day
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 
 //明细页营业额汇月 -汇总
 export const getBusinessConditionDataByMonth = (cur_day) => fetch('/api/query/*/action/get_business_condition_datas_by_month', {
-    aux: {
-        cur_day: cur_day
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 
 
 //明细页营业额汇年 -汇总
 export const getBusinessConditionDatasByYear = (cur_day) => fetch('/api/query/*/action/get_business_condition_datas_by_year', {
-    aux: {
-        cur_day: cur_day
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 
 //明细页营业额汇年 -同期对比
@@ -57,9 +57,9 @@ export const arSummaryBar = () => fetch("/api/query/dash_board/action/get_ar_sum
  * 获取账款情况
  */
 export const getAccountSituation = (cur_day) => fetch("/api/query/dash_board/action/get_account_situation", {
-    aux: {
-        cur_day: cur_day
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, "POST")
 // 应收账款列表
 export const arCompanyList = () => fetch("/api/query/dash_board/action/get_ar_company_list", {}, "POST")
@@ -73,45 +73,45 @@ export const arCompanyMonthlyBar = (company) => fetch("/api/query/dash_board/act
 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
-    }
+  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
-    }
+  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
-    }
+  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
-    }
+  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
-    }
+  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
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 
 
@@ -123,39 +123,46 @@ export const getTargetOrderDataByCondition = (aux) => fetch("/api/query/*/action
 
 //流失客户 & 新增客户
 export const getOrderLoseAddCustomer = (cur_day) => fetch('/api/query/*/action/get_order_loss_add_customer', {
-    aux: {
-        cur_day: cur_day
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 
 //流失客户 & 新增客户-明细
-export const getOrderAddCustomerDetail = (cur_day, type, cur_page) => fetch('/api/query/*/action/get_order_add_customer_detail', {
-    aux: {
-        cur_day: cur_day,
-        type: type,
-        cur_page: cur_page
-    }
+export const getOrderAddCustomerDetail = (cur_day, type,cur_page) => fetch('/api/query/*/action/get_order_add_customer_detail', {
+  aux: {
+    cur_day: cur_day,
+    type: type,
+    cur_page:cur_page
+  }
 }, 'POST');
 
 //当日订单量，当时完成量 余量
 export const getOrderBusinessConditionData = (cur_day, type) => fetch('/api/query/*/action/get_order_business_condition_data', {
-    aux: {
-        cur_day: cur_day
-    }
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 //30天内事务部运单完成量
 export const getDepartmentShipmentWeight = (department_code, cur_day) => fetch('/api/query/*/action/get_shipment_data_by_department', {
-    aux: {
-        cur_day: cur_day
-        , department_code: department_code
-    }
+  aux: {
+    cur_day: cur_day
+    ,department_code: department_code
+  }
 }, 'POST');
 //折线图目标量
 export const getDepartmentTargetWeight = (department_code, year) => fetch('/api/query/*/action/get_department_target_weight', {
-    aux: {
-        year: year
-        , department_code: department_code
-    }
+  aux: {
+    year: year
+    ,department_code: department_code
+  }
+}, 'POST');
+
+//首页区域完成量
+export const getShipmentDataByArea = (cur_day) => fetch('/api/query/*/action/get_shipment_data_by_area', {
+  aux: {
+    cur_day: cur_day
+  }
 }, 'POST');
 
 //车船情况

src/module/index/index.vue

@@ -2,7 +2,7 @@
   <div class="page">
     <div class="head">
       <div class="text_left">
-        <input class="btn" type="button" value="返回上级" v-if="$route.fullPath !== '/index'" @click="goIndex">
+        <input class="btn" type="button" value="返回上级" v-if="$route.fullPath !== '/index' && $route.fullPath !== '/index_sale' " @click="goIndex">
         <span>{{ currentDate }}</span>
         <span>{{ currentTime }}</span>
         <span>{{ currentWeek }}</span>
@@ -36,7 +36,7 @@ export default {
   },
   methods: {
     goIndex() {
-      this.$router.push({path: '/'})
+      this.$router.go(-1)
     },
     reload() {
       this.isRouterAlive = false

src/module/index/router/index_router.js

 import Vue from 'vue'
 import Router from 'vue-router'
 import Index from '../../databoard/index.vue'
+import IndexSale from '../../databoard/index_sale'
 import ArBar from "../../databoard/components/chart/ar-bar.vue";
 import ArCompanyBar from "../../databoard/components/chart/ar-company-bar.vue";
 import ArMonthlyBar from "../../databoard/components/chart/ar-monthly-bar.vue";
@@ -30,6 +31,11 @@ export default new Router({
       name: 'index',
       component: Index
     },
+    {
+      path: '/index_sale',
+      name: 'index_sale',
+      component: IndexSale
+    },
     {
       path: '/ar_bar',
       name: 'arBar',