From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreen/largescreen.vue | 61 +++++++++++-------------------
1 files changed, 22 insertions(+), 39 deletions(-)
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 3f105fa..43b4e09 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,6 +1,6 @@
<template>
<div style="height: 500px;">
- <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" >
<el-scrollbar height="800px">
<div style="font-size: 20px;font-weight: bold;">{{ $t('large.loading') }}{{ temperingtotal }}</div>
<div id="top" style="height: 150px;display: flex; justify-content: center; align-items: center;">
@@ -56,7 +56,7 @@
<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>
+ <el-button type="text" plain @click="handleBinda(scope.row)">{{ $t('large.mes') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -75,7 +75,7 @@
<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="quantity" align="center" :label="$t('large.tionnumber')" 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" />
@@ -95,8 +95,6 @@
</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;">
@@ -129,7 +127,6 @@
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {useI18n} from 'vue-i18n'
import * as echarts from 'echarts';
-
const {t} = useI18n()
const tableData = ref([])
const tableDatab = ref([])
@@ -154,9 +151,7 @@
const xiapian6 = ref(false)
const blind = ref(false)
const temperingtotal = ref(0)
-
-const thisProcess = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
-// 瀹氫箟涓�涓搷搴斿紡寮曠敤鏉ュ瓨鍌ㄥ浘琛ㄥ疄渚�
+const thisProcess = ref();
const chartDom = ref(null);
let chartInstance = null;
const blinda = ref(false)
@@ -174,13 +169,11 @@
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);
}
}
@@ -193,7 +186,7 @@
case 2:
return 'success';
}
-}
+}
function getStatusText(warehousing) {
switch (warehousing) {
case 0:
@@ -212,13 +205,10 @@
let socket6 = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
const handleMessage = (data) => {
-// tableData.value = data.awaitingRepairs[0]
tableDatab.value = data.DoingTask[0]
tableDatac.value = data.orders[0]
socket.onmessage = (event) => {
const data = JSON.parse(event.data);
- console.log(data.device[0]);
-
processesData.value = data.device[0].map(rect => ({
...rect,
completedQuantity: rect.completedQuantity,
@@ -317,7 +307,6 @@
}
]
};
-
chart.setOption(options);
});
};
@@ -359,7 +348,6 @@
}
]
};
-
chart.setOption(options);
});
};
@@ -392,7 +380,6 @@
}
});
onBeforeUnmount(() => {
-console.log("鍏抽棴浜�")
closeWebSocket();
closeWebSocket2();
closeWebSocket3();
@@ -410,8 +397,6 @@
reportingWorkTime2: timeRange.value[1],
})
if (response.code === 200) {
- console.log(response.data);
-
dialogprocesses.value = response.data.map(rect => ({
...rect,
completedQuantity: rect.completedQuantity,
@@ -420,14 +405,12 @@
}));
await nextTick();
renderPieCharts1();
-
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
};
-</script>
-
+</script>
<style scoped>
.echarts-container {
display: flex;
@@ -444,19 +427,19 @@
height: 100%;
}
.parter {
- position: relative;
- display: inline-block; /* 浣垮鍣ㄥぇ灏忛�傚簲鍥剧墖澶у皬 */
- width: 1500px;
- margin-left: -300px
+ position: relative;
+ display: inline-block; /* 浣垮鍣ㄥぇ灏忛�傚簲鍥剧墖澶у皬 */
+ width: 1500px;
+ margin-left: -300px
}
img {
- display: block; /* 璁╁浘鐗囦互鍧楃骇鍏冪礌鏄剧ず */
- max-width: 100%; /* 纭繚鍥剧墖涓嶈秴鍑哄鍣� */
+ display: block; /* 璁╁浘鐗囦互鍧楃骇鍏冪礌鏄剧ず */
+ max-width: 100%; /* 纭繚鍥剧墖涓嶈秴鍑哄鍣� */
}
.moving-rect {
- width: 100px;
- height: 50px;
- position: absolute;
+ width: 100px;
+ height: 50px;
+ position: absolute;
}
.longa{
z-index: 1;
@@ -523,13 +506,13 @@
margin-left: 293px;
}
.xiapianji {
- width: 20px;
- height: 10px;
- background-color: #529b2e;
- top: 9px;
- left: 200px;
- transform: translateX(-50%);
- animation: move-xiapianji 15s infinite;
+ width: 20px;
+ height: 10px;
+ background-color: #529b2e;
+ top: 9px;
+ left: 200px;
+ transform: translateX(-50%);
+ animation: move-xiapianji 15s infinite;
}
@keyframes move-xiapianji {
0% {
--
Gitblit v1.8.0