From 86903050702bb898277ed8f87202c0224867c47f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 16:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identifwu.vue | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwu.vue b/UI-Project/src/views/Identify/identifwu.vue
index cdebbc0..a3bdf48 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">
+ <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
@@ -37,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'
@@ -48,6 +49,8 @@
const blind = ref(false)
const currentGlassId = ref(null);
const adjustedRects = ref([]);
+const ava = ref([]);
+const avanum = ref([]);
let socket = null;
const currentGlassRect = computed(() => {
return adjustedRects.value.find(rect => rect.glassId === currentGlassId.value);
@@ -139,6 +142,16 @@
}
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/currentCutDrawingOne`;
const handleMessage = (data: any) => {
+ if (data.engineer != null) {
+ ava.value = data.engineer[0]
+ }else{
+ ava.value = 0
+ }
+ if (data.engineer != null) {
+ avanum.value = data.sequence[0]
+ }else{
+ avanum.value = 0
+ }
const scaleFactor = 1621.78 / 6000;
const scaleFactory = 750 / 3300;
if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
--
Gitblit v1.8.0