From 2aad1d9afd52427eaa528a1201e0db5b0de091e3 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期三, 05 十一月 2025 21:03:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
components/mold.vue | 111 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 42 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 3db00f3..831cad9 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -7,7 +7,6 @@
<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>
@@ -40,16 +39,16 @@
<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>
+ <button class="cancel-btn" @click="cancel" :disabled="submitting || loadingForm">鍙栨秷</button>
+ </view>
- <!-- 鎿嶄綔鎸夐挳 -->
- <view class="button-row">
- <button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">涓婂垁鎻愪氦</button>
- <button class="save-btn" @click="handleDownTool" :disabled="submitting || loadingForm">涓嬪垁鎻愪氦</button>
- <button class="cancel-btn" @click="cancel" :disabled="submitting || loadingForm">鍙栨秷</button>
- </view>
-
- <!-- 鍒�鍏风洰褰曞脊绐� -->
- <view v-if="showToolDialog" class="dialog-overlay">
+ <!-- 鍒�鍏风洰褰曞脊绐� -->
+ <view v-if="showToolDialog" class="dialog-overlay">
<view class="dialog">
<view class="form-group">
<input v-model="searchKey" placeholder="杈撳叆鍒�鍏风紪鐮併�佸悕绉版ā绯婃悳绱�" class="input" @input="onSearchKeyInput" />
@@ -76,10 +75,10 @@
</div>
</view>
</view>
- </view>
+ </view>
- <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
- <view class="table-section">
+ <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
+ <view class="table-section">
<table class="styled-table">
<thead>
<tr>
@@ -118,14 +117,14 @@
</tr>
</tbody>
</table>
- </view>
+ </view>
<!-- 璇存槑 -->
<!--<view class="tool-desc">
<p style="color:red;">'浣跨敤涓婇檺'浠ヤ笅鍒�鏃剁殑'浣跨敤涓婇檺'涓鸿绠楁爣鍑�</p>
<p style="color:red;">瀵垮懡姣旈璀﹀�奸粯璁や负90%</p>
</view>-->
- </view>
+ </view>
</template>
<script>
@@ -681,7 +680,7 @@
align-items: center;
flex: 1;
margin: 0 8px;
- min-height: 40px;
+ min-height: 44px;
}
.form-label {
@@ -691,6 +690,7 @@
color: #333;
white-space: nowrap;
margin-right: 8px;
+ flex-shrink: 0;
}
.input {
@@ -698,7 +698,7 @@
font-size: 16px;
border: 1px solid #dcdfe6;
flex: 1;
- margin-right: 8px;
+ margin-right: 0;
border-radius: 4px;
background: #fff;
min-width: 0;
@@ -726,9 +726,10 @@
font-size: 16px;
font-weight: 500;
white-space: nowrap;
- height: 36px;
+ height: 60px;
box-sizing: border-box;
transition: all 0.3s;
+ flex-shrink: 0;
}
.btn-blue:hover {
@@ -800,15 +801,27 @@
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 {
+ display: flex;
+ gap: 12px;
+ align-items: center;
+ margin-bottom: 2vh;
+ flex-shrink: 0;
}
.form-group .input {
- width: 24vw;
+ flex: 1;
+ min-width: 300px;
border-radius: 6px;
background: #f8f8f8;
}
@@ -817,25 +830,29 @@
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: 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 {
@@ -848,10 +865,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 {
@@ -867,16 +885,23 @@
align-items: center;
}
+ .dialog-actions .btn-blue {
+ padding: 10px 24px;
+ font-size: 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: 16px;
+ font-weight: 500;
cursor: not-allowed;
box-shadow: none;
+ min-width: 100px;
}
/* 琛ㄦ牸鏍峰紡 */
@@ -1006,15 +1031,17 @@
/* 鏂板澶ф寜閽牱寮� */
.btn-blue.large-btn {
- padding: 12px 24px;
- font-size: 18px;
- height: 44px;
- min-width: 120px;
+ padding: 8px 24px;
+ font-size: 16px;
+ height: 60px;
+ min-width: 100px;
}
- /* 璋冩暣琛ㄥ崟鍗曞厓鏍煎竷灞�浠ラ�傚簲澶ф寜閽� */
- .form-cell:last-child {
- justify-content: flex-end;
+ /* 璋冩暣琛ㄥ崟鍗曞厓鏍煎竷灞�浠ラ�傚簲鎸夐挳 */
+ .form-row .form-cell:last-child {
+ justify-content: center;
+ flex: 0 0 auto;
+ min-width: 120px;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3