From fae45959eda57c85eb3a9440eb95d7eb6540e14d Mon Sep 17 00:00:00 2001 From: hwj Date: Tue, 27 Jan 2026 18:02:30 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A4=A7=E5=B1=8F=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dashboard/index.ts | 106 +- .../dashboard1/components/DeviceOverview.vue | 114 +- .../dashboard1/components/EventReminder.vue | 244 +++- .../dashboard1/components/TaskList.vue | 164 ++- .../dashboard1/{Dashboard8.vue => index.vue} | 0 .../dashboardPage/dashboard8/dashboard8.html | 1243 ----------------- .../dashboard8/{Dashboard8.vue => index.vue} | 0 7 files changed, 501 insertions(+), 1370 deletions(-) rename src/views/report/dashboardPage/dashboard1/{Dashboard8.vue => index.vue} (100%) delete mode 100644 src/views/report/dashboardPage/dashboard8/dashboard8.html rename src/views/report/dashboardPage/dashboard8/{Dashboard8.vue => index.vue} (100%) diff --git a/src/api/dashboard/index.ts b/src/api/dashboard/index.ts index adc744c3..2a3aaa09 100644 --- a/src/api/dashboard/index.ts +++ b/src/api/dashboard/index.ts @@ -1,47 +1,89 @@ import request from '@/config/axios' + export interface DashboardProductVO { - taskItems: ItemVO[] - planItems: ItemVO[] + taskItems: ItemVO[] + planItems: ItemVO[] } export interface ItemVO { - key: string - label: string - value: number + key: string + label: string + value: number } export interface DeviceStatusVO { - key: string - label: string - value: number - level: string + key: string + label: string + value: number + level: string } +export interface TaskStatisticsData { + deviceInspection: number + deviceInspectionProportion: string + moldInspection: number + moldInspectionProportion: string + deviceMaintenance: number + deviceMaintenanceProportion: string + moldMaintenance: number + moldMaintenanceProportion: string + deviceRepair: number + deviceRepairProportion: string + moldRepair: number + moldRepairProportion: string +} + +export interface TaskStatisticsResponse { + code: number + status: number + data: TaskStatisticsData + msg: string +} + +export interface DashboardTaskItem { + code: string + name: string + type: string + finishStatus: string + resultStatus: number +} + +export interface DashboardTaskListResponse { + code: number + status: number + data: DashboardTaskItem[] + msg: string +} // 编码生成记录 API export const DashboardApi = { - // 查询编码生成记录分页 - getProduction: async (params: any) => { - return await request.get({ url: `/mes/dashboard/getProduction`, params }) - }, -getPlan: async () => { - return await request.get({ url: `/mes/dashboard/getPlan` }) - }, - getDevice: async () => { - return await request.get({ url: `/mes/dashboard/getDevice` }) - }, - getMold: async () => { - return await request.get({ url: `/mes/dashboard/getMold` }) - }, - getTodoList: async () => { - return await request.get({ url: `/mes/dashboard/getTodoList` }) - }, - getDeviceOperationalStatus: async () => { - return await request.get({ url: `/iot/device/getDeviceOperationalStatus` }) - }, - getDeviceRepairLineOptions: async () => { - return await request.get({ url: `/mes/dashboard/getDeviceRepairLineOptions` }) - }, - + // 查询编码生成记录分页 + getProduction: async (params: any) => { + return await request.get({ url: `/mes/dashboard/getProduction`, params }) + }, + getPlan: async () => { + return await request.get({ url: `/mes/dashboard/getPlan` }) + }, + getDevice: async () => { + return await request.get({ url: `/mes/dashboard/getDevice` }) + }, + getMold: async () => { + return await request.get({ url: `/mes/dashboard/getMold` }) + }, + getTodoList: async () => { + return await request.get({ url: `/mes/dashboard/getTodoList` }) + }, + getDeviceOperationalStatus: async () => { + return await request.get({ url: `/iot/device/getDeviceOperationalStatus` }) + }, + getDeviceRepairLineOptions: async () => { + return await request.get({ url: `/mes/dashboard/getDeviceRepairLineOptions` }) + }, + getTaskStatistics: async () => { + return await request.get({ url: `/mes/dashboard/getTaskStatistics` }) + }, + getAllTaskList: async () => { + return await request.get({ url: `/mes/dashboard/getAllTaskList` }) + } } diff --git a/src/views/report/dashboardPage/dashboard1/components/DeviceOverview.vue b/src/views/report/dashboardPage/dashboard1/components/DeviceOverview.vue index 860ab372..f2fd3737 100644 --- a/src/views/report/dashboardPage/dashboard1/components/DeviceOverview.vue +++ b/src/views/report/dashboardPage/dashboard1/components/DeviceOverview.vue @@ -18,14 +18,28 @@ diff --git a/src/views/report/dashboardPage/dashboard1/Dashboard8.vue b/src/views/report/dashboardPage/dashboard1/index.vue similarity index 100% rename from src/views/report/dashboardPage/dashboard1/Dashboard8.vue rename to src/views/report/dashboardPage/dashboard1/index.vue diff --git a/src/views/report/dashboardPage/dashboard8/dashboard8.html b/src/views/report/dashboardPage/dashboard8/dashboard8.html deleted file mode 100644 index b5fd6196..00000000 --- a/src/views/report/dashboardPage/dashboard8/dashboard8.html +++ /dev/null @@ -1,1243 +0,0 @@ - - - - - - 智能制造产线可视化看板 - - - - - -
-
- -
-
-
-
- -
-
-
智能制造产线任务总览
-
INTELLIGENT MANUFACTURING REAL-TIME DASHBOARD
-
-
-
- - - - - - - 当前在线产线 10 - -
-
-
- -
-
- -
- -
-
-
- - 产线任务看板 -
-
- 实时刷新 · 滚动展示 - 已完成 - 进度偏低 -
-
-
-
- - - - - - - - - - - - -
产线名称排产单产品名称计划数量完工数量完工率
-
-
-
- - -
-
-
- - 日产能达成情况 -
- 当日维度 -
-
-
-
-
-
-
-
-
-
排产单数量
-
-
-
-
-
排产数量
-
-
-
-
-
待生产数量
-
-
-
-
-
产能达成率
-
-
目标 ≥ 80%
-
-
-
-
-
-
- - -
-
-
- - 月产能达成情况 -
- 当月累计 -
-
-
-
-
-
-
-
-
-
排产单数量
-
-
-
-
-
排产数量
-
-
-
-
-
待生产数量
-
-
-
-
-
产能达成率
-
-
目标 ≥ 85%
-
-
-
-
-
-
-
- - -
- -
-
-
- - 周生产趋势 -
-
- 产量 - 计划 -
-
-
-
-
-
- - -
-
-
- - 开机率/稼动率趋势 -
-
-
- 历史七天(不含当天) -
-
-
-
-
-
- - -
-
-
- - 今日开机率/稼动率 -
- 产线A -
-
-
-
-
-
- - -
- -
-
-
- - 成品检合格率趋势图 -
- 按天统计(全产线) -
-
-
-
-
- - -
-
-
- - 实时报警信息 -
- 滚动展示 -
-
-
    -
    -
    - - -
    -
    -
    - - 能耗周趋势 -
    - 本周能耗对比 -
    -
    -
    -
    -
    -
    -
    -
    - - - - - diff --git a/src/views/report/dashboardPage/dashboard8/Dashboard8.vue b/src/views/report/dashboardPage/dashboard8/index.vue similarity index 100% rename from src/views/report/dashboardPage/dashboard8/Dashboard8.vue rename to src/views/report/dashboardPage/dashboard8/index.vue