Revert "调试"

快乐的昕的电脑

2025-11-14 05303f059e0b1011be5083e92c0bbb96c594891d

 components/mold.vue

@@ -2,32 +2,47 @@
    <view class="page">
        <!-- 刀具选择区 -->
        <view class="top-section-grid">
            <view class="form-cell">
                <label class="form-label">刀具编号：</label>
                <input class="input" 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">
                    <label class="form-label highlight-label">使用上限：</label>
                    <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-life-warn"
                               v-model="lifeWarnInput"
                               placeholder="如0.9或90"
                               :disabled="!selectedToolNo || loadingForm" />
                        <span class="unit-text">%</span>
                    </view>
                </view>
            </view>
            <view class="form-cell">
                <label class="form-label">设置使用上限：</label>
                <input class="input" type="number" v-model="useLimitInput" placeholder="每次换刀后手填" :disabled="!selectedToolNo || loadingForm" />
            </view>
            <!-- 新增：寿命比预警值输入框 -->
            <view class="form-cell">
                <label class="form-label">寿命比预警值：</label>
                <input class="input"
                       v-model="lifeWarnInput"
                       placeholder="如0.9或90(%)"
                       :disabled="!selectedToolNo || loadingForm" />
            </view>
            <view class="form-cell">
                <label class="form-label">刀具名称：</label>
                <input class="input" v-model="toolName" placeholder="刀具带出" disabled />
                <label class="form-label" style="margin-left: 16px;">规格型号：</label>
                <input class="input" 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">
                    <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>
@@ -107,11 +122,10 @@
        </view>

        <!-- 说明 -->
        <view class="tool-desc">
            <p style="color:red;">当前工单中，换了几次刀，就会产生几条数据。上刀时间、下刀时间在表中能看到。</p>
            <p style="color:red;">上刀时间和对应时间用生产计数器匹配，查出当时的生产数（累计计数）。</p>
            <p style="color:red;">寿命比预警值在刀具上，默认统一。</p>
        </view>
        <!--<view class="tool-desc">
            <p style="color:red;">'使用上限'以下刀时的'使用上限'为计算标准</p>
            <p style="color:red;">寿命比预警值默认为90%</p>
        </view>-->
    </view>
</template>

@@ -139,7 +153,14 @@
                loadingForm: false,
                submitting: false,
                _searchTimer: null,
                workOrderCurrentCjNum: null // 工单当前数采
                workOrderCurrentCjNum: null, // 工单当前数采

                // 自动保存相关
                autoSaveTimer: null,
                isDirty: false, // 表单是否有未保存变更
                autoSaveIntervalMs: 5 * 60 * 1000, // 默认 5 分钟
                autoSaveEnabled: true,
                autoSaveActionName: 'handleUpTool' // 自动触发的方法名，可改为自定义保存方法
            };
        },
        computed: {
@@ -147,7 +168,56 @@
                return Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
            }
        },
        watch: {
            // 标记脏数据：按需监听字段变化
            selectedToolNo() { this.isDirty = true; },
            useLimitInput() { this.isDirty = true; },
            lifeWarnInput() { this.isDirty = true; },
            toolName() { this.isDirty = true; },
            toolModel() { this.isDirty = true; }
        },
        methods: {
            // 自动保存：启动
            startAutoSave() {
                if (!this.autoSaveEnabled) return;
                this.stopAutoSave();
                this.autoSaveTimer = setInterval(() => {
                    this.autoSaveTick();
                }, this.autoSaveIntervalMs);
            },
            // 自动保存：停止
            stopAutoSave() {
                if (this.autoSaveTimer) {
                    clearInterval(this.autoSaveTimer);
                    this.autoSaveTimer = null;
                }
            },
            // 自动保存：每次定时执行时的逻辑
            async autoSaveTick() {
                if (!this.autoSaveEnabled) return;
                if (!this.isDirty) return;
                if (this.submitting || this.loadingForm) return;

                const fn = this.autoSaveActionName && typeof this[this.autoSaveActionName] === 'function'
                    ? this[this.autoSaveActionName]
                    : null;
                if (!fn) {
                    console.warn('自动保存：未找到方法', this.autoSaveActionName);
                    return;
                }

                try {
                    this.submitting = true;
                    await fn.call(this); // 调用保存方法（例如 handleUpTool）
                    // 如果保存成功，清脏标记（保存方法内部若失败没有抛出可保持此方式）
                    this.isDirty = false;
                } catch (e) {
                    console.error('自动保存失败：', e);
                } finally {
                    this.submitting = false;
                }
            },

            // 新增：寿命比预警值归一化 (返回 0~1 或 null)
            normalizeLifeWarn(v) {
                if (v == null) return null;
@@ -189,10 +259,12 @@
                            return null;
                        };

                        // 这里需要把 lifeWarn 字段也带出来
                        const mapped = (payload || []).map(t => ({
                            no: getField(t, 'cutterId', 'CUTTER_ID', 'cutteR_ID', 'daA001', 'no'),
                            name: getField(t, 'cutterName', 'CUTTER_NAME', 'cutteR_NAME', 'name'),
                            model: getField(t, 'cutterModel', 'CUTTER_MODEL', 'cutteR_MODEL', 'model')
                            model: getField(t, 'cutterModel', 'CUTTER_MODEL', 'cutteR_MODEL', 'model'),
                            lifeWarn: getField(t, 'modlLifeWorning', 'lifeWarn', 'LIFE_WARN', 'lifE_WARN')
                        }));

                        this.filteredTools = mapped;
@@ -242,6 +314,14 @@
                this.toolName = tool.name;
                this.toolModel = tool.model;
                this.activeToolNo = tool.no;
                // 新增：带出寿命比预警值
                if (tool.lifeWarn !== undefined && tool.lifeWarn !== null) {
                    // 格式化为百分比字符串
                    const warn = Number(tool.lifeWarn);
                    this.lifeWarnInput = warn <= 1 ? (warn * 100).toFixed(0) : warn.toFixed(0);
                } else {
                    this.lifeWarnInput = '';
                }
            },
            confirmTool() {
                this.showToolDialog = false;
@@ -313,6 +393,7 @@
                } catch (err) {
                    console.error(err);
                    this.$showMessage('上刀提交失败，请检查网络');
                    throw err; // 抛出以便自动保存逻辑捕获并保留 isDirty
                } finally {
                    this.submitting = false;
                }
@@ -364,6 +445,7 @@
                } catch (err) {
                    console.error(err);
                    this.$showMessage('下刀提交失败，请检查网络');
                    throw err;
                } finally {
                    this.submitting = false;
                }
@@ -374,6 +456,7 @@
                this.toolModel = '';
                this.useLimitInput = '';
                this.lifeWarnInput = ''; // 新增：清空
                this.isDirty = false;
            },
            async fetchFormData() {
                if (!this.workOrderNo || !this.machineNo) {
@@ -458,6 +541,18 @@
                        };
                    });

                    // 新增：按上刀时间降序排序（越晚的越上面）
                    mapped.sort((a, b) => {
                        // 时间格式如 "10-24 16:03"，转为 Date 对象比较
                        const parse = s => {
                            if (!s) return 0;
                            // 补年份，假设都是今年
                            const year = new Date().getFullYear();
                            return new Date(`${year}-${s.replace(/-/g, '-')}:00`).getTime();
                        };
                        return parse(b.upTime) - parse(a.upTime); // 注意这里顺序反过来
                    });

                    this.toolRecords = mapped;
                    const totalFromRes = Number(
                        res.data?.total ?? res.data?.totalCount ?? res.total ?? res.totalCount ?? mapped.length
@@ -487,6 +582,13 @@
                        this.toolModel = order.cutterModel || order.cutteR_MODEL || '';
                        // 关键：获取工单最新采集数
                        this.workOrderCurrentCjNum = order.CurrentCjNum ?? order.currentCjNum ?? null;
                        // 新增：自动填充寿命比预警值
                        if (order.modlLifeWorning !== undefined && order.modlLifeWorning !== null) {
                            const warn = Number(order.modlLifeWorning);
                            this.lifeWarnInput = warn <= 1 ? (warn * 100).toFixed(0) : warn.toFixed(0);
                        } else {
                            this.lifeWarnInput = '';
                        }
                    } else {
                        this.workOrderCurrentCjNum = null;
                    }
@@ -532,78 +634,126 @@
            } else {
                console.warn('机台号或工单号为空，无法获取表单数据');
            }

            // 启动自动保存定时器
            this.startAutoSave();
        },
        beforeDestroy() {
            // 清理定时器，防止内存泄漏
            this.stopAutoSave();
        }
    };
</script>

<style scoped>
    /* 原样保持，未改动样式，只插入了一个输入框 */
    .top-section-grid {
        display: flex;
        flex-direction: column;
        justify-content: center;
        align-items: flex-end;
        gap: 32px;
        align-items: center;
        gap: 12px;
        margin-bottom: 2vh;
        width: 95vw;
        max-width: 1600px;
        width: 99vw; /* 原95vw，改为99vw */
        max-width: 1920px; /* 原1600px，改为1920px */
        margin-left: auto;
        margin-right: auto;
        padding: 12px;
        background: #f8f9fa;
        border-radius: 8px;
        border: 1px solid #e9ecef;
        font-size: 32px;
    }

    /* 表单行样式优化 */
    .form-row {
        display: flex;
        justify-content: space-between;
        align-items: center;
        width: 100%;
        margin-bottom: 12px;
    }

        .form-row:last-child {
            margin-bottom: 0;
        }

    .form-cell {
        display: flex;
        align-items: center;
        flex-basis: 0;
        flex-grow: 1;
        max-width: 33.33%; /* 三等分 */
        min-width: 0;
        margin: 0 8px;
    }

    .form-label {
        width: 90px;
        width: 120px;
        font-weight: bold;
        font-size: 32px !important; /* 原18/22px，调大 */
        color: #333;
        white-space: nowrap;
        margin-right: 12px;
        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;
        font-size: 30px !important; /* 原16/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;
    }

    .form-select {
        width: 12vw;
        padding: 1vh;
        font-size: 1.1vw;
        margin-right: 8px;
        border-radius: 6px;
        background: #f8f8f8;
        .input.small-font {
            font-size: 28px !important; /* 原15/19px，调大 */
        }

        .input:disabled {
            background-color: #f5f7fa;
            color: #c0c4cc;
            cursor: not-allowed;
        }

    .input, .input-with-unit {
        width: 100%;
        box-sizing: border-box;
    }

    .btn-blue {
        background-color: #00A2E9;
        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-size: 32px !important; /* 原16/22px，调大 */
        font-weight: 500;
        white-space: nowrap;
        height: 70px !important;
        box-sizing: border-box;
        transition: all 0.3s;
        flex-shrink: 0;
        min-width: 140px;
    }

        .btn-blue:active,
        .btn-blue:focus {
            background-color: #0086c2;
            box-shadow: 0 4px 12px rgba(0,162,233,0.12);
        .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 {
@@ -618,7 +768,7 @@
        padding: 1.5vh;
        background-color: #00A2E9;
        color: white;
        font-size: 1.2vw;
        font-size: 1.8vw; /* 原1.2vw，调大 */
        border: none;
        text-align: center;
        border-radius: 6px;
@@ -630,6 +780,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;
@@ -647,42 +811,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: 22px; /* 原13/18px，调大 */
        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 {
@@ -695,10 +875,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 {
@@ -714,18 +895,26 @@
            align-items: center;
        }

        .dialog-actions .btn-blue {
            padding: 10px 24px;
            font-size: 28px !important; /* 原16/22px，调大 */
            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-size: 28px !important; /* 原16/22px，调大 */
        font-weight: 500;
        cursor: not-allowed;
        box-shadow: none;
        min-width: 120px;
    }

    /* 表格样式 */
    .table-section {
        display: flex;
        justify-content: center;
@@ -751,14 +940,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;
        }
@@ -806,33 +995,93 @@
        padding: 2px 6px;
        border-radius: 3px;
        font-weight: bold;
        font-size: 0.9vw;
        font-size: 1.4vw; /* 原0.9/1.2vw，调大 */
    }

    .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;
    }

    .warn {
        color: red;
        font-weight: bold;
    }

    .bottom-section {
    /* 带单位的输入框样式 */
    .input-with-unit {
        display: flex;
        justify-content: space-around;
        margin-top: 2vh;
        align-items: center;
        flex: 1;
    }

    .tool-desc {
        margin-top: 2vh;
        .input-with-unit .input {
            flex: 1;
            margin-right: 8px;
        }

    .unit-text {
        color: #666;
        font-size: 28px !important; /* 原14/18px，调大 */
        white-space: nowrap;
        width: 28px;
    }

    /* 响应式调整 */
    @media (max-width: 1200px) {
        .form-cell {
            margin: 0 4px;
        }

        .form-label {
            width: 90px;
            font-size: 22px !important; /* 原16/18px，调大 */
        }

        .input {
            font-size: 20px !important; /* 原14/17px，调大 */
            padding: 10px 14px;
        }

        .btn-blue {
            padding: 10px 18px;
            font-size: 22px !important; /* 原14/18px，调大 */
        }
    }

    /* 新增大按钮样式 */
    .btn-blue.large-btn {
        padding: 14px 32px;
        font-size: 32px !important; /* 原16/22px，调大 */
        height: 70px !important;
        min-width: 140px;
    }

    /* 调整表单单元格布局以适应按钮 */
    .form-row .form-cell:last-child {
        justify-content: center;
        flex: 0 0 auto;
        min-width: 140px;
    }

    /* 新增：让“设置使用上限”“寿命比预警值”输入框变窄 */
    .input-life-warn {
        width: 120px !important;
        min-width: 0 !important;
        margin-right: 8px;
    }

    .input-use-limit {
        width: 100px !important;
        min-width: 0 !important;
        margin-right: 16px;
        color: #1890ff !important;
        border-color: #1890ff !important;
    }

    .input-tool-model {
        width: 100px !important;
        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;
    }
</style>