From 377c0a70c094d024aeb0bb94f4b791c6d5530c1e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 八月 2026 10:21:55 +0800
Subject: [PATCH] 新疆_马铃薯 1.不合格管理添加拒收逻辑
---
src/views/index.vue | 612 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 352 insertions(+), 260 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 49f8b05..e14da5e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -113,10 +113,11 @@
<div class="panel-title-row">
<div class="panel-title">鐢熶骇璁㈠崟杩涘害</div>
<el-radio-group v-model="orderFilter" size="small">
- <el-radio-button label="all">鍏ㄩ儴</el-radio-button>
- <el-radio-button label="in_progress">杩涜涓�</el-radio-button>
- <el-radio-button label="completed">宸插畬鎴�</el-radio-button>
- <el-radio-button label="paused">宸叉殏鍋�</el-radio-button>
+ <el-radio-button :value="'all'">鍏ㄩ儴({{ orderProgressMeta.total }})</el-radio-button>
+ <el-radio-button :value="'waiting'">寰呭紑濮�({{ orderProgressMeta.waitingCount }})</el-radio-button>
+ <el-radio-button :value="'inProgress'">杩涜涓�({{ orderProgressMeta.inProgressCount }})</el-radio-button>
+ <el-radio-button :value="'completed'">宸插畬鎴�({{ orderProgressMeta.completedCount }})</el-radio-button>
+ <el-radio-button :value="'paused'">宸叉殏鍋�({{ orderProgressMeta.pausedCount }})</el-radio-button>
</el-radio-group>
</div>
<el-table :data="filteredOrders" stripe>
@@ -141,7 +142,7 @@
<el-table-column label="鐘舵��" min-width="90">
<template #default="{ row }">
<el-tag :type="getOrderStatusType(row.status)" effect="light">
- {{ getOrderStatusText(row.status) }}
+ {{ row.statusLabel || getOrderStatusText(row.status) }}
</el-tag>
</template>
</el-table-column>
@@ -181,32 +182,6 @@
</ul>
</div>
- <div v-if="visiblePanels.quality" class="cockpit-panel quality-panel">
- <div class="panel-title-row">
- <div class="panel-title">璐ㄩ噺缁熻</div>
- <el-radio-group v-model="qualityRange" size="small" @change="qualityStatisticsInfo">
- <el-radio-button :value="1">鍛�</el-radio-button>
- <el-radio-button :value="2">鏈�</el-radio-button>
- <el-radio-button :value="3">瀛ｅ害</el-radio-button>
- </el-radio-group>
- </div>
- <div class="quality-cards">
- <div class="quality-card one">鍘熸潗鏂欏凡妫�鏁伴噺 <span>{{ qualityStatisticsObject.supplierNum }}浠�</span></div>
- <div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{ qualityStatisticsObject.processNum }}浠�</span></div>
- <div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{ qualityStatisticsObject.factoryNum }}浠�</span></div>
- </div>
- <Echarts
- :options="chartBaseOptions"
- :chartStyle="chartStyle"
- :grid="grid"
- :legend="barLegend"
- :series="barSeries1"
- :tooltip="tooltip"
- :xAxis="xAxis1"
- :yAxis="yAxis1"
- style="height: 270px"
- />
- </div>
</div>
<div v-if="hasRightPanels" class="right-column">
@@ -277,7 +252,7 @@
<div v-if="visiblePanels.plan" class="cockpit-panel plan-panel">
<div class="panel-title-row">
<div class="panel-title">浠婃棩鐢熶骇璁″垝</div>
- <span class="panel-more">{{ todayPlanList.length }}椤�</span>
+ <span class="panel-more">{{ todayPlanTotal }}椤�</span>
</div>
<ul class="plan-list">
<li v-for="item in todayPlanList" :key="item.orderNo" class="plan-item">
@@ -293,21 +268,34 @@
</ul>
</div>
- <div v-if="visiblePanels.receipt" class="cockpit-panel receipt-panel">
- <div class="panel-title">鍥炴涓庡紑绁ㄥ垎鏋�</div>
- <Echarts
- :options="chartBaseOptions"
- :chartStyle="chartStyle"
- :grid="grid"
- :legend="lineLegend"
- :series="lineSeries"
- :tooltip="tooltipLine"
- :xAxis="xAxis2"
- :yAxis="yAxis2"
- style="height: 300px"
- />
- </div>
+ </div>
+ <!-- 璐ㄩ噺缁熻 - 鍗犳弧鏁磋 -->
+ <div v-if="visiblePanels.quality" class="cockpit-panel quality-panel full-width">
+ <div class="panel-title-row">
+ <div class="panel-title">璐ㄩ噺缁熻</div>
+ <el-radio-group v-model="qualityRange" size="small" @change="qualityStatisticsInfo">
+ <el-radio-button :value="1">鍛�</el-radio-button>
+ <el-radio-button :value="2">鏈�</el-radio-button>
+ <el-radio-button :value="3">瀛ｅ害</el-radio-button>
+ </el-radio-group>
+ </div>
+ <div class="quality-cards">
+ <div class="quality-card one">鍘熸潗鏂欏凡妫�鏁伴噺 <span>{{ qualityStatisticsObject.supplierNum }}鍚�</span></div>
+ <div class="quality-card two">杩囩▼妫�楠屾暟閲� <span>{{ qualityStatisticsObject.processNum }}鍚�</span></div>
+ <div class="quality-card three">鍑哄巶宸叉鏁伴噺 <span>{{ qualityStatisticsObject.factoryNum }}鍚�</span></div>
+ </div>
+ <Echarts
+ :options="chartBaseOptions"
+ :chartStyle="chartStyle"
+ :grid="grid"
+ :legend="barLegend"
+ :series="barSeries1"
+ :tooltip="tooltip"
+ :xAxis="xAxis1"
+ :yAxis="yAxis1"
+ style="height: 270px"
+ />
</div>
</section>
@@ -319,7 +307,7 @@
<div class="process-selection-wrapper">
<el-checkbox-group v-model="tempProcessIds">
<div class="process-grid">
- <el-checkbox v-for="item in processOptions" :key="item.id" :label="item.id" border>
+ <el-checkbox v-for="item in processOptions" :key="item.id" :value="item.id" border>
{{ item.name }}
</el-checkbox>
</div>
@@ -359,12 +347,14 @@
import useUserStore from "@/store/modules/user.js";
import {
analysisCustomerContractAmounts,
- getAmountHalfYear,
getBusiness,
homeTodos,
processDataProductionStatistics,
+ productionOrderProgress,
+ productionOverview,
+ productionRealtimeBoard,
qualityInspectionStatistics,
- statisticsReceivablePayable,
+ todayProductionPlan,
} from "@/api/viewIndex.js";
import { list } from "@/api/productionManagement/productionProcess";
@@ -429,6 +419,8 @@
monthSaleHaveMoney: 0,
monthSaleMoney: 0,
todayInventoryNum: 0,
+ lastMonthSaleMoney: 0,
+ lastMonthPurchaseMoney: 0,
});
const qualityStatisticsObject = ref({
@@ -436,6 +428,34 @@
processNum: 0,
factoryNum: 0,
});
+
+const productionOverviewData = ref({
+ totalOutput: 0,
+ totalScrap: 0,
+ yieldRate: 0,
+});
+
+const realtimeBoardData = ref({
+ deviceOee: { value: 0, compareYesterday: 0 },
+ orderAchievementRate: { value: 0, compareYesterday: 0 },
+ defectRate: { value: 0, compareYesterday: 0 },
+});
+
+const orderProgressMeta = ref({
+ status: "all",
+ tab: "all",
+ bizDate: null,
+ total: 0,
+ pageNum: 1,
+ pageSize: 10,
+ waitingCount: 0,
+ inProgressCount: 0,
+ completedCount: 0,
+ pausedCount: 0,
+});
+
+const todayPlanList = ref([]);
+const todayPlanTotal = ref(0);
const sum = ref(0);
const yny = ref(0);
@@ -548,74 +568,6 @@
itemStyle: { color: "#f59e0b", borderRadius: [6, 6, 0, 0] },
emphasis: { focus: "series" },
data: [],
- },
-]);
-
-const lineLegend = {
- show: true,
- textStyle: { color: axisTextColor },
- data: ["寮�绁�", "鍥炴"],
-};
-
-const xAxis2 = ref([
- {
- type: "category",
- data: [],
- axisLine: { lineStyle: { color: axisLineColor } },
- axisLabel: {
- color: axisTextColor,
- interval: 0,
- formatter: (value) => value.replace(/~/g, "\n"),
- },
- },
-]);
-
-const yAxis2 = ref([
- {
- type: "value",
- splitLine: { lineStyle: { color: splitLineColor } },
- axisLine: { lineStyle: { color: axisLineColor } },
- axisLabel: { color: axisTextColor },
- },
-]);
-
-const tooltipLine = {
- trigger: "axis",
- backgroundColor: "rgba(255, 255, 255, 0.97)",
- borderColor: "rgba(148, 163, 184, 0.26)",
- textStyle: { color: "#334155" },
-};
-
-const lineSeries = ref([
- {
- name: "寮�绁�",
- type: "line",
- data: [],
- smooth: true,
- itemStyle: { color: "#2563eb" },
- lineStyle: { width: 2, color: "#2563eb" },
- showSymbol: true,
- areaStyle: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: "rgba(37, 99, 235, 0.24)" },
- { offset: 1, color: "rgba(37, 99, 235, 0.02)" },
- ]),
- },
- },
- {
- name: "鍥炴",
- type: "line",
- data: [],
- smooth: true,
- itemStyle: { color: "#14b8a6" },
- lineStyle: { width: 2, color: "#14b8a6" },
- showSymbol: true,
- areaStyle: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: "rgba(20, 184, 166, 0.2)" },
- { offset: 1, color: "rgba(20, 184, 166, 0.02)" },
- ]),
- },
},
]);
@@ -751,15 +703,29 @@
});
});
+// 璁＄畻鐜瘮澧為暱鐜�
+const calculateGrowthRate = (current, last) => {
+ const currentVal = parseFloat(current) || 0;
+ const lastVal = parseFloat(last) || 0;
+ if (lastVal === 0) return currentVal > 0 ? 100 : 0;
+ return ((currentVal - lastVal) / lastVal * 100).toFixed(1);
+};
+
const dashboardCards = computed(() => [
{
key: "sales",
title: "閿�鍞暟鎹�",
desc: "鏈湀閿�鍞(鍏�)",
value: formatNumber(businessInfo.value.monthSaleMoney),
- subLabel: "鏈紑绁ㄩ噾棰�",
- subValue: formatNumber(businessInfo.value.monthSaleHaveMoney),
- trend: `鍗犳瘮 ${ratioText(businessInfo.value.monthSaleHaveMoney, businessInfo.value.monthSaleMoney)}`,
+ subLabel: "涓婃湀閿�鍞�",
+ subValue: formatNumber(businessInfo.value.lastMonthSaleMoney),
+ trend: (() => {
+ const rate = calculateGrowthRate(businessInfo.value.monthSaleMoney, businessInfo.value.lastMonthSaleMoney);
+ const num = parseFloat(rate);
+ if (num > 0) return `鐜瘮 鈫� ${rate}%`;
+ if (num < 0) return `鐜瘮 鈫� ${Math.abs(num)}%`;
+ return "鐜瘮鎸佸钩";
+ })(),
icon: DataLine,
visible: visibleModules.value.sales,
},
@@ -768,12 +734,15 @@
title: "閲囪喘鏁版嵁",
desc: "鏈湀閲囪喘棰�(鍏�)",
value: formatNumber(businessInfo.value.monthPurchaseMoney),
- subLabel: "寰呬粯娆鹃噾棰�",
- subValue: formatNumber(businessInfo.value.monthPurchaseHaveMoney),
- trend: `鍗犳瘮 ${ratioText(
- businessInfo.value.monthPurchaseHaveMoney,
- businessInfo.value.monthPurchaseMoney
- )}`,
+ subLabel: "涓婃湀閲囪喘",
+ subValue: formatNumber(businessInfo.value.lastMonthPurchaseMoney),
+ trend: (() => {
+ const rate = calculateGrowthRate(businessInfo.value.monthPurchaseMoney, businessInfo.value.lastMonthPurchaseMoney);
+ const num = parseFloat(rate);
+ if (num > 0) return `鐜瘮 鈫� ${rate}%`;
+ if (num < 0) return `鐜瘮 鈫� ${Math.abs(num)}%`;
+ return "鐜瘮鎸佸钩";
+ })(),
icon: ShoppingCartFull,
visible: visibleModules.value.procurement,
},
@@ -788,106 +757,89 @@
icon: Box,
visible: visibleModules.value.inventory,
},
- {
- key: "production",
- title: "鐢熶骇鎬昏",
- desc: "绱浜у嚭(浠�)",
- value: formatNumber(processTotals.value.output),
- subLabel: "绱鎶ュ簾",
- subValue: formatNumber(processTotals.value.scrap),
- trend: `鑹巼 ${ratioText(processTotals.value.output, processTotals.value.input)}`,
- icon: Operation,
- visible: visibleModules.value.production,
- },
].filter((item) => item.visible));
-const productionOrders = ref([
- {
- orderNo: "MO-20260518-001",
- productName: "鏅鸿兘鎺у埗鍣�",
- planQty: 1000,
- completedQty: 860,
- completionRate: 86,
- deliveryDate: "2026-05-20",
- status: "in_progress",
- },
- {
- orderNo: "MO-20260518-002",
- productName: "鐢垫簮妯″潡",
- planQty: 800,
- completedQty: 640,
- completionRate: 80,
- deliveryDate: "2026-05-22",
- status: "in_progress",
- },
- {
- orderNo: "MO-20260518-003",
- productName: "浼犳劅鍣ㄧ粍浠�",
- planQty: 500,
- completedQty: 150,
- completionRate: 30,
- deliveryDate: "2026-05-25",
- status: "paused",
- },
- {
- orderNo: "MO-20260518-004",
- productName: "缁撴瀯浠禔",
- planQty: 1200,
- completedQty: 1200,
- completionRate: 100,
- deliveryDate: "2026-05-15",
- status: "completed",
- },
-]);
+const productionOrders = ref([]);
+const orderFilterOptions = ["all", "waiting", "inProgress", "completed", "paused"];
+const orderFilterAliasMap = {
+ 1: "waiting",
+ 2: "inProgress",
+ 3: "completed",
+ 4: "paused",
+};
const orderFilter = ref("all");
-const filteredOrders = computed(() => {
- if (orderFilter.value === "all") return productionOrders.value;
- return productionOrders.value.filter((item) => item.status === orderFilter.value);
-});
+const filteredOrders = computed(() => productionOrders.value);
-const todayPlanList = computed(() =>
- productionOrders.value
- .slice()
- .sort((a, b) => dayjs(a.deliveryDate).valueOf() - dayjs(b.deliveryDate).valueOf())
- .slice(0, 5)
-);
+const normalizeOrderFilter = (value, fallback = "all") => {
+ const safeFallback = orderFilterOptions.includes(fallback) ? fallback : "all";
+ const text = String(value ?? "").trim();
+ if (orderFilterAliasMap[text]) {
+ return orderFilterAliasMap[text];
+ }
+ return orderFilterOptions.includes(text) ? text : safeFallback;
+};
-const avgCompletionRate = computed(() => {
- if (!productionOrders.value.length) return 0;
- const total = productionOrders.value.reduce((acc, cur) => acc + Number(cur.completionRate || 0), 0);
- return Number((total / productionOrders.value.length).toFixed(1));
-});
+const parseCount = (value) => {
+ if (value === null || value === undefined || value === "") return null;
+ const num = Number(value);
+ return Number.isFinite(num) ? num : null;
+};
+
+const resolveProgressCount = (rawValue, currentStatus, targetStatus, total) => {
+ const count = parseCount(rawValue);
+ if (count !== null) return count;
+ return currentStatus === targetStatus ? total : 0;
+};
+
+const getCompareTrend = (value) => {
+ const num = Number(value || 0);
+ if (num > 0) return "up";
+ if (num < 0) return "down";
+ return "flat";
+};
+
+const getCompareText = (value) => {
+ const num = Number(value || 0);
+ const abs = Math.abs(num).toFixed(2);
+ if (num > 0) return `杈冩槰鏃� 鈫� ${abs}%`;
+ if (num < 0) return `杈冩槰鏃� 鈫� ${abs}%`;
+ return "杈冩槰鏃� 鎸佸钩";
+};
const realtimeBoard = computed(() => {
- const oee = ratioNumber(processTotals.value.output, processTotals.value.input);
- const defectRate = ratioNumber(processTotals.value.scrap, processTotals.value.input);
+ const oee = Number(realtimeBoardData.value.deviceOee?.value || 0);
+ const orderAchievement = Number(realtimeBoardData.value.orderAchievementRate?.value || 0);
+ const defectRate = Number(realtimeBoardData.value.defectRate?.value || 0);
+ const oeeCompare = Number(realtimeBoardData.value.deviceOee?.compareYesterday || 0);
+ const orderCompare = Number(realtimeBoardData.value.orderAchievementRate?.compareYesterday || 0);
+ const defectCompare = Number(realtimeBoardData.value.defectRate?.compareYesterday || 0);
return [
{
key: "oee",
label: "璁惧 OEE",
percent: clampPercent(oee),
- display: `${oee.toFixed(1)}%`,
- delta: "杈冩槰鏃� 鈫� 4.0%",
- trend: "up",
+ display: `${oee.toFixed(2)}%`,
+ delta: getCompareText(oeeCompare),
+ trend: getCompareTrend(oeeCompare),
color: "#2d8cff",
},
{
key: "order",
label: "璁㈠崟杈炬垚鐜�",
- percent: clampPercent(avgCompletionRate.value),
- display: `${avgCompletionRate.value.toFixed(1)}%`,
- delta: "杈冩槰鏃� 鈫� 2.6%",
- trend: "up",
+ percent: clampPercent(orderAchievement),
+ display: `${orderAchievement.toFixed(2)}%`,
+ delta: getCompareText(orderCompare),
+ trend: getCompareTrend(orderCompare),
color: "#31d2ff",
},
{
key: "defect",
label: "涓嶈壇鐜�",
percent: clampPercent(defectRate),
- display: `${defectRate.toFixed(1)}%`,
- delta: "杈冩槰鏃� 鈫� 0.5%",
- trend: "down",
+ display: `${defectRate.toFixed(2)}%`,
+ delta: getCompareText(defectCompare),
+ trend: getCompareTrend(defectCompare),
color: "#f6a23f",
},
];
@@ -1043,16 +995,16 @@
realtime: visibleModules.value.production,
quick: quickEntries.value.length > 0,
plan: visibleModules.value.production,
- receipt: visibleModules.value.sales || visibleModules.value.finance,
+
}));
const hasLeftPanels = computed(
- () => visiblePanels.value.process || visiblePanels.value.order || visiblePanels.value.contract || visiblePanels.value.quality
+ () => visiblePanels.value.process || visiblePanels.value.order || visiblePanels.value.contract
);
const hasRightPanels = computed(
- () => visiblePanels.value.todo || visiblePanels.value.realtime || visiblePanels.value.quick || visiblePanels.value.plan || visiblePanels.value.receipt
+ () => visiblePanels.value.todo || visiblePanels.value.realtime || visiblePanels.value.quick || visiblePanels.value.plan
);
-const hasVisiblePanels = computed(() => hasLeftPanels.value || hasRightPanels.value);
+const hasVisiblePanels = computed(() => hasLeftPanels.value || hasRightPanels.value || visiblePanels.value.quality);
const quickEntries = computed(() =>
quickEntryConfigs
@@ -1111,20 +1063,149 @@
const getOrderStatusText = (status) => {
const mapping = {
- in_progress: "杩涜涓�",
- completed: "宸插畬鎴�",
- paused: "鏆傚仠",
+ 1: "寰呭紑濮�",
+ 2: "杩涜涓�",
+ 3: "宸插畬鎴�",
+ 4: "宸叉殏鍋�",
};
return mapping[status] || "鏈煡";
};
const getOrderStatusType = (status) => {
const mapping = {
- in_progress: "success",
- completed: "primary",
- paused: "warning",
+ 1: "info",
+ 2: "success",
+ 3: "primary",
+ 4: "warning",
};
return mapping[status] || "info";
+};
+
+const formatDueDate = (value) => {
+ if (!value) return "--";
+ const date = dayjs(value);
+ return date.isValid() ? date.format("YYYY-MM-DD") : "--";
+};
+
+const mapOrderProgressRecord = (item = {}) => ({
+ orderNo: item.orderNo || "--",
+ productName: item.productName || "--",
+ planQty: Number(item.plannedQuantity || 0),
+ completedQty: Number(item.completedQuantity || 0),
+ completionRate: clampPercent(Number(item.completionRate || 0)),
+ deliveryDate: formatDueDate(item.dueDate),
+ status: Number(item.status || 0),
+ statusLabel: item.statusLabel || "",
+});
+
+const mapTodayPlanRecord = (item = {}) => ({
+ orderNo: item.orderNo || "--",
+ productName: item.productName || "--",
+ planQty: Number(item.plannedQuantity || 0),
+ deliveryDate: formatDueDate(item.dueDate),
+ status: Number(item.status || 0),
+ statusLabel: item.statusLabel || "",
+});
+
+const refreshProductionOverview = async () => {
+ try {
+ const res = await productionOverview();
+ const data = res?.data || {};
+ productionOverviewData.value = {
+ totalOutput: Number(data.totalOutput || 0),
+ totalScrap: Number(data.totalScrap || 0),
+ yieldRate: Number(data.yieldRate || 0),
+ };
+ } catch {
+ productionOverviewData.value = {
+ totalOutput: 0,
+ totalScrap: 0,
+ yieldRate: 0,
+ };
+ }
+};
+
+const refreshProductionRealtimeBoard = async () => {
+ try {
+ const res = await productionRealtimeBoard();
+ const data = res?.data || {};
+ realtimeBoardData.value = {
+ deviceOee: {
+ value: Number(data.deviceOee?.value || 0),
+ compareYesterday: Number(data.deviceOee?.compareYesterday || 0),
+ },
+ orderAchievementRate: {
+ value: Number(data.orderAchievementRate?.value || 0),
+ compareYesterday: Number(data.orderAchievementRate?.compareYesterday || 0),
+ },
+ defectRate: {
+ value: Number(data.defectRate?.value || 0),
+ compareYesterday: Number(data.defectRate?.compareYesterday || 0),
+ },
+ };
+ } catch {
+ realtimeBoardData.value = {
+ deviceOee: { value: 0, compareYesterday: 0 },
+ orderAchievementRate: { value: 0, compareYesterday: 0 },
+ defectRate: { value: 0, compareYesterday: 0 },
+ };
+ }
+};
+
+const refreshProductionOrderProgress = async () => {
+ try {
+ const res = await productionOrderProgress({
+ status: orderFilter.value,
+ tab: orderFilter.value,
+ pageNum: 1,
+ pageSize: 10,
+ });
+ const data = res?.data || {};
+ const statusValue = normalizeOrderFilter(data.status, orderFilter.value);
+ const total = Number(data.total || 0);
+ orderProgressMeta.value = {
+ status: statusValue,
+ tab: data.tab || orderFilter.value,
+ bizDate: data.bizDate || null,
+ total,
+ pageNum: Number(data.pageNum || 1),
+ pageSize: Number(data.pageSize || 10),
+ waitingCount: resolveProgressCount(data.waitingCount, statusValue, "waiting", total),
+ inProgressCount: resolveProgressCount(data.inProgressCount, statusValue, "inProgress", total),
+ completedCount: resolveProgressCount(data.completedCount, statusValue, "completed", total),
+ pausedCount: resolveProgressCount(data.pausedCount, statusValue, "paused", total),
+ };
+ productionOrders.value = (data.records || []).map(mapOrderProgressRecord);
+ } catch {
+ orderProgressMeta.value = {
+ status: orderFilter.value,
+ tab: orderFilter.value,
+ bizDate: null,
+ total: 0,
+ pageNum: 1,
+ pageSize: 10,
+ waitingCount: 0,
+ inProgressCount: 0,
+ completedCount: 0,
+ pausedCount: 0,
+ };
+ productionOrders.value = [];
+ }
+};
+
+const refreshTodayProductionPlan = async () => {
+ try {
+ const res = await todayProductionPlan({
+ limit: 4,
+ planDate: nowDate.value,
+ });
+ const data = res?.data || {};
+ todayPlanTotal.value = Number(data.total || 0);
+ todayPlanList.value = (data.records || []).map(mapTodayPlanRecord);
+ } catch {
+ todayPlanTotal.value = 0;
+ todayPlanList.value = [];
+ }
};
const getBusinessData = async () => {
@@ -1149,45 +1230,22 @@
todoList.value = res.data || [];
};
-const statisticsReceivable = async () => {
- const res = await statisticsReceivablePayable({ type: 1 });
- barSeries.value[0].data = [
- { value: res.data.payableMoney, itemStyle: { color: barColors2[0] } },
- { value: res.data.receivableMoney, itemStyle: { color: barColors2[1] } },
- ];
-};
-
const qualityStatisticsInfo = async () => {
const res = await qualityInspectionStatistics({ type: qualityRange.value });
xAxis1.value[0].data = [];
barSeries1.value[0].data = [];
barSeries1.value[1].data = [];
barSeries1.value[2].data = [];
- (res.data.item || []).forEach((item) => {
+ const data = res.data || {};
+ (data.item || []).forEach((item) => {
xAxis1.value[0].data.push(item.date);
barSeries1.value[0].data.push(item.supplierNum);
barSeries1.value[1].data.push(item.processNum);
barSeries1.value[2].data.push(item.factoryNum);
});
- qualityStatisticsObject.value.supplierNum = res.data.supplierNum;
- qualityStatisticsObject.value.processNum = res.data.processNum;
- qualityStatisticsObject.value.factoryNum = res.data.factoryNum;
-};
-
-const getAmountHalfYearNum = async () => {
- const res = await getAmountHalfYear();
- const monthName = [];
- const receiptAmount = [];
- const invoiceAmount = [];
- (res.data || []).forEach((item) => {
- monthName.push(item.month);
- receiptAmount.push(item.receiptAmount);
- invoiceAmount.push(item.invoiceAmount);
- });
-
- xAxis2.value[0].data = monthName.map((item) => item.replace(/~/g, "\n~"));
- lineSeries.value[0].data = invoiceAmount;
- lineSeries.value[1].data = receiptAmount;
+ qualityStatisticsObject.value.supplierNum = data.supplierNum || 0;
+ qualityStatisticsObject.value.processNum = data.processNum || 0;
+ qualityStatisticsObject.value.factoryNum = data.factoryNum || 0;
};
const getProcessList = async () => {
@@ -1238,11 +1296,20 @@
router.push(path).catch(() => {});
};
+watch(orderFilter, () => {
+ if (visiblePanels.value.order) {
+ refreshProductionOrderProgress();
+ }
+});
+
onMounted(() => {
updateNowTime();
clockTimer = setInterval(updateNowTime, 1000);
if (dashboardCards.value.length > 0) {
getBusinessData();
+ }
+ if (visibleModules.value.production) {
+ refreshProductionOverview();
}
if (visiblePanels.value.contract) {
analysisCustomer();
@@ -1253,13 +1320,18 @@
if (visiblePanels.value.quality) {
qualityStatisticsInfo();
}
- if (visiblePanels.value.receipt) {
- statisticsReceivable();
- getAmountHalfYearNum();
- }
if (visiblePanels.value.process) {
getProcessList();
refreshProcessStats();
+ }
+ if (visiblePanels.value.order) {
+ refreshProductionOrderProgress();
+ }
+ if (visiblePanels.value.realtime) {
+ refreshProductionRealtimeBoard();
+ }
+ if (visiblePanels.value.plan) {
+ refreshTodayProductionPlan();
}
});
@@ -1378,7 +1450,7 @@
.stats-grid {
display: grid;
- grid-template-columns: repeat(4, minmax(0, 1fr));
+ grid-template-columns: repeat(3, minmax(0, 1fr));
gap: 14px;
}
@@ -1570,7 +1642,7 @@
display: flex;
flex-direction: column;
gap: 8px;
- max-height: 230px;
+ max-height: 380px;
overflow-y: auto;
}
@@ -1619,18 +1691,31 @@
}
.main-grid {
- display: grid;
- grid-template-columns: minmax(0, 1fr) 400px;
+ display: flex;
+ flex-wrap: wrap;
gap: 16px;
align-items: start;
}
-.left-column,
+.left-column {
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ flex-direction: column;
+ gap: 16px;
+}
+
.right-column {
+ width: 400px;
display: flex;
flex-direction: column;
gap: 16px;
min-width: 0;
+}
+
+.full-width {
+ width: 100%;
+ flex-basis: 100%;
}
.process-panel {
@@ -1953,6 +2038,10 @@
color: #f59e0b;
}
+.realtime-delta.flat {
+ color: #64748b;
+}
+
.warning-list {
margin-top: 10px;
display: flex;
@@ -2015,7 +2104,7 @@
}
.quick-panel {
- min-height: 0;
+ min-height: 280px;
}
.table-progress {
@@ -2057,10 +2146,6 @@
.quality-panel {
min-height: 0;
-}
-
-.receipt-panel {
- min-height: 340px;
}
.plan-list {
@@ -2215,24 +2300,31 @@
}
@media (max-width: 1600px) {
- .main-grid {
- grid-template-columns: minmax(0, 1fr) 380px;
+ .right-column {
+ width: 380px;
}
}
@media (max-width: 1366px) {
- .main-grid {
- grid-template-columns: minmax(0, 1fr) 340px;
+ .right-column {
+ width: 340px;
}
+ .stats-grid {
+ grid-template-columns: repeat(3, minmax(0, 1fr));
+ }
+}
+
+@media (max-width: 992px) {
.stats-grid {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
@media (max-width: 1200px) {
- .main-grid {
- grid-template-columns: 1fr;
+ .left-column,
+ .right-column {
+ width: 100%;
}
.right-column {
--
Gitblit v1.9.3