From 0628e0c6f338f937feff00593f8069fd60a178f8 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 10:18:02 +0800
Subject: [PATCH] 逻辑优化
---
components/mold.vue | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 2ba016d..403ba9b 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -129,7 +129,8 @@
loadingTools: false,
loadingForm: false,
submitting: false,
- _searchTimer: null
+ _searchTimer: null,
+ workOrderCurrentCjNum: null // 宸ュ崟褰撳墠鏁伴噰
};
},
computed: {
@@ -179,7 +180,6 @@
this.filteredTools = mapped;
this.toolList = mapped.slice();
- // 淇 total 璧嬪�间紭鍏堢骇锛屼紭鍏堝彇 res.data.total
const totalFromRes = Number(
res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
);
@@ -197,7 +197,6 @@
this.loadingTools = false;
}
},
- //缈婚〉
async prevPage() {
if (this.pageIndex > 1) {
this.pageIndex--;
@@ -211,21 +210,20 @@
}
},
onSearchKeyInput() {
- // 闃叉姈锛氳緭鍏ユ椂鑷姩鎼滅储锛堣妭鐪佺偣鍑伙級
clearTimeout(this._searchTimer);
this._searchTimer = setTimeout(() => {
this.searchTool();
}, 300);
},
async searchTool() {
- this.pageIndex = 1; // 鎼滅储鏃堕噸缃埌绗竴椤�
+ this.pageIndex = 1;
await this.fetchTools(this.searchKey);
},
selectTool(tool) {
this.selectedToolNo = tool.no;
this.toolName = tool.name;
this.toolModel = tool.model;
- this.activeToolNo = tool.no; // 璁板綍閫変腑
+ this.activeToolNo = tool.no;
},
confirmTool() {
this.showToolDialog = false;
@@ -240,18 +238,16 @@
this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺');
return;
}
- // 浠呭墠绔洿鏂拌〃鏍兼樉绀猴紙濡傞渶鎸佷箙鍖栬璋冪敤鍚庣鎺ュ彛锛�
this.toolRecords = this.toolRecords.map(r => {
if (r.no === this.selectedToolNo) {
return { ...r, useLimit: v };
}
return r;
});
- // 鍚屾 toolList 涓殑妯″瀷锛堝彲鐢ㄦ潵灞曠ず锛�
this.toolList = this.toolList.map(t => t.no === this.selectedToolNo ? { ...t, useLimit: v } : t);
this.$showMessage('浣跨敤涓婇檺宸茶缃紙浠呭墠绔樉绀猴級');
},
- // 涓婂垁鏃朵紶閫� sdjs = 褰撳墠 currentCjNum
+ // 涓婂垁鏃朵紶閫� sdjs = 宸ュ崟 currentCjNum
async handleUpTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -260,9 +256,8 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
- // 鏌ユ壘褰撳墠鍒�鍏风殑 currentCjNum
- const currentTool = this.toolRecords.find(r => r.no === this.selectedToolNo);
- const sdjs = currentTool && currentTool.currentCjNum != null ? Number(currentTool.currentCjNum) : null;
+ // sdjs 浣跨敤宸ュ崟 currentCjNum
+ const sdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
const payload = {
workOrderNo: this.workOrderNo,
@@ -270,7 +265,7 @@
toolNo: this.selectedToolNo,
type: '涓婂垁',
useLimit,
- sdjs // 涓婂垁璁℃暟锛堝綋鍓嶆暟閲囷級
+ sdjs // 涓婂垁璁℃暟锛堝伐鍗曞綋鍓嶆暟閲囷級
};
try {
this.submitting = true;
@@ -301,7 +296,6 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
- // 鏌ユ壘褰撳墠鍒�鍏风殑 downCount
const currentTool = this.toolRecords.find(r => r.no === this.selectedToolNo);
const xdjs = currentTool && currentTool.downCount != null ? Number(currentTool.downCount) : null;
@@ -379,22 +373,22 @@
const formatPercent = n => {
if (n === null || n === undefined || isNaN(n)) return '';
- // 濡傛灉鏄皬浜庣瓑浜�1鐨勫皬鏁帮紝鎸夋瘮渚嬫斁澶�
if (n <= 1) return `${(n * 100).toFixed(0)}%`;
return `${Number(n).toFixed(0)}%`;
};
+
+ // 鑾峰彇宸ュ崟 currentCjNum
+ this.workOrderCurrentCjNum = res.data?.currentCjNum ?? null;
const mapped = (list || []).map(t => {
const upTimeRaw = getField(t, 'uP_TIME', 'UP_TIME', 'uPTime', 'UPTIME', 'UpTime');
const downTimeRaw = getField(t, 'dowN_TIME', 'DOWN_TIME', 'downTime', 'DOWNTIME');
const lifeWarnRaw = getField(t, 'lifE_WARN', 'LIFE_WARN', 'lifeWarn', 'LIFEWARN');
- const currentCjNum = getField(t, 'currentCjNum', 'CURRENTCJNUM', 'currentcjnum'); // 褰撳墠鏁伴噰
+ const currentCjNum = getField(t, 'currentCjNum', 'CURRENTCJNUM', 'currentcjnum');
- // 浣跨敤娆℃暟鍜屼笂闄�
const useCount = getField(t, 'usE_COUNT', 'USE_COUNT', 'useCount');
const useLimit = getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit');
- // 璁＄畻瀵垮懡姣旓紙浣跨敤娆℃暟/浣跨敤涓婇檺锛�
let percent = '';
if (
useCount != null && useLimit != null &&
@@ -404,7 +398,6 @@
percent = ((Number(useCount) / Number(useLimit)) * 100).toFixed(0) + '%';
}
- // 棰勮鍊兼牸寮忓寲
const parseNumber = v => {
if (v === null || v === undefined || v === '') return null;
const s = String(v).replace(/[,锛�%]/g, '').trim();
@@ -418,7 +411,6 @@
};
const lifeWarnNum = parseNumber(lifeWarnRaw);
- // 棰勮瑙勫垯锛氬綋瀵垮懡姣� >= 棰勮鍊兼椂鏍囪 棰勮
let warnStatus = getField(t, 'status', 'STATUS') || '';
if (lifeWarnNum !== null && useCount != null && useLimit != null && !isNaN(useCount) && !isNaN(useLimit) && Number(useLimit) > 0) {
const percentNum = Number(useCount) / Number(useLimit);
@@ -440,7 +432,7 @@
lifePercent: percent,
lifeWarn: formatPercent(lifeWarnNum),
warnStatus,
- currentCjNum // 褰撳墠鏁伴噰
+ currentCjNum
};
});
@@ -457,9 +449,8 @@
this.loadingForm = false;
}
},
- // 鑷姩甯﹀嚭宸ュ崟鍒�鍏蜂俊鎭�
async fetchDefaultToolFromWorkOrder() {
- if (!this.machineNo) return; // 娉ㄦ剰锛氳繖閲岀敤鏈哄彴鍙�
+ if (!this.machineNo) return;
try {
const res = await this.$post({
url: '/Womdaa/GetWomdaasByShow',
@@ -510,7 +501,7 @@
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
- this.fetchDefaultToolFromWorkOrder(); // 鑷姩甯﹀嚭宸ュ崟鍒�鍏�
+ this.fetchDefaultToolFromWorkOrder();
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
--
Gitblit v1.9.3