From 4fcf766a0e293ed8163b981d0766f80eb9c84a2a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 24 三月 2025 16:44:43 +0800
Subject: [PATCH] 上片、掰片、卧式缓存、磨边、大理片笼、钢化、系统管理模块，控制台报错问题
---
UI-Project/src/views/Identify/identify.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 8c60e30..ae7f372 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,7 +1,7 @@
<template>
<div style="height: 500px;">
<div style="display: flex;">
- <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
+ <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')"/>
<el-button type="primary" style="margin-left: 10px;margin-top: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
<el-pagination
v-model:current-page="currentPage"
@@ -14,7 +14,7 @@
style="margin-top: 10px;"
/>
</div>
- <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;">
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
@@ -29,7 +29,8 @@
>
<div class="centered-text">
<div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</div>
- <div style="font-size: 20px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</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>
@@ -158,10 +159,12 @@
totalPages.value = response.data.totalPatternSequence;
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
- adjustedRects.value = rawRects.map(rect => ({
+ adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
- yaxisa: rect.yaxis * scaleFactory * 1.1,
+ xaxisa: rect.xaxis * scaleFactor * 1.1,
+ yaxisa: (3300 - (rect.yaxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
+ // xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
+ // yaxisa: rect.yaxis * scaleFactory * 1.1,
width: rect.edgWidth * scaleFactor * 1.1,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
@@ -177,14 +180,13 @@
const response = await request.post(url)
if (response.code === 200) {
const rawRects = response.data.currentCutDrawing;
- console.log(response.data);
rawData.value = response.data;
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
- yaxisa: rect.yaxis * scaleFactory * 1.1,
+ xaxisa: rect.xaxis * scaleFactor * 1.1,
+ yaxisa: (3300 - (rect.yaxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
width: rect.edgWidth * scaleFactor * 1.1,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
@@ -195,18 +197,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';
}
}
const optionsb = [
--
Gitblit v1.8.0