From 2169195fa828a54680daed6a23784402c135284b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 27 三月 2025 15:28:11 +0800
Subject: [PATCH] 报工管理页面完善、大屏显示翻译文件补充
---
UI-Project/src/views/Slicecage/slicecage.vue | 2
UI-Project/src/lang/en.js | 1
UI-Project/src/lang/py.js | 1
UI-Project/src/lang/zh.js | 3 +
UI-Project/src/views/ReportWork/reportWork.vue | 78 +++++++++++++++++++++++++++++++++++----
UI-Project/src/views/hollow/hollowequipment.vue | 2
UI-Project/src/views/hollow/hellowquiphistory.vue | 2
UI-Project/src/views/largescreen/largescreen.vue | 2
8 files changed, 78 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 4dfe190..cac5c4a 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -540,6 +540,7 @@
brokeno: 'The report is broken and not filled',
close: 'Shut down',
orderId: 'Order ID',
+ order: '璁㈠崟璇︽儏',
customerName: 'The name of the customer',
project: 'The name of the project',
are: 'are',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index af25c95..cf00894 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -538,6 +538,7 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index bc0ac98..9d22654 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -539,6 +539,7 @@
brokeno: '鎶ユ鐮存湭琛�',
close: '鍏抽棴',
orderId: '璁㈠崟ID',
+ order: '璁㈠崟璇︽儏',
customerName: '瀹㈡埛鍚嶇О',
project: '椤圭洰鍚嶇О',
are: '闈㈢Н',
@@ -749,7 +750,7 @@
pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
isForceList: '鏄惁寮哄埗',
yesisForceList: '寮哄埗',
- noisForceList: '闈炲己鍒�',
+ noisForceList: '闈炲己鍒�',
hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index ef5e1b9..5400e22 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -45,9 +45,31 @@
<el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')"
min-width="120" />
<el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.productiontime')"
- min-width="230" />damageTime
- <el-table-column prop="type" align="center" :label="$t('reportmanage.type')" min-width="120" />
- <el-table-column prop="status" align="center" :label="$t('reportmanage.state')" min-width="120" />
+ min-width="230" />
+ <el-table-column
+ align="center"
+ :label="$t('reportmanage.type')"
+ min-width="120"
+ prop="type"
+ >
+ <template #default="scope">
+ <el-tag :type="gettypeType(scope.row.type)">
+ {{ gettypeText(scope.row.type) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('reportmanage.state')"
+ min-width="120"
+ prop="status"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.status)">
+ {{ getStatusText(scope.row.status) }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="140" />
<el-table-column prop="orderNumber" align="center" :label="$t('reportmanage.number')" min-width="120" />
<el-table-column prop="technologyNumber" align="center" :label="$t('reportmanage.layer')" min-width="120" />
@@ -74,9 +96,9 @@
<template #default="{ row }">
<el-select v-model="row.responsibleProcess" filterable :placeholder="$t('reportmanage.ptypebreakage')" :disabled="selectedType"
clearable @input="handleInputChangea($event, row.id)">
- <el-option value="鍒囧壊" label="鍒囧壊"></el-option>
- <el-option value="纾ㄨ竟" label="纾ㄨ竟"></el-option>
- <el-option value="閽㈠寲" label="閽㈠寲"></el-option>
+ <el-option :label="$t('reportmanage.incise')" value="鍒囧壊"></el-option>
+ <el-option :label="$t('reportmanage.edging')" value="纾ㄨ竟"></el-option>
+ <el-option :label="$t('reportmanage.steel')" value="閽㈠寲"></el-option>
</el-select>
</template>
</el-table-column>
@@ -118,7 +140,7 @@
</el-card>
</div>
</template>
-<script setup>
+<script lang="ts" setup>
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ref, onMounted, onBeforeUnmount, reactive, computed, shallowRef, onUnmounted, watchEffect } from "vue";
@@ -191,7 +213,7 @@
if (response.code === 200) {
const formattedData = response.data.map(record => ({
...record,
- formattedCreateTime: formatTimestamp(record.createTime),
+ formattedCreateTime: formatTimestamp(record.damageTime),
}));
reportData.value = formattedData;
ElMessage.success(response.message);
@@ -259,6 +281,46 @@
inputValuesb[rowId] = value;
};
fetchTableData();
+function gettypeType(type: number) {
+ switch (type) {
+ case 9:
+ return 'success';
+ case 8:
+ return 'danger';
+ }
+}
+function gettypeText(type: number) {
+ switch (type) {
+ case 9:
+ return t('reportmanage.takeout');
+ case 8:
+ return t('reportmanage.broke');
+ }
+}
+function getStatusType(status: number) {
+ switch (status) {
+ case 1:
+ return 'warning';
+ case 3:
+ return 'info';
+ case 7:
+ return 'success';
+ case 8:
+ return 'primary';
+ }
+}
+function getStatusText(status: number) {
+ switch (status) {
+ case 1:
+ return t('reportmanage.dreportwork');
+ case 3:
+ return t('reportmanage.reportwork');
+ case 7:
+ return t('reportmanage.pendingwork');
+ case 8:
+ return t('reportmanage.reportworked');
+ }
+}
let socket = null;
// const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
// const handleMessage = (data) => {
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 5271b9b..aa27298 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1038,7 +1038,7 @@
}
function tableRowClassName({ row }) {
if (row.isSame === 1) {
- return 'row-red-background'; // 璁剧疆绾㈣壊鑳屾櫙
+ return 'row-red-background';
}
return '';
}
diff --git a/UI-Project/src/views/hollow/hellowquiphistory.vue b/UI-Project/src/views/hollow/hellowquiphistory.vue
index 644efb1..a5c673e 100644
--- a/UI-Project/src/views/hollow/hellowquiphistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiphistory.vue
@@ -658,7 +658,7 @@
}
function getStatusTexta(isForce: number) {
switch (isForce) {
- case 0:
+ case 0:
return t('hellow.noisForceList');
case 1:
return t('hellow.yesisForceList');
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 380bdac..a1b78b7 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -27,7 +27,7 @@
<div id="dotClass">
<!-- <div style="margin-bottom: -5px;margin-left: 5px;"> -->
<!-- <el-form> -->
- <!-- <el-row> -->
+ <!-- <el-row> -->
<!-- <el-col :span="4">
<div style="font-size: 15px;">
<el-form-item :label="$t('hellow.currenttask')" style="width: 14vw">
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index c2bed38..43b4e09 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -186,7 +186,7 @@
case 2:
return 'success';
}
-}
+}
function getStatusText(warehousing) {
switch (warehousing) {
case 0:
--
Gitblit v1.8.0