From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identifwu.vue | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwu.vue b/UI-Project/src/views/Identify/identifwu.vue
index 8aeb441..3ade8dd 100644
--- a/UI-Project/src/views/Identify/identifwu.vue
+++ b/UI-Project/src/views/Identify/identifwu.vue
@@ -1,6 +1,7 @@
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;">
+ <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ ava }}-{{ avanum }} </div>
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
@@ -9,12 +10,13 @@
class="rect"
@click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
- top: `${rect.yAxis}px`, left: `${rect.xAxis}px`, width: `${rect.width}px`, height: `${rect.height}px`,
+ top: `${rect.yAxisa}px`, left: `${rect.xAxisa}px`, width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}">
<div class="centered-text">
- <div>{{ rect.glassId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <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>
</div>
</div>
@@ -36,7 +38,7 @@
</div>
</template>
<script setup lang="ts">
-import {ElMessage} from 'element-plus'
+import {avatarEmits, ElMessage} from 'element-plus'
import {onBeforeUnmount, computed, onMounted, onUnmounted, ref} from 'vue';
import request from "@/utils/request"
import {host, WebSocketHost} from '@/utils/constants'
@@ -47,6 +49,10 @@
const blind = ref(false)
const currentGlassId = ref(null);
const adjustedRects = ref([]);
+const ava = ref('');
+const avanum = ref('');
+const realwidth = ref('');
+const realheight = ref('');
let socket = null;
const currentGlassRect = computed(() => {
return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
@@ -108,18 +114,24 @@
}
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#99BBFF';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
// 鏇存柊鐭╁舰鐘舵��
@@ -132,20 +144,44 @@
}
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/currentCutDrawingOne`;
const handleMessage = (data: any) => {
- const scaleFactor = 1621.78 / 6000;
- const scaleFactory = 750 / 3300;
+ if (data.engineer != null) {
+ ava.value = data.engineer[0]
+ }else{
+ ava.value = ''
+ }
+ if (data.engineer != null) {
+ avanum.value = data.sequence[0]
+ }else{
+ avanum.value = ''
+ }
+ console.log(data.upPattenUsage);
+ console.log(data.currentCutTerritory);
+ if (data.upPattenUsage && data.upPattenUsage.length > 0) {
+ realwidth.value = data.upPattenUsage[0].width;
+ realheight.value = data.upPattenUsage[0].height;
+ const realx = realwidth.value;
+ const realy = realheight.value;
+ window.localStorage.setItem('widthreturna', realy)
+ const scaleFactora = 1621.78 / realx;
+ const scaleFactorya = 750 / realy;
+ window.localStorage.setItem('scaleFactorb', scaleFactora)
+ window.localStorage.setItem('scaleFactoryb', scaleFactorya)
+ }
if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
+ let scaleFactor = window.localStorage.getItem('scaleFactorb')
+ let scaleFactory = window.localStorage.getItem('scaleFactoryb')
+ let widthreturn = window.localStorage.getItem('widthreturna')
const newRects = data.currentCutTerritory[0].map(rect => {
const existingRect = adjustedRects.value.find(r => r.glassId === rect.glassId);
if (existingRect) {
return {
...existingRect,
- xAxis: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
- yAxis: rect.yAxis * scaleFactory,
- width: rect.width * scaleFactor,
- height: rect.height * scaleFactory,
- widtha: rect.width,
- heighta: rect.height,
+ xAxisa: rect.xAxis * scaleFactor,
+ yAxisa: (widthreturn - (rect.yAxis + rect.edgHeight)) * scaleFactory,
+ width: rect.edgWidth * scaleFactor,
+ height: rect.edgHeight * scaleFactory,
+ widtha: rect.edgWidth,
+ heighta: rect.edgHeight,
state: rect.state,
// 淇濇寔 isActive 鐘舵�佷笉鍙�
};
@@ -153,12 +189,12 @@
// 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
return {
...rect,
- xAxis: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
- yAxis: rect.yAxis * scaleFactory,
- width: rect.width * scaleFactor,
- height: rect.height * scaleFactory,
- widtha: rect.width,
- heighta: rect.height,
+ xAxisa: rect.xAxis * scaleFactor,
+ yAxisa: (widthreturn - (rect.yAxis + rect.edgHeight)) * scaleFactory,
+ width: rect.edgWidth * scaleFactor,
+ height: rect.edgHeight * scaleFactory,
+ widtha: rect.edgWidth,
+ heighta: rect.edgHeight,
state: rect.state,
isActive: false,
glassId: rect.glassId,
@@ -188,7 +224,7 @@
justify-content: center;
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
- font-size: small;
+ /* font-size: large; */
}
#line {
position: absolute;
--
Gitblit v1.8.0