From 9f62a50709d7b554ca78973f7a962a38b4bcf421 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 01 八月 2024 14:57:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 5870cad..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,7 +23,9 @@
const tableDatad = ref([])
const tableDataf = ref([])
const tableDatae = ref([])
+const tableDataxx = ref([])
const carPosition = ref([])
+const ganghua = ref('')
const adjustedRects = ref([]);
const project = ref([]);
const adjust = ref([]);
@@ -175,8 +178,15 @@
// }
return 9;
});
-
-
+ setInterval(() => {
+ localStorage.clear(); // 娓呴櫎鎵�鏈塴ocalStorage鏁版嵁
+ console.log(11111);
+}, 60000);
+// function cleanUp() {
+// console.log('鎵ц娓呯悊鎿嶄綔');
+// }
+// // 鍋囪鎴戜滑姣�2鍒嗛挓鎵ц涓�娆℃竻鐞�
+// setInterval(cleanUp, 1 * 60 * 1000);
const getTableRow = (row,type) =>{
switch (type) {
@@ -502,21 +512,73 @@
console.error('鍙戠敓閿欒:', error);
}
};
+const handlezhiban = () => {
+ fetchFlowCardId();
+ dialoglea.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+};
+const fetchFlowCardId = async () => {
+ try {
+ // 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.message);
+ }
+ } catch (error) {
+ console.error(error);
+ }
+};
function handleRowClick(row) {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
}
+ const handleChange = async () => {
+ try {
+ const body = {
+ flag: ganghua.value, // 浣跨敤 ganghua.value 鑾峰彇褰撳墠寮�鍏崇殑鐘舵��
+ };
+
+ var url="/cacheVerticalGlass/bigStorageCageDetails/temperingSwitch?flag="+ganghua.value;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ ganghua.value = response.data
+ }else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/slicecage`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
+ console.log(data.temperingSwitch[0]);
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+ } else {
+ tableDatac.value = '',
+ adjusta.value = ''
}
if(data.bigStorageCageDetailsFeedTask!=null){
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
- }
+ }else{
+ tableDatad.value = ''
+ }
// adjust.value = data.bigStorageCageDetailsFeedTask[0].map(rect => ({
// ...rect,
@@ -527,18 +589,30 @@
// });
if(data.bigStorageCageInfo!=null){
tableData.value = data.bigStorageCageInfo[0]
-}
+}else{
+ tableData.value = ''
+ }
if(data.temperingGlassInfoList!=null){
tableDatab.value = data.temperingGlassInfoList[0]
-}
+}else{
+ tableDatab.value = ''
+ }
if(data.bigStorageCageUsage!=null){
tableDatae.value = data.bigStorageCageUsage[0]
-}
+}else{
+ tableDatae.value = ''
+ }
if(data.carPostion!=null){
carPosition.value = data.carPostion[0]
-}
-
-
+}else{
+ carPosition.value = ''
+ }
+if(data.temperingSwitch!=null){
+ ganghua.value = data.temperingSwitch[0]
+}else{
+ ganghua.value = ''
+ }
+console.log(data.temperingSwitch[0]);
if(data.bigStorageCageInfos!=null){
window.localStorage.setItem('length', data.bigStorageCageInfos[0][1].length)
let length = window.localStorage.getItem('length')
@@ -587,6 +661,8 @@
height: 20/length,
top: 29/length
}));
+ }else{
+ adjustedRects.value = ''
}
@@ -655,9 +731,11 @@
<template>
<div style="height: 600px;">
- <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="info" @click="dialogFormVisiblec = true">{{ $t('searchOrder.temperingqueries') }}</el-button>
+ <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="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;">
<el-table height="100px" ref="table"
@@ -1293,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