From 61a45cedbba62437a03323909c68865e13cd21c9 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 31 十月 2025 17:12:28 +0800
Subject: [PATCH] 优化
---
components/mold.vue | 336 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 252 insertions(+), 84 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index dba921a..07f340c 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -2,28 +2,39 @@
<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 />
+ <button class="btn-blue" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
+ </view>
+ <view class="form-cell">
+ <label class="form-label">璁剧疆浣跨敤涓婇檺锛�</label>
+ <input class="input small-font" 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"
+ 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 class="form-row">
+ <view class="form-cell">
+ <label class="form-label">鍒�鍏峰悕绉帮細</label>
+ <input class="input small-font" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
+ </view>
+ <view class="form-cell">
+ <label class="form-label">瑙勬牸鍨嬪彿锛�</label>
+ <input class="input small-font" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
+ </view>
</view>
</view>
@@ -107,11 +118,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>
@@ -139,7 +149,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: {
@@ -147,7 +164,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;
@@ -194,7 +260,7 @@
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'),
- lifeWarn: getField(t, 'lifeWarn', 'LIFE_WARN', 'lifE_WARN') // 鏂板
+ lifeWarn: getField(t, 'modlLifeWorning', 'lifeWarn', 'LIFE_WARN', 'lifE_WARN')
}));
this.filteredTools = mapped;
@@ -248,7 +314,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 = '';
}
@@ -323,6 +389,7 @@
} catch (err) {
console.error(err);
this.$showMessage('涓婂垁鎻愪氦澶辫触锛岃妫�鏌ョ綉缁�');
+ throw err; // 鎶涘嚭浠ヤ究鑷姩淇濆瓨閫昏緫鎹曡幏骞朵繚鐣� isDirty
} finally {
this.submitting = false;
}
@@ -374,6 +441,7 @@
} catch (err) {
console.error(err);
this.$showMessage('涓嬪垁鎻愪氦澶辫触锛岃妫�鏌ョ綉缁�');
+ throw err;
} finally {
this.submitting = false;
}
@@ -384,6 +452,7 @@
this.toolModel = '';
this.useLimitInput = '';
this.lifeWarnInput = ''; // 鏂板锛氭竻绌�
+ this.isDirty = false;
},
async fetchFormData() {
if (!this.workOrderNo || !this.machineNo) {
@@ -468,6 +537,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
@@ -497,6 +578,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;
}
@@ -542,79 +630,118 @@
} 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;
}
+
+ /* 琛ㄥ崟琛屾牱寮忎紭鍖� */
+ .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: 40px;
}
.form-label {
- width: 90px;
+ width: 100px;
font-weight: bold;
+ font-size: 14px;
+ color: #333;
+ white-space: nowrap;
+ margin-right: 8px;
}
.input {
- padding: 1vh;
- font-size: 1.1vw;
- border: 1px solid #ccc;
- width: 10vw;
+ padding: 8px 12px;
+ font-size: 14px;
+ border: 1px solid #dcdfe6;
+ flex: 1;
margin-right: 8px;
- border-radius: 6px;
- background: #f8f8f8;
+ 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: 13px;
+ }
+
+ .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: 14px;
+ font-weight: 500;
+ white-space: nowrap;
+ height: 36px;
+ box-sizing: border-box;
+ transition: all 0.3s;
}
- .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 {
display: flex;
@@ -640,6 +767,32 @@
color: #333;
}
+ .save-btn:hover {
+ background-color: #40a9ff;
+ }
+
+ .save-btn:active {
+ background-color: #096dd9;
+ }
+
+ .cancel-btn {
+ background-color: #f5f5f5;
+ color: #666;
+ border: 1px solid #d9d9d9;
+ }
+
+ .cancel-btn:hover {
+ background-color: #fff;
+ border-color: #1890ff;
+ color: #1890ff;
+ }
+
+ .save-btn:disabled, .cancel-btn:disabled {
+ opacity: 0.6;
+ cursor: not-allowed;
+ }
+
+ /* 寮圭獥鏍峰紡淇濇寔鍘熸牱 */
.dialog-overlay {
position: fixed;
top: 0;
@@ -736,6 +889,7 @@
box-shadow: none;
}
+ /* 琛ㄦ牸鏍峰紡淇濇寔鍘熸牱 */
.table-section {
display: flex;
justify-content: center;
@@ -819,30 +973,44 @@
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 {
- 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: 14px;
+ white-space: nowrap;
+ width: 20px;
+ }
+
+ /* 鍝嶅簲寮忚皟鏁� */
+ @media (max-width: 1200px) {
+ .form-cell {
+ margin: 0 4px;
+ }
+
+ .form-label {
+ width: 90px;
+ font-size: 13px;
+ }
+
+ .input {
+ font-size: 13px;
+ padding: 6px 10px;
+ }
+
+ .btn-blue {
+ padding: 6px 12px;
+ font-size: 13px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3