From de46cb80b7c4d1fb74a4b72d8fc4406e7e3144e7 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 19 八月 2024 08:49:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/largescreen/largescreen.vue | 511 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 435 insertions(+), 76 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index fb2ab1a..0ac8dc0 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,18 +24,51 @@
</template>
</el-table-column>
</el-table>
-</div>
-<div id="center" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 750px;">
- <img src="../../assets/d1a.png" alt="" style="margin-left: -10px; width: 100%;height: 100%;position: relative;">
+</div> -->
+<div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
+ <img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
+ <div class="moving-rect lipiana" v-show="woshia"></div>
+ <div class="moving-rect lipianb" v-show="woshia"></div>
+ <div class="moving-rect lipianc" v-show="woshic"></div>
+ <div class="moving-rect lipiand" v-show="woshic"></div>
+ <div class="moving-rect overlaya" v-show="flake"></div>
+ <div class="moving-rect overlayb" v-show="flakeb"></div>
+ <div class="moving-rect overlayc" v-show="flakec"></div>
+ <div class="moving-rect overlayd" v-show="flaked"></div>
+ <div class="moving-rect longa" v-show="dalipiana"></div>
+ <div class="moving-rect longb" v-show="dalipianb"></div>
+ <div class="moving-rect shangpianji" v-show="shangpian"></div>
+ <div class="moving-rect xiapianji" v-show="xiapian"></div>
+ <div class="moving-rect xiapianji1" v-show="xiapian1"></div>
+ <div class="moving-rect xiapianji2" v-show="xiapian2"></div>
+ <div class="moving-rect xiapianji3" v-show="xiapian3"></div>
+ <div class="moving-rect xiapianji4" v-show="xiapian4"></div>
+ <div class="moving-rect xiapianji5" v-show="xiapian5"></div>
+ <div class="moving-rect xiapianji6" v-show="xiapian6"></div>
</div>
-<div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
+<!-- <div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
+ <img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
+ <div class="moving-rect vertical"></div>
+ <div class="moving-rect all"></div>
+ <div class="moving-rect horizontal"></div>
+ <div class="moving-rect xiao"></div>
+ <div class="moving-rect zhan"></div>
+ <div class="moving-rect tu"></div>
+ <div class="moving-rect zi"></div>
+ <div class="moving-rect xia"></div>
+ <div class="moving-rect zan"></div>
+ <div class="moving-rect fa"></div>
+ <div class="moving-rect hua"></div>
+ <div class="moving-rect shui"></div>
+</div> -->
+<!-- <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"
@@ -58,41 +91,50 @@
</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" align="center" :label="$t('large.project')" min-width="110" />
+ <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="110" />
+ <el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />
+ <el-table-column prop="productName" align="center" :label="$t('large.productname')" min-width="110" />
+ <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="100" />
+ <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="100" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="100" />
+ <el-table-column prop="quantity" align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="numberPatches" align="center" :label="$t('large.numberpatches')" min-width="110" />
+ <el-table-column prop="receivedQuantity" align="center" :label="$t('large.innumber')" min-width="110" />
+ <el-table-column prop="terminationStatus" align="center" :label="$t('large.productstatus')" min-width="110" />
+ <el-table-column
+ align="center"
+ :label="$t('large.productstatus')"
+ min-width="80"
+ prop="terminationStatus"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.terminationStatus === 0 ? 'success' : 'danger'"
+ >
+ {{ scope.row.terminationStatus === 0 ? $t('large.right') : $t('large.stop') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="packType" align="center" :label="$t('large.quantity')" min-width="110" />
+ <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" 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;">
@@ -116,17 +158,51 @@
const tableDatac = ref([])
const adjustedRects = ref([]);
const chartRefs = ref([]);
+const flake = ref(false)
+const flakeb = ref(false)
+const flakec = ref(false)
+const flaked = ref(false)
+const woshia = ref(false)
+const woshic = ref(false)
+const dalipiana = ref(false)
+const dalipianb = ref(false)
+const shangpian = ref(false)
+const xiapian = ref(false)
+const xiapian1 = ref(false)
+const xiapian2 = ref(false)
+const xiapian3 = ref(false)
+const xiapian4 = ref(false)
+const xiapian5 = ref(false)
+const xiapian6 = ref(false)
+
const thisProcess = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
// 瀹氫箟涓�涓搷搴斿紡寮曠敤鏉ュ瓨鍌ㄥ浘琛ㄥ疄渚�
const chartDom = ref(null);
let chartInstance = null;
const blinda = ref(false)
-const handleBinda = (row) => {
-blinda.value = true;
-};
-const processesData = ref([
-
-]);
+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:
@@ -148,30 +224,17 @@
}
}
let socket = null;
+let socket2 = null;
+let socket3 = null;
+let socket4 = null;
+let socket5 = null;
+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]
-// adjustedRects.value = data.device[0].map(rect => ({
-// ...rect,
-// completed: rect.completedQuantity,
-// breakage: rect.breakageQuantity,
-// thisProcess: rect.thisProcess,
-// }));
-};
-// let socket;
-// 璁剧疆鍥捐〃 DOM 寮曠敤
-function setChartDom(index, el) {
-if (!chartRefs.value[index]) {
- chartRefs.value[index] = { dom: el, chart: null };
-} else {
- chartRefs.value[index].dom = el;
-}
-}
-onMounted(() => {
-socket = new WebSocket(socketUrl);
-socket.onmessage = (event) => {
+ socket.onmessage = (event) => {
const data = JSON.parse(event.data);
processesData.value = data.device[0].map(rect => ({
...rect,
@@ -180,12 +243,61 @@
thisProcess: rect.thisProcess,
}));
renderPieCharts();
- console.log(processesData.value);
- // updateCharts();
+}
};
+function setChartDom(index, el) {
+if (!chartRefs.value[index]) {
+ chartRefs.value[index] = { dom: el, chart: null };
+} else {
+ chartRefs.value[index].dom = el;
+}
+}
+const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingIsRun`;
+const handleMessage2 = (data) => {
+ const tasks = data.temperingTaskType[0];
+ 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`;
+const handleMessage3 = (data) => {
+ const tasks = data.taskCaches[0];
+ woshia.value = tasks.some(task => task.line == 2001);
+ woshic.value = tasks.some(task => task.line == 2002);
+ console.log(tasks);
-// };
-});
+};
+// 澶х悊鐗囩
+const socketUrl4 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/isRun`;
+const handleMessage4 = (data) => {
+ const tasks = data.bigStorageCageDetailsOutTask[0];
+ const taskss = data.bigStorageCageDetailsFeedTask[0];
+ dalipiana.value = tasks.some(task => task.slot !== null && task.slot !== undefined);
+dalipianb.value = taskss.some(task => task.slot !== null && task.slot !== undefined);
+};
+// 涓婄墖
+const socketUrl5 = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassIsRun`;
+const handleMessage5 = (data) => {
+ if(data.engineering.length !==0 ){
+ shangpian.value = true;
+}
+};
+// 涓嬬墖
+const socketUrl6 = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unLoadGlassIsRun`;
+const handleMessage6 = (data) => {
+ const tasks = data.downWorkstation[0];
+ if (tasks && tasks.length >= 6) {
+ xiapian.value = tasks.some(task => task.racksNumber!== 0);
+ xiapian1.value = tasks[0].racksNumber !== 0;
+ xiapian2.value = tasks[1].racksNumber !== 0;
+ xiapian3.value = tasks[2].racksNumber !== 0;
+ xiapian4.value = tasks[3].racksNumber !== 0;
+ xiapian5.value = tasks[4].racksNumber !== 0;
+ xiapian6.value = tasks[5].racksNumber !== 0;
+ }
+};
const renderPieCharts = () => {
processesData.value.forEach((data, index) => {
const chart = echarts.init(document.getElementById('pieChart_' + index));
@@ -228,43 +340,290 @@
chart.setOption(options);
});
};
-
-
-onUnmounted(() => {
-socket.close();
-});
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ socket2 = initializeWebSocket(socketUrl2, handleMessage2);
+ socket3 = initializeWebSocket(socketUrl3, handleMessage3);
+ socket4 = initializeWebSocket(socketUrl4, handleMessage4);
+ socket5 = initializeWebSocket(socketUrl5, handleMessage5);
+ socket6 = initializeWebSocket(socketUrl6, handleMessage6);
});
onUnmounted(() => {
if (socket) {
closeWebSocket(socket);
}
+ if (socket2) {
+ closeWebSocket2(socket2);
+ }
+ if (socket3) {
+ closeWebSocket3(socket3);
+ }
+ if (socket4) {
+ closeWebSocket4(socket4);
+ }
+ if (socket5) {
+ closeWebSocket5(socket5);
+ }
+ if (socket6) {
+ closeWebSocket6(socket6);
+ }
});
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
+closeWebSocket2();
+closeWebSocket3();
+closeWebSocket4();
+closeWebSocket5();
+closeWebSocket6();
});
</script>
<style scoped>
-
-
-
.echarts-container {
display: flex;
flex-wrap: wrap;
gap: 20px;
}
-
.echarts-item {
-width: 150px;
+width: 120px;
height: 150px;
margin: 20px;
}
-
.pie-chart {
width: 100%;
height: 100%;
}
+.parter {
+ position: relative;
+ display: inline-block; /* 浣垮鍣ㄥぇ灏忛�傚簲鍥剧墖澶у皬 */
+ width: 1500px;
+ margin-left: -300px
+}
+img {
+ display: block; /* 璁╁浘鐗囦互鍧楃骇鍏冪礌鏄剧ず */
+ max-width: 100%; /* 纭繚鍥剧墖涓嶈秴鍑哄鍣� */
+}
+.moving-rect {
+ width: 100px;
+ height: 50px;
+ position: absolute;
+}
+.longa{
+ z-index: 1;
+ width: 33px;
+ height: 5px;
+ background-color: #529b2e;
+ margin-top: -15px;
+ margin-left: 130px;
+}
+.longb{
+ z-index: 1;
+ width: 33px;
+ height: 5px;
+ background-color: #529b2e;
+ margin-top: -15px;
+ margin-left: 235px;
+}
+.xiapianji1{
+ z-index: 1;
+ width: 12px;
+ height: 7px;
+ background-color: #529b2e;
+ margin-top: -206px;
+ margin-left: 173px;
+}
+.xiapianji2{
+ z-index: 1;
+ width: 12px;
+ height: 7px;
+ background-color: #529b2e;
+ margin-top: -206px;
+ margin-left: 217px;
+}
+.xiapianji3{
+ z-index: 1;
+ width: 12px;
+ height: 7px;
+ background-color: #529b2e;
+ margin-top: -195px;
+ margin-left: 196px;
+}
+.xiapianji4{
+ z-index: 1;
+ width: 12px;
+ height: 7px;
+ background-color: #529b2e;
+ margin-top: -206px;
+ margin-left: 270px;
+}
+.xiapianji5{
+ z-index: 1;
+ width: 12px;
+ height: 7px;
+ background-color: #529b2e;
+ margin-top: -206px;
+ margin-left: 314px;
+}
+.xiapianji6{
+ z-index: 1;
+ width: 12px;
+ height: 7px;
+ background-color: #529b2e;
+ margin-top: -195px;
+ margin-left: 293px;
+}
+.xiapianji {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 9px;
+ left: 200px;
+ transform: translateX(-50%);
+ animation: move-xiapianji 6s infinite;
+}
+@keyframes move-xiapianji {
+ 0% {
+ left: 200px;
+ }
+ 100% {
+ left: calc(100% - 700px);
+ }
+}
+.lipiana {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 190px;
+ right: 530px;
+ transform: translateX(-50%);
+ animation: move-lipiana 6s infinite;
+}
+@keyframes move-lipiana {
+ 0% {
+ right: 530px;
+ }
+ 100% {
+ right: calc(100% - 350px);
+ }
+}
+.lipianb {
+ width: 18px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 160px;
+ left: 502px;
+ transform: translateX(-50%);
+ animation: move-lipianb 6s infinite;
+}
+@keyframes move-lipianb {
+ 0% {
+ top: 160px;
+ }
+ 100% {
+ top: calc(100% - 55px);
+ }
+}
+.lipianc {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 215px;
+ right: 490px;
+ transform: translateX(-50%);
+ animation: move-lipianc 6s infinite;
+}
+@keyframes move-lipianc {
+ 0% {
+ right: 490px;
+ }
+ 100% {
+ right: calc(100% - 350px);
+ }
+}
+.lipiand {
+ width: 25px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 160px;
+ left: 555px;
+ transform: translateX(-50%);
+ animation: move-lipiand 6s infinite;
+}
+@keyframes move-lipiand {
+ 0% {
+ top: 160px;
+ }
+ 100% {
+ top: calc(100% - 40px);
+ }
+}
+.overlaya {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 213px;
+ right: 800px;
+ transform: translateX(-50%);
+ animation: move-overlaya 6s infinite;
+}
+@keyframes move-overlaya {
+ 0% {
+ right: 880px;
+ }
+ 100% {
+ right: calc(100% - 15px);
+ }
+}
+.overlayb {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 110px;
+ left: 13px;
+ transform: translateX(-50%);
+ animation: move-overlayb 6s infinite;
+}
+@keyframes move-overlayb {
+ 0% {
+ top: 160px;
+ }
+ 100% {
+ top: calc(100% - 190px);
+ }
+}
+.overlayc {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 7px;
+ left: 13px;
+ transform: translateX(-50%);
+ animation: move-overlayc 6s infinite;
+}
+@keyframes move-overlayc {
+ 0% {
+ left: 20px;
+ }
+ 100% {
+ left: calc(100% - 900px);
+ }
+}
+.shangpianji {
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 157px;
+ right: 90px;
+ transform: translateX(-50%);
+ animation: move-shangpianji 6s infinite;
+}
+@keyframes move-shangpianji {
+ 0% {
+ right: 90px;
+ }
+ 100% {
+ right: calc(100% - 770px);
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0