From 98715dc8cb012d10dd4a9ff798e7ba8049c26722 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 13 十一月 2025 09:58:58 +0800
Subject: [PATCH] BUG
---
components/mold.vue | 435 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 328 insertions(+), 107 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 152c4f3..0b8bd56 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -2,32 +2,47 @@
<view class="page">
<!-- 鍒�鍏烽�夋嫨鍖� -->
<view class="top-section-grid">
- <view class="form-cell">
- <label class="form-label">鍒�鍏风紪鍙凤細</label>
- <input class="input" v-model="selectedToolNo" placeholder="璇烽�氳繃鍒�鍏风洰褰曢�夋嫨" disabled />
- <button class="btn-blue" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
+ <!-- 绗竴琛岋細绉婚櫎鍒�鍏风洰褰曟寜閽� -->
+ <view class="form-row">
+ <view class="form-cell">
+ <label class="form-label">鍒�鍏风紪鍙凤細</label>
+ <input class="input small-font" v-model="selectedToolNo" placeholder="璇烽�氳繃鍒�鍏风洰褰曢�夋嫨" disabled />
+ </view>
+ <view class="form-cell">
+ <label class="form-label">璁剧疆浣跨敤涓婇檺锛�</label>
+ <input class="input small-font input-use-limit" type="number" v-model="useLimitInput" placeholder="姣忔鎹㈠垁鍚庢墜濉�" :disabled="!selectedToolNo || loadingForm" />
+ </view>
+ <view class="form-cell">
+ <label class="form-label">瀵垮懡姣旈璀﹀�硷細</label>
+ <view class="input-with-unit">
+ <input class="input small-font input-life-warn"
+ v-model="lifeWarnInput"
+ placeholder="濡�0.9鎴�90"
+ :disabled="!selectedToolNo || loadingForm" />
+ <span class="unit-text">%</span>
+ </view>
+ </view>
</view>
- <view class="form-cell">
- <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 />
- <label class="form-label" style="margin-left: 16px;">瑙勬牸鍨嬪彿锛�</label>
- <input class="input" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
- </view>
- </view>
- <!-- 鎿嶄綔鎸夐挳 -->
+ <!-- 绗簩琛岋細鍦ㄦ渶鍚庢坊鍔犲垁鍏风洰褰曟寜閽� -->
+ <view class="form-row">
+ <!-- 鍒�鍏峰悕绉� -->
+ <view class="form-cell">
+ <label class="form-label">鍒�鍏峰悕绉帮細</label>
+ <input class="input small-font input-tool-name" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
+ </view>
+ <!-- 瑙勬牸鍨嬪彿 -->
+ <view class="form-cell">
+ <label class="form-label">瑙勬牸鍨嬪彿锛�</label>
+ <input class="input small-font input-tool-model" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
+ </view>
+ <!-- 鏂板鐨勫垁鍏风洰褰曟寜閽� -->
+ <view class="form-cell">
+ <button class="btn-blue large-btn" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
+ </view>
+ </view>
+ </view> <!-- 杩欓噷闂悎 top-section-grid -->
+ <!-- 鎿嶄綔鎸夐挳 - 绉诲嚭 top-section-grid -->
<view class="button-row">
<button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">涓婂垁鎻愪氦</button>
<button class="save-btn" @click="handleDownTool" :disabled="submitting || loadingForm">涓嬪垁鎻愪氦</button>
@@ -138,7 +153,14 @@
loadingForm: false,
submitting: false,
_searchTimer: null,
- workOrderCurrentCjNum: null // 宸ュ崟褰撳墠鏁伴噰
+ workOrderCurrentCjNum: null, // 宸ュ崟褰撳墠鏁伴噰
+
+ // 鑷姩淇濆瓨鐩稿叧
+ autoSaveTimer: null,
+ isDirty: false, // 琛ㄥ崟鏄惁鏈夋湭淇濆瓨鍙樻洿
+ autoSaveIntervalMs: 5 * 60 * 1000, // 榛樿 5 鍒嗛挓
+ autoSaveEnabled: true,
+ autoSaveActionName: 'handleUpTool' // 鑷姩瑙﹀彂鐨勬柟娉曞悕锛屽彲鏀逛负鑷畾涔変繚瀛樻柟娉�
};
},
computed: {
@@ -146,7 +168,56 @@
return Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
}
},
+ watch: {
+ // 鏍囪鑴忔暟鎹細鎸夐渶鐩戝惉瀛楁鍙樺寲
+ selectedToolNo() { this.isDirty = true; },
+ useLimitInput() { this.isDirty = true; },
+ lifeWarnInput() { this.isDirty = true; },
+ toolName() { this.isDirty = true; },
+ toolModel() { this.isDirty = true; }
+ },
methods: {
+ // 鑷姩淇濆瓨锛氬惎鍔�
+ startAutoSave() {
+ if (!this.autoSaveEnabled) return;
+ this.stopAutoSave();
+ this.autoSaveTimer = setInterval(() => {
+ this.autoSaveTick();
+ }, this.autoSaveIntervalMs);
+ },
+ // 鑷姩淇濆瓨锛氬仠姝�
+ stopAutoSave() {
+ if (this.autoSaveTimer) {
+ clearInterval(this.autoSaveTimer);
+ this.autoSaveTimer = null;
+ }
+ },
+ // 鑷姩淇濆瓨锛氭瘡娆″畾鏃舵墽琛屾椂鐨勯�昏緫
+ async autoSaveTick() {
+ if (!this.autoSaveEnabled) return;
+ if (!this.isDirty) return;
+ if (this.submitting || this.loadingForm) return;
+
+ const fn = this.autoSaveActionName && typeof this[this.autoSaveActionName] === 'function'
+ ? this[this.autoSaveActionName]
+ : null;
+ if (!fn) {
+ console.warn('鑷姩淇濆瓨锛氭湭鎵惧埌鏂规硶', this.autoSaveActionName);
+ return;
+ }
+
+ try {
+ this.submitting = true;
+ await fn.call(this); // 璋冪敤淇濆瓨鏂规硶锛堜緥濡� handleUpTool锛�
+ // 濡傛灉淇濆瓨鎴愬姛锛屾竻鑴忔爣璁帮紙淇濆瓨鏂规硶鍐呴儴鑻ュけ璐ユ病鏈夋姏鍑哄彲淇濇寔姝ゆ柟寮忥級
+ this.isDirty = false;
+ } catch (e) {
+ console.error('鑷姩淇濆瓨澶辫触锛�', e);
+ } finally {
+ this.submitting = false;
+ }
+ },
+
// 鏂板锛氬鍛芥瘮棰勮鍊煎綊涓�鍖� (杩斿洖 0~1 鎴� null)
normalizeLifeWarn(v) {
if (v == null) return null;
@@ -247,7 +318,7 @@
if (tool.lifeWarn !== undefined && tool.lifeWarn !== null) {
// 鏍煎紡鍖栦负鐧惧垎姣斿瓧绗︿覆
const warn = Number(tool.lifeWarn);
- this.lifeWarnInput = warn <= 1 ? `${(warn * 100).toFixed(0)}%` : `${warn.toFixed(0)}%`;
+ this.lifeWarnInput = warn <= 1 ? (warn * 100).toFixed(0) : warn.toFixed(0);
} else {
this.lifeWarnInput = '';
}
@@ -322,6 +393,7 @@
} catch (err) {
console.error(err);
this.$showMessage('涓婂垁鎻愪氦澶辫触锛岃妫�鏌ョ綉缁�');
+ throw err; // 鎶涘嚭浠ヤ究鑷姩淇濆瓨閫昏緫鎹曡幏骞朵繚鐣� isDirty
} finally {
this.submitting = false;
}
@@ -373,6 +445,7 @@
} catch (err) {
console.error(err);
this.$showMessage('涓嬪垁鎻愪氦澶辫触锛岃妫�鏌ョ綉缁�');
+ throw err;
} finally {
this.submitting = false;
}
@@ -383,6 +456,7 @@
this.toolModel = '';
this.useLimitInput = '';
this.lifeWarnInput = ''; // 鏂板锛氭竻绌�
+ this.isDirty = false;
},
async fetchFormData() {
if (!this.workOrderNo || !this.machineNo) {
@@ -511,7 +585,7 @@
// 鏂板锛氳嚜鍔ㄥ～鍏呭鍛芥瘮棰勮鍊�
if (order.modlLifeWorning !== undefined && order.modlLifeWorning !== null) {
const warn = Number(order.modlLifeWorning);
- this.lifeWarnInput = warn <= 1 ? `${(warn * 100).toFixed(0)}%` : `${warn.toFixed(0)}%`;
+ this.lifeWarnInput = warn <= 1 ? (warn * 100).toFixed(0) : warn.toFixed(0);
} else {
this.lifeWarnInput = '';
}
@@ -560,78 +634,119 @@
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
+
+ // 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
+ this.startAutoSave();
+ },
+ beforeDestroy() {
+ // 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
+ this.stopAutoSave();
}
};
</script>
<style scoped>
- /* 鍘熸牱淇濇寔锛屾湭鏀瑰姩鏍峰紡锛屽彧鎻掑叆浜嗕竴涓緭鍏ユ */
+ /* 浼樺寲椤堕儴琛ㄥ崟鍖哄煙鏍峰紡 */
.top-section-grid {
display: flex;
+ flex-direction: column;
justify-content: center;
- align-items: flex-end;
- gap: 32px;
+ align-items: center;
+ gap: 12px;
margin-bottom: 2vh;
width: 95vw;
max-width: 1600px;
margin-left: auto;
margin-right: auto;
+ padding: 12px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 1px solid #e9ecef;
+ font-size: 22px; /* 鏁翠綋璋冨ぇ琛ㄥ崟鍖哄瓧浣� */
}
+
+ /* 琛ㄥ崟琛屾牱寮忎紭鍖� */
+ .form-row {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ margin-bottom: 8px;
+ }
+
+ .form-row:last-child {
+ margin-bottom: 0;
+ }
.form-cell {
display: flex;
align-items: center;
+ flex: 1;
+ margin: 0 8px;
+ min-height: 44px;
}
.form-label {
- width: 90px;
+ width: 100px;
font-weight: bold;
+ font-size: 22px; /* 鍘�18px锛岃皟澶� */
+ color: #333;
+ white-space: nowrap;
+ margin-right: 8px;
+ flex-shrink: 0;
}
.input {
- padding: 1vh;
- font-size: 1.1vw;
- border: 1px solid #ccc;
- width: 10vw;
- margin-right: 8px;
- border-radius: 6px;
- background: #f8f8f8;
+ padding: 8px 12px;
+ font-size: 20px; /* 鍘�16px锛岃皟澶� */
+ border: 1px solid #dcdfe6;
+ flex: 1;
+ margin-right: 0;
+ border-radius: 4px;
+ background: #fff;
+ min-width: 0;
+ height: 36px;
+ box-sizing: border-box;
}
- .form-select {
- width: 12vw;
- padding: 1vh;
- font-size: 1.1vw;
- margin-right: 8px;
- border-radius: 6px;
- background: #f8f8f8;
- }
+ .input.small-font {
+ font-size: 19px; /* 鍘�15px锛岃皟澶� */
+ }
+
+ .input:disabled {
+ background-color: #f5f7fa;
+ color: #c0c4cc;
+ cursor: not-allowed;
+ }
.btn-blue {
- background-color: #00A2E9;
+ background-color: #1890ff;
color: white;
border: none;
- padding: 14px 36px;
- margin-left: 8px;
- border-radius: 10px;
+ padding: 8px 16px;
+ border-radius: 4px;
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;
+ font-size: 22px; /* 鍘�16px锛岃皟澶� */
+ font-weight: 500;
+ white-space: nowrap;
+ height: 60px;
+ box-sizing: border-box;
+ transition: all 0.3s;
+ flex-shrink: 0;
}
- .btn-blue:active,
- .btn-blue:focus {
- background-color: #0086c2;
- box-shadow: 0 4px 12px rgba(0,162,233,0.12);
+ .btn-blue:hover {
+ background-color: #40a9ff;
+ }
+
+ .btn-blue:active {
+ background-color: #096dd9;
}
.btn-blue:disabled {
- background: #b3e0f7;
- color: #eee;
+ background: #bae7ff;
+ color: #91d5ff;
cursor: not-allowed;
- box-shadow: none;
}
.button-row {
@@ -646,7 +761,7 @@
padding: 1.5vh;
background-color: #00A2E9;
color: white;
- font-size: 1.2vw;
+ font-size: 1.6vw; /* 鍘�1.2vw锛岃皟澶� */
border: none;
text-align: center;
border-radius: 6px;
@@ -658,6 +773,20 @@
color: #333;
}
+ .save-btn:hover {
+ background-color: #40a9ff;
+ }
+
+ .save-btn:active {
+ background-color: #096dd9;
+ }
+
+ .save-btn:disabled, .cancel-btn:disabled {
+ opacity: 0.6;
+ cursor: not-allowed;
+ }
+
+ /* 寮圭獥鏍峰紡 */
.dialog-overlay {
position: fixed;
top: 0;
@@ -675,42 +804,58 @@
background: #fff;
padding: 3vh 3vw;
border-radius: 18px;
- width: 100vw;
- max-width: 1200px;
- min-height: 60vh;
+ width: 90vw;
+ max-width: 1600px;
+ min-height: 70vh;
+ max-height: 85vh;
box-sizing: border-box;
box-shadow: 0 8px 32px rgba(0,0,0,0.12);
+ display: flex;
+ flex-direction: column;
}
- .form-group .input {
- width: 24vw;
- border-radius: 6px;
- background: #f8f8f8;
+ .form-group {
+ display: flex;
+ gap: 12px;
+ align-items: center;
+ margin-bottom: 2vh;
+ flex-shrink: 0;
}
+
+ .form-group .input {
+ flex: 1;
+ min-width: 300px;
+ border-radius: 6px;
+ background: #f8f8f8;
+ }
.tool-list {
display: flex;
flex-wrap: wrap;
margin: 1vh 0;
- max-height: 40vh;
+ flex: 1;
overflow-y: auto;
- gap: 10px 0;
+ gap: 12px;
+ align-content: flex-start;
}
.tool-btn {
- flex: 0 0 24%;
+ flex: 0 0 calc(20% - 10px);
box-sizing: border-box;
- margin: 5px 1% 5px 0;
- padding: 12px 18px;
+ padding: 10px 12px;
background: #f5f5f5;
border: 1px solid #d0d0d0;
border-radius: 8px;
cursor: pointer;
color: #333;
text-align: left;
- font-size: 1vw;
+ font-size: 18px; /* 鍘�13px锛岃皟澶� */
+ min-height: 50px;
transition: background 0.15s, color 0.15s;
- word-break: break-all;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ line-height: 1.4;
}
.tool-btn.active {
@@ -723,10 +868,11 @@
.dialog-actions {
display: flex;
justify-content: space-between;
- align-items: flex-end;
+ align-items: center;
margin-top: 2vh;
padding-top: 2vh;
border-top: 1px solid #eee;
+ flex-shrink: 0;
}
.dialog-actions > div:first-child {
@@ -742,18 +888,26 @@
align-items: center;
}
+ .dialog-actions .btn-blue {
+ padding: 10px 24px;
+ font-size: 22px; /* 鍘�16px锛岃皟澶� */
+ min-width: 100px;
+ }
+
.btn-disabled {
background: #f2f2f2;
- color: #bbb;
+ color: #999;
border: none;
- padding: 14px 36px;
- border-radius: 10px;
- font-size: 1.1vw;
- font-weight: bold;
+ padding: 10px 24px;
+ border-radius: 4px;
+ font-size: 22px; /* 鍘�16px锛岃皟澶� */
+ font-weight: 500;
cursor: not-allowed;
box-shadow: none;
+ min-width: 100px;
}
+ /* 琛ㄦ牸鏍峰紡 */
.table-section {
display: flex;
justify-content: center;
@@ -779,14 +933,14 @@
border-bottom: 2px solid #bfbfbf;
padding: 16px 10px;
font-weight: bold;
- font-size: 1.2vw;
+ font-size: 1.6vw; /* 鍘�1.2vw锛岃皟澶� */
text-align: center;
}
table.styled-table tbody td {
border-bottom: 1px solid #e8e8e8;
padding: 14px 10px;
- font-size: 1.1vw;
+ font-size: 1.4vw; /* 鍘�1.1vw锛岃皟澶� */
vertical-align: middle;
text-align: center;
}
@@ -834,33 +988,100 @@
padding: 2px 6px;
border-radius: 3px;
font-weight: bold;
- font-size: 0.9vw;
+ font-size: 1.2vw; /* 鍘�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 {
- color: red;
- font-weight: bold;
- }
-
- .bottom-section {
+ /* 甯﹀崟浣嶇殑杈撳叆妗嗘牱寮� */
+ .input-with-unit {
display: flex;
- justify-content: space-around;
- margin-top: 2vh;
+ align-items: center;
+ flex: 1;
}
- .tool-desc {
- margin-top: 2vh;
+ .input-with-unit .input {
+ flex: 1;
+ margin-right: 8px;
+ }
+
+ .unit-text {
+ color: #666;
+ font-size: 18px; /* 鍘�14px锛岃皟澶� */
+ white-space: nowrap;
+ width: 20px;
}
+
+ /* 鍝嶅簲寮忚皟鏁� */
+ @media (max-width: 1200px) {
+ .form-cell {
+ margin: 0 4px;
+ }
+
+ .form-label {
+ width: 90px;
+ font-size: 18px; /* 鍘�16px锛岃皟澶� */
+ }
+
+ .input {
+ font-size: 17px; /* 鍘�14px锛岃皟澶� */
+ padding: 6px 10px;
+ }
+
+ .btn-blue {
+ padding: 6px 12px;
+ font-size: 18px; /* 鍘�14px锛岃皟澶� */
+ }
+ }
+
+ /* 鏂板澶ф寜閽牱寮� */
+ .btn-blue.large-btn {
+ padding: 8px 24px;
+ font-size: 22px; /* 鍘�16px锛岃皟澶� */
+ height: 60px;
+ min-width: 100px;
+ }
+
+ /* 璋冩暣琛ㄥ崟鍗曞厓鏍煎竷灞�浠ラ�傚簲鎸夐挳 */
+ .form-row .form-cell:last-child {
+ justify-content: center;
+ flex: 0 0 auto;
+ min-width: 120px;
+ }
+
+ /* 鏂板锛氳鈥滆缃娇鐢ㄤ笂闄愨�濃�滃鍛芥瘮棰勮鍊尖�濊緭鍏ユ鍙樼獎 */
+ .input-use-limit {
+ width: 80px !important;
+ min-width: 0 !important;
+ margin-right: 10px;
+ }
+
+ .input-life-warn {
+ width: 80px !important;
+ min-width: 0 !important;
+ margin-right: 4px;
+ }
+
+ .input-use-limit {
+ width: 60px !important;
+ min-width: 0 !important;
+ margin-right: 10px;
+ }
+
+ .input-tool-model {
+ width: 60px !important;
+ min-width: 0 !important;
+ margin-right: 10px;
+ }
+
+ .input-tool-name {
+ width: 80px !important;
+ min-width: 0 !important;
+ margin-right: 10px;
+ }
+
+ .input-tool-model {
+ width: 80px !important;
+ min-width: 0 !important;
+ margin-right: 10px;
+ }
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3