From ecef8843c1b1bc15c9c011df11fb29a76a30094e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 20 十月 2025 14:05:43 +0800
Subject: [PATCH] 界面优化
---
components/mold.vue | 275 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 210 insertions(+), 65 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 170dff5..9ec5fa9 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>
@@ -48,7 +48,7 @@
<span style="margin: 0 12px;">绗瑊{ pageIndex }}椤� / 鍏眥{ totalPages }}椤�</span>
<button class="btn-blue" @click="nextPage" :disabled="pageIndex === totalPages || loadingTools">涓嬩竴椤�</button>
</div>
- <div>
+ <div style="display: flex; gap: 18px; align-items: center;">
<button class="btn-blue" @click="confirmTool">纭畾</button>
<button class="btn-disabled" @click="closeToolDialog">鍙栨秷</button>
</div>
@@ -56,14 +56,14 @@
</view>
</view>
- <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍硷紙閲嶅啓鏍峰紡浠ヨ创鍚堢ず渚嬪浘锛� -->
+ <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
<view class="table-section">
<table class="styled-table">
<thead>
<tr>
<th style="width:8%">鍒�鍏风紪鍙�</th>
<th style="width:14%">鍒�鍏峰悕绉�</th>
- <th style="width:12%">涓婂垁鏃堕棿 <span class="header-badge">1</span></th>
+ <th style="width:12%">涓婂垁鏃堕棿</th>
<th class="num" style="width:8%">涓婂垁璁℃暟</th>
<th style="width:12%">涓嬪垁鏃堕棿</th>
<th class="num" style="width:8%">涓嬪垁璁℃暟</th>
@@ -113,8 +113,9 @@
return {
machineNo: '',//鏈哄彴缂栫爜
workOrderNo: '',//宸ュ崟鍙�
+ activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
pageIndex: 1,
- pageSize: 20,
+ pageSize: 20, //鍗曢〉鏄剧ず鐨勫垁鍏锋暟閲�
total: 0,
toolList: [],
selectedToolNo: '',
@@ -128,7 +129,8 @@
loadingTools: false,
loadingForm: false,
submitting: false,
- _searchTimer: null
+ _searchTimer: null,
+ workOrderCurrentCjNum: null // 宸ュ崟褰撳墠鏁伴噰
};
},
computed: {
@@ -178,8 +180,9 @@
this.filteredTools = mapped;
this.toolList = mapped.slice();
- // 鏇存柊 total 骞朵慨姝� pageIndex 瓒婄晫闂
- const totalFromRes = Number(res.totalCount ?? res.data?.total ?? res.data?.totalCount ?? mapped.length);
+ 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;
@@ -194,7 +197,6 @@
this.loadingTools = false;
}
},
- //缈婚〉
async prevPage() {
if (this.pageIndex > 1) {
this.pageIndex--;
@@ -208,20 +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;
},
confirmTool() {
this.showToolDialog = false;
@@ -236,17 +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
async handleUpTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -255,12 +256,16 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ // sdjs 浣跨敤宸ュ崟 currentCjNum
+ const sdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
+
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
type: '涓婂垁',
- useLimit
+ useLimit,
+ sdjs // 涓婂垁璁℃暟锛堝伐鍗曞綋鍓嶆暟閲囷級
};
try {
this.submitting = true;
@@ -282,6 +287,7 @@
this.submitting = false;
}
},
+ // 涓嬪垁鏃朵紶閫� xdjs = 宸ュ崟 currentCjNum
async handleDownTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -290,12 +296,16 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ // 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
+
const payload = {
workOrderNo: this.workOrderNo,
machineNo: this.machineNo,
toolNo: this.selectedToolNo,
type: '涓嬪垁',
- useLimit
+ useLimit,
+ xdjs // 涓嬪垁璁℃暟
};
try {
this.submitting = true;
@@ -361,21 +371,47 @@
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 '';
+ 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 currentCjNum = getField(t, 'currentCjNum', 'CURRENTCJNUM', 'CurrentCjNum');
- 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 || '鏈煡';
}
@@ -388,23 +424,50 @@
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) : ''),
- warnStatus
+ useCount: useCount ?? '',
+ useLimit: useLimit ?? '',
+ lifePercent: percent,
+ lifeWarn: formatPercent(lifeWarnNum),
+ warnStatus,
+ currentCjNum
};
});
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('鑾峰彇鏁版嵁澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
this.toolRecords = [];
} finally {
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 order = res.data.tbBillList[0];
+ this.selectedToolNo = order.cutterId || order.cutteR_ID || '';
+ this.toolName = order.cutterName || order.cutteR_NAME || '';
+ this.toolModel = order.cutterModel || order.cutteR_MODEL || '';
+ // 鍏抽敭锛氳幏鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ this.workOrderCurrentCjNum = order.CurrentCjNum ?? order.currentCjNum ?? null;
+ } else {
+ this.workOrderCurrentCjNum = null;
+ }
+ } catch (e) {
+ console.warn('鑷姩甯﹀嚭宸ュ崟鍒�鍏峰け璐�', e);
+ this.workOrderCurrentCjNum = null;
}
},
formatDateTime(dateTimeStr) {
@@ -441,6 +504,7 @@
if (this.machineNo && this.workOrderNo) {
this.fetchFormData();
+ this.fetchDefaultToolFromWorkOrder();
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
@@ -473,6 +537,8 @@
border: 1px solid #ccc;
width: 10vw;
margin-right: 8px;
+ border-radius: 6px;
+ background: #f8f8f8;
}
.form-select {
@@ -480,17 +546,36 @@
padding: 1vh;
font-size: 1.1vw;
margin-right: 8px;
+ border-radius: 6px;
+ background: #f8f8f8;
}
.btn-blue {
background-color: #00A2E9;
color: white;
border: none;
- padding: 8px 18px;
+ padding: 14px 36px;
margin-left: 8px;
- border-radius: 5px;
+ border-radius: 10px;
cursor: pointer;
+ font-size: 1.1vw;
+ font-weight: bold;
+ box-shadow: 0 2px 8px rgba(0,0,0,0.04);
+ transition: background 0.2s, box-shadow 0.2s;
}
+
+ .btn-blue:active,
+ .btn-blue:focus {
+ background-color: #0086c2;
+ box-shadow: 0 4px 12px rgba(0,162,233,0.12);
+ }
+
+ .btn-blue:disabled {
+ background: #b3e0f7;
+ color: #eee;
+ cursor: not-allowed;
+ box-shadow: none;
+ }
.button-row {
display: flex;
@@ -507,11 +592,12 @@
font-size: 1.2vw;
border: none;
text-align: center;
- border-radius: 5px;
+ border-radius: 6px;
+ transition: background 0.2s;
}
.cancel-btn {
- background-color: #ccc;
+ background-color: #eee;
color: #333;
}
@@ -521,7 +607,7 @@
left: 0;
right: 0;
bottom: 0;
- background: rgba(0,0,0,0.3);
+ background: rgba(0,0,0,0.18);
display: flex;
justify-content: center;
align-items: center;
@@ -530,9 +616,19 @@
.dialog {
background: #fff;
- padding: 2vh 2vw;
- border-radius: 8px;
- width: 60vw;
+ padding: 3vh 3vw;
+ border-radius: 18px;
+ width: 100vw;
+ max-width: 1200px;
+ min-height: 60vh;
+ box-sizing: border-box;
+ box-shadow: 0 8px 32px rgba(0,0,0,0.12);
+ }
+
+ .form-group .input {
+ width: 24vw;
+ border-radius: 6px;
+ background: #f8f8f8;
}
.tool-list {
@@ -541,53 +637,102 @@
margin: 1vh 0;
max-height: 40vh;
overflow-y: auto;
+ gap: 10px 0;
}
.tool-btn {
- margin: 5px 10px 5px 0;
- padding: 8px 16px;
+ flex: 0 0 24%; /* 姣忚4涓寜閽� */
+ box-sizing: border-box;
+ margin: 5px 1% 5px 0;
+ padding: 12px 18px;
background: #f5f5f5;
- border: 1px solid #ccc;
- border-radius: 4px;
+ border: 1px solid #d0d0d0;
+ border-radius: 8px;
cursor: pointer;
- background: #e0e0e0;
- color: #888;
+ color: #333;
+ text-align: left;
+ font-size: 1vw;
+ transition: background 0.15s, color 0.15s;
+ word-break: break-all;
}
+
+ .tool-btn.active {
+ background: #00A2E9;
+ color: #fff;
+ font-weight: bold;
+ border: 1.5px solid #0086c2;
+ }
.dialog-actions {
display: flex;
justify-content: space-between;
+ align-items: flex-end;
margin-top: 2vh;
+ padding-top: 2vh;
+ border-top: 1px solid #eee;
}
- .table-section {
- margin: 2vh 0;
- overflow-x: auto;
+ .dialog-actions > div:first-child {
+ display: flex;
+ align-items: center;
+ gap: 24px;
+ }
+
+ .dialog-actions > div:last-child {
+ display: flex;
+ flex-direction: row;
+ gap: 18px;
+ align-items: center;
+ }
+
+ .btn-disabled {
+ background: #f2f2f2;
+ color: #bbb;
+ border: none;
+ padding: 14px 36px;
+ border-radius: 10px;
+ font-size: 1.1vw;
+ font-weight: bold;
+ cursor: not-allowed;
+ box-shadow: none;
}
- /* 鏂扮殑琛ㄦ牸鏍峰紡锛岃创杩戞埅鍥鹃鏍� */
- table.styled-table {
- width: 100%;
- border-collapse: separate;
- border-spacing: 0;
- border: 2px solid #bfbfbf;
- background: #fff;
- }
+ /* 琛ㄦ牸鏁翠綋灞呬腑锛屽搴﹂檺鍒讹紝鍐呭灞呬腑 */
+ .table-section {
+ display: flex;
+ justify-content: center;
+ margin: 1vh 0;
+ overflow-x: auto;
+ }
+
+ table.styled-table {
+ max-width: 1600px; /* 鍘熶负1400px锛岃皟瀹� */
+ width: 95vw; /* 鍘熶负90vw锛岃皟瀹� */
+ margin: 0 auto;
+ border-collapse: separate;
+ border-spacing: 0;
+ border: 2px solid #bfbfbf;
+ background: #fff;
+ border-radius: 12px;
+ overflow: hidden;
+ box-shadow: 0 2px 12px rgba(0,0,0,0.06);
+ }
table.styled-table thead th {
background: #fafafa;
border-bottom: 2px solid #bfbfbf;
- padding: 10px 6px;
+ padding: 16px 10px;
font-weight: bold;
- font-size: 1vw;
+ font-size: 1.2vw;
text-align: center;
}
table.styled-table tbody td {
border-bottom: 1px solid #e8e8e8;
- padding: 10px 6px;
- font-size: 0.95vw;
+ padding: 14px 10px;
+ font-size: 1.1vw;
vertical-align: middle;
+ text-align: center;
}
.table-section table th:first-child,
@@ -609,8 +754,8 @@
}
.num {
- text-align: right;
- padding-right: 12px;
+ text-align: center;
+ padding-right: 0;
font-variant-numeric: tabular-nums;
}
--
Gitblit v1.9.3