From da43aa38dedc711d20093a0ee467a9674594644b Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 24 七月 2024 13:56:22 +0800 Subject: [PATCH] 上片机位置信息更换,显示玻璃根据宽、高、数量判断,上方表格增加序号,数量固定为1。钢化模块新增状态5,新增破损功能 --- UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue index 4e372e6..742ba24 100644 --- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue +++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue @@ -2,14 +2,19 @@ import {Search} from "@element-plus/icons-vue"; import {reactive} from "vue"; import {useRouter} from "vue-router" +import { ElMessage, ElMessageBox } from 'element-plus' +import request from "@/utils/request" import { ref, onMounted, onBeforeUnmount } from 'vue'; import { WebSocketHost ,host} from '@/utils/constants' import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; const adjustedRects = ref([]); +const currentGlassId = ref(null); +const currenttemperingFeedSequence = ref(null); const dialogFormVisible = ref(true) const dialogFormVisiblea = ref(false) +const blind = ref(false) const getTableRow = (row,type) =>{ switch (type) { @@ -58,6 +63,52 @@ }); } }; +function updateRectColors() { + adjustedRectsa.value.forEach(rect => { + if (rect.glassId === glassId) { + rect.state = 5; + } + }); +} +function getRectColora(state) { + switch (state) { + case 3: + return '#f8e3c5'; + case 4: + return '#F0F8FF'; + case 5: + return '#911005'; + } +} +function showDialog(rect) { + currentGlassId.value = rect.glassId; + currenttemperingFeedSequence.value = rect.temperingFeedSequence; + blind.value = true; +} +// 鐮存崯 +const handleDamage = async () => { + try { + const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', { + glassId: currentGlassId.value, + // temperingFeedSequence: currenttemperingFeedSequence.value, + line: 4001, + status: 2, + workingProcedure: '閽㈠寲', + }) + if (response.code == 200) { + ElMessage.success(response.message); + blind.value = false; + updateRectColors(); + } else { + // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭� + ElMessage.error(response.message); + } +} +catch (error) { + // 澶勭悊閿欒 + console.error(error); + } +} onMounted(() => { // fetchFlowCardId(); // fetchTableData(); // 鑾峰彇鏁版嵁 @@ -82,10 +133,11 @@ <div v-for="(rect, index) in adjustedRects" :key="index" + @click="showDialog(rect)" class="rect" :style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`, width: `${rect.width}px`, height: `${rect.height}px`, - backgroundColor: rect.state === 4 ? '#d1edc4' : '#f8e3c5' }"> + backgroundColor: getRectColora(rect.state) }"> <div class="centered-text"> <div >{{ rect.glassId }}</div> <div >{{ rect.flowCardId }}</div> @@ -98,6 +150,11 @@ </div> </el-card> </div> + <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;"> + <el-button type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;"> + {{ $t('order.dilapidation') }} + </el-button> + </el-dialog> </div> </template> -- Gitblit v1.8.0