From 3048ae014effa8f8ba92395eeb1e69f18e76ebf0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 27 八月 2024 14:10:07 +0800
Subject: [PATCH] 大理片笼更改样式，时间选择器中文，钢化模块、掰片模块更新算法
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 87f0c2f..dc37809 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -41,7 +41,8 @@
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.overGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
+ const scaleFactor = 1390/5190;
+ const scaleFactorY = 750/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
@@ -54,15 +55,15 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.16;
+ adjustedHeight = heighta * scaleFactorY;
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.16;
+ adjustedHeight = widtha * scaleFactorY;
}
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.16,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
@@ -157,11 +158,11 @@
<template>
<div style="margin-top: 10px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
<div v-if="adjustedRects.length > 0">
<div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
- <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
v-for="(rect, index) in adjustedRects"
--
Gitblit v1.8.0