From 24946a7945620878b05120a7fa91a2cc1be550ed Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 13 十一月 2025 13:50:58 +0800
Subject: [PATCH] BUG

---
 components/machine.vue |  441 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 279 insertions(+), 162 deletions(-)

diff --git a/components/machine.vue b/components/machine.vue
index 7fe6323..e0a039c 100644
--- a/components/machine.vue
+++ b/components/machine.vue
@@ -1,75 +1,82 @@
 <template>
 	<view class="page">
-
+		<!--璋冩満閫佹-->
+		<!-- 鍙充笂瑙掑埛鏂版寜閽� -->
 		<view class="top-right">
 			<button class="refresh-btn" @click="refresh">鍒锋柊</button>
 		</view>
-		<!-- 涓棿鐘舵�侀儴鍒嗭紝涓婁笅缁撴瀯 -->
-		<!--
+
+		<!-- 涓棿鐘舵�侀儴鍒嗭紝涓婁笅缁撴瀯锛屽寘鍚皟鏈烘祦绋嬬殑涓変釜姝ラ -->
 		<view class="middle-section">
 			<view class="item" style="height: 100px;">
-				<h4>璇存槑:璋冩満寮�濮嬫椂闂撮渶瑕佹墜鍔ㄧ‘璁�</h4>
-			</view>
-			<view class="item" v-if="!maStartTime">
-				<button class="btn-blue" @click="setMaStartTime">璋冩満寮�濮嬶紙=鎹㈡ā瀹屾垚锛�</button>
-				<input class="txt-inp" v-model="maStartTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
-			</view>
-			<view class="item" v-else>
-				<button class="btn-disabled">璋冩満寮�濮嬶紙=鎹㈡ā瀹屾垚锛�</button>
-				<input class="txt-inp" v-model="maStartTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
-			</view>
-			<view class="item" v-if="!maShoutTime">
-				<button @click="stateCheck(1)" class="btn-blue">閫佹鍛煎彨锛堢偣鍑绘寜閽畖娓呴浂鏈哄彴闈㈡澘鏁帮級</button>
-				<input class="txt-inp" v-model="maShoutTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
-			</view>
-			<view class="item" v-else>
-				<button class="btn-disabled">閫佹鍛煎彨锛堢偣鍑绘寜閽畖娓呴浂鏈哄彴闈㈡澘鏁帮級</button>
-				<input class="txt-inp" v-model="maShoutTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
-			</view>
-			<view class="item">
-				<button class="btn-disabled">璋冩満瀹屾垚锛�=妫�楠岄�氳繃锛�</button>
-				<input class="txt-inp" v-model="maEndTime" placeholder="棣栨棣栨纭閫氳繃鍐欏叆" disabled="true" />
-			</view>
-		</view>
-		-->
-		<!-- 涓棿鐘舵�侀儴鍒嗭紝涓婁笅缁撴瀯 -->
-		<view class="middle-section">
-			<view class="item" style="height: 100px;">
-				<h4>璇存槑:璋冩満寮�濮嬫椂闂撮渶瑕佹墜鍔ㄧ‘璁�</h4>
+				<h4>
+					<!--璇存槑:
+					1.鐐瑰嚮'璋冩満寮�濮�'銆�'閫佹鍛煎彨'鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
+					2.涓荤晫闈㈤妫�鍚堟牸鍚庡啀鐐瑰嚮'淇濆瓨鐢熸晥'<br />
+					3.棣栨涓嶅悎鏍煎啀鐐瑰嚮'淇濆瓨鐢熸晥'浼氭竻绌洪�佹鏃堕棿<br />
+					4.娓呯┖閫佹鏃堕棿鍚庣偣鍑烩�樻楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨鈥欏啀淇濆瓨-->
+				</h4>
 			</view>
 			<view class="item">
 				<!-- 璋冩満寮�濮嬫寜閽紝maStartTime鏈夊�兼椂绂佺敤 -->
 				<button :class="maStartTime ? 'btn-disabled' : 'btn-blue'"
 						:disabled="!!maStartTime"
-						@click="!maStartTime && setMaStartTime">
-					璋冩満寮�濮嬶紙=鎹㈡ā瀹屾垚锛�
+						@click="handleMaStartTime">
+					璋冩満寮�濮�
 				</button>
