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/Slicecage/slicecage.vue | 4
UI-Project/src/views/Returns/returns.vue | 3
UI-Project/src/views/Identify/identify.vue | 74 ++++++++++++------------
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 13 ++--
UI-Project/src/main.js | 2
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 45 ++++++++-------
6 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/UI-Project/src/main.js b/UI-Project/src/main.js
index 30b5a74..166ffa7 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -23,7 +23,7 @@
app.use(VXETable)
app.use(pinia)
app.use(router)
-app.use(ElementPlus)
+// app.use(ElementPlus)
app.use(ElementPlus,{
locale: zhCn,
})
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 590269c..013068a 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -11,8 +11,8 @@
@current-change="handleCurrentChange"
/>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
- <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+ <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="position: relative;">
<div
v-for="(rect, index) in adjustedRects"
@@ -60,6 +60,7 @@
const glass_id = ref();
const inputValue = ref('');
const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
+const currentstate = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
let webSocket: WebSocket | null = null;
@@ -68,12 +69,12 @@
const currentPage = ref(1);
const disabled = false;
const size = 'small';
-const rawData = ref([]);
+const rawData = ref([]);
// const handleBind = (row) => {
// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
// };
// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
-function showDialog(glassId: number) {
+function showDialog(glassId: number) {
currentGlassId.value = glassId;
blind.value = true;
adjustedRects.value = adjustedRects.value.map(rect =>
@@ -103,7 +104,7 @@
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 8);
- } else {
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -131,7 +132,7 @@
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 9);
- } else {
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -146,20 +147,19 @@
var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
const response = await request.post(url)
if (response.code === 200) {
- console.log(response.data);
-
const rawRects = response.data[0];
rawData.value = response.data;
totalPages.value = rawData.value.length;
const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor ,
widtha: rect.width ,
heighta: rect.height ,
- height: rect.height * 0.165 ,
+ height: rect.height * scaleFactory,
glass_state: rect.glass_state
}));
// 濡傛灉WebSocket宸茶繛鎺ワ紝鍒欏叧闂�
@@ -177,36 +177,35 @@
currentPage.value = val;
const page = currentPage.value - 1
const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
adjustedRects.value = rawData.value[page]?.map(rect => ({
// adjustedRects.value = rawRects.map(rect => ({
...rect,
x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor ,
widtha: rect.width ,
heighta: rect.height ,
- height: rect.height * 0.165 ,
+ height: rect.height * scaleFactory,
glass_state: rect.glass_state
- }));
+ }));
};
-function getRectColor(state: number): string {
- switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
- case 8:
- return '#911005';
- case 9:
- return '#f3d19e';
- // default:
- // return '#911005'; // 榛樿棰滆壊
- }
-}
+function getRectColor(state: number): string {
+ switch (state) {
+ case 0:
+ return '#e1f3d8';
+ case 100:
+ return '#c8c9cc';
+ case 110:
+ return '#b3e19d';
+ case 120:
+ return '#f89898';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#f3d19e';
+ }
+}
// 鏇存柊鐭╁舰鐘舵��
function updateRectStatus(glassId: string, status: number) {
adjustedRects.value.forEach(rect => {
@@ -221,8 +220,9 @@
webSocket = new WebSocket(socketUrl);
webSocket.onmessage = (event) => {
const data = JSON.parse(event.data);
- const scaleFactor = 1621.78 / 6000;
- if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
+ const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
+ if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
const newRects = data.currentCutTerritory[0].map(rect => {
const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
@@ -230,9 +230,9 @@
return {
...existingRect,
x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor,
- height: rect.height * 0.165,
+ height: rect.height * scaleFactory,
widtha: rect.width,
heighta: rect.height,
glass_state: rect.glass_state,
@@ -243,9 +243,9 @@
return {
...rect,
x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor,
- height: rect.height * 0.165,
+ height: rect.height * scaleFactory,
widtha: rect.width,
heighta: rect.height,
glass_state: rect.glass_state,
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index d329c50..55be7f0 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -93,6 +93,7 @@
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.intoGlass2[0].map(rect => {
const scaleFactor = 794.67/5087;
+ const scaleFactorY = 430/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -104,13 +105,13 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.1;
+ adjustedHeight = heighta * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.1;
+ adjustedHeight = widtha * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + heighta);
@@ -118,7 +119,7 @@
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
@@ -145,6 +146,7 @@
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.intoGlass[0].map(rect => {
const scaleFactor = 794.67/5087;
+ const scaleFactorY = 430/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -156,13 +158,13 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.1;
+ adjustedHeight = heighta * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.1;
+ adjustedHeight = widtha * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + heighta);
@@ -170,7 +172,7 @@
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
@@ -196,8 +198,9 @@
const existingRects = adjustedRectsa.value.filter(rect => newGlassIds.has(rect.glassId));
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.waitingGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
+ const scaleFactor = 1390/5190;
+ const scaleFactorY = 750/2800;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
widtha = rect.height;
@@ -208,13 +211,13 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.16;
+ adjustedHeight = heighta * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + widtha);
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.16;
+ adjustedHeight = widtha * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + heighta);
@@ -222,7 +225,7 @@
return {
...rect,
x: newX * scaleFactor,
- y: rect.xCoordinate * 0.16,
+ y: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
@@ -248,8 +251,8 @@
const existingRects = adjustedRectsb.value.filter(rect => newGlassIds.has(rect.glassId));
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.outGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
- const scaleFactory = 550/2800;
+ const scaleFactor = 1390/5190;
+ const scaleFactory = 750/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta,newY;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -517,11 +520,11 @@
<el-button id="searchButton" type="info" @click="dialogFormVisiblec = true;dialogFormVisibleb = false;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.print') }}</el-button>
<div v-if="dialogFormVisible" >
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
-<div style="width: 49%;float: left;background-color: #f4f4f5;height: 550px;">
+<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects1.length > 0">
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="430px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRects1"
@@ -545,11 +548,11 @@
</el-scrollbar>
</div>
</div>
-<div style="width: 49%;float: right;background-color: #f4f4f5;height: 550px;">
+<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects2.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="430px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRects2"
@@ -577,11 +580,11 @@
</div>
<div v-if="dialogFormVisiblea">
<!-- 杩涚倝鍓� -->
- <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">
<div v-if="adjustedRectsa.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsa[0].engineerId }}-{{ adjustedRectsa[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplaya }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsa"
@@ -604,11 +607,11 @@
</div>
<div v-if="dialogFormVisibleb">
<!-- 宸插嚭鐐� -->
- <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">
<div v-if="adjustedRectsb.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsb[0].engineerId }}-{{ adjustedRectsb[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplayb }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsb"
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"
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index ad2298d..a3613f2 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -28,14 +28,13 @@
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
-const canSelectProject = ref(true); // 鍋囪寮�濮嬫椂鍙互閫夋嫨椤圭洰
+const canSelectProject = ref(true);
const canStartLoading = ref(false);
import { WebSocketHost ,host} from '@/utils/constants'
import request from "@/utils/request"
const ida = ref(null);
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ref, onMounted, onUnmounted, onBeforeUnmount } from "vue";
-// 鍝嶅簲寮忔暟鎹�
const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const selectedValue = ref(''); // 褰撳墠閫変腑鐨勫
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 75c4a83..894ec34 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1239,7 +1239,7 @@
<el-table
:data="paginatedUsers"
@row-click="handleRowClick"
- height="500"
+ height="700"
@expand-change="handleExpandChange"
row-key="id"
default-expand-all
@@ -1351,7 +1351,7 @@
<el-button style="margin-left: 10px;size: mini;" type="danger">鍋滄</el-button>
<el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
</div> -->
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
+ <el-table ref="table" style="margin-top: 20px;height: 700px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<!-- <el-table-column prop="id" fixed align="center" :label="$t('searchOrder.sheetID')" min-width="150"/>
-->
--
Gitblit v1.8.0