From c2437613fdb41f8b187130ffc78f6afafb2d64c3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 13:31:21 +0800
Subject: [PATCH] 所有默认开始时间更为00:00:00
---
UI-Project/src/views/Identify/identifwutwo.vue | 65 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwutwo.vue b/UI-Project/src/views/Identify/identifwutwo.vue
index e633e48..9dda4a0 100644
--- a/UI-Project/src/views/Identify/identifwutwo.vue
+++ b/UI-Project/src/views/Identify/identifwutwo.vue
@@ -1,7 +1,8 @@
<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-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
+ <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
v-for="(rect, index) in adjustedRects"
@@ -9,12 +10,13 @@
class="rect"
@click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
- top: `${rect.yAxis}px`, left: `${rect.xAxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}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>
@@ -47,9 +49,21 @@
const blind = ref(false)
const currentGlassId = ref(null);
const adjustedRects = ref([]);
+const ava = ref([]);
+const avanum = ref([]);
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/currentCutDrawingTwo`;
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) {
@@ -58,23 +72,22 @@
if (existingRect) {
return {
...existingRect,
- xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
- yAxis: rect.yAxis * scaleFactory,
- edgWidth: rect.edgWidth * scaleFactor,
- edgHeight: rect.edgHeight * scaleFactory,
+ xAxisa: rect.xAxis * scaleFactor * 1.1,
+ yAxisa: (3300 - (rect.yAxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
+ height: rect.edgHeight * scaleFactory * 1.1,
widtha: rect.edgWidth,
heighta: rect.edgHeight,
state: rect.state,
- // 淇濇寔 isActive 鐘舵�佷笉鍙�
};
} else {
// 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
return {
...rect,
- xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
- yAxis: rect.yAxis * scaleFactory,
- edgWidth: rect.edgWidth * scaleFactor,
- edgHeight: rect.edgHeight * scaleFactory,
+ xAxisa: rect.xAxis * scaleFactor * 1.1,
+ yAxisa: (3300 - (rect.yAxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
+ height: rect.edgHeight * scaleFactory * 1.1,
widtha: rect.edgWidth,
heighta: rect.edgHeight,
state: rect.state,
@@ -148,18 +161,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';
}
}
// 鏇存柊鐭╁舰鐘舵��
@@ -188,7 +207,7 @@
justify-content: center;
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
- font-size: small;
+ /* font-size: large; */
}
#line {
position: absolute;
--
Gitblit v1.8.0