-				<input class="txt-inp" v-model="maStartTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
+				<!-- 鏄剧ず璋冩満寮�濮嬫椂闂� -->
+				<input class="txt-inp" v-model="maStartTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭璋冩満鏃堕棿" disabled="true" />
 			</view>
 			<view class="item">
 				<!-- 閫佹鍛煎彨鎸夐挳锛宮aShoutTime鏈夊�兼椂绂佺敤 -->
 				<button :class="maShoutTime ? 'btn-disabled' : 'btn-blue'"
 						:disabled="!!maShoutTime"
-						@click="!maShoutTime && stateCheck(1)">
-					閫佹鍛煎彨锛堢偣鍑绘寜閽畖娓呴浂鏈哄彴闈㈡澘鏁帮級
+						@click="handleMaShoutTime">
+					閫佹鍛煎彨
 				</button>
-				<input class="txt-inp" v-model="maShoutTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭鏃堕棿" disabled="true" />
+				<!-- 鏄剧ず閫佹鍛煎彨鏃堕棿 -->
+				<input class="txt-inp" v-model="maShoutTime" placeholder="鐐瑰嚮鎸夐挳甯﹀嚭閫佹鏃堕棿" disabled="true" />
 			</view>
+			<!--<view class="item">-->
+			<!-- 璋冩満瀹屾垚鎸夐挳锛宮aEndTime鏈夊�兼椂绂佺敤 -->
+			<!--<button :class="maEndTime ? 'btn-disabled' : 'btn-blue'"
+					:disabled="!!maEndTime"
+					@click="handleMaEndTime">
+				璋冩満瀹屾垚锛�=妫�楠岄�氳繃锛�
+			</button>-->
+			<!-- 鏄剧ず璋冩満瀹屾垚鏃堕棿 -->
+			<!--<input class="txt-inp" v-model="maEndTime" placeholder="棣栨棣栨纭閫氳繃鍐欏叆" disabled="true" />
+			</view>-->
 			<view class="item">
-				<!-- 璋冩満瀹屾垚鎸夐挳锛宮aEndTime鏈夊�兼椂绂佺敤 -->
-				<button :class="maEndTime ? 'btn-disabled' : 'btn-blue'"
-						:disabled="!!maEndTime"
-						@click="!maEndTime && setMaEndTime">
-					璋冩満瀹屾垚锛�=妫�楠岄�氳繃锛�
+				<button class="btn-disabled" disabled>
+					璋冩満瀹屾垚锛�=妫�楠岄�氳繃=寮�宸ワ級
 				</button>
 				<input class="txt-inp" v-model="maEndTime" placeholder="棣栨棣栨纭閫氳繃鍐欏叆" disabled="true" />
 			</view>
+
+			<!--鍚敤璇ュ姛鑳�-->
+			<!--鏂板锛氭楠屼笉鍚堟牸閫佹鍛煎彨 鎸夐挳锛堝姛鑳戒笌閫佹鍛煎彨涓�鏍凤紝浠呭湪鐗瑰畾 remark 涓嬪彲浠ョ偣鍑伙級-->
+			<view class="item">
+				<!--妫�楠屼笉鍚堟牸閫佹鍛煎彨鎸夐挳锛屼粎鍦� remark 涓烘寚瀹氭枃鏈� 涓� 褰撳墠鏃犻�佹鏃堕棿 鏃跺彲鐐瑰嚮-->
+				<button :class="canFailResend ? 'btn-blue' : 'btn-disabled'"
+						:disabled="!canFailResend"
+						@click="ReHandleMaShoutTime">
+					妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
+				</button>
+				<!--浠嶅鐢ㄥ悓涓�閫佹鏃堕棿瀛楁锛岄伩鍏嶉噸澶嶇姸鎬�-->
+				<input class="txt-inp"
+					   v-model="maShoutTime"
+					   placeholder="棣栨涓嶅悎鏍奸噸鏂板懠鍙椂鐐瑰嚮鎸夐挳甯﹀嚭閫佹鏃堕棿"
+					   disabled="true" />
+			</view>
+
 		</view>
 
 		<!-- 搴曢儴淇濆瓨/鍙栨秷鎸夐挳 -->
 		<view class="bottom-section">
+			<!-- 鍙湁璋冩満瀹屾垚鏈~鍐欐椂鎵嶅彲淇濆瓨 -->
 			<button class="save-btn" v-if="!maEndTime" @click="save">淇濆瓨骞剁敓鏁�</button>
-			<!-- <button class="save-btn" @click="save">淇濆瓨骞剁敓鏁�</button> -->
+			<!-- 宸插畬鎴愭椂淇濆瓨鎸夐挳绂佺敤 -->
 			<button class="btn-disabled" v-else>淇濆瓨骞剁敓鏁�</button>
 			<button class="cancel-btn" @click="cancel">鍙栨秷</button>
 		</view>
@@ -80,111 +87,161 @@
 <script>
 	export default {
 		props: {
-			orderNo: String,
-			orderId: Number,
-			machineNo: String
+			orderNo: String,    // 宸ュ崟鍙�
+			orderId: Number,    // 宸ュ崟ID
+			machineNo: String   // 鏈哄彴鍙�
 		},
 		data() {
 			return {
-				maShoutTime: '',
-				maStartTime: '',
-				maEndTime: '',
-				statusForm: {},
-				flag: -1,
+				maShoutTime: '',   // 閫佹鍛煎彨鏃堕棿
+				maStartTime: '',   // 璋冩満寮�濮嬫椂闂�
+				maEndTime: '',     // 璋冩満瀹屾垚鏃堕棿
+				statusForm: {},    // 宸ュ崟鐘舵�佽〃鍗曟暟鎹紙鍖呭惈 remark 瀛楁锛�
+				flag: -1,          // 鎿嶄綔鏍囪
+				failedRemark: '棣栨涓嶅悎鏍硷紝閫佹鏃堕棿宸叉竻绌猴紝璇烽噸鏂伴�佹鍛煎彨鐢熸垚鏂扮殑棣栨鍗�' // 棣栨涓嶅悎鏍煎悗鐢卞悗绔繑鍥炵殑鎻愮ず
+			}
+		},
+		computed: {
+			// 婊¤冻棣栨涓嶅悎鏍奸噸鏂板懠鍙潯浠朵笖褰撳墠灏氭湭閲嶆柊鐢熸垚閫佹鏃堕棿 => 鎸夐挳鍙敤
+			canFailResend() {
+				return this.statusForm &&
+					this.statusForm.remark === this.failedRemark &&
+					!this.maShoutTime;
 			}
 		},
 		created() {
-
-			// let machine = uni.getStorageSync('machine');
-			// let orderId = uni.getStorageSync('orderId');
-			// let orderNo = uni.getStorageSync('orderNo');
-
-			// if (orderId) {
-			// 	this.orderId = orderId;
-			// } else {
-			// 	if (!this.orderId) {
-			// 		this.orderId = uni.getStorageSync('id');
-			// 	}
-
-			// }
-
-			// if (orderNo) {
-			// 	this.orderNo = orderNo;
-			// } else {
-			// 	if (!this.orderNo) {
-			// 		this.orderNo = uni.getStorageSync('daa001');
-			// 	}
-			// }
-
-			// if (machine) {
-			// 	this.machineNo = machine;
-			// } else {
-			// 	if (!this.machineNo) {
-			// 		this.machineNo = uni.getStorageSync('machineNo');
-			// 	}
-			// }
-
+			// 缁勪欢鍒涘缓鏃惰嚜鍔ㄥ姞杞藉伐鍗曟暟鎹�
 			if (!this.orderId && !this.orderNo) {
 				return;
 			}
-
 			this.findByOrderId();
 		},
 		methods: {
+			// 澶勭悊璋冩満寮�濮嬫寜閽偣鍑�
+			handleMaStartTime() {
+				if (!this.maStartTime) {
+					this.setMaStartTime();
+					this.flag = -1; // 璋冩満寮�濮嬫寜閽寜涓嬫椂鍥炰紶鐨刦lag=-1
+				}
+			},
+			// 澶勭悊閫佹鍛煎彨鎸夐挳鐐瑰嚮锛堜笉鍚妫�涓嶅悎鏍奸噸鍛煎彨锛�
+			handleMaShoutTime() {
+				if (!this.maShoutTime) {
+					this.stateCheck(1);
+				}
+			},
+			// 棣栨涓嶅悎鏍奸噸鍛煎彨锛歠lag = 2
+			ReHandleMaShoutTime() {
+				if (!this.maShoutTime && this.canFailResend) {
+					this.stateCheck(2);
+				}
+			},
+			// 澶勭悊璋冩満瀹屾垚鎸夐挳鐐瑰嚮
+			handleMaEndTime() {
+				if (!this.maEndTime) {
+					this.setMaEndTime();
+				}
+			},
+			// 璁剧疆璋冩満寮�濮嬫椂闂翠负褰撳墠鏃堕棿
 			setMaStartTime() {
 				this.maStartTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
 			},
+			// 璁剧疆璋冩満瀹屾垚鏃堕棿涓哄綋鍓嶆椂闂�
 			setMaEndTime() {
-                console.log('璋冩満瀹屾垚鎸夐挳琚偣鍑�');
-                this.maEndTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
-            },
+				console.log('璋冩満瀹屾垚鎸夐挳琚偣鍑�');
+				this.maEndTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+			},
+			// 鍒锋柊宸ュ崟鏁版嵁锛堝眬閮ㄥ埛鏂板綋鍓嶇粍浠讹級
 			refresh() {
-				this.findByOrderId(); // This will reload the data for the current order
+				this.findByOrderId();
 			},
-			save() {
-				if (!this.statusForm.id) {
-					this.$showMessage("id涓虹┖锛屼笉鍏佽鎺ㄩ��");
-					return;
-				}
+			// 淇濆瓨骞剁敓鏁堬紝灏嗘椂闂寸瓑淇℃伅鎻愪氦鍒板悗绔�
+			// 鍙樻洿锛氳繑鍥� Promise锛涙垚鍔熷悗灞�閮ㄥ埛鏂帮紙璋冪敤 findByOrderId锛夎�屼笉鏄暣椤� reload
+            save() {
+                if (!this.statusForm.id) {
+                    this.$showMessage("id涓虹┖锛屼笉鍏佽鎺ㄩ��");
+                    return Promise.resolve();
+                }
+                return this.$post({
+                    url: "/MesOrderSta/ChangeMachineTime",
+                    data: {
+                        maStartTime: this.maStartTime,
+                        maShoutTime: this.maShoutTime,
+                        maEndTime: this.maEndTime,
+                        id: this.statusForm.id,
+                        orderId: this.orderId,
+                        machineNo: this.machineNo,
+                        flag: this.flag
+                    }
+                }).then(res => {
+                    if (res && res.data && res.data.tbBillList) {
+                        this.$showMessage("鍛煎彨鎴愬姛");
 
-				this.$post({
-					url: "/MesOrderSta/ChangeMachineTime",
-					data: {
-						maStartTime: this.maStartTime, // 鏂板璋冩満鏃堕棿
-						maShoutTime: this.maShoutTime,
-						maEndTime: this.maEndTime, // 鏂板璋冩満瀹屾垚鏃堕棿
-						id: this.statusForm.id,
-						orderId: this.orderId,
-						machineNo: this.machineNo,
-						flag: this.flag
-					}
-				}).then(res => {
-					if (res.data.tbBillList) {
-						this.$showMessage("鍛煎彨鎴愬姛");
-						this.findByOrderId();
-					} else {
-						this.$showMessage("鍛煎彨澶辫触");
-						this.cancel();
-					}
-				})
-			},
+                        // 鍏抽敭淇敼锛氭竻绌� flag 鐨勫��
+                        this.flag = -1; // 鎴栬�呮牴鎹笟鍔¢渶姹傝缃负鍏朵粬鍒濆鍊�
+
+                        // 鏂规1锛氫娇鐢╱ni-app鐨勯〉闈㈠埛鏂版柟娉�
+                        // 鏂规硶1锛氳Е鍙戜笅鎷夊埛鏂帮紙濡傛灉椤甸潰鏀寔锛�
+                        if (uni.startPullDownRefresh) {
+                            uni.startPullDownRefresh();
+                            // 2绉掑悗鍋滄鍒锋柊
+                            setTimeout(() => {
+                                uni.stopPullDownRefresh();
+                            }, 2000);
+                        }
+
+                        // 鏂规硶2锛氶噸鏂拌皟鐢ㄩ〉闈㈢殑onLoad鏂规硶锛堟帹鑽愶級
+                        const pages = getCurrentPages();
+                        const currentPage = pages[pages.length - 1];
+                        if (currentPage && currentPage.onLoad) {
+                            // 淇濆瓨褰撳墠椤甸潰鍙傛暟
+                            const pageOptions = currentPage.options || {};
+                            // 閲嶆柊鍔犺浇椤甸潰鏁版嵁
+                            currentPage.onLoad(pageOptions);
+                        }
+
+                        // 鏂规硶3锛氬悓鏃跺埛鏂扮粍浠舵暟鎹�
+                        this.findByOrderId();
+
+                    } else {
+                        this.$showMessage("鍛煎彨澶辫触");
+                        this.cancel();
+                    }
+                    return res;
+                }).catch(err => {
+                    console.error('淇濆瓨澶辫触锛�', err);
+                    this.$showMessage("淇濆瓨鏃跺彂鐢熼敊璇�");
+                    throw err;
+                });
+            },
+			// 鍙栨秷鎿嶄綔锛屾仮澶嶄负涓婃淇濆瓨鐨勬暟鎹�
 			cancel() {
 				this.maShoutTime = this.statusForm.maShoutTime;
 				this.maStartTime = this.statusForm.maStartTime;
 				this.maEndTime = this.statusForm.maEndTime;
 			},
+			// 閫佹鍛煎彨锛宨tem=1鏃惰缃�佹鍛煎彨鏃堕棿
+			// 閫佹鍛煎彨涓庨噸鏂伴�佹鍛煎彨浠ュ強璋冩満寮�濮嬪搴旂殑 flag 鍊�
+			// flag 璇存槑锛�-1 = 璋冩満寮�濮嬶紱1 = 棣栨閫佹鍛煎彨锛�2 = 涓嶅悎鏍奸噸鏂伴�佹鍛煎彨
 			stateCheck(item) {
 				switch (item) {
 					case 0:
 						break;
-					case 1:
+					case 1:// 棣栨閫佹鍛煎彨
 						this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+						//this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
 						break;
-					case 2:
+					case 2:// 妫�楠屼笉鍚堟牸閲嶆柊閫佹鍛煎彨
+						this.maShoutTime = this.$getDate('yyyy-mm-dd hh24:mi:ss');
+						//this.flag = -1; // 閫佹鍛煎彨鏈夊�煎悗锛宖lag濮嬬粓涓�-1
+						break;
+					default:
+						// 鍏跺畠鍊间笉澶勭悊
 						break;
 				}
 				this.flag = item;
 			},
+			// 鏍规嵁宸ュ崟鍙�/ID鑾峰彇宸ュ崟鐘舵�佹暟鎹�
 			findByOrderId() {
 				this.$post({
 					url: "/MesOrderSta/FindByOrderNo",
@@ -199,14 +256,32 @@
 					this.maEndTime = res.data.tbBillList.maEndTime;
 				})
 			}
-		}
+		},
+        mounted() {
+                // 椤甸潰鍔犺浇鏃讹紝鍚姩瀹氭椂鍣紝姣忛殧30绉掕嚜鍔ㄤ繚瀛�
+                this.autoSaveTimer = setInterval(() => {
+                    // 1. 璋冩満瀹屾垚鏃堕棿鏈変簡灏变笉鑷姩淇濆瓨
+                    if (this.maEndTime) {
+                        return;
+                    }
+                    // 2. 閫佹鏃堕棿涓虹┖涔熶笉鑷姩淇濆瓨
+                    if (!this.maShoutTime) {
+                        return;
+                    }
+                    this.save(); // 婊¤冻鏉′欢鎵嶈嚜鍔ㄤ繚瀛�
+                }, 1 * 30 * 1000); // 30绉�
+            },
+		beforeDestroy() {
+			// 椤甸潰鍗歌浇鏃舵竻鐞嗗畾鏃跺櫒
+			clearInterval(this.autoSaveTimer);
+		},
 	};
 </script>
 
 <style scoped>
-	/* 椤甸潰鎾戞弧绐椾綋 */
+	/* 椤甸潰鏁翠綋甯冨眬 */
 	.page {
-		padding: 2vh;
+		padding: 8px;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
@@ -214,62 +289,59 @@
 		height: 100%;
 	}
 
+	/* 鍙充笂瑙掑埛鏂版寜閽� */
 	.top-right {
 		position: absolute;
-		top: 10px;
-		right: 50px;
+		top: 8px;
+		right: 40px;
+		width: 200px;
 		z-index: 1000;
 	}
 
 	.refresh-btn {
-		padding: 10px;
+		padding: 8px 16px;
 		background-color: #00A2E9;
 		color: white;
 		border: none;
-		font-size: 1.5vw;
+		font-size: 16px;
 		border-radius: 5px;
 	}
 
-
 	label {
-		margin-right: 1vw;
-		font-size: 1.6vw;
-		/* Larger font for labels */
+		margin-right: 10px;
+		font-size: 16px;
 	}
 
-	input {
-		padding: 1vh;
-		font-size: 1.5vw;
-		/* Larger font size for inputs */
-		border: 1px solid #ccc;
-		width: 100%;
-		/* Full width for inputs */
-		margin-top: 1vh;
-		box-sizing: border-box;
-	}
-
-	/* 涓棿鐘舵�侀儴鍒嗭紝涓婁笅甯冨眬 */
+	/* 涓棿鐘舵�侀儴鍒嗗竷灞� */
 	.middle-section {
 		display: flex;
 		flex-direction: column;
-		margin-bottom: 4vh;
+		margin-bottom: 8px;
 	}
 
 	.item {
 		display: flex;
 		flex-direction: row;
-		align-items: flex-start;
-		margin-bottom: 2vh;
+		align-items: center;
+		margin-bottom: 10px;
+		gap: 10px;
+	}
+
+	.item h4 {
+		font-size: 14px;
+		line-height: 1.4;
+		margin: 0;
+		padding: 5px 0;
 	}
 
 	button {
-		width: 100%;
-		/* Full-width buttons */
-		padding: 1.5vh;
-		font-size: 1.5vw;
-		/* Larger font size for buttons */
+		width: 50%;
+		flex-shrink: 0;
+		padding: 10px;
+		font-size: 16px;
 		border: none;
 		text-align: center;
+		min-height: 40px;
 	}
 
 	.btn-disabled {
@@ -283,41 +355,86 @@
 	}
 
 	input {
-		margin-top: 10px;
-		padding: 10px;
-		font-size: 14px;
+		margin-top: 0;
+		padding: 8px;
+		font-size: 15px;
 		border: 1px solid #ccc;
-		width: 100%;
-		/* 杈撳叆妗嗘拺婊″搴� */
+		width: 50%;
+		flex-grow: 1;
+		box-sizing: border-box;
 	}
 
-	/* 搴曢儴淇濆瓨/鍙栨秷鎸夐挳 */
+	/* 搴曢儴淇濆瓨/鍙栨秷鎸夐挳甯冨眬 */
 	.bottom-section {
 		display: flex;
 		justify-content: space-between;
-		margin-top: 4vh;
+		margin-top: 10px;
+		padding-top: 10px;
 	}
 
 	.save-btn,
 	.cancel-btn {
 		width: 48%;
-		/* Half-width buttons */
-		padding: 1.5vh;
+		padding: 12px;
 		background-color: #00A2E9;
 		color: white;
-		font-size: 1.6vw;
-		/* Larger font size for save/cancel buttons */
+		font-size: 18px;
 		border: none;
 		text-align: center;
+		min-height: 45px;
 	}
 
 	.txt-inp {
-		height: 8vh;
-		padding: 1vh;
-		font-size: 1.5vw;
-		/* Increased font size for input fields in middle section */
-		width: 100%;
-		/* Full width for middle section inputs */
+		height: 40px;
+		padding: 8px;
+		font-size: 15px;
+		width: 50%;
+		flex-grow: 1;
 		box-sizing: border-box;
+		margin-top: 0;
+	}
+
+	/* 閽堝1280*717灞忓箷鐨勭壒瀹氫紭鍖� */
+	@media screen and (max-width: 1280px) and (max-height: 800px) {
+		.page {
+			padding: 6px;
+		}
+
+		.middle-section {
+			margin-bottom: 6px;
+		}
+
+		.item {
+			margin-bottom: 8px;
+		}
+
+		.item h4 {
+			font-size: 13px;
+			padding: 3px 0;
+		}
+
+		button {
+			padding: 8px;
+			font-size: 15px;
+			min-height: 38px;
+		}
+
+		.txt-inp {
+			height: 38px;
+			padding: 6px;
+			font-size: 14px;
+		}
+
+		.bottom-section {
+			margin-top: 8px;
+			padding-top: 8px;
+		}
+
+		.save-btn,
+		.cancel-btn {
+			padding: 10px;
+			font-size: 17px;
+			min-height: 42px;
+		}
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3