快乐的昕的电脑
昨天 df499252aa425d30cd9ae4697e8f6ceeacb62098
components/mold.vue
@@ -48,7 +48,7 @@
        <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>
            <button class="cancel-btn" @click="cancel" :disabled="submitting || loadingForm">清空刀具选择</button>
        </view>
        <!-- 刀具目录弹窗 -->
@@ -86,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>
@@ -106,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>
@@ -179,13 +225,37 @@
            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('刷新完成');
            },
@@ -638,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() {
            // 清理定时器,防止内存泄漏
@@ -716,11 +789,12 @@
    .form-label {
        width: auto;
        font-weight: bold;
        font-weight: 500;
        color: #333;
        white-space: nowrap;
        margin-right: 4px;
        flex-shrink: 0;
        font-size: 22px;
    }
    .input {
@@ -733,6 +807,7 @@
        min-width: 0;
        height: 56px !important;
        box-sizing: border-box;
        font-size: 22px;
    }
        .input.small-font {
@@ -830,12 +905,15 @@
        color: white;
        border: none;
        text-align: center;
        border-radius: 6px;
        transition: background 0.2s;
        border-radius: 4px;
        transition: all 0.3s;
        font-size: 22px;
        font-weight: 500;
        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
    }
    .cancel-btn {
        background-color: #eee;
        background-color: #f5f5f5;
        color: #333;
    }
@@ -956,6 +1034,7 @@
        .dialog-actions .btn-blue {
            padding: 10px 24px;
            min-width: 120px;
            font-size: 22px;
        }
    .btn-disabled {
@@ -997,6 +1076,7 @@
            padding: 16px 10px;
            font-weight: bold;
            text-align: center;
            font-size: 22px;
        }
        table.styled-table tbody td {
@@ -1004,6 +1084,7 @@
            padding: 14px 10px;
            vertical-align: middle;
            text-align: center;
            font-size: 22px;
        }
    .table-section table th:first-child, .table-section table td:first-child {
@@ -1136,5 +1217,4 @@
        margin-right: 16px;
        flex: none !important; /* 关键:彻底禁止flex拉伸 */
    }
</style>