From ecef8843c1b1bc15c9c011df11fb29a76a30094e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 20 十月 2025 14:05:43 +0800
Subject: [PATCH] 界面优化
---
components/mold.vue | 195 ++++++++++++++++++++++++++++++++----------------
1 files changed, 129 insertions(+), 66 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 2dec576..9ec5fa9 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -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>
@@ -63,7 +63,7 @@
<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>
@@ -115,7 +115,7 @@
workOrderNo: '',//宸ュ崟鍙�
activeToolNo: '', // 褰撳墠閫変腑鐨勫垁鍏风紪鍙�
pageIndex: 1,
- pageSize: 18,
+ pageSize: 20, //鍗曢〉鏄剧ず鐨勫垁鍏锋暟閲�
total: 0,
toolList: [],
selectedToolNo: '',
@@ -287,7 +287,7 @@
this.submitting = false;
}
},
- // 涓嬪垁鏃朵紶閫� xdjs = 褰撳墠 downCount
+ // 涓嬪垁鏃朵紶閫� xdjs = 宸ュ崟 currentCjNum
async handleDownTool() {
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
@@ -296,8 +296,8 @@
const useLimit = Number(this.useLimitInput);
if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
- const currentTool = this.toolRecords.find(r => r.no === this.selectedToolNo);
- const xdjs = currentTool && currentTool.downCount != null ? Number(currentTool.downCount) : null;
+ // 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
const payload = {
workOrderNo: this.workOrderNo,
@@ -377,14 +377,11 @@
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');
@@ -449,29 +446,30 @@
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;
- }
- },
+ // 鑷姩甯﹀嚭宸ュ崟鍒�鍏蜂俊鎭紝骞惰幏鍙栧伐鍗曟渶鏂伴噰闆嗘暟
+ 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) {
if (!dateTimeStr) return '';
try {
@@ -539,6 +537,8 @@
border: 1px solid #ccc;
width: 10vw;
margin-right: 8px;
+ border-radius: 6px;
+ background: #f8f8f8;
}
.form-select {
@@ -546,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;
@@ -573,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;
}
@@ -587,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;
@@ -596,16 +616,19 @@
.dialog {
background: #fff;
- padding: 3vh 3vw; /* 澧炲ぇ鍐呰竟璺� */
- border-radius: 12px; /* 绋嶅井鍦嗘鼎涓�鐐� */
- width: 100vw; /* 鍘�60vw锛屾敼涓�100vw鏇村 */
- max-width: 1200px; /* 闄愬埗鏈�澶у搴︼紝闃叉瓒呭睆 */
- min-height: 60vh; /* 澧炲姞鏈�灏忛珮搴� */
+ 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; /* 杈撳叆妗嗘洿瀹� */
+ width: 24vw;
+ border-radius: 6px;
+ background: #f8f8f8;
}
.tool-list {
@@ -614,62 +637,102 @@
margin: 1vh 0;
max-height: 40vh;
overflow-y: auto;
+ gap: 10px 0;
}
.tool-btn {
- flex: 0 0 32%;
+ flex: 0 0 24%; /* 姣忚4涓寜閽� */
box-sizing: border-box;
margin: 5px 1% 5px 0;
- padding: 8px 16px;
- background: #e0e0e0;
- border: 1px solid #ccc;
- border-radius: 4px;
+ padding: 12px 18px;
+ background: #f5f5f5;
+ border: 1px solid #d0d0d0;
+ border-radius: 8px;
cursor: pointer;
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,
@@ -691,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