From 019c1b3873bab179fdb2284a6e43267e1937156f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 29 七月 2024 08:47:12 +0800
Subject: [PATCH] 已出炉和钢化后180度旋转，大理片笼每2分钟清理一次，报工管理中英文（部分）
---
UI-Project/src/views/Slicecage/slicecage.vue | 6 +++++-
UI-Project/src/views/Returns/returns.vue | 1 -
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 4 ++--
UI-Project/src/lang/zh.js | 2 ++
UI-Project/src/views/ReportWork/reportWork.vue | 4 ++--
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 4 ++--
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 724296e..b829b82 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -422,6 +422,8 @@
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
all :'鍏ㄩ儴',
completed :'瀹屽伐',
broke :'鐮存崯',
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index b9892b8..583522d 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -128,13 +128,13 @@
adjustedHeight = rect.height * 0.16;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
- newX = 5190 - (rect.yCoordinate + rect.width);
+ // newX = 5190 - (rect.yCoordinate + rect.width);
} else {
adjustedWidth = rect.height * 0.24;
adjustedHeight = rect.width * 0.16;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ // newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index f5944a4..a516793 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -43,13 +43,13 @@
adjustedHeight = rect.height * 0.16;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
- newX = 5190 - (rect.yCoordinate + rect.width);
+ // newX = 5190 - (rect.yCoordinate + rect.width);
} else {
adjustedWidth = rect.height * 0.24;
adjustedHeight = rect.width * 0.16;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ // newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect,
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 752226a..3630f05 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -1,9 +1,9 @@
<template>
<div style="height: 600px;">
<div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
- <span style="margin-left: 10px;" class="demonstration">鐢熶骇鏃堕棿</span>
+ <span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span>
<el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
- start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :default-time="defaultTime" />
+ :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" />
<el-select v-model="report.type" placeholder="娓呴�夋嫨绫诲瀷" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="瀹屽伐" value="1"></el-option>
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 26b1c91..3c14673 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -637,7 +637,6 @@
}
};
</script>
-
<template>
<div>
<div id="dotClass">
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 5870cad..73b7c1b 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -176,7 +176,11 @@
return 9;
});
-
+ function cleanUp() {
+ console.log('鎵ц娓呯悊鎿嶄綔');
+}
+// 鍋囪鎴戜滑姣�2鍒嗛挓鎵ц涓�娆℃竻鐞�
+setInterval(cleanUp, 2 * 60 * 1000);
const getTableRow = (row,type) =>{
switch (type) {
--
Gitblit v1.8.0