From 0c742784ffbf071e968fc6f2a980849b3e5e6c05 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 09:56:20 +0800
Subject: [PATCH] BUG修改
---
components/mold.vue | 260 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 204 insertions(+), 56 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index f2dc402..f719e1b 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -3,17 +3,13 @@
<!-- 鍒�鍏烽�夋嫨鍖� -->
<view class="top-section-grid">
<view class="form-cell">
- <label class="form-label">閫夋嫨鍒�鍏风紪鍙凤細</label>
- <select v-model="selectedToolNo" class="form-select" :disabled="loadingTools">
- <option value="" disabled>璇烽�夋嫨</option>
- <option v-for="tool in toolList" :key="tool.no" :value="tool.no">{{ tool.no }} | {{ tool.name }}</option>
- </select>
+ <label class="form-label">鍒�鍏风紪鍙凤細</label>
+ <input class="input" v-model="selectedToolNo" placeholder="璇烽�氳繃鍒�鍏风洰褰曢�夋嫨" disabled />
<button class="btn-blue" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
</view>
<view class="form-cell">
<label class="form-label">璁剧疆浣跨敤涓婇檺锛�</label>
<input class="input" type="number" v-model="useLimitInput" placeholder="姣忔鎹㈠垁鍚庢墜濉�" :disabled="!selectedToolNo || loadingForm" />
- <button class="btn-blue" @click="setUseLimit" :disabled="!selectedToolNo || !useLimitInput || loadingForm">淇濆瓨涓婇檺</button>
</view>
<view class="form-cell">
<label class="form-label">鍒�鍏峰悕绉帮細</label>
@@ -38,7 +34,11 @@
<button class="btn-blue" @click="searchTool" :disabled="loadingTools">鎼滅储</button>
</view>
<view class="tool-list">
- <button v-for="tool in filteredTools" :key="tool.no" class="tool-btn" @click="selectTool(tool)">
+ <button v-for="tool in filteredTools"
+ :key="tool.no"
+ class="tool-btn"
+ :class="{ active: activeToolNo === tool.no }"
+ @click="selectTool(tool)">
{{ tool.no }} | {{ tool.name }}
</button>
</view>
@@ -58,35 +58,38 @@
<!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
<view class="table-section">
- <table>
+ <table class="styled-table">
<thead>
<tr>
- <th>鍒�鍏风紪鍙�</th>
- <th>鍒�鍏峰悕绉�</th>
- <th>涓婂垁鏃堕棿</th>
- <th>涓婂垁璁℃暟</th>
- <th>涓嬪垁鏃堕棿</th>
- <th>涓嬪垁璁℃暟</th>
- <th>浣跨敤娆℃暟</th>
- <th>浣跨敤涓婇檺</th>
- <th>瀵垮懡姣�%</th>
- <th>瀵垮懡姣旈璀﹀��</th>
- <th>棰勮鐘舵��</th>
+ <th style="width:8%">鍒�鍏风紪鍙�</th>
+ <th style="width:14%">鍒�鍏峰悕绉�</th>
+ <th style="width:12%">涓婂垁鏃堕棿 <span class="header-badge">1</span></th>
+ <th class="num" style="width:8%">涓婂垁璁℃暟</th>
+ <th style="width:12%">涓嬪垁鏃堕棿</th>
+ <th class="num" style="width:8%">涓嬪垁璁℃暟</th>
+ <th class="num" style="width:8%">浣跨敤娆℃暟</th>
+ <th class="num" style="width:8%">浣跨敤涓婇檺</th>
+ <th class="num" style="width:8%">瀵垮懡姣�%</th>
+ <th class="num" style="width:8%">瀵垮懡姣旈璀﹀��</th>
+ <th style="width:8%">棰勮鐘舵��</th>
</tr>
</thead>
<tbody>
- <tr v-for="item in toolRecords" :key="item.id">
+ <tr v-for="(item, idx) in toolRecords" :key="item.id" :class="{'row-odd': idx % 2 === 0}">
<td>{{ item.no }}</td>
- <td>{{ item.name }}</td>
+ <td class="left">{{ item.name }}</td>
<td>{{ item.upTime }}</td>
- <td>{{ item.upCount }}</td>
+ <td class="num">{{ item.upCount != null ? item.upCount : '' }}</td>
<td>{{ item.downTime }}</td>
- <td>{{ item.downCount }}</td>
- <td>{{ item.useCount }}</td>
- <td>{{ item.useLimit }}</td>
- <td>{{ item.lifePercent }}</td>
- <td>{{ item.lifeWarn }}</td>
- <td :class="item.warnStatus === '棰勮' ? 'warn' : ''">{{ item.warnStatus }}</td>
+ <td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>
+ <td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>
+ <td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
+ <td class="num">{{ item.lifePercent }}</td>
+ <td class="num">{{ item.lifeWarn }}</td>
+ <td :class="item.warnStatus === '棰勮' ? 'warn-cell' : (item.warnStatus === '姝ｅ父' ? 'ok-cell' : '')">
+ <span v-if="item.warnStatus === '棰勮'" class="warn-badge">璀﹀憡</span>
+ <span v-else>{{ item.warnStatus }}</span>
+ </td>
</tr>
<tr v-if="!toolRecords.length">
<td colspan="11">鏆傛棤鏁版嵁</td>
@@ -110,6 +113,7 @@
return {
machineNo: '',//鏈哄彴缂栫爜
workOrderNo: '',//宸ュ崟鍙�
+ activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
pageIndex: 1,
pageSize: 18,
total: 0,
@@ -175,8 +179,10 @@
this.filteredTools = mapped;
this.toolList = mapped.slice();
- // 鏇存柊 total 骞朵慨姝� pageIndex 瓒婄晫闂
- const totalFromRes = Number(res.totalCount ?? res.data?.total ?? res.data?.totalCount ?? mapped.length);
+ // 淇 total 璧嬪�间紭鍏堢骇锛屼紭鍏堝彇 res.data.total
+ const totalFromRes = Number(
+ res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
+ );
this.total = Number.isFinite(totalFromRes) ? totalFromRes : mapped.length;
if (this.pageIndex > this.totalPages) {
this.pageIndex = this.totalPages;
@@ -219,6 +225,7 @@
this.selectedToolNo = tool.no;
this.toolName = tool.name;
this.toolModel = tool.model;
+ this.activeToolNo = tool.no; // 璁板綍閫変腑
},
confirmTool() {
this.showToolDialog = false;
@@ -358,21 +365,51 @@
return Number.isFinite(n) ? n : null;
};
- const formatPercent = n => (n === null || n === undefined || isNaN(n)) ? '' : `${Number(n).toFixed(2)}%`;
+ 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)}%`;
+ };
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 lifePercentRaw = getField(t, 'lifE_PERCENT', 'LIFE_PERCENT', 'lifePercent', 'LIFEPERCENT');
const lifeWarnRaw = getField(t, 'lifE_WARN', 'LIFE_WARN', 'lifeWarn', 'LIFEWARN');
- const lifePercentNum = parseNumber(lifePercentRaw);
+ // 浣跨敤娆℃暟鍜屼笂闄�
+ 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 &&
+ !isNaN(useCount) && !isNaN(useLimit) &&
+ Number(useLimit) > 0
+ ) {
+ 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();
+ 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 lifeWarnNum = parseNumber(lifeWarnRaw);
- // 棰勮瑙勫垯锛氬綋瀵垮懡姣� >= 棰勮鍊兼椂鏍囪 棰勮锛堜笌鍚庣 V_WOMDAA_BY_CUTTER 淇濇寔涓�鑷达級
+ // 棰勮瑙勫垯锛氬綋瀵垮懡姣� >= 棰勮鍊兼椂鏍囪 棰勮
let warnStatus = getField(t, 'status', 'STATUS') || '';
- if (lifeWarnNum !== null && lifePercentNum !== null) {
- warnStatus = (lifePercentNum >= lifeWarnNum) ? '棰勮' : '姝ｅ父';
+ if (lifeWarnNum !== null && useCount != null && useLimit != null && !isNaN(useCount) && !isNaN(useLimit) && Number(useLimit) > 0) {
+ const percentNum = Number(useCount) / Number(useLimit);
+ warnStatus = (percentNum >= lifeWarnNum) ? '棰勮' : '姝ｅ父';
} else {
warnStatus = warnStatus || '鏈煡';
}
@@ -385,17 +422,19 @@
upCount: getField(t, 'uP_COUNT', 'UP_COUNT', 'upCount') ?? '',
downTime: this.formatDateTime(downTimeRaw),
downCount: getField(t, 'dowN_COUNT', 'DOWN_COUNT', 'downCount') ?? '',
- useCount: getField(t, 'usE_COUNT', 'USE_COUNT', 'useCount') ?? '',
- useLimit: getField(t, 'usE_LIMIT', 'USE_LIMIT', 'useLimit') ?? '',
- lifePercent: formatPercent(lifePercentNum),
- lifeWarn: lifeWarnNum !== null ? `${Number(lifeWarnNum).toFixed(0)}%` : (lifeWarnRaw ? String(lifeWarnRaw) : ''),
+ useCount: useCount ?? '',
+ useLimit: useLimit ?? '',
+ lifePercent: percent,
+ lifeWarn: formatPercent(lifeWarnNum),
warnStatus
};
});
this.toolRecords = mapped;
- const totalFromRes = Number(res.totalCount ?? res.data?.total ?? res.data?.totalCount ?? this.toolRecords.length);
- this.total = Number.isFinite(totalFromRes) ? totalFromRes : this.toolRecords.length;
+ const totalFromRes = Number(
+ res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
+ );
+ this.total = Number.isFinite(totalFromRes) ? totalFromRes : mapped.length;
} catch (error) {
console.error('鑾峰彇琛ㄥ崟鏁版嵁閿欒:', error);
this.$showMessage('鑾峰彇鏁版嵁澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
@@ -404,6 +443,25 @@
this.loadingForm = false;
}
},
+ // 鑷姩甯﹀嚭宸ュ崟鍒�鍏蜂俊鎭�
+ async fetchDefaultToolFromWorkOrder() {
+ if (!this.machineNo) return; // 娉ㄦ剰锛氳繖閲岀敤鏈哄彴鍙�
+ try {
+ const res = await this.$post({
+ url: '/Womdaa/GetWomdaasByShow',
+ data: JSON.stringify({ machineNo: this.machineNo }),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0 && Array.isArray(res.data?.tbBillList) && res.data.tbBillList.length > 0) {
+ const tool = res.data.tbBillList[0];
+ this.selectedToolNo = tool.cutterId || tool.cutteR_ID || '';
+ this.toolName = tool.cutterName || tool.cutteR_NAME || '';
+ this.toolModel = tool.cutterModel || tool.cutteR_MODEL || '';
+ }
+ } catch (e) {
+ console.warn('鑷姩甯﹀嚭宸ュ崟鍒�鍏峰け璐�', e);
+ }
+ },
formatDateTime(dateTimeStr) {
if (!dateTimeStr) return '';
try {
@@ -438,6 +496,7 @@
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
+ this.fetchDefaultToolFromWorkOrder(); // 鑷姩甯﹀嚭宸ュ崟鍒�鍏�
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
@@ -527,9 +586,16 @@
.dialog {
background: #fff;
- padding: 2vh 2vw;
- border-radius: 8px;
- width: 60vw;
+ padding: 3vh 3vw; /* 澧炲ぇ鍐呰竟璺� */
+ border-radius: 12px; /* 绋嶅井鍦嗘鼎涓�鐐� */
+ width: 100vw; /* 鍘�60vw锛屾敼涓�100vw鏇村 */
+ max-width: 1200px; /* 闄愬埗鏈�澶у搴︼紝闃叉瓒呭睆 */
+ min-height: 60vh; /* 澧炲姞鏈�灏忛珮搴� */
+ box-sizing: border-box;
+ }
+
+ .form-group .input {
+ width: 24vw; /* 杈撳叆妗嗘洿瀹� */
}
.tool-list {
@@ -541,15 +607,24 @@
}
.tool-btn {
- margin: 5px 10px 5px 0;
+ flex: 0 0 32%;
+ box-sizing: border-box;
+ margin: 5px 1% 5px 0;
padding: 8px 16px;
- background: #f5f5f5;
+ background: #e0e0e0;
border: 1px solid #ccc;
border-radius: 4px;
cursor: pointer;
- background: #e0e0e0;
- color: #888;
+ color: #333;
+ text-align: left;
+ transition: background 0.15s, color 0.15s;
}
+
+ .tool-btn.active {
+ background: #00A2E9;
+ color: #fff;
+ font-weight: bold;
+ }
.dialog-actions {
display: flex;
@@ -562,16 +637,89 @@
overflow-x: auto;
}
- table {
+ /* 鏂扮殑琛ㄦ牸鏍峰紡锛岃创杩戞埅鍥鹃鏍� */
+ table.styled-table {
width: 100%;
- border-collapse: collapse;
+ border-collapse: separate;
+ border-spacing: 0;
+ border: 2px solid #bfbfbf;
+ background: #fff;
}
- th, td {
- border: 1px solid #ccc;
- padding: 8px 4px;
- text-align: center;
- font-size: 1vw;
+ table.styled-table thead th {
+ background: #fafafa;
+ border-bottom: 2px solid #bfbfbf;
+ padding: 10px 6px;
+ font-weight: bold;
+ font-size: 1vw;
+ text-align: center;
+ }
+
+ table.styled-table tbody td {
+ border-bottom: 1px solid #e8e8e8;
+ padding: 10px 6px;
+ font-size: 0.95vw;
+ vertical-align: middle;
+ }
+
+ .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 {
+ border-right: 2px solid #bfbfbf;
+ }
+
+ .row-odd {
+ background: #fff;
+ }
+
+ .row-odd + tr {
+ background: #fafafa;
+ }
+
+ .num {
+ text-align: right;
+ padding-right: 12px;
+ font-variant-numeric: tabular-nums;
+ }
+
+ .left {
+ text-align: left;
+ padding-left: 8px;
+ }
+
+ .warn-cell {
+ color: #d93025;
+ font-weight: bold;
+ }
+
+ .ok-cell {
+ color: #333;
+ }
+
+ .warn-badge {
+ display: inline-block;
+ background: #ff4d4f;
+ color: #fff;
+ padding: 2px 6px;
+ border-radius: 3px;
+ font-weight: bold;
+ font-size: 0.9vw;
+ }
+
+ .header-badge {
+ display: inline-block;
+ background: #fff7e6;
+ color: #8a6d00;
+ border: 1px solid #ffe58f;
+ padding: 1px 6px;
+ border-radius: 3px;
+ margin-left: 6px;
+ font-size: 0.8vw;
+ vertical-align: middle;
}
.warn {
--
Gitblit v1.9.3