Merge branch 'dev_overview_charts' into release

components.d.ts

@@ -16,6 +16,7 @@ declare module 'vue' {
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxButton: typeof import('element-plus/es')['ElCheckboxButton']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -54,7 +55,6 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElUpload: typeof import('element-plus/es')['ElUpload']

package-lock.json

@@ -14,6 +14,7 @@
         "axios": "^1.6.7",
         "bignumber.js": "^9.3.0",
         "dayjs": "^1.11.13",
+        "echarts": "^6.0.0",
         "element-plus": "^2.6.0",
         "lodash-es": "^4.17.21",
         "luxon": "^3.7.1",
@@ -3635,6 +3636,16 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/echarts": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-6.0.0.tgz",
+      "integrity": "sha512-Tte/grDQRiETQP4xz3iZWSvoHrkCQtwqd6hs+mifXcjrCuo2iKWbajFObuLJVBlDIJlOzgQPd1hsaKt/3+OMkQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "2.3.0",
+        "zrender": "6.0.0"
+      }
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.5.157",
       "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz",
@@ -6009,6 +6020,12 @@
         "typescript": ">=4.2.0"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
+      "license": "0BSD"
+    },
     "node_modules/type": {
       "version": "2.7.3",
       "resolved": "https://registry.npmmirror.com/type/-/type-2.7.3.tgz",
@@ -6848,6 +6865,15 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zrender": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-6.0.0.tgz",
+      "integrity": "sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tslib": "2.3.0"
+      }
     }
   }
 }

package.json

@@ -16,6 +16,7 @@
     "axios": "^1.6.7",
     "bignumber.js": "^9.3.0",
     "dayjs": "^1.11.13",
+    "echarts": "^6.0.0",
     "element-plus": "^2.6.0",
     "lodash-es": "^4.17.21",
     "luxon": "^3.7.1",

src/api/statistic.ts

+import axios from './axios'
+import { BaseRespData } from '@/types/api'
+import { statisticData, trendType } from '@/types/api/statistic'
+
+//1、核心数据看板
+export function getStatisticData() {
+  return axios.get<never, BaseRespData<statisticData>>(
+    'factory/overview/statistic',
+  )
+}
+//2、趋势图（订单趋势+24/48发货率图+超时发货率图）
+export function trendApi(params: {
+  timeUnit: string | number
+  trendType: string
+}) {
+  return axios.post<never, BaseRespData<trendType[]>>(
+    '/factory/overview/trend',
+    params,
+  )
+}

src/types/api/statistic.ts

+export interface statisticData {
+  todayNewOrderNum: number
+  todayNewProductNum: number
+  todayConfirmOrderNum: number
+  todayConfirmProductNum: number
+  notShipmentOrderNum: number
+  overTimeNotShipmentOrderNum: number
+  yesterdayShipmentOrderNum: number
+  beforeYesterdayShipmentOrderNum: number
+  compareYesterdayShipmentOrderNum: number
+  shipmentRateOf24Hour: number
+  compareLastDayShipmentRateOf24Hour: number
+  shipmentRateOf48Hour: number
+  compareLastDayShipmentRateOf48Hour: number
+  overTimeShipmentRate: number
+  compareLastDayOverTimeShipmentRate: number
+  waitCreateLogisticOrderNum: number
+  waitArrangeOrderNum: number
+  producingOrderNum: number
+  waitShipmentNum: number
+  blockApplyOrderNum: number
+  exceptionOrderNum: number
+  outOfStockOrderNum: number
+  outOfStock24HourOrderNum: number
+  outOfStock48HourOrderNum: number
+  outOfStockOver48HourOrderNum: number
+  outOfStockSkuNum: number
+  outOfStockProductNum: number
+  yesterdayOverTimeShipmentOrderNum: number
+}
+export interface trendType {
+  confirmNum: number // 接单数
+  produceNum: number // 生产数
+  shipmentNum: number // 发货数
+  shipmentRateOf24Hour: number // 24小时发货率
+  shipmentRateOf48Hour: number // 48小时发货率
+  overtimeShipmentRate: number // 超48小时发货率
+  overtimeShipmentOrderNum: number // 超时发货单数
+  startTime: string // 周期开始时间
+  endTime: string // 周期结束时间
+}