From 0c8f85d16c97a8fd4ba381dce13ea9f0b051e6c1 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 十二月 2025 15:26:56 +0800
Subject: [PATCH] 只更新第一行 currentCjNum

---
 pages/index.vue |  171 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 116 insertions(+), 55 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index aaf2367..9726dc4 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -38,27 +38,24 @@
 		<scroll-view class="content">
 			<view v-if="currentTab === 7" class="tab-content">
 				<view class="content">
-					<view class="top-right">
+					<!--<view class="top-right">
 						<button class="refresh-btn" @click="refresh">鍒锋柊</button>
-					</view>
+					</view>-->
 					<view>
 						<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
 					</view>
 					<view class="section top-section">
-						<!--鏄剧ず褰撳墠鏈哄彴-->
-						<view class="form-row">
-							<view>
-								<input v-model="machineName"
-									   disabled="true"
-									   type="text"
-									   class="machine-name-box" />
-							</view>
-						</view>
-
-						<view class="form-row">
-							<view>
-								<label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
+						<view class="form-row align-row">
+							<input v-model="machineName"
+								   disabled="true"
+								   type="text"
+								   class="machine-name-box" />
+							<view class="form-group">
+								<label class="order-label">绗竴姝ラ�夋嫨宸ュ崟:</label>
 								<button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
+							</view>
+							<view class="top-right">
+								<button class="refresh-btn" @click="refresh">鍒锋柊</button>
 							</view>
 						</view>
 					</view>
@@ -72,9 +69,9 @@
 								<uni-th align="center" class="th" style="color: #FFFFFF; width: 150px;">浜у搧缂栫爜</uni-th>
 								<uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">浜у搧鍚嶇О</uni-th>
 								<uni-th align="center" class="th" style="color: #FFFFFF; width: 200px;">瑙勬牸</uni-th>
-								<uni-th align="center" class="th" style="color: #FFFFFF; width: 70px;">宸茬敓浜ф暟閲�</uni-th>
-								<uni-th align="center" class="th" style="color: #FFFFFF; width: 70px;">鏈敓浜ф暟閲�</uni-th>
-								<uni-th align="center" class="th" style="color: #FFFFFF; width: 70px;">娲惧伐鏁伴噺</uni-th>
+								<uni-th align="center" class="th" style="color: #FFFFFF; width: 75px;">宸茬敓浜ф暟閲�</uni-th>
+								<uni-th align="center" class="th" style="color: #FFFFFF; width: 75px;">鏈敓浜ф暟閲�</uni-th>
+								<uni-th align="center" class="th" style="color: #FFFFFF; width: 75px;">娲惧伐鏁伴噺</uni-th>
 								<!--<uni-th align="center" class="th" style="color: #FFFFFF; width: 70px;">宸ュ崟鏁伴噺</uni-th>-->
 								<uni-th align="center" class="th" style="color: #FFFFFF; width: 90px;">宸ュ崟鐘舵��</uni-th>
 								<uni-th align="center" class="th" style="color: #FFFFFF; width: 90px;">鎶ュ伐浜�</uni-th>
@@ -194,18 +191,18 @@
 							<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
 									   class="large-selection-table" @selection-change="selectionChange">
 								<uni-tr>
-									<uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ簭</uni-th>
-									<uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸ュ崟鍙�</uni-th>
-									<uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">浜у搧缂栫爜</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF; width: 170px;">宸ュ簭</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF; width: 490px;">宸ュ崟鍙�</uni-th>
+									<uni-th align="center" class="th" style="color: #FFFFFF; width: 250px;">浜у搧缂栫爜</uni-th>
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">浜у搧鍚嶇О</uni-th>
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">瑙勬牸</uni-th>
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸茬敓浜ф暟閲�</uni-th>
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">鏈敓浜ф暟閲�</uni-th>
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">娲惧伐鏁伴噺</uni-th>
-									<uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸ュ崟鏁伴噺</uni-th>
+									<!--<uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸ュ崟鏁伴噺</uni-th>-->
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ崟鐘舵��</uni-th>
 									<uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">鎶ュ伐浜�</uni-th>
-									<uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">閫夋嫨</uni-th>
+									<!--<uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">閫夋嫨</uni-th>-->
 								</uni-tr>
 								<uni-tr v-for="(item, index) in tableData"
 										:key="index"
@@ -236,9 +233,9 @@
 									<uni-td align="center">
 										<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
 									</uni-td>
-									<uni-td align="center">
-										<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
-									</uni-td>
+									<!--<uni-td align="center">
+										<input class="form-input" disabled="true" type="text" v-model="item.daa008" />--><!--宸ュ崟鏁伴噺-->
+									<!--</uni-td>-->
 									<uni-td align="center">
 										<input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
 									</uni-td>
@@ -756,10 +753,17 @@
 
     :deep(.checkbox),
     :deep(.checkbox__inner) {
-        padding: 10px !important;
-        width: 44px !important;
-        min-width: 44px !important;
-        box-sizing: border-box;
+        width: 60px !important;
+        height: 60px !important;
+        min-width: 60px !important;
+        min-height: 60px !important;
+        padding: 16px !important;
+        margin-right: 20px !important;
+    }
+
+    .popup .large-selection-table {
+        width: 100% !important;
+        table-layout: auto !important; // 璁╄〃鏍艰嚜鍔ㄥ垎閰嶅搴�
     }
 
     .row-selected {
@@ -844,14 +848,23 @@
 	}
 
 	/* 鍗$墖鏍峰紡 */
-	.card {
-		background-color: #fff;
-		border-radius: 10px;
-		box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-		padding: 16px;
-		position: relative;
-		margin-bottom: 25px
-	}
+    .card {
+        background-color: #fff;
+        border-radius: 10px;
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        padding: 0; // 鍘婚櫎澶氫綑鍐呰竟璺�
+        position: relative;
+        margin-bottom: 25px;
+        width: 100%; // 濉弧鐖跺鍣�
+        box-sizing: border-box;
+    }
+
+/*    //.content {
+    //    flex: 1;
+    //    padding: 1vh 1vw; // 淇濊瘉鏁翠綋鏈夊乏鍙崇暀鐧�
+    //    background-color: white;
+    //    font-size: 1.5vw;
+    //}*/
 
 	/* 鍗$墖鏍囬鍦ㄥ乏涓婅 */
 	.card-header {
@@ -978,7 +991,7 @@
         justify-content: space-around;
         margin-bottom: 2vh;
         padding: 2vh 1vw;
-        margin-top: 40px; // 鏂板锛氳鎸夐挳鏁翠綋涓嬬Щ
+        margin-top: 160px; // 鍘熸潵鏄�40px锛屾敼鎴�80px锛屾寜閽暣浣撲笅绉�
     }
 
 	.save-btn,
@@ -994,25 +1007,26 @@
 		cursor: pointer;
 	}
 
-	.overlay {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0, 0, 0, 0.5);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+    .overlay {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0, 0, 0, 0.5);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        z-index: 2000; // 澧炲姞z-index锛岀‘淇濆脊绐楀湪鍒锋柊鎸夐挳涔嬩笂
+    }
 
     .popup {
         background-color: #fff;
         padding: 2vh;
         border: 1px solid #ccc;
         box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-        width: 90vw;
-        height: 85vh; /* 鍘�70vh锛岃皟楂� */
+        width: 98vw; // 鍘熸潵鏄� 90vw锛屾敼鎴� 98vw
+        height: 85vh;
         font-size: 1.6vw;
     }
 
@@ -1030,13 +1044,13 @@
 	}
 
     .machine-name-box {
-        border: 2px solid #e53935; /* 绾㈣壊杈规 */
+        border: 2px solid #007aff; /* 钃濊壊杈规 */
         border-radius: 8px;
         font-family: fantasy;
         font-size: 33px;
         margin-top: 20px;
-        padding: 15px 48px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
-        width: 500px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
+        padding: 15px 28px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
+        width: 300px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
         height: 70px; /* 澧炲姞楂樺害 */
         box-sizing: border-box;
         background: #fff;
@@ -1104,6 +1118,53 @@
         display: block;
     }
 
+    .top-section {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        margin-bottom: 20px;
+        padding: 20px 10px;
+    }
+
+    .form-row.align-row {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        position: relative;
+        width: 100%;
+    }
+
+    .machine-name-box {
+        flex: 1 1 45%;
+        margin-right: 20px;
+    }
+
+    .form-group {
+        display: flex;
+        align-items: center;
+        flex: 1 1 45%;
+        justify-content: flex-start;
+    }
+
+    .order-label {
+        font-family: fantasy;
+        font-size: 33px;
+        margin-top: 20px;
+        margin-right: 10px;
+        float: none;
+    }
+
+    .print-btn {
+        margin-top: 20px;
+    }
+
+    .top-right {
+        position: absolute;
+        top: -30px; // 寰�涓婄Щ
+        right: 0;
+        z-index: 1000;
+    }
+
 /* 鏀惧ぇ琛ㄥご鍜岃〃鏍煎唴瀹瑰瓧浣� */
     .th,
     .uni-th,

--
Gitblit v1.9.3