From bc458b96305597cf661a86ddc66a3d29e4624b27 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 十二月 2025 17:25:36 +0800
Subject: [PATCH] 调试
---
components/mold.vue | 543 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 409 insertions(+), 134 deletions(-)
diff --git a/components/mold.vue b/components/mold.vue
index 69176fd..9acf1a1 100644
--- a/components/mold.vue
+++ b/components/mold.vue
@@ -2,34 +2,51 @@
<view class="page">
<!-- 鍒�鍏烽�夋嫨鍖� -->
<view class="top-section-grid">
- <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 class="form-row">
+ <view class="form-cell">
+ <label class="form-label">鍒�鍏风紪鍙凤細</label>
+ <input class="input small-font" v-model="selectedToolNo" placeholder="璇烽�氳繃鍒�鍏风洰褰曢�夋嫨" disabled />
+ </view>
+ <view class="form-cell form-cell-flex">
+ <label class="form-label highlight-label">浣跨敤涓婇檺锛�</label>
+ <input class="input small-font input-use-limit" type="number" v-model="useLimitInput" placeholder="姣忔涓婂垁鏃舵墜濉笂闄�" :disabled="!selectedToolNo || loadingForm" />
+ <label class="form-label" style="margin-left:16px;">瀵垮懡姣旈璀﹀�硷細</label>
+ <view class="input-with-unit">
+ <input class="input small-font input-life-warn"
+ v-model="lifeWarnInput"
+ placeholder="濡�90"
+ :disabled="!selectedToolNo || loadingForm" />
+ <span class="unit-text">%</span>
+ </view>
+ </view>
</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>
- <input class="input small-font"
- v-model="lifeWarnInput"
- placeholder="濡�0.9鎴�90鎴�90%"
- :disabled="!selectedToolNo || loadingForm" />
- </view>
- <view class="form-cell">
- <label class="form-label">鍒�鍏峰悕绉帮細</label>
- <input class="input small-font" v-model="toolName" placeholder="鍒�鍏峰甫鍑�" disabled />
- <label class="form-label" style="margin-left: 16px;">瑙勬牸鍨嬪彿锛�</label>
- <input class="input small-font" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
- </view>
- </view>
- <!-- 鎿嶄綔鎸夐挳 -->
+ <!-- 绗簩琛岋細鍦ㄦ渶鍚庢坊鍔犲垁鍏风洰褰曟寜閽� -->
+ <view class="form-row">
+ <!-- 鍒�鍏峰悕绉� -->
+ <view class="form-cell">
+ <label class="form-label">鍒�鍏峰悕绉帮細</label>
+ <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 input-tool-model" v-model="toolModel" placeholder="鍒�鍏峰甫鍑�" disabled />
+ </view>
+ <!-- 鍒�鍏风洰褰曟寜閽彸绉� -->
+ <view class="form-cell tool-dir-cell">
+ <button class="btn-blue large-btn" @click="openToolDialog" :disabled="loadingTools">鍒�鍏风洰褰�</button>
+ </view>
+ <!-- 鏂板锛氬埛鏂版寜閽� -->
+ <view class="form-cell" style="flex:0 0 auto; margin-left:16px;">
+ <button class="btn-blue large-btn" @click="handleRefresh" :disabled="loadingForm || submitting">鍒锋柊</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="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>
@@ -69,17 +86,18 @@
<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>
+ <th style="width:7%">鍒�鍏风紪鍙�</th>
+ <th style="width:12%">鍒�鍏峰悕绉�</th>
+ <th style="width:10%">涓婂垁鏃堕棿</th>
+ <th class="num" style="width:7%">涓婂垁璁℃暟</th>
+ <th style="width:10%">涓嬪垁鏃堕棿</th>
+ <th class="num" style="width:7%">涓嬪垁璁℃暟</th>
+ <th class="num" style="width:7%">浣跨敤娆℃暟</th>
+ <th class="num" style="width:7%">浣跨敤涓婇檺</th>
+ <th class="num" style="width:7%">瀵垮懡姣�%</th>
+ <th class="num" style="width:7%">瀵垮懡姣旈璀﹀��</th>
+ <th style="width:7%">棰勮鐘舵��</th>
+ <th style="width:7%">鍒�鍏峰湪鏈虹姸鎬�</th>
</tr>
</thead>
<tbody>
@@ -89,18 +107,63 @@
<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>
+ <!-- 鍙湁绗竴琛屾樉绀� currentCjNum锛屽叾瀹冭鏄剧ず downCount -->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛岋細涓嬫満鏃朵笉瀹炴椂鏄剧ず currentCjNum锛屾樉绀� downCount -->
+ <template v-if="!item.downTime">
+ {{ item.currentCjNum != null ? item.currentCjNum : '' }}
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.downCount != null ? item.downCount : '' }}
+ </template>
+ </td>
+ <!--浣跨敤娆℃暟-->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠椾娇鐢ㄦ鏁帮紝鑻ヤ负涓嬫満鍒欎笉瀹炴椂鏄剧ず -->
+ <template v-if="!item.downTime">
+ {{item.currentCjNum != null && item.upCount != null ? (Number(item.currentCjNum) - Number(item.upCount)) : (item.useCount != null ? item.useCount : '') }}
+ </template>
+ <template v-else>
+ {{ item.useCount != null ? item.useCount : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.useCount != null ? item.useCount : '' }}
+ </template>
+ </td>
<td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
- <td class="num">{{ item.lifePercent }}</td>
+ <!--瀵垮懡姣�%-->
+ <td class="num">
+ <template v-if="idx === 0">
+ <!-- 绗竴琛屽疄鏃惰绠楀鍛芥瘮%锛岃嫢涓轰笅鏈哄垯涓嶅疄鏃舵樉绀� -->
+ <template v-if="!item.downTime">
+ {{item.currentCjNum != null && item.upCount != null && item.useLimit != null && Number(item.useLimit) > 0 ? Math.round((Number(item.currentCjNum) - Number(item.upCount)) / Number(item.useLimit) * 100) + '%' : (item.lifePercent != null ? item.lifePercent : '') }}
+ </template>
+ <template v-else>
+ {{ item.lifePercent != null ? item.lifePercent : '' }}
+ </template>
+ </template>
+ <template v-else>
+ {{ item.lifePercent }}
+ </template>
+ </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>
+ <td>
+ {{ item.downTime ? '涓嬫満' : '鍦ㄦ満' }}<!--鍦ㄦ満鐘舵��-->
+ </td>
</tr>
<tr v-if="!toolRecords.length">
- <td colspan="11">鏆傛棤鏁版嵁</td>
+ <td colspan="12">鏆傛棤鏁版嵁</td>
</tr>
</tbody>
</table>
@@ -162,6 +225,40 @@
toolModel() { this.isDirty = true; }
},
methods: {
+ //鏌ヨ褰撳墠鏁伴噰鏁帮紝浣滀负涓嬪垁璁℃暟瀹炴椂鏄剧ず
+ async fetchCurrentCjNum(toolNo) {
+ if (!this.machineNo) return null;
+ try {
+ const res = await this.$post({
+ url: '/Womdaa/GetWomdaasByShow',
+ data: JSON.stringify({ machineNo: this.machineNo }),
+ headers: { 'Content-Type': 'application/json' }
+ });
+ if (res.status === 0 && Array.isArray(res.data?.tbBillList)) {
+ const found = res.data.tbBillList.find(x =>
+ x.cutterId === toolNo || x.cutteR_ID === toolNo
+ );
+ return found ? (found.CurrentCjNum ?? found.currentCjNum ?? null) : null;
+ }
+ } catch (e) {
+ console.warn('鑾峰彇currentCjNum澶辫触', e);
+ }
+ return null;
+ },
+
+ // 鏂板锛氬埛鏂版寜閽鐞嗘柟娉�
+ async handleRefresh() {
+ this.fetchTools('');
+ if (this.machineNo && this.workOrderNo) {
+ await this.fetchFormData();
+ await this.fetchDefaultToolFromWorkOrder();
+ // 鍒锋柊鍚庤祴鍊肩涓�琛� currentCjNum
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
+ }
+ this.$showMessage('鍒锋柊瀹屾垚');
+ },
// 鑷姩淇濆瓨锛氬惎鍔�
startAutoSave() {
if (!this.autoSaveEnabled) return;
@@ -303,7 +400,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 = '';
}
@@ -335,10 +432,10 @@
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
if (!this.selectedToolNo) { this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�'); return; }
- //涓婂垁涓嶅己鍒跺綍鍏ヤ娇鐢ㄤ笂闄�
- //if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
+ //涓婂垁寮哄埗褰曞叆浣跨敤涓婇檺
+ if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
const useLimit = Number(this.useLimitInput);
- //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
// sdjs 浣跨敤宸ュ崟 currentCjNum
const sdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
@@ -388,9 +485,10 @@
if (!this.workOrderNo) { this.$showMessage('宸ュ崟鍙蜂笉鑳戒负绌�'); return; }
if (!this.machineNo) { this.$showMessage('鏈哄彴鍙蜂笉鑳戒负绌�'); return; }
if (!this.selectedToolNo) { this.$showMessage('鍒�鍏风紪鍙蜂笉鑳戒负绌�'); return; }
- if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
+ //涓嬪垁涓嶅己鍒跺綍鍏ヤ娇鐢ㄤ笂闄�
+ //if (!this.useLimitInput) { this.$showMessage('浣跨敤涓婇檺涓嶈兘涓虹┖'); return; }
const useLimit = Number(this.useLimitInput);
- if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
+ //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('璇疯緭鍏ユ湁鏁堢殑浣跨敤涓婇檺'); return; }
// 涓嬪垁璁℃暟鍚屾牱鍙栧伐鍗曟渶鏂伴噰闆嗘暟
const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
@@ -570,7 +668,7 @@
// 鏂板锛氳嚜鍔ㄥ～鍏呭鍛芥瘮棰勮鍊�
if (order.modlLifeWorning !== undefined && order.modlLifeWorning !== null) {
const warn = Number(order.modlLifeWorning);
- 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 = '';
}
@@ -610,18 +708,21 @@
this.fetchTools('');
this.machineNo = uni.getStorageSync('machineNo') || '';
this.workOrderNo = uni.getStorageSync('daa001') || '';
- // 鍘婚櫎榛樿棰勮鍊� (90% -> 0.9)
- //this.lifeWarnInput = '90';
if (this.machineNo && this.workOrderNo) {
- this.fetchFormData();
- this.fetchDefaultToolFromWorkOrder();
+ this.fetchFormData().then(async () => {
+ await this.fetchDefaultToolFromWorkOrder();
+ // 杩涘叆椤甸潰鏃惰祴鍊肩涓�琛� currentCjNum
+ if (this.toolRecords.length > 0) {
+ this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum);
+ }
+ });
} else {
console.warn('鏈哄彴鍙锋垨宸ュ崟鍙蜂负绌猴紝鏃犳硶鑾峰彇琛ㄥ崟鏁版嵁');
}
// 鍚姩鑷姩淇濆瓨瀹氭椂鍣�
- this.startAutoSave();
+ //this.startAutoSave();
},
beforeDestroy() {
// 娓呯悊瀹氭椂鍣紝闃叉鍐呭瓨娉勬紡
@@ -631,78 +732,161 @@
</script>
<style scoped>
- /* 鍘熸牱淇濇寔锛屾湭鏀瑰姩鏍峰紡锛屽彧鎻掑叆浜嗕竴涓緭鍏ユ */
.top-section-grid {
display: flex;
+ flex-direction: column;
justify-content: center;
- align-items: flex-end;
- gap: 32px;
+ align-items: flex-start;
+ gap: 12px;
margin-bottom: 2vh;
- width: 95vw;
- max-width: 1600px;
+ width: 99vw;
+ max-width: 1920px;
margin-left: auto;
margin-right: auto;
+ padding: 12px;
+ background: #f8f9fa;
+ border-radius: 8px;
+ border: 1px solid #e9ecef;
}
+
+ .form-row {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ align-items: center;
+ width: 100%;
+ margin-bottom: 12px;
+ }
+
+ .form-row:last-child {
+ margin-bottom: 0;
+ }
.form-cell {
display: flex;
align-items: center;
+ min-width: 0;
+ margin-right: 0;
}
+ .form-cell:nth-child(1) {
+ flex: 0 0 28%;
+ min-width: 180px;
+ }
+
+ .form-cell:nth-child(2) {
+ flex: 0 0 32%;
+ min-width: 180px;
+ justify-content: flex-start;
+ }
+
+ .form-cell:nth-child(3) {
+ flex: 0 0 auto;
+ min-width: 0;
+ max-width: 220px; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鎾戝紑 */
+ justify-content: flex-end;
+ }
+
.form-label {
- width: 90px;
+ width: auto;
font-weight: bold;
+ color: #333;
+ white-space: nowrap;
+ margin-right: 4px;
+ flex-shrink: 0;
}
.input {
- padding: 1vh;
- font-size: 1.1vw;
- border: 1px solid #ccc;
- width: 10vw;
- margin-right: 8px;
- border-radius: 6px;
- background: #f8f8f8;
+ padding: 14px 20px;
+ border: 1px solid #dcdfe6;
+ flex: 1;
+ margin-right: 0;
+ border-radius: 4px;
+ background: #fff;
+ min-width: 0;
+ height: 56px !important;
+ box-sizing: border-box;
}
- /* 鏂板锛氬皬瀛椾綋鏍峰紡 */
.input.small-font {
- font-size: 0.8vw; /* 璋冨皬瀛椾綋 */
+ /* 涓嶈缃瓧浣撳ぇ灏� */
}
- .form-select {
- width: 12vw;
- padding: 1vh;
- font-size: 1.1vw;
- margin-right: 8px;
- border-radius: 6px;
- background: #f8f8f8;
+ .input:disabled {
+ background-color: #f5f7fa;
+ color: #c0c4cc;
+ cursor: not-allowed;
+ }
+
+ .input-with-unit {
+ display: flex;
+ align-items: center;
+ gap: 0;
}
- .btn-blue {
- background-color: #00A2E9;
+ .input-with-unit .input {
+ width: 60px !important;
+ min-width: 0 !important;
+ margin-right: 2px !important;
+ text-align: center;
+ padding-left: 2px;
+ padding-right: 2px;
+ }
+
+ .input-with-unit .input {
+ margin-right: 4px !important;
+ width: 60px !important;
+ min-width: 0 !important;
+ text-align: center;
+ }
+
+ .unit-text {
+ margin-left: 0 !important;
+ padding-left: 0 !important;
+ font-size: 22px !important;
+ }
+
+ .btn-blue, .btn-blue.large-btn {
+ background-color: #1890ff;
color: white;
border: none;
- padding: 14px 36px;
- margin-left: 8px;
- border-radius: 10px;
+ padding: 14px 32px;
+ 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-weight: 500;
+ white-space: nowrap;
+ height: 70px !important;
+ box-sizing: border-box;
+ transition: all 0.3s;
+ flex-shrink: 0;
+ min-width: 140px;
+ margin-left: 24px;
}
- .btn-blue:active,
- .btn-blue:focus {
- background-color: #0086c2;
- box-shadow: 0 4px 12px rgba(0,162,233,0.12);
+ .btn-blue.large-btn {
+ padding: 0 60px;
+ min-width: 180px;
+ height: 72px !important;
+ margin-left: 0 !important;
+ font-size: 1.3em;
+ box-shadow: 0 2px 8px rgba(24,144,255,0.08);
+ line-height: 72px; /* 鍨傜洿灞呬腑 */
+ display: inline-block; /* 淇濊瘉line-height鐢熸晥 */
+ vertical-align: middle;
+ }
+
+ .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 {
@@ -717,7 +901,6 @@
padding: 1.5vh;
background-color: #00A2E9;
color: white;
- font-size: 1.2vw;
border: none;
text-align: center;
border-radius: 6px;
@@ -729,6 +912,20 @@
color: #333;
}
+ .save-btn:hover {
+ background-color: #40a9ff;
+ }
+
+ .save-btn:active {
+ background-color: #096dd9;
+ }
+
+ .save-btn:disabled, .cancel-btn:disabled {
+ opacity: 0.6;
+ cursor: not-allowed;
+ }
+
+ /* 寮圭獥鏍峰紡 */
.dialog-overlay {
position: fixed;
top: 0;
@@ -746,42 +943,57 @@
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;
+ 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 {
@@ -794,10 +1006,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 {
@@ -813,16 +1026,21 @@
align-items: center;
}
+ .dialog-actions .btn-blue {
+ padding: 10px 24px;
+ min-width: 120px;
+ }
+
.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-weight: 500;
cursor: not-allowed;
box-shadow: none;
+ min-width: 120px;
}
.table-section {
@@ -830,11 +1048,12 @@
justify-content: center;
margin: 1vh 0;
overflow-x: auto;
+ width: 100%; /* 纭繚琛ㄦ牸瀹瑰櫒鍗犳弧瀹藉害 */
}
table.styled-table {
- max-width: 1600px;
- width: 95vw;
+ max-width: 1800px; /* 浠�1600px澧炲姞鍒�1800px */
+ width: 98vw; /* 浠�95vw澧炲姞鍒�98vw */
margin: 0 auto;
border-collapse: separate;
border-spacing: 0;
@@ -850,14 +1069,12 @@
border-bottom: 2px solid #bfbfbf;
padding: 16px 10px;
font-weight: bold;
- font-size: 1.2vw;
text-align: center;
}
table.styled-table tbody td {
border-bottom: 1px solid #e8e8e8;
padding: 14px 10px;
- font-size: 1.1vw;
vertical-align: middle;
text-align: center;
}
@@ -905,33 +1122,91 @@
padding: 2px 6px;
border-radius: 3px;
font-weight: bold;
- 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;
+ /* 鍝嶅簲寮忚皟鏁� */
+ @media (max-width: 1200px) {
+ .form-cell {
+ margin: 0 4px;
+ }
+
+ .form-label {
+ width: 90px;
+ }
+
+ .input {
+ padding: 10px 14px;
+ }
+
+ .btn-blue {
+ padding: 10px 18px;
+ }
}
- .warn {
- color: red;
- font-weight: bold;
+ .input-life-warn {
+ width: 48px !important; /* 绋嶅井鏀惧锛岄伩鍏嶅瓧浣撴孩鍑� */
+ min-width: 0 !important;
+ margin-right: 4px;
+ padding-left: 2px;
+ padding-right: 2px;
+ font-size: 22px !important;
+ text-align: center;
+ box-sizing: border-box;
}
- .bottom-section {
+ .input,
+ .input.small-font,
+ .input-use-limit,
+ .input-tool-model,
+ .input-tool-name,
+ .input-life-warn {
+ font-size: 22px !important;
+ }
+
+ .input-tool-model {
+ width: 320px !important; /* 鍘熶负200px锛岀幇鍔犻暱 */
+ min-width: 0 !important;
+ margin-right: 16px;
+ }
+
+ .input-tool-name {
+ width: 120px !important;
+ min-width: 0 !important;
+ margin-right: 16px;
+ }
+
+ .highlight-label {
+ color: #1890ff !important;
+ }
+
+ .tool-dir-cell {
+ flex: 0 0 auto !important;
+ justify-content: flex-start !important;
+ display: flex !important;
+ align-items: center;
+ margin-left: 16px; /* 涓庤鏍煎瀷鍙疯緭鍏ユ鎷夊紑璺濈 */
+ }
+
+ .form-cell-flex {
display: flex;
- justify-content: space-around;
- margin-top: 2vh;
+ align-items: center;
+ flex: 0 0 60%;
+ min-width: 320px;
}
- .tool-desc {
- margin-top: 2vh;
+ .form-cell-flex .form-label {
+ margin-right: 4px;
+ width: auto;
+ }
+
+ .form-cell-flex .input-use-limit {
+ margin-right: 12px;
+ }
+
+ .input-use-limit {
+ width: 450px !important;
+ min-width: 0 !important;
+ margin-right: 16px;
+ flex: none !important; /* 鍏抽敭锛氬交搴曠姝lex鎷変几 */
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3