From 6bc7ce4b5bb2cbaf458766ac40d9ba8c5d40133d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 15 八月 2024 09:12:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/largescreen/largescreen.vue | 195 +++++++++++++++++++++---------------------------
1 files changed, 86 insertions(+), 109 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index a3831c8..abbf44e 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,5 +1,5 @@
<template>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" v-loading="loading">
<el-scrollbar height="600px">
<div id="top" style="height: 150px;display: flex;">
<div class="echarts-container">
@@ -9,7 +9,7 @@
</div>
</div>
<div style="display: flex;">
-<div id="centerleft" style="margin-top: 10px;height: 240px;width: 340px;background-color: #911005;">
+<!-- <div id="centerleft" style="margin-top: 10px;height: 240px;width: 340px;background-color: #911005;">
<el-table height="240" ref="table" width="340px"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
@@ -24,8 +24,8 @@
</template>
</el-table-column>
</el-table>
-</div>
-<div id="parent" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 750px;">
+</div> -->
+<div id="parent" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
<img src="../../assets/dpxsa.png" alt="" style="margin-left: -10px; width: 100%;height: 100%;position: relative;">
<div id="lipiana" v-show="woshia"></div>
<div id="lipianb" v-show="woshia"></div>
@@ -45,14 +45,14 @@
<div id="xiapianji5" v-show="xiapian5"></div>
<div id="xiapianji6" v-show="xiapian6"></div>
</div>
-<div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
+<!-- <div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
<el-table height="240" ref="table" width="340px"
@selection-change="handleSelectionChange"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="50" />
<el-table-column prop="projectName" align="center" :label="$t('large.projectname')" min-width="50" />
</el-table>
-</div>
+</div> -->
</div>
<div id="bottom" style="margin-top: 10px;height: 190px;background-color: #911005;">
<el-table height="190" ref="table"
@@ -75,41 +75,29 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="50" />
+ <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="100" />
+ <el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-scrollbar>
</el-card>
-<el-dialog v-model="blinda" top="5vh" width="80%" :title="$t('large.brokeno')">
+<el-dialog v-model="blinda" top="5vh" width="85%">
<el-table height="400" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="reportingWorkTime" fixed align="center" :label="$t('large.time')" min-width="110" />
- <el-table-column prop="orderId" fixed align="center" :label="$t('large.number')" min-width="110" />
- <el-table-column prop="reportingWorkId" align="center" :label="$t('large.jobnumber')" min-width="120" />
- <el-table-column prop="productionId" align="center" :label="$t('large.productionnumber')" min-width="130" />
- <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="140" />
- <el-table-column prop="project" align="center" :label="$t('large.projectname')" min-width="110" />
- <el-table-column prop="batch" align="center" :label="$t('large.batch')" min-width="110" />
- <el-table-column prop="reviewer" align="center" :label="$t('large.detailID')" min-width="110" />
- <el-table-column prop="orderSort" align="center" :label="$t('large.serialnumber')" min-width="110" />
- <el-table-column prop="productName" align="center" :label="$t('large.productname')" :show-overflow-tooltip="true" min-width="220" />
- <el-table-column prop="technologyNumber" align="center" :label="$t('large.serial')" min-width="110" />
- <el-table-column prop="glassAddress" align="center" :label="$t('large.slicemarker')" min-width="130" />
- <el-table-column prop="patchNum" align="center" :label="$t('large.numberpatches')" min-width="110" />
- <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="110" />
- <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="110" />
- <el-table-column prop="shape" align="center" :label="$t('large.shape')" min-width="110" />
- <el-table-column prop="responsibleProcess" align="center" :label="$t('large.responsibleprocess')" min-width="110" />
- <el-table-column prop="patchProcesses" align="center" :label="$t('large.process')" min-width="110" />
- <el-table-column prop="breakageQuantity" align="center" :label="$t('large.numberfractions')" min-width="110" />
- <el-table-column prop="patchReason" align="center" :label="$t('large.breakreason')" min-width="110" />
- <el-table-column prop="patchType" align="center" :label="$t('large.breaktype')" min-width="110" />
- <el-table-column prop="responsiblePersonnel" align="center" :label="$t('large.responsiblepersonnel')" min-width="110" />
- <el-table-column prop="responsibleEquipment" align="center" :label="$t('large.responsiblequipment')" min-width="110" />
- <el-table-column prop="responsibleTeam" align="center" :label="$t('large.responsibleteam')" min-width="110" />
- <el-table-column prop="patchArea" align="center" :label="$t('large.area')" min-width="110" />
- <el-table-column prop="qualityInspector" align="center" :label="$t('large.inspector')" min-width="110" />
+ <el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
+ <el-table-column prop="project" fixed align="center" :label="$t('large.project')" min-width="110" />
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="110" />
+ <el-table-column prop="width" fixed align="center" :label="$t('large.width')" min-width="100" />
+ <el-table-column prop="height" fixed align="center" :label="$t('large.height')" min-width="100" />
+ <el-table-column prop="area" fixed align="center" :label="$t('large.are')" min-width="100" />
+ <el-table-column prop="quantity" fixed align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="processingNote" fixed align="center" :label="$t('large.method')" min-width="110" />
+ <el-table-column prop="deliveryDate" fixed align="center" :label="$t('large.deliveryDate')" min-width="130" />
</el-table>
<template #footer>
<div id="dialog-footer" style="text-align: center;">
@@ -154,10 +142,29 @@
const chartDom = ref(null);
let chartInstance = null;
const blinda = ref(false)
-const handleBinda = (row) => {
-blinda.value = true;
-};
+const handleBinda = async (row) => {
+ blinda.value = true;
+ await fetchFlowCardId(row.orderId);
+};
const processesData = ref([]);
+const fetchFlowCardId = async (orderId) => {
+ try {
+ const response = await request.post('/loadGlass/order/order/selectOrderdetail',{
+ orderId: orderId
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableData.value = response.data;
+ console.log(tableData.value);
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
function getStatusType(warehousing) {
switch (warehousing) {
case 0:
@@ -186,7 +193,7 @@
let socket6 = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
const handleMessage = (data) => {
-tableData.value = data.awaitingRepairs[0]
+// tableData.value = data.awaitingRepairs[0]
tableDatab.value = data.DoingTask[0]
tableDatac.value = data.orders[0]
socket.onmessage = (event) => {
@@ -210,12 +217,10 @@
const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingIsRun`;
const handleMessage2 = (data) => {
const tasks = data.temperingTaskType[0];
- if (tasks && tasks.length >= 4) {
- flake.value = tasks[0].state === 1;
- flakeb.value = tasks[1].state === 2;
- flakec.value = tasks[2].state === 3;
- flaked.value = tasks[3].state === 4;
- }
+ flake.value = tasks.some(task => task.state == 1);
+ flakeb.value = tasks.some(task => task.state == 2);
+ flakec.value = tasks.some(task => task.state == 3);
+ flaked.value = tasks.some(task => task.state == 4);
};
// 鍗у紡鐞嗙墖
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassIsRun`;
@@ -296,34 +301,6 @@
chart.setOption(options);
});
};
-
-
-// onUnmounted(() => {
-// socket.close();
-// socket2.close();
-// });
-// onMounted(() => {
-// socket = initializeWebSocket(socketUrl, handleMessage);
-// // socket = new WebSocket(socketUrl);
-// socket.onmessage = (event) => {
-// const data = JSON.parse(event.data);
-// processesData.value = data.device[0].map(rect => ({
-// ...rect,
-// completedQuantity: rect.completedQuantity,
-// breakageQuantity: rect.breakageQuantity,
-// thisProcess: rect.thisProcess,
-// }));
-// renderPieCharts();
-// console.log(processesData.value);
-// // updateCharts();
-// socket2 = initializeWebSocket(socketUrl2, handleMessage2);
-// // socket2 = new WebSocket(socketUrl2);
-// // socket2.onmessage = (event) => {
-// // const data = JSON.parse(event.data);
-// // handleMessage2(data);
-// // };
-// };
-// });
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
socket2 = initializeWebSocket(socketUrl2, handleMessage2);
@@ -370,7 +347,7 @@
gap: 20px;
}
.echarts-item {
-width: 150px;
+width: 120px;
height: 150px;
margin: 20px;
}
@@ -386,92 +363,92 @@
#overlay{
position: absolute;
z-index: 1;
- width: 29px;
+ width: 36px;
height: 10px;
background-color: #529b2e;
margin-top: -34px;
- margin-left: -8px;
+ margin-left: -2px;
}
#overlayb{
position: absolute;
z-index: 1;
- width: 15px;
+ width: 17px;
height: 115px;
background-color: #529b2e;
margin-top: -197px;
- margin-left: -3px;
+ margin-left:4px;
}
#overlayc{
position: absolute;
z-index: 1;
- width: 14px;
+ width: 16px;
height: 16px;
background-color: #529b2e;
margin-top: -243px;
- margin-left: -2px;
+ margin-left: 5px;
}
#overlayd{
position: absolute;
z-index: 1;
- width: 28px;
- height: 11px;
+ width: 37px;
+ height: 10px;
background-color: #529b2e;
- margin-top: -239px;
- margin-left: 40px;
+ margin-top: -238px;
+ margin-left: 70px;
}
#lipiana{
position: absolute;
z-index: 1;
- width: 65px;
+ width: 100px;
height: 10px;
background-color: #529b2e;
margin-top: -57px;
- margin-left: 240px;
+ margin-left: 365px;
}
#lipianb{
position: absolute;
z-index: 1;
- width: 16px;
+ width: 20px;
height: 10px;
background-color: #529b2e;
margin-top: -72px;
- margin-left: 323px;
+ margin-left: 492px;
}
#lipianc{
position: absolute;
z-index: 1;
- width: 65px;
+ width: 100px;
height: 10px;
background-color: #529b2e;
margin-top: -32px;
- margin-left: 270px;
+ margin-left: 410px;
}
#lipiand{
position: absolute;
z-index: 1;
- width: 21px;
+ width: 30px;
height: 10px;
background-color: #529b2e;
- margin-top: -48px;
- margin-left: 354px;
+ margin-top: -47px;
+ margin-left: 539px;
}
#longa{
position: absolute;
z-index: 1;
- width: 29px;
+ width: 33px;
height: 5px;
background-color: #529b2e;
margin-top: -20px;
- margin-left: 80px;
+ margin-left: 130px;
}
#longb{
position: absolute;
z-index: 1;
- width: 29px;
+ width: 33px;
height: 5px;
background-color: #529b2e;
margin-top: -20px;
- margin-left: 150px;
+ margin-left: 235px;
}
#shangpianji{
position: absolute;
@@ -480,60 +457,60 @@
height: 10px;
background-color: #529b2e;
margin-top: -90px;
- margin-left: 568px;
+ margin-left: 868px;
}
#xiapianji1{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 111px;
+ margin-left: 173px;
}
#xiapianji2{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 140px;
+ margin-left: 217px;
}
#xiapianji3{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -202px;
- margin-left: 126px;
+ margin-left: 196px;
}
#xiapianji4{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 175px;
+ margin-left: 270px;
}
#xiapianji5{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 204px;
+ margin-left: 314px;
}
#xiapianji6{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -202px;
- margin-left: 190px;
+ margin-left: 293px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0