From 5732b10f29b68f7e1057c63c5819750efa5adabe Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 七月 2024 16:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Returns/returns.vue | 191 +++++++++++++++++++++++++++++++++--------------
UI-Project/src/assets/shangpian.png | 0
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 8 +-
3 files changed, 136 insertions(+), 63 deletions(-)
diff --git a/UI-Project/src/assets/shangpian.png b/UI-Project/src/assets/shangpian.png
new file mode 100644
index 0000000..71152cc
--- /dev/null
+++ b/UI-Project/src/assets/shangpian.png
Binary files differ
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 14920eb..a0a6912 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -9,8 +9,8 @@
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-const dialogFormVisible = ref(true)
-const dialogFormVisiblea = ref(false)
+const dialogFormVisible = ref(false)
+const dialogFormVisiblea = ref(true)
const dialogFormVisibleb = ref(false)
const width = ref();
const height = ref();
@@ -73,8 +73,8 @@
</script>
<template>
<div style="margin-top: 10px;">
- <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;">{{ $t('processCard.intofurnace') }}</el-button>
- <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;" >{{ $t('processCard.beforefurnace') }}</el-button>
+ <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;" >{{ $t('processCard.beforefurnace') }}</el-button>
+ <el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;">{{ $t('processCard.intofurnace') }}</el-button>
<el-button id="searchButton" type="success" @click="dialogFormVisibleb = true;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.outfurnace') }}</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">
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 42dd369..55a5f37 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -15,6 +15,8 @@
const adda = ref(false)
const flake = ref(false)
const flakea = ref(false)
+const flakeb = ref(false)
+const flakec = ref(false)
import { WebSocketHost ,host} from '@/utils/constants'
import request from "@/utils/request"
const ida = ref(null);
@@ -78,26 +80,62 @@
// ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
-request.get("/loadGlass/LoadGlass/list").then((res) => {
- window.localStorage.setItem('patternWidth', res.data.patternWidth)
- window.localStorage.setItem('workstationId', res.data.workstationId)
- if (res.code == 200) {
- console.log(res.data);
- tableDataa.value = res.data
- console.log(res.data.patternWidth);
-
- let workstationId = window.localStorage.getItem('workstationId')
- let patternWidth = window.localStorage.getItem('patternWidth')
- if (patternWidth !== '' || workstationId == '1') {
- flake.value = true
- } else if (patternWidth !== '' || workstationId == '2') {
- flakea.value = true
- }
- } else {
- ElMessage.warning(res.message)
- // router.push("/login")
+onMounted(() => {
+ list('');
+ fetchOptions('');
+ initializeWebSocket(socketUrl, handleMessage);
+});
+onMounted(() => {
+});
+const list = async () => {
+ try {
+ const response = await request.get('/loadGlass/LoadGlass/list');
+ if (response.code == 200) {
+ tableDataa.value = response.data
+ if (tableDataa.value.length === 4) {
+ if (tableDataa.value[0].patternHeight > 0) {
+ flake.value = true;
}
- });
+ if (tableDataa.value[1].patternHeight > 0) {
+ flakea.value = true;
+ }
+ if (tableDataa.value[2].patternHeight > 0) {
+ flakeb.value = true;
+ }
+ if (tableDataa.value[3].patternHeight > 0) {
+ flakec.value = true;
+ }
+ }
+ } else {
+ ElMessage.warning(response.data);
+ }
+ } catch (error) {
+ console.error('Error fetching options:', error);
+ }
+};
+// 鍋囪杩欐槸鎮ㄧ殑鍝嶅簲澶勭悊鍑芥暟
+// request.get("/loadGlass/LoadGlass/list").then((res) => {
+// if (res.code == 200) {
+// tableDataa.value = res.data
+// if (tableDataa.value.length === 4) {
+// if (tableDataa.value[0].patternHeight > 0) {
+// flake.value = true;
+// }
+// if (tableDataa.value[1].patternHeight > 0) {
+// flakea.value = true;
+// }
+// if (tableDataa.value[2].patternHeight > 0) {
+// flakeb.value = true;
+// }
+// if (tableDataa.value[3].patternHeight > 0) {
+// flakec.value = true;
+// }
+// }
+// } else {
+// ElMessage.warning(res.message)
+// // router.push("/login")
+// }
+// });
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
processType: [],
@@ -109,10 +147,12 @@
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
-
+ if(data.prioritylist!=null){
tableData.splice(0, tableData.length, ...data.prioritylist[0]);
+ }
+ if(data.list!=null){
tableDataa.value = data.list[0]
- // console.log("鏇存柊鍚庢暟鎹�", tableData);
+ }
};
const requestData = {
state: 100
@@ -153,13 +193,7 @@
options.value = []; // 娓呯┖閫夐」鍒楄〃
}
};
-// 鍒濆鍖栧姞杞芥暟鎹紙濡傛灉闇�瑕侊級
-onMounted(() => {
- fetchOptions('');
- initializeWebSocket(socketUrl, handleMessage);
-});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
const user = ref('');
@@ -175,14 +209,12 @@
const handleBindRack = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
ida.value = row.id;
- console.log(ida.value);
add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
};
// 娣诲姞
const handleConfirm = async () => {
- console.log(ida.value);
// console.log('id.value:', id.value);
- if ((ida.value === 2 || ida.value === 4) && (parseInt(patternHeight.value, 10) >= 2700 )) {
+ if ((ida.value === 2 || ida.value === 4) && (parseInt(selectedValuea.value, 10) >= 2700 )) {
try {
const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
id: workstationId.value,
@@ -193,24 +225,31 @@
patternThickness: selectedValuec.value,
number: number.value
});
+ window.localStorage.setItem('workstationId', workstationId.value)
+ window.localStorage.setItem('patternHeight', selectedValuea.value)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
// window.location.reload()
add.value = false;
tableDataa.value = response.data;
+ let workstationId = window.localStorage.getItem('workstationId')
+ let patternHeight = window.localStorage.getItem('patternHeight')
+ if (patternHeight !== '' && workstationId === '1') {
+ flake.value = true
+ } else if (patternHeight !== '' && workstationId === '2'){
+ flakea.value = true
+ }else if (patternHeight !== '' && workstationId === '3'){
+ flakeb.value = true
+ }else if (patternHeight !== '' && workstationId === '4'){
+ flakec.value = true
+ }
selectedValuea.value = '';
selectedValue.value = '';
selectedValueb.value = '';
selectedValuec.value = '';
number.value = '';
- window.localStorage.setItem('workstationId', response.data.workstationId)
- let workstationId = window.localStorage.getItem('workstationId')
- if (workstationId == '1') {
- flake.value = true
- } else if (workstationId == '2'){
- flakea.value = true
- }
+ list()
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -232,24 +271,31 @@
patternThickness: selectedValuec.value,
number: number.value
});
+ window.localStorage.setItem('workstationId', workstationId.value)
+ window.localStorage.setItem('patternHeight', selectedValuea.value)
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
ElMessage.success(response.message);
// window.location.reload()
add.value = false;
tableDataa.value = response.data;
+ let workstationId = window.localStorage.getItem('workstationId')
+ let patternHeight = window.localStorage.getItem('patternHeight')
+ if (patternHeight !== '' && workstationId === '1') {
+ flake.value = true
+ } else if (patternHeight !== '' && workstationId === '2'){
+ flakea.value = true
+ }else if (patternHeight !== '' && workstationId === '3'){
+ flakeb.value = true
+ }else if (patternHeight !== '' && workstationId === '4'){
+ flakec.value = true
+ }
selectedValuea.value = '';
selectedValue.value = '';
selectedValueb.value = '';
selectedValuec.value = '';
number.value = '';
- window.localStorage.setItem('workstationId', response.data.workstationId)
- let workstationId = window.localStorage.getItem('workstationId')
- if (workstationId == '1') {
- flake.value = true
- } else if (workstationId == '2'){
- flakea.value = true
- }
+ list()
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -285,14 +331,19 @@
ElMessage.success(response.message);
adda.value = false;
tableDataa.value = response.data;
- window.localStorage.setItem('workstationId', response.data.workstationId)
- let workstationId = window.localStorage.getItem('workstationId')
- if (workstationId == '1') {
+ // window.localStorage.setItem('workstationId', response.data.workstationId)
+ // let workstationId = window.localStorage.getItem('workstationId')
+ if (workstationId.value == '1') {
flake.value = false
- } else if (workstationId == '2'){
+ } else if (workstationId.value == '2'){
flakea.value = false
+ }else if (workstationId.value == '3'){
+ flakeb.value = false
+ }else if (workstationId.value == '4'){
+ flakec.value = false
}
- } else {
+ list()
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
@@ -545,11 +596,13 @@
const data = JSON.parse(event.data); // 瑙ｆ瀽娑堟伅涓篔SON
if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) {
+if(data.InkageStatus!=null){
const status = data.InkageStatus[0];
cuttingMachine.value = status;
upstatus.value = status === '1' ? t('basicData.machine') : t('basicData.machineaa');
cuttingMachineStatusColor.value = status === '1' ? 'green' : '#911005';
inKageWord.value = status === '1' ? 0 : 1;
+}
} else {
// 澶勭悊閿欒鎯呭喌鎴栨棤鏁堟暟鎹�
console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);
@@ -673,11 +726,13 @@
</template>
</el-dialog> -->
<div id="parent">
- <img src="../../assets/shangpianji.png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 500px;">
+ <img src="../../assets/shangpian.png" alt="" style="max-width: 40%;max-height: 40%;margin-top: 20px;margin-left: 340px;">
<div id="overlay" v-show="flake"></div>
<div id="overlaya" v-show="flakea"></div>
+ <div id="overlayb" v-show="flakeb"></div>
+ <div id="overlayc" v-show="flakec"></div>
</div>
- <div style="margin-top: -350px;margin-left: 650px;">
+ <div style="margin-top: -300px;margin-left: 680px;">
<el-table :data="tableDataa" border style="width: 85%"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
@@ -876,20 +931,38 @@
#overlay{
position: absolute;
z-index: 1;
- width: 212px;
- height: 15px;
+ width: 228px;
+ height: 16px;
background-color: #529b2e;
- margin-top: -404px;
- margin-left: 542px;
+ margin-top: -303px;
+ margin-left: 355px;
}
#overlaya{
position: absolute;
z-index: 1;
- width: 212px;
- height: 15px;
+ width: 228px;
+ height: 16px;
background-color: #529b2e;
- margin-top: -38px;
- margin-left: 537px;
+ margin-top: -303px;
+ margin-left:703px;
+}
+#overlayb{
+ position: absolute;
+ z-index: 1;
+ width: 228px;
+ height: 16px;
+ background-color: #529b2e;
+ margin-top: -45px;
+ margin-left: 355px;
+}
+#overlayc{
+ position: absolute;
+ z-index: 1;
+ width: 228px;
+ height: 16px;
+ background-color: #529b2e;
+ margin-top: -45px;
+ margin-left: 703px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0