From 99a32724da7d094ad65afaa50b3a6d91896c8fbe Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 01 八月 2024 13:52:18 +0800
Subject: [PATCH] 钢化进炉中调转方向
---
UI-Project/src/views/Slicecage/slicecage.vue | 45 +++++++++++---
UI-Project/src/lang/zh.js | 5 +
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 78 +++++++++++++++++--------
3 files changed, 92 insertions(+), 36 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 2b1e6ff..c04c3a4 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -214,6 +214,11 @@
specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
+ line:'绾胯矾',
+ process:'宸ュ簭',
+ team:'鐝粍',
+ basic:'璁惧',
+ add:'纭淇濆瓨',
},
workOrder:{
glassID:'鐜荤拑ID',
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 44b5882..3ab4e62 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -37,23 +37,36 @@
widtha = rect.width;
heighta = rect.height;
}
- if (rect.angle === 0) {
- adjustedWidth = heighta * 0.12;
- adjustedHeight = widtha * 0.1;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
- newX = 5087 - (rect.xCoordinate + heighta);
- } else {
- adjustedWidth = widtha * 0.12;
- adjustedHeight = heighta * 0.1;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
- newX = 5087 - (rect.xCoordinate + widtha);
- }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ adjustedHeight = widtha * 0.1;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
+ // if (rect.angle === 0) {
+ // adjustedWidth = heighta * 0.12;
+ // adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5087 - (rect.xCoordinate + heighta);
+ // } else {
+ // adjustedWidth = widtha * 0.12;
+ // adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5087 - (rect.xCoordinate + widtha);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -76,22 +89,35 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = heighta * 0.12;
- adjustedHeight = widtha * 0.1;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
- newX = 5087 - (rect.xCoordinate + heighta);
- } else {
- adjustedWidth = widtha * 0.12;
- adjustedHeight = heighta * 0.1;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
- newX = 5087 - (rect.xCoordinate + widtha);
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ adjustedHeight = widtha * 0.1;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ newX = 5087 - (rect.yCoordinate + heighta);
}
+ // if (rect.angle === 0) {
+ // adjustedWidth = heighta * 0.12;
+ // adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5087 - (rect.xCoordinate + heighta);
+ // } else {
+ // adjustedWidth = widtha * 0.12;
+ // adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5087 - (rect.xCoordinate + widtha);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 7aa6477..f52ad85 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -12,6 +12,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { tr } from "element-plus/es/locale";
const dialogFormVisible = ref(false)
+const dialoglea = ref(false)
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
@@ -22,6 +23,7 @@
const tableDatad = ref([])
const tableDataf = ref([])
const tableDatae = ref([])
+const tableDataxx = ref([])
const carPosition = ref([])
const ganghua = ref('')
const adjustedRects = ref([]);
@@ -510,19 +512,26 @@
console.error('鍙戠敓閿欒:', error);
}
};
-// const handleBindRack = (row) => {
-// fetchFlowCardId();
-// dialogFormVisiblea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
-// };
+const handlezhiban = () => {
+ fetchFlowCardId();
+ dialoglea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
const fetchFlowCardId = async () => {
try {
- const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
- console.log(response)
+ // var url="/cacheVerticalGlass/work_assignment/selectWorkAssignment?line=" + 2001 + "&workingProcedure='鍐峰姞宸�'";
+ // const response = await request.post(url)
+ const response = await request.post('/cacheVerticalGlass/work_assignment/selectWorkAssignment',{
+ line: 2001,
+ workingProcedure : '鍐峰姞宸�'
+ });
if (response.code === 200) {
-
+ ElMessage.error(response.message);
+ tableDataxx.value = response.data;
+ console.log(tableDataxx.value);
+
}
else {
- ElMessage.error(response.msg);
+ ElMessage.error(response.message);
}
} catch (error) {
console.error(error);
@@ -725,7 +734,7 @@
<el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true">{{ $t('searchOrder.cageinformation') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="success" @click="dialogFormVisibleb = true">{{ $t('searchOrder.productionqueue') }}</el-button>
<el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="warning" @click="dialogFormVisiblec = true">{{ $t('searchOrder.temperingqueries') }}</el-button>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="info" @click="dialogFormVisiblec = true">{{ $t('searchOrder.dutyinformation') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button>
<el-switch style="margin-top: 5px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('searchOrder.temperedswitch')" @change="handleChange" />
<el-card style="flex: 1;margin-left: 10px;margin-top: 5px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
@@ -1362,7 +1371,23 @@
</el-table-column>
</el-table>
</el-dialog>
-
+<el-dialog v-model="dialoglea" top="5vh" width="85%" :title="$t('searchOrder.dutyinformation')">
+ <el-table ref="table" style="margin-top: 20px;height: 400px;"
+ :data="tableDataxx" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="line" fixed align="center" :label="$t('searchOrder.line')" min-width="150"/>
+ <el-table-column prop="workProcesses" fixed align="center" :label="$t('searchOrder.process')" min-width="120" />
+ <el-table-column prop="teamsGroupsName" align="center" :label="$t('searchOrder.team')" min-width="150" />
+ <el-table-column prop="deviceName" align="center" :label="$t('searchOrder.basic')" min-width="150" />
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer">
+ <el-button type="primary" @click="handleConfirm">
+ {{ $t('searchOrder.add') }}
+ </el-button>
+ <el-button @click="dialoglea = false">{{ $t('basicData.cancel') }}</el-button>
+ </div>
+ </template>
+</el-dialog>
</template>
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
--
Gitblit v1.8.0