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 | 323 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 195 insertions(+), 128 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 3db00f3..0b8bd56 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -7,16 +7,15 @@
<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" type="number" v-model="useLimitInput" placeholder="姣忔鎹㈠垁鍚庢墜濉�" :disabled="!selectedToolNo || loadingForm" />
+ <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 class="input small-font input-life-warn"
v-model="lifeWarnInput"
placeholder="濡�0.9鎴�90"
:disabled="!selectedToolNo || loadingForm" />
@@ -27,105 +26,107 @@
<!-- 绗簩琛岋細鍦ㄦ渶鍚庢坊鍔犲垁鍏风洰褰曟寜閽� -->
<view class="form-row">
+ <!-- 鍒�鍏峰悕绉� -->
<view class="form-cell">
<label class="form-label">鍒�鍏峰悕绉帮細</label>
- <input class="input small-font" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
+ <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" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
+ <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>
+ <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 class="dialog">
- <view class="form-group">
- <input v-model="searchKey" placeholder="杈撳叆鍒�鍏风紪鐮併�佸悕绉版ā绯婃悳绱�" class="input" @input="onSearchKeyInput" />
- <button class="btn-blue" @click="searchTool" :disabled="loadingTools">鎼滅储</button>
- </view>
- <view class="tool-list">
- <button v-for="tool in filteredTools"
- :key="tool.no"
- class="tool-btn"
- :class="{ active: activeToolNo === tool.no }"
- @click="selectTool(tool)">
- {{ tool.no }} | {{ tool.name }}
- </button>
- </view>
- <view class="dialog-actions">
- <div style="display: flex; align-items: center;">
- <button class="btn-blue" @click="prevPage" :disabled="pageIndex === 1 || loadingTools">涓婁竴椤�</button>
- <span style="margin: 0 12px;">绗瑊{ pageIndex }}椤� / 鍏眥{ totalPages }}椤�</span>
- <button class="btn-blue" @click="nextPage" :disabled="pageIndex === totalPages || loadingTools">涓嬩竴椤�</button>
- </div>
- <div style="display: flex; gap: 18px; align-items: center;">
- <button class="btn-blue" @click="confirmTool">纭畾</button>
- <button class="btn-disabled" @click="closeToolDialog">鍙栨秷</button>
- </div>
- </view>
+ <!-- 鍒�鍏风洰褰曞脊绐� -->
+ <view v-if="showToolDialog" class="dialog-overlay">
+ <view class="dialog">
+ <view class="form-group">
+ <input v-model="searchKey" placeholder="杈撳叆鍒�鍏风紪鐮併�佸悕绉版ā绯婃悳绱�" class="input" @input="onSearchKeyInput" />
+ <button class="btn-blue" @click="searchTool" :disabled="loadingTools">鎼滅储</button>
+ </view>
+ <view class="tool-list">
+ <button v-for="tool in filteredTools"
+ :key="tool.no"
+ class="tool-btn"
+ :class="{ active: activeToolNo === tool.no }"
+ @click="selectTool(tool)">
+ {{ tool.no }} | {{ tool.name }}
+ </button>
+ </view>
+ <view class="dialog-actions">
+ <div style="display: flex; align-items: center;">
+ <button class="btn-blue" @click="prevPage" :disabled="pageIndex === 1 || loadingTools">涓婁竴椤�</button>
+ <span style="margin: 0 12px;">绗瑊{ pageIndex }}椤� / 鍏眥{ totalPages }}椤�</span>
+ <button class="btn-blue" @click="nextPage" :disabled="pageIndex === totalPages || loadingTools">涓嬩竴椤�</button>
+ </div>
+ <div style="display: flex; gap: 18px; align-items: center;">
+ <button class="btn-blue" @click="confirmTool">纭畾</button>
+ <button class="btn-disabled" @click="closeToolDialog">鍙栨秷</button>
+ </div>
</view>
</view>
-
- <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
- <view class="table-section">
- <table class="styled-table">
- <thead>
- <tr>
- <th style="width:8%">鍒�鍏风紪鍙�</th>
- <th style="width:14%">鍒�鍏峰悕绉�</th>
- <th style="width:12%">涓婂垁鏃堕棿</th>
- <th class="num" style="width:8%">涓婂垁璁℃暟</th>
- <th style="width:12%">涓嬪垁鏃堕棿</th>
- <th class="num" style="width:8%">涓嬪垁璁℃暟</th>
- <th class="num" style="width:8%">浣跨敤娆℃暟</th>
- <th class="num" style="width:8%">浣跨敤涓婇檺</th>
- <th class="num" style="width:8%">瀵垮懡姣�%</th>
- <th class="num" style="width:8%">瀵垮懡姣旈璀﹀��</th>
- <th style="width:8%">棰勮鐘舵��</th>
- </tr>
- </thead>
- <tbody>
- <tr v-for="(item, idx) in toolRecords" :key="item.id" :class="{'row-odd': idx % 2 === 0}">
- <td>{{ item.no }}</td>
- <td class="left">{{ item.name }}</td>
- <td>{{ item.upTime }}</td>
- <td class="num">{{ item.upCount != null ? item.upCount : '' }}</td>
- <td>{{ item.downTime }}</td>
- <td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>
- <td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>
- <td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
- <td class="num">{{ item.lifePercent }}</td>
- <td class="num">{{ item.lifeWarn }}</td>
- <td :class="item.warnStatus === '棰勮' ? 'warn-cell' : (item.warnStatus === '姝ｅ父' ? 'ok-cell' : '')">
- <span v-if="item.warnStatus === '棰勮'" class="warn-badge">璀﹀憡</span>
- <span v-else>{{ item.warnStatus }}</span>
- </td>
- </tr>
- <tr v-if="!toolRecords.length">
- <td colspan="11">鏆傛棤鏁版嵁</td>
- </tr>
- </tbody>
- </table>
- </view>
-
- <!-- 璇存槑 -->
- <!--<view class="tool-desc">
- <p style="color:red;">'浣跨敤涓婇檺'浠ヤ笅鍒�鏃剁殑'浣跨敤涓婇檺'涓鸿绠楁爣鍑�</p>
- <p style="color:red;">瀵垮懡姣旈璀﹀�奸粯璁や负90%</p>
- </view>-->
</view>
+
+ <!-- 鍒�鍏蜂娇鐢ㄨ褰曡〃鏍� -->
+ <view class="table-section">
+ <table class="styled-table">
+ <thead>
+ <tr>
+ <th style="width:8%">鍒�鍏风紪鍙�</th>
+ <th style="width:14%">鍒�鍏峰悕绉�</th>
+ <th style="width:12%">涓婂垁鏃堕棿</th>
+ <th class="num" style="width:8%">涓婂垁璁℃暟</th>
+ <th style="width:12%">涓嬪垁鏃堕棿</th>
+ <th class="num" style="width:8%">涓嬪垁璁℃暟</th>
+ <th class="num" style="width:8%">浣跨敤娆℃暟</th>
+ <th class="num" style="width:8%">浣跨敤涓婇檺</th>
+ <th class="num" style="width:8%">瀵垮懡姣�%</th>
+ <th class="num" style="width:8%">瀵垮懡姣旈璀﹀��</th>
+ <th style="width:8%">棰勮鐘舵��</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="(item, idx) in toolRecords" :key="item.id" :class="{'row-odd': idx % 2 === 0}">
+ <td>{{ item.no }}</td>
+ <td class="left">{{ item.name }}</td>
+ <td>{{ item.upTime }}</td>
+ <td class="num">{{ item.upCount != null ? item.upCount : '' }}</td>
+ <td>{{ item.downTime }}</td>
+ <td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>
+ <td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>
+ <td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
+ <td class="num">{{ item.lifePercent }}</td>
+ <td class="num">{{ item.lifeWarn }}</td>
+ <td :class="item.warnStatus === '棰勮' ? 'warn-cell' : (item.warnStatus === '姝ｅ父' ? 'ok-cell' : '')">
+ <span v-if="item.warnStatus === '棰勮'" class="warn-badge">璀﹀憡</span>
+ <span v-else>{{ item.warnStatus }}</span>
+ </td>
+ </tr>
+ <tr v-if="!toolRecords.length">
+ <td colspan="11">鏆傛棤鏁版嵁</td>
+ </tr>
+ </tbody>
+ </table>
+ </view>
+
+ <!-- 璇存槑 -->
+ <!--<view class="tool-desc">
+ <p style="color:red;">'浣跨敤涓婇檺'浠ヤ笅鍒�鏃剁殑'浣跨敤涓婇檺'涓鸿绠楁爣鍑�</p>
+ <p style="color:red;">瀵垮懡姣旈璀﹀�奸粯璁や负90%</p>
+ </view>-->
+ </view>
</template>
<script>
@@ -661,6 +662,7 @@
background: #f8f9fa;
border-radius: 8px;
border: 1px solid #e9ecef;
+ font-size: 22px; /* 鏁翠綋璋冨ぇ琛ㄥ崟鍖哄瓧浣� */
}
/* 琛ㄥ崟琛屾牱寮忎紭鍖� */
@@ -681,24 +683,25 @@
align-items: center;
flex: 1;
margin: 0 8px;
- min-height: 40px;
+ min-height: 44px;
}
.form-label {
width: 100px;
font-weight: bold;
- font-size: 18px;
+ font-size: 22px; /* 鍘�18px锛岃皟澶� */
color: #333;
white-space: nowrap;
margin-right: 8px;
+ flex-shrink: 0;
}
.input {
padding: 8px 12px;
- font-size: 16px;
+ font-size: 20px; /* 鍘�16px锛岃皟澶� */
border: 1px solid #dcdfe6;
flex: 1;
- margin-right: 8px;
+ margin-right: 0;
border-radius: 4px;
background: #fff;
min-width: 0;
@@ -707,7 +710,7 @@
}
.input.small-font {
- font-size: 15px;
+ font-size: 19px; /* 鍘�15px锛岃皟澶� */
}
.input:disabled {
@@ -723,12 +726,13 @@
padding: 8px 16px;
border-radius: 4px;
cursor: pointer;
- font-size: 16px;
+ font-size: 22px; /* 鍘�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 {
@@ -757,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;
@@ -800,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 {
@@ -848,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 {
@@ -867,16 +888,23 @@
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;
}
/* 琛ㄦ牸鏍峰紡 */
@@ -905,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;
}
@@ -960,7 +988,7 @@
padding: 2px 6px;
border-radius: 3px;
font-weight: bold;
- font-size: 0.9vw;
+ font-size: 1.2vw; /* 鍘�0.9vw锛岃皟澶� */
}
/* 甯﹀崟浣嶇殑杈撳叆妗嗘牱寮� */
@@ -977,7 +1005,7 @@
.unit-text {
color: #666;
- font-size: 14px;
+ font-size: 18px; /* 鍘�14px锛岃皟澶� */
white-space: nowrap;
width: 20px;
}
@@ -990,31 +1018,70 @@
.form-label {
width: 90px;
- font-size: 16px;
+ font-size: 18px; /* 鍘�16px锛岃皟澶� */
}
.input {
- font-size: 14px;
+ font-size: 17px; /* 鍘�14px锛岃皟澶� */
padding: 6px 10px;
}
.btn-blue {
padding: 6px 12px;
- font-size: 14px;
+ font-size: 18px; /* 鍘�14px锛岃皟澶� */
}
}
/* 鏂板澶ф寜閽牱寮� */
.btn-blue.large-btn {
- padding: 12px 24px;
- font-size: 18px;
- height: 44px;
+ 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;
}
- /* 璋冩暣琛ㄥ崟鍗曞厓鏍煎竷灞�浠ラ�傚簲澶ф寜閽� */
- .form-cell:last-child {
- justify-content: flex-end;
+ /* 鏂板锛氳鈥滆缃娇鐢ㄤ笂闄愨�濃�滃鍛芥瘮棰勮鍊尖�濊緭鍏ユ鍙樼獎 */
+ .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