From 5d652d74d9c9cabeada006f4a15ecc6bcf0784f4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 06 三月 2025 11:02:43 +0800
Subject: [PATCH] 上片机手动状态接口、bug，理片笼模块新增表格，中空理片笼小片恢复
---
UI-Project/src/views/Returns/upreturns.vue | 11 +++
UI-Project/src/views/Slicecage/slicecage.vue | 16 +++++
UI-Project/src/views/hollow/hollowslicecage.vue | 71 ++++++++++++++---------
UI-Project/src/views/Returns/upreturns2.vue | 14 +++-
UI-Project/src/lang/en.js | 8 ++
UI-Project/src/lang/py.js | 9 ++
UI-Project/src/lang/zh.js | 8 ++
UI-Project/src/views/hollow/hollowequipment.vue | 2
8 files changed, 101 insertions(+), 38 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 6dcdd71..adad083 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -132,6 +132,14 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害',
+ temperingpriority:'閽㈠寲浼樺厛绾�',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index f393c56..9ef3d2c 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -36,7 +36,6 @@
basicData: {
rackreset:'鏋跺瓙澶嶄綅',
prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
- deletemessage: '校写邪谢懈褌褜 褝褌褍 懈薪褎芯褉屑邪褑懈褞 懈谢懈 薪械褌?',
laserprinting: '袦邪褕懈薪邪 谢邪蟹械褉薪芯泄 屑邪褉泻懈褉芯胁泻懈 谐芯褌芯胁邪锛�',
cuttingmachine: '袦邪褕懈薪邪 写谢褟 褉械蟹泻懈 谐芯褌芯胁邪锛�',
machine: '小芯褋褌芯褟薪懈械 褋褌邪薪芯泻 蟹邪谐褉褍蟹泻懈 胁 褉械卸懈屑械 芯薪谢邪泄薪锛�',
@@ -132,6 +131,14 @@
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害',
+ temperingpriority:'閽㈠寲浼樺厛绾�',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index a62b374..aaa1062 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -131,6 +131,14 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ totallogarithms:'鎬诲鏁�',
+ numberpairs:'閰嶅鏁�',
+ numberoccupied:'鍗犵敤鏍煎瓙鏁�',
+ totalfurnaces:'鎬荤倝鏁�',
+ cagesnumber:'绗煎唴鏁伴噺',
+ slotnumber:'鍗犳湁鏍煎瓙鏁�',
+ progress:'杩涘害',
+ temperingpriority:'閽㈠寲浼樺厛绾�',
whethersame:'鏄惁鐩稿悓',
same:'鐩稿悓',
notsame:'涓嶇浉鍚�',
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 6df2a38..d9a721f 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -74,14 +74,21 @@
window.localStorage.setItem('engineeringIda', tableData[0].engineeringId)
}
} catch (error) {
- ElMessage.error(response.message);
+ // ElMessage.error(response.message);
}
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
+ if (data.LoadOneState != null) {
+ cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
+ }
+ if (data.list!=null) {
tableDataa.value = data.list[0].slice(0, 2);
- if(data.loadTask1.length !=0){
+ }else {
+ tableDataa.value = ''
+ }
+ if(data.loadTask1!=null){
tableData.value = data.loadTask1[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
canSelectProjecta.value = false;
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index b3b01d0..9b3710e 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -79,7 +79,15 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
tableDataa.value = data.list[0].slice(2, 4);
- if(data.loadTask2.length !=0){
+ if (data.list!=null) {
+ tableDataa.value = data.list[0].slice(2, 4);
+ }else {
+ tableDataa.value = ''
+ }
+ if (data.LoadTwoervice != null) {
+ cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';
+ }
+ if(data.loadTask2!=null){
// tableData.splice(0, tableData.length, ...data.loadTask2[0]);
tableData.value = data.loadTask2[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
@@ -432,10 +440,6 @@
</el-button>
<div style="margin-left: 70px;">{{ upstatus }}</div>
<i :style="{ marginTop: '2px', backgroundColor: cuttingMachineStatusColor, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
- <el-button @click="confirmCutting" style="margin-left: 30px;margin-top: -3px;">{{
- $t('basicData.change')
- }}
- </el-button>
</div>
<el-button :disabled="!canSelectProjecta" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('Mounting.previewproject') }}</el-button>
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index aaa9f12..9f4da0c 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1235,6 +1235,22 @@
</div>
</div>
</div>
+<el-card style="flex: 1;margin-left: 1220px;margin-top: -510px;" v-loading="loading">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 420px;">
+ <el-table height="420px" ref="table" border
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('Mounting.project')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.totalfurnaces')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.cagesnumber')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('large.are')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.fullfurnaces')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.slotnumber')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.progress')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.temperingpriority')" min-width="120" />
+ </el-table>
+ </div>
+ </el-card>
+
</div>
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
<div style="margin-bottom: 20px">
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index b3d9177..8ed3196 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -1059,7 +1059,7 @@
const dialogFormVisibled = ref(false)
const dialogFormVisiblee = ref(false)
const add = ref(false)
-const adda = ref(false)
+const adda = ref(false)
const currentPage2 = ref(1)
const currentRow = reactive({});
const formattedProcessType = ref([]);
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 4c53783..df6d7bc 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -409,7 +409,7 @@
const rectStyle = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -425,24 +425,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyle = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStylea = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -458,24 +458,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStylea = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyleb = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -491,24 +491,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyleb = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStylec = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -524,24 +524,24 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStylec = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
height: '100%',
- marginRight,
+ marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
// 璁＄畻姣忎釜澶х煩褰㈢殑鏍峰紡
const rectStyled = (rect, index) => ({
position: 'absolute',
width: '170px',
- right: '0px',
+ left: '0px',
top: `${index*rect.top}px`,
height: `${rect.height}px`,
});
@@ -557,9 +557,9 @@
// 璁＄畻姣忎釜灏忕煩褰㈢殑鏍峰紡
const subRectStyled = (rectIndex, subIndex) => {
const width = '18px';
- const marginRight = '8px';
- const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
- const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
+ const marginLeft = '8px';
+ const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
+ const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
return {
position: 'absolute',
width,
@@ -567,7 +567,7 @@
marginLeft,
top: '0px',
backgroundColor: '#911005',
- right,
+ left,
};
};
onMounted(() => {
@@ -769,6 +769,19 @@
</div>
</div>
</div>
+<el-card style="flex: 1;margin-left: 1020px;margin-top: -670px;" v-loading="loading">
+ <div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
+ <el-table height="550px" ref="table" border
+ :data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('hellow.realpieces')" min-width="120" />
+ <el-table-column prop="startSlot" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" />
+ </el-table>
+ </div>
+ </el-card>
</div>
<!-- 娣诲姞鐞嗙墖绗间俊鎭� -->
<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
--
Gitblit v1.8.0