From dd4778d2cc47467a39473f02513ec5438b5c9512 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 九月 2025 12:31:58 +0800
Subject: [PATCH] 1、合并冲突
---
UI-Project/src/views/Identify/identifwu.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwu.vue b/UI-Project/src/views/Identify/identifwu.vue
index 3ade8dd..02b90a0 100644
--- a/UI-Project/src/views/Identify/identifwu.vue
+++ b/UI-Project/src/views/Identify/identifwu.vue
@@ -1,7 +1,10 @@
<template>
- <div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;">
+ <div style="height: 600px;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 850px;">
+ <div style="display: flex;margin-left: 40%;margin-bottom: 5px;">
<div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ ava }}-{{ avanum }} </div>
+ <el-button @click="handleAllDamage" style="margin-left: 80%;margin-top: -5px;">{{$t('order.dilapidation')}}</el-button>
+ </div>
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
@@ -14,9 +17,9 @@
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}">
<div class="centered-text">
- <div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</div>
- <div style="font-size: 20px;font-weight: bold;">{{ rect.flowCardId }}</div>
- <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -38,7 +41,7 @@
</div>
</template>
<script setup lang="ts">
-import {avatarEmits, ElMessage} from 'element-plus'
+import {avatarEmits, ElMessage, ElMessageBox } from 'element-plus'
import {onBeforeUnmount, computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
@@ -70,6 +73,47 @@
isActive: false
}));
}
+// 涓�閿牬鎹熸墍鏈夌幓鐠�
+const handleAllDamage = async () => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('order.dilapidationWhether'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ // 绛涢�夊嚭state涓嶆槸8鍜�9鐨勭幓鐠僆D
+ const glassIdList = adjustedRects.value
+ .filter(rect => rect.state !== 8 && rect.state !== 9)
+ .map(rect => rect.glassId);
+ if (glassIdList.length === 0) {
+ ElMessage.warning(t('order.noGlassToDamage')); // 娌℃湁鍙牬鎹熺殑鐜荤拑
+ return;
+ }
+ const response = await request.post('/cacheGlass/taskCache/identControlsByPatternSequence', {
+ glassIdList: glassIdList,
+ state: 8,
+ line: 1,
+ workingProcedure: '鍒囧壊',
+ remark: '鎺扮墖'
+ });
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ // 鏇存柊鎵�鏈夌幓鐠冪姸鎬�
+ glassIdList.forEach(glassId => {
+ updateRectStatus(glassId, 8);
+ });
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
+ ElMessage.error(t(''));
+ }
+};
// 鐮存崯
const handleDamage = async () => {
try {
--
Gitblit v1.8.0