From 0ad950aabf93b2f333d1292a99ec7c3f2a922ccb Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 25 十月 2025 11:14:28 +0800
Subject: [PATCH] 修改说明
---
components/mold.vue | 168 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 101 insertions(+), 67 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index b00a15d..152c4f3 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -11,6 +11,14 @@
<label class="form-label">璁剧疆浣跨敤涓婇檺锛�</label>
<input class="input" type="number" v-model="useLimitInput" placeholder="姣忔鎹㈠垁鍚庢墜濉�" :disabled="!selectedToolNo || loadingForm" />
</view>
+ <!-- 鏂板锛氬鍛芥瘮棰勮鍊艰緭鍏ユ -->
+ <view class="form-cell">
+ <label class="form-label">瀵垮懡姣旈璀﹀�硷細</label>
+ <input class="input"
+ v-model="lifeWarnInput"
+ placeholder="濡�0.9鎴�90(%)"
+ :disabled="!selectedToolNo || loadingForm" />
+ </view>
<view class="form-cell">
<label class="form-label">鍒�鍏峰悕绉帮細</label>
<input class="input" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
@@ -99,11 +107,10 @@
</view>
<!-- 璇存槑 -->
- <view class="tool-desc">
- <p style="color:red;">褰撳墠宸ュ崟涓紝鎹簡鍑犳鍒�锛屽氨浼氫骇鐢熷嚑鏉℃暟鎹�備笂鍒�鏃堕棿銆佷笅鍒�鏃堕棿鍦ㄨ〃涓兘鐪嬪埌銆�</p>
- <p style="color:red;">涓婂垁鏃堕棿鍜屽搴旀椂闂寸敤鐢熶骇璁℃暟鍣ㄥ尮閰嶏紝鏌ュ嚭褰撴椂鐨勭敓浜ф暟锛堢疮璁¤鏁帮級銆�</p>
- <p style="color:red;">瀵垮懡姣旈璀﹀�煎湪鍒�鍏蜂笂锛岄粯璁ょ粺涓�銆�</p>
- </view>
+ <!--<view class="tool-desc">
+ <p style="color:red;">'浣跨敤涓婇檺'浠ヤ笅鍒�鏃剁殑'浣跨敤涓婇檺'涓鸿绠楁爣鍑�</p>
+ <p style="color:red;">瀵垮懡姣旈璀﹀�奸粯璁や负90%</p>
+ </view>-->
</view>
</template>
@@ -125,6 +132,7 @@
searchKey: '',
filteredTools: [],
useLimitInput: '',
+ lifeWarnInput: '', // 鏂板锛氬鍛芥瘮棰勮鍊煎師濮嬭緭鍏�
toolRecords: [],
loadingTools: false,
loadingForm: false,
@@ -139,6 +147,15 @@
}
},
methods: {
+ // 鏂板锛氬鍛芥瘮棰勮鍊煎綊涓�鍖� (杩斿洖 0~1 鎴� null)
+ normalizeLifeWarn(v) {
+ if (v == null) return null;
+ const raw = String(v).trim().replace(/[%锛匽/g, '');
+ if (raw === '') return null;
+ const num = Number(raw);
+ if (!isFinite(num) || num <= 0) return null;
+ return num > 1 ? (num / 100) : num;
+ },
openToolDialog() {
this.showToolDialog = true;
this.pageIndex = 1;
@@ -171,10 +188,12 @@
return null;
};
+ // 杩欓噷闇�瑕佹妸 lifeWarn 瀛楁涔熷甫鍑烘潵
const mapped = (payload || []).map(t => ({
no: getField(t, 'cutterId', 'CUTTER_ID', 'cutteR_ID', 'daA001', 'no'),
name: getField(t, 'cutterName', 'CUTTER_NAME', 'cutteR_NAME', 'name'),
- model: getField(t, 'cutterModel', 'CUTTER_MODEL', 'cutteR_MODEL', 'model')
+ model: getField(t, 'cutterModel', 'CUTTER_MODEL', 'cutteR_MODEL', 'model'),
+ lifeWarn: getField(t, 'modlLifeWorning', 'lifeWarn', 'LIFE_WARN', 'lifE_WARN')
}));
this.filteredTools = mapped;
@@ -224,6 +243,14 @@
this.toolName = tool.name;
this.toolModel = tool.model;
this.activeToolNo = tool.no;
+ // 鏂板锛氬甫鍑哄鍛芥瘮棰勮鍊�
+ if (tool.lifeWarn !== undefined && tool.lifeWarn !== null) {
+ // 鏍煎紡鍖栦负鐧惧垎姣斿瓧绗︿覆
+ const warn = Number(tool.lifeWarn);
+ this.lifeWarnInput = warn <= 1 ? `${(warn * 100).toFixed(0)}%` : `${warn.toFixed(0)}%`;
+ } else {
+ this.lifeWarnInput = '';
+ }
},
confirmTool() {
this.showToolDialog = false;
@@ -252,20 +279,22 @@
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
if (!this.selectedToolNo) { this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�'); return; }
- if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
+ //涓婂垁涓嶅己鍒跺綍鍏ヤ娇鐢ㄤ笂闄�
+ //if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
const useLimit = Number(this.useLimitInput);
- if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
// sdjs 浣跨敤宸ュ崟 currentCjNum
const sdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
-
+ const lifeWarnRatio = this.normalizeLifeWarn(this.lifeWarnInput);
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
- type: '涓婂垁',
+ type: '涓婃満',
useLimit,
- sdjs // 涓婂垁璁℃暟锛堝伐鍗曞綋鍓嶆暟閲囷級
+ sdjs,// 涓婂垁璁℃暟锛堝伐鍗曞綋鍓嶆暟閲囷級
+ modlLifeWorning: lifeWarnRatio // 鏂板
};
try {
this.submitting = true;
@@ -274,17 +303,19 @@
data: JSON.stringify(payload),
headers: { 'Content-Type': 'application/json' }
});
- if (res.data && res.data.outMsg) {
- if (res.data.outMsg.includes('閲嶅涓婁笅鍒�')) {
- this.$showMessage(res.data.outMsg, { type: 'error' });
- } else {
- this.$showMessage(res.data.outMsg);
- }
- } else if (res.status === 0) {
- this.$showMessage('涓婂垁鎻愪氦鎴愬姛');
- } else {
- this.$showMessage(res.message || '涓婂垁鎻愪氦澶辫触');
+ if (res.data && res.data.outSum === "0") {
+ uni.showToast({
+ title: res.data.outMsg || '',
+ icon: 'error'
+ });
+ return;
+ } else if (res.data && res.data.outMsg) {
+ uni.showToast({
+ title: res.data.outMsg,
+ icon: 'none'
+ });
}
+ // 鍚庣画閫昏緫缁х画鎵ц
if (res.status === 0) {
await this.fetchFormData();
}
@@ -306,14 +337,15 @@
// 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
-
+ const lifeWarnRatio = this.normalizeLifeWarn(this.lifeWarnInput);
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
- type: '涓嬪垁',
+ type: '涓嬫満',
useLimit,
- xdjs // 涓嬪垁璁℃暟
+ xdjs,// 涓嬪垁璁℃暟
+ modlLifeWorning: lifeWarnRatio // 鏂板
};
try {
this.submitting = true;
@@ -322,17 +354,19 @@
data: JSON.stringify(payload),
headers: { 'Content-Type': 'application/json' }
});
- if (res.data && res.data.outMsg) {
- if (res.data.outMsg.includes('閲嶅涓婁笅鍒�')) {
- this.$showMessage(res.data.outMsg, { type: 'error' });
- } else {
- this.$showMessage(res.data.outMsg);
- }
- } else if (res.status === 0) {
- this.$showMessage('涓嬪垁鎻愪氦鎴愬姛');
- } else {
- this.$showMessage(res.message || '涓嬪垁鎻愪氦澶辫触');
+ if (res.data && res.data.outSum === "0") {
+ uni.showToast({
+ title: res.data.outMsg || '',
+ icon: 'error'
+ });
+ return;
+ } else if (res.data && res.data.outMsg) {
+ uni.showToast({
+ title: res.data.outMsg,
+ icon: 'none'
+ });
}
+ // 鍚庣画閫昏緫缁х画鎵ц
if (res.status === 0) {
await this.fetchFormData();
}
@@ -348,6 +382,7 @@
this.toolName = '';
this.toolModel = '';
this.useLimitInput = '';
+ this.lifeWarnInput = ''; // 鏂板锛氭竻绌�
},
async fetchFormData() {
if (!this.workOrderNo || !this.machineNo) {
@@ -380,19 +415,6 @@
return null;
};
- const parseNumber = v => {
- if (v === null || v === undefined || v === '') return null;
- const s = String(v).replace(/[,锛�%]/g, '').trim();
- const n = parseFloat(s);
- return Number.isFinite(n) ? n : null;
- };
-
- const formatPercent = n => {
- if (n === null || n === undefined || isNaN(n)) return '';
- if (n <= 1) return `${(n * 100).toFixed(0)}%`;
- return `${Number(n).toFixed(0)}%`;
- };
-
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');
@@ -403,11 +425,7 @@
const useLimit = getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit');
let percent = '';
- if (
- useCount != null && useLimit != null &&
- !isNaN(useCount) && !isNaN(useLimit) &&
- Number(useLimit) > 0
- ) {
+ if (useCount != null && useLimit != null && !isNaN(useCount) && !isNaN(useLimit) && Number(useLimit) > 0) {
percent = ((Number(useCount) / Number(useLimit)) * 100).toFixed(0) + '%';
}
@@ -449,6 +467,18 @@
};
});
+ // 鏂板锛氭寜涓婂垁鏃堕棿闄嶅簭鎺掑簭锛堣秺鏅氱殑瓒婁笂闈級
+ mapped.sort((a, b) => {
+ // 鏃堕棿鏍煎紡濡� "10-24 16:03"锛岃浆涓� Date 瀵硅薄姣旇緝
+ const parse = s => {
+ if (!s) return 0;
+ // 琛ュ勾浠斤紝鍋囪閮芥槸浠婂勾
+ const year = new Date().getFullYear();
+ return new Date(`${year}-${s.replace(/-/g, '-')}:00`).getTime();
+ };
+ return parse(b.upTime) - parse(a.upTime); // 娉ㄦ剰杩欓噷椤哄簭鍙嶈繃鏉�
+ });
+
this.toolRecords = mapped;
const totalFromRes = Number(
res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
@@ -478,6 +508,13 @@
this.toolModel = order.cutterModel || order.cutteR_MODEL || '';
// 鍏抽敭锛氳幏鍙栧伐鍗曟渶鏂伴噰闆嗘暟
this.workOrderCurrentCjNum = order.CurrentCjNum ?? order.currentCjNum ?? null;
+ // 鏂板锛氳嚜鍔ㄥ～鍏呭鍛芥瘮棰勮鍊�
+ if (order.modlLifeWorning !== undefined && order.modlLifeWorning !== null) {
+ const warn = Number(order.modlLifeWorning);
+ this.lifeWarnInput = warn <= 1 ? `${(warn * 100).toFixed(0)}%` : `${warn.toFixed(0)}%`;
+ } else {
+ this.lifeWarnInput = '';
+ }
} else {
this.workOrderCurrentCjNum = null;
}
@@ -514,9 +551,8 @@
this.fetchTools('');
this.machineNo = uni.getStorageSync('machineNo') || '';
this.workOrderNo = uni.getStorageSync('daa001') || '';
-
- console.log('鏈哄彴鍙�:', this.machineNo);
- console.log('宸ュ崟鍙�:', this.workOrderNo);
+ // 鍘婚櫎榛樿棰勮鍊� (90% -> 0.9)
+ //this.lifeWarnInput = '90';
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
@@ -529,16 +565,17 @@
</script>
<style scoped>
+ /* 鍘熸牱淇濇寔锛屾湭鏀瑰姩鏍峰紡锛屽彧鎻掑叆浜嗕竴涓緭鍏ユ */
.top-section-grid {
display: flex;
justify-content: center;
align-items: flex-end;
gap: 32px;
margin-bottom: 2vh;
- width: 95vw; /* 鏂板锛屽拰琛ㄦ牸瀹藉害涓�鑷� */
- max-width: 1600px; /* 鏂板锛屽拰琛ㄦ牸涓�鑷� */
- margin-left: auto; /* 鏂板锛屽眳涓� */
- margin-right: auto; /* 鏂板锛屽眳涓� */
+ width: 95vw;
+ max-width: 1600px;
+ margin-left: auto;
+ margin-right: auto;
}
.form-cell {
@@ -661,7 +698,7 @@
}
.tool-btn {
- flex: 0 0 24%; /* 姣忚4涓寜閽� */
+ flex: 0 0 24%;
box-sizing: border-box;
margin: 5px 1% 5px 0;
padding: 12px 18px;
@@ -717,7 +754,6 @@
box-shadow: none;
}
- /* 琛ㄦ牸鏁翠綋灞呬腑锛屽搴﹂檺鍒讹紝鍐呭灞呬腑 */
.table-section {
display: flex;
justify-content: center;
@@ -726,8 +762,8 @@
}
table.styled-table {
- max-width: 1600px; /* 鍘熶负1400px锛岃皟瀹� */
- width: 95vw; /* 鍘熶负90vw锛岃皟瀹� */
+ max-width: 1600px;
+ width: 95vw;
margin: 0 auto;
border-collapse: separate;
border-spacing: 0;
@@ -755,13 +791,11 @@
text-align: center;
}
- .table-section table th:first-child,
- .table-section table td:first-child {
+ .table-section table th:first-child, .table-section table td:first-child {
border-left: 2px solid #bfbfbf;
}
- .table-section table th:last-child,
- .table-section table td:last-child {
+ .table-section table th:last-child, .table-section table td:last-child {
border-right: 2px solid #bfbfbf;
}
--
Gitblit v1.9.3