From a4a795a986b009779f09e9a825c0099aa0bacbb8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 18 八月 2025 16:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/largescreendisplay/screendisplay.vue | 576 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 335 insertions(+), 241 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 11dad86..f1127b4 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -8,7 +8,11 @@
import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n'
import * as echarts from 'echarts';
-
+import { debounce } from 'lodash-es';// 浣跨敤闃叉姈澶勭悊楂橀鏁版嵁鏇存柊
+// 浣跨敤娴呮瘮杈冨噺灏戜笉蹇呰鐨勫搷搴斿紡鏇存柊
+import { shallowRef } from 'vue';
+const rawGlassStorageDetailList = shallowRef([]);
+const orderDTOS = shallowRef([]);
const load = ref(true)
const edg = ref(true)
const temp = ref(true)
@@ -20,10 +24,17 @@
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
let socket = null;
-const rawGlassStorageDetailList = ref([])
-const orderDTOS = ref([])
+// const rawGlassStorageDetailList = ref([])
+// const orderDTOS = ref([])
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/largenScreen`;
-const handleMessage = (data) => {
+const debouncedUpdate = debounce((data, handler) => {
+ handler(data);
+}, 300);
+let handleMessage = (data) => {
+ debouncedUpdate(data, (cleanData) => {
+ rawGlassStorageDetailList.value = cleanData.rawGlassStorageDetailList[0];
+ orderDTOS.value = cleanData.orderDTOS[0];
+ });
rawGlassStorageDetailList.value = data.rawGlassStorageDetailList[0]
orderDTOS.value = data.orderDTOS[0]
};
@@ -32,34 +43,47 @@
const edgTwoTasks = ref([])
const engineeringOne = ref([])
const engineeringTwo = ref([])
+// 鍚堝苟WebSocket杩炴帴锛屽噺灏戣繛鎺ユ暟
+const socketManager = {
+ sockets: {},
+ init(url, handler) {
+ if (!this.sockets[url]) {
+ this.sockets[url] = initializeWebSocket(url, handler);
+ }
+ return this.sockets[url];
+ },
+ closeAll() {
+ Object.values(this.sockets).forEach(socket => closeWebSocket(socket));
+ this.sockets = {};
+ }
+};
let myChartLoad = null;
let myChartEdg = null;
let myChartTemp = null;
let myChartHollow = null;
const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
-const handleMessage1 = (data) => {
- edgOneTasks.value = data.edgOneTasks[0];
- edgTwoTasks.value = data.edgTwoTasks[0];
+let handleMessage1 = (data) => {
+ edgOneTasks.value = data.edgOneCount[0];
+ edgTwoTasks.value = data.edgOneCount[0];
engineeringOne.value = data.engineeringOne[0];
engineeringTwo.value = data.engineeringTwo[0];
- if (numBoxes.value != edgOneTasks.value.length) {
- numBoxes.value = edgOneTasks.value.length;
+ if (numBoxes.value != edgOneTasks.value) {
+ numBoxes.value = edgOneTasks.value;
initBoxes(boxes, numBoxes, 'firstup');
-
}
- if (numBoxes2.value != edgTwoTasks.value.length) {
- numBoxes2.value = edgTwoTasks.value.length;
+ if (numBoxes2.value != edgTwoTasks.value) {
+ numBoxes2.value = edgTwoTasks.value;
initBoxes(boxes2, numBoxes2, 'firstup');
}
- timeAxisCreate("鍒囧壊褰撳ぉ杩愯鎯呭喌", chartLoad.value, myChartLoad, data.loadRunTimes[0]);
- timeAxisCreate("纾ㄨ竟褰撳ぉ杩愯鎯呭喌", chartEdg.value, myChartEdg, data.loadRunTimes[0]);
+ timeAxisCreate(t('large.cuttingState'), chartLoad.value, myChartLoad, tableDataTime(false, data.loadRunTimes[0]));
+ timeAxisCreate(t('large.edgingState'), chartEdg.value, myChartEdg, tableDataTime(false, data.loadRunTimes[0]));
};
let socket2 = null;
const temperingTaskType = ref([])
const temperingGlassInfoList = ref([])
const temperingGlassInfoInList = ref([])
const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/largenScreen`;
-const handleMessage2 = (data) => {
+let handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
if (numBoxes3.value != temperingTaskType.value) {
@@ -76,21 +100,17 @@
numBoxes4.value = 0;
initBoxes(boxes4, numBoxes4, 'right');
}
-
}
-
temperingGlassInfoInList.value = data.temperingGlassInfoInList[0];
-
};
let socket3 = null;
const bigStorageCageUsage = ref([])
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/largenScreen`;
-const handleMessage3 = (data) => {
+let handleMessage3 = (data) => {
bigStorageCageUsage.value = data.bigStorageCageUsage[0];
- timeAxisCreate("閽㈠寲褰撳ぉ杩愯鎯呭喌", chartTemp.value, myChartTemp, data.tempRunTimes[0]);
+ timeAxisCreate(t('large.temperingState'), chartTemp.value, myChartTemp, tableDataTime(false, data.tempRunTimes[0]));
};
// let mychart = null; // 寤鸿璁句负澶栭儴鍙橀噺閬垮厤閲嶅鍒濆鍖�
-
// const formatToTimeString(datetime) => {
const formatToTimeString = (datetime) => {
const date = new Date(datetime);
@@ -99,13 +119,37 @@
const seconds = date.getSeconds().toString().padStart(2, '0');
return `${hours}:${minutes}:${seconds}`;
}
-
+const tableDataTime = (result, tableDatax) => {
+ const tableData = [];
+ if (tableDatax.length > 0) {
+ tableDatax.forEach((item, index) => {
+ tableData.push({
+ firstTimestamp: index == 0 ? item.startTimestamp : tableDatax[index - 1].secondTimestamp,
+ secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
+ diffMinutes: item.diffMinutes,
+ startTimestamp: item.startTimestamp,
+ endTimestamp: item.endTimestamp,
+ state: 1
+ });
+ if (result) {
+ tableData.push({
+ firstTimestamp: item.firstTimestamp,
+ secondTimestamp: item.secondTimestamp,
+ diffMinutes: item.diffMinutes,
+ startTimestamp: item.startTimestamp,
+ endTimestamp: item.endTimestamp,
+ state: 2
+ });
+ }
+ });
+ }
+ return tableData;
+};
const timeAxisCreate = (title, chartDom, mychart, RunTimes) => {
if (!chartDom) {
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
}
-
if (!mychart) {
mychart = echarts.init(chartDom);
}
@@ -118,25 +162,25 @@
firstTime = RunTimes[0].startTimestamp;
secondTime = RunTimes[0].endTimestamp;
}
-
- let datas = ref([])
- RunTimes.forEach((item, index) => {
- // if (index % 2 === 0) {
- datas.value.push([item.firstTimestamp, -1, formatToTimeString(item.firstTimestamp)])
- datas.value.push([item.secondTimestamp, 1, formatToTimeString(item.secondTimestamp)])
- // } else {
- // datas.value.push([item.firstTimestamp, -1, item.diffMinutes])
- // datas.value.push([item.firstTimestamp, -1, item.diffMinutes])
- // }
- })
- // console.log(D)
// 鏋勫缓绾挎鏁扮粍
const segments = RunTimes.map(item => ({
type: 'line',
symbol: 'none',
data: [
- [item.firstTimestamp, 0],
- [item.secondTimestamp, 0]
+ {
+ value: [item.firstTimestamp, 0],
+ extra: {
+ start: item.firstTimestamp,
+ end: item.secondTimestamp
+ }
+ },
+ {
+ value: [item.secondTimestamp, 0],
+ extra: {
+ start: item.firstTimestamp,
+ end: item.secondTimestamp
+ }
+ }
],
lineStyle: {
color: 'red', // 鏀寔涓嶅悓棰滆壊
@@ -144,8 +188,6 @@
},
z: 1
}));
-
-
const optionOne = {
title: {
text: title,
@@ -161,7 +203,28 @@
trigger: 'axis',
axisPointer: { type: 'line' },
backgroundColor: 'rgba(50,50,50,0.7)',
- textStyle: { color: '#fff' }
+ textStyle: { color: '#fff' },
+ formatter: (params) => {
+ const seen = new Set();
+ const items = params
+ .filter(p => {
+ const key = p.data?.extra?.start + '|' + p.data?.extra?.end;
+ if (seen.has(key)) return false;
+ seen.add(key);
+ return true;
+ })
+ .map(p => {
+ const start = p.data?.extra?.start;
+ const end = p.data?.extra?.end;
+ const timeStr = p.axisValueLabel;
+ if (start && end) {
+ return `寮�濮嬫椂闂达細${start}<br/>缁撴潫鏃堕棿锛�${end}`;
+ }
+ return `鏃堕棿锛�${timeStr}`;
+ })
+ .filter(Boolean);
+ return items.join('<br/>');
+ }
},
grid: {
top: '20%',
@@ -203,8 +266,8 @@
],
lineStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
- { offset: 0, color: '#4facfe' },
- { offset: 1, color: '#00f2fe' }
+ { offset: 0, color: 'red' },
+ { offset: 1, color: 'red' }
]),
width: 5,
shadowColor: 'rgba(0,0,0,0.2)',
@@ -216,104 +279,31 @@
...segments.map(seg => ({
...seg,
lineStyle: {
- color: '#ffcc00',
+ color: '#4facfe',
width: 3,
shadowColor: 'rgba(255,204,0,0.5)',
shadowBlur: 5
}
})),
- // 鍗＄墖浜嬩欢锛堜紭鍖栨牱寮忥級
- {
- type: 'custom',
- renderItem: function (params, api) {
- const x = api.coord([api.value(0), api.value(1)])[0];
- const yBase = api.coord([api.value(0), 0])[1];
- const yOffset = api.value(1) > 0 ? -70 : 30;
- const cardWidth = 40;
- const cardHeight = 22;
- const cardX = x;
- const cardY = yBase + yOffset;
- const text = api.value(2);
-
- return {
- type: 'group',
- children: [
- {
- type: 'line',
- shape: {
- x1: x,
- y1: yBase,
- x2: x,
- y2: cardY + (api.value(1) > 0 ? cardHeight : 0)
- },
- style: {
- stroke: '#888',
- lineWidth: 1.5,
- lineDash: [4, 2]
- }
- },
- {
- type: 'rect',
- shape: {
- x: cardX - cardWidth / 2,
- y: cardY,
- width: cardWidth,
- height: cardHeight,
- r: 6 // 鍦嗚
- },
- style: {
- fill: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: '#ffffff' },
- { offset: 1, color: '#e0f7fa' }
- ]),
- stroke: '#00acc1',
- lineWidth: 1,
- shadowColor: '#ccc',
- shadowBlur: 6
- }
- },
- {
- type: 'text',
- style: {
- text: text,
- x: cardX,
- y: cardY + cardHeight / 2,
- textAlign: 'center',
- textVerticalAlign: 'middle',
- font: '12px sans-serif',
- fill: '#006064'
- }
- }
- ]
- };
- },
- encode: {
- x: 0
- },
- data: datas.value,
- z: 10
- }
]
};
-
- mychart.setOption(optionOne);
+ mychart.setOption(optionOne, true);
};
-
let socket4 = null;
const hollowBigStorageCageUsage = ref([])
const socketUrl4 = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/largenScreen`;
-const handleMessage4 = (data) => {
+let handleMessage4 = (data) => {
hollowBigStorageCageUsage.value = data.hollowBigStorageCageUsage[0];
- timeAxisCreate("涓┖褰撳ぉ杩愯鎯呭喌", chartHollow.value, myChartHollow, data.hollowRunTimes[0]);
+ timeAxisCreate(t('large.hollowState'), chartHollow.value, myChartHollow, tableDataTime(false, data.hollowRunTimes[0]));
};
let socket5 = null;
let myChart = null;
let myChart2 = null;
+const switchNoorAreaLeft = ref(true)
+const switchNoorAreaRight = ref(true)
const productionVO = ref([])
const socketUrl5 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreenProduction`;
-const handleMessage5 = (data) => {
- productionVO.value = data.productionVO[0];
- // 灏嗗師濮嬫暟鎹浆鎹负 ECharts 鍥捐〃鎵�闇�鏍煎紡
+const createchart = (productionVO) => {
categories = productionVO.value.map(item => item.date); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
totalAreaOutOne = productionVO.value.map(item => item.totalAreaOutOne);
countIn = productionVO.value.map(item => item.countIn);
@@ -334,48 +324,72 @@
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
}
- // myChart = echarts.init(chartDom);
if (!myChart) {
myChart = echarts.init(chartDom);
}
- // else {
- // myChart.clear();
- // }
-
-
+ let loadOneData;
+ let loadTwoData;
+ let tempfontData;
+ if (switchNoorAreaLeft.value) {
+ loadOneData = countOutOne;
+ loadTwoData = countOutTwo;
+ tempfontData = countIn;
+ } else {
+ loadOneData = totalAreaOutOne;
+ loadTwoData = totalAreaOutTwo;
+ tempfontData = totalAreaIn;
+ }
const option = {
title: { text: '' },
tooltip: { trigger: 'axis' },
legend: {
data: [
t('large.countOutOne'),
- t('large.totalAreaOutOne'),
+ // t('large.totalAreaOutOne'),
t('large.countOutTwo'),
- t('large.totalAreaOutTwo'),
+ // t('large.totalAreaOutTwo'),
t('large.countIn'),
- t('large.totalAreaIn')
+ // t('large.totalAreaIn')
]
},
- grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
- toolbox: { feature: { saveAsImage: {} } },
+ grid: { top: '20%', left: '3%', right: '4%', bottom: '3%', containLabel: true },
+ toolbox: {
+ feature: {
+ saveAsImage: {},
+ myTool1: {
+ show: true,
+ title: t('large.switch'),
+ icon: 'path://M512 0C229.234 0 0 229.234 0 512s229.234 512 512 512 512-229.234 512-512S794.766 0 512 0z m0 960C264.602 960 64 759.398 64 512S264.602 64 512 64s448 200.602 448 448-200.602 448-448 448z m0-768c-176.448 0-320 143.552-320 320s143.552 320 320 320 320-143.552 320-320-143.552-320-320-320z', // 鍦嗗舰鎸夐挳鍥炬爣锛堝彲鎹級
+ onclick: function () {
+ switchNoorAreaLeft.value = !switchNoorAreaLeft.value;
+ createchart(productionVO);
+ // customButtonClick(); // 璋冪敤浣犺嚜瀹氫箟鐨勬柟娉�
+ }
+ }
+ }
+ },
xAxis: {
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
data: categories // 杩欐槸鏃ユ湡鏁版嵁
},
- yAxis: { type: 'value' },
+ yAxis: {
+ type: 'value',
+ name: switchNoorAreaLeft.value==true?t('large.quantity'):t('large.are'), // 鍧愭爣杞村悕绉�
+ axisLabel: {
+ formatter: '{value}'
+ }
+ },
series: [
- { name: t('large.countOutOne'), type: 'bar', data: countOutOne },
- { name: t('large.totalAreaOutOne'), type: 'bar', data: totalAreaOutOne },
- { name: t('large.countOutTwo'), type: 'bar', data: countOutTwo },
- { name: t('large.totalAreaOutTwo'), type: 'bar', data: totalAreaOutTwo },
- { name: t('large.countIn'), type: 'bar', data: countIn },
- { name: t('large.totalAreaIn'), type: 'bar', data: totalAreaIn }
+ { name: t('large.countOutOne'), type: 'bar', data: loadOneData },
+ // { name: t('large.totalAreaOutOne'), type: 'bar', data: totalAreaOutOne },
+ { name: t('large.countOutTwo'), type: 'bar', data: loadTwoData },
+ // { name: t('large.totalAreaOutTwo'), type: 'bar', data: totalAreaOutTwo },
+ { name: t('large.countIn'), type: 'bar', data: tempfontData },
+ // { name: t('large.totalAreaIn'), type: 'bar', data: totalAreaIn }
]
};
-
- myChart.setOption(option);
-
+ myChart.setOption(option, true);
const chartDom2 = chartRef2.value;
if (!chartDom2) {
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
@@ -388,38 +402,73 @@
// else {
// myChart2.clear();
// }
+ let tempData;
+ let hollowOneData;
+ let hollowTwoData;
+ if (switchNoorAreaRight.value) {
+ tempData = countOut;
+ hollowOneData = hollowCountOutOne;
+ hollowTwoData = hollowCountOutTwo;
+ } else {
+ tempData = totalAreaOut;
+ hollowOneData = hollowTotalAreaOutOne;
+ hollowTwoData = hollowTotalAreaOutTwo;
+ }
const option2 = {
title: { text: '' },
tooltip: { trigger: 'axis' },
legend: {
data: [
- t('large.totalAreaOut'),
t('large.countOut'),
- t('large.hollowTotalAreaOutOne'),
+ // t('large.totalAreaOut'),
t('large.hollowCountOutOne'),
+ // t('large.hollowTotalAreaOutOne'),
t('large.hollowCountOutTwo'),
- t('large.hollowTotalAreaOutTwo')
+ // t('large.hollowTotalAreaOutTwo')
]
},
grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
- toolbox: { feature: { saveAsImage: {} } },
+ toolbox: {
+ feature: {
+ saveAsImage: {},
+ myTool1: {
+ show: true,
+ title: t('large.switch'),
+ icon: 'path://M512 0C229.234 0 0 229.234 0 512s229.234 512 512 512 512-229.234 512-512S794.766 0 512 0z m0 960C264.602 960 64 759.398 64 512S264.602 64 512 64s448 200.602 448 448-200.602 448-448 448z m0-768c-176.448 0-320 143.552-320 320s143.552 320 320 320 320-143.552 320-320-143.552-320-320-320z', // 鍦嗗舰鎸夐挳鍥炬爣锛堝彲鎹級
+ onclick: function () {
+ switchNoorAreaRight.value = !switchNoorAreaRight.value;
+ createchart(productionVO);
+ // customButtonClick(); // 璋冪敤浣犺嚜瀹氫箟鐨勬柟娉�
+ }
+ }
+ }
+ },
xAxis: {
type: 'category',
- boundaryGap: false,
+ boundaryGap: true,
data: categories // 杩欐槸鏃ユ湡鏁版嵁
},
- yAxis: { type: 'value' },
+ yAxis: {
+ type: 'value',
+ name: switchNoorAreaRight.value==true?t('large.quantity'):t('large.are'), // 鍧愭爣杞村悕绉�
+ axisLabel: {
+ formatter: '{value}'
+ }
+ },
series: [
- { name: t('large.totalAreaOut'), type: 'bar', data: totalAreaOut },
- { name: t('large.countOut'), type: 'bar', data: countOut },
- { name: t('large.hollowTotalAreaOutOne'), type: 'bar', data: hollowTotalAreaOutOne },
- { name: t('large.hollowCountOutOne'), type: 'bar', data: hollowCountOutOne },
- { name: t('large.hollowCountOutTwo'), type: 'bar', data: hollowCountOutTwo },
- { name: t('large.hollowTotalAreaOutTwo'), type: 'bar', data: hollowTotalAreaOutTwo }
+ // { name: t('large.totalAreaOut'), type: 'bar', data: tempData },
+ { name: t('large.countOut'), type: 'bar', data: tempData },
+ // { name: t('large.hollowTotalAreaOutOne'), type: 'bar', data: hollowOneData },
+ { name: t('large.hollowCountOutOne'), type: 'bar', data: hollowOneData },
+ // { name: t('large.hollowTotalAreaOutTwo'), type: 'bar', data: hollowTwoData },
+ { name: t('large.hollowCountOutTwo'), type: 'bar', data: hollowTwoData }
]
};
-
- myChart2.setOption(option2);
+ myChart2.setOption(option2, true);
+}
+let handleMessage5 = (data) => {
+ productionVO.value = data.productionVO[0];
+ createchart(productionVO);
};
// 灏嗗師濮嬫暟鎹浆鎹负 ECharts 鍥捐〃鎵�闇�鏍煎紡
let categories = ref([]); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
@@ -435,7 +484,6 @@
let hollowTotalAreaOutOne = ref([]);
let totalAreaIn = ref([]);
let countOutOne = ref([]);
-
const tableDatad = ref([]);
const patternUsage = async () => {
try {
@@ -451,23 +499,14 @@
console.error(error);
}
}
-
const exportToExcel = async () => {
try {
- window.open('http://192.168.0.39:10011/largenScreen/exportDailyProduction', '_blank');
- // const response = await request.get('/cacheGlass/largenScreen/exportDailyProduction');
- // if (response.code == 200) {
- // ElMessage.success(response.message);
- // tableDatad.value = response.data;
- // } else {
- // ElMessage.error(response.message);
- // }
+ window.open(`http://${WebSocketHost}:10011/largenScreen/exportDailyProduction`, '_blank');
}
catch (error) {
console.error(error);
}
}
-
const tableData = ref([]);
const dynamicColumns = ref([]);
const flowCardDetail = async (orderId) => {
@@ -486,7 +525,6 @@
prop: key,
label: key,
}));
-
// 瑙ｆ瀽鏁版嵁骞跺皢 JSON 瀛楃涓茶浆鎹负瀵硅薄
tableData.value = response.data.map((item) => {
const reportData = JSON.parse(item.reportWorkQuantity || "{}");
@@ -504,7 +542,6 @@
console.error(error);
}
}
-
const ptnusage = ref({
width: '',
height: '',
@@ -522,21 +559,17 @@
const chartEdg = ref(null)
const chartTemp = ref(null)
const chartHollow = ref(null)
-
const cleanupWebSocketData = (completeCleanup) => {
if (completeCleanup) {
// 瀹屽叏娓呯悊
rawGlassStorageDetailList.value = [];
orderDTOS.value = [];
- // ...鍏朵粬鏁扮粍
} else {
// 閮ㄥ垎娓呯悊 - 淇濈暀鏈�杩戞暟鎹�
const MAX_ITEMS = 50;
rawGlassStorageDetailList.value = rawGlassStorageDetailList.value.slice(-MAX_ITEMS);
orderDTOS.value = orderDTOS.value.slice(-MAX_ITEMS);
- // ...鍏朵粬鏁扮粍
}
-
// 娓呯悊鍥捐〃
[myChart, myChart2, myChartLoad, myChartEdg, myChartTemp, myChartHollow].forEach(chart => {
if (chart) {
@@ -545,37 +578,35 @@
}
});
};
-
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(async () => {
- // boxStart();
- // boxStart2()
- // boxStart3()
- // boxStart4();
- // requestAnimationFrame(animate);
- socket = initializeWebSocket(socketUrl, handleMessage);
- socket1 = initializeWebSocket(socketUrl1, handleMessage1);
- socket2 = initializeWebSocket(socketUrl2, handleMessage2);
- socket3 = initializeWebSocket(socketUrl3, handleMessage3);
- socket4 = initializeWebSocket(socketUrl4, handleMessage4);
- socket5 = initializeWebSocket(socketUrl5, handleMessage5);
+ socketManager.init(socketUrl, handleMessage);
+ socketManager.init(socketUrl1, handleMessage1);
+ socketManager.init(socketUrl2, handleMessage2);
+ socketManager.init(socketUrl3, handleMessage3);
+ socketManager.init(socketUrl4, handleMessage4);
+ socketManager.init(socketUrl5, handleMessage5);
+ // socket = initializeWebSocket(socketUrl, handleMessage);
+ // socket1 = initializeWebSocket(socketUrl1, handleMessage1);
+ // socket2 = initializeWebSocket(socketUrl2, handleMessage2);
+ // socket3 = initializeWebSocket(socketUrl3, handleMessage3);
+ // socket4 = initializeWebSocket(socketUrl4, handleMessage4);
+ // socket5 = initializeWebSocket(socketUrl5, handleMessage5);
const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
const startTime = endTime.subtract(1, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
// 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
// timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
-
const cleanupInterval = setInterval(() => {
cleanupWebSocketData(true); // 瀹屽叏娓呯悊
- }, 3000);
-
+ }, 300000);
// 姣忔鏀跺埌娑堟伅鏃舵鏌ユ暟鎹噺
const originalHandleMessage = handleMessage;
handleMessage = (data) => {
originalHandleMessage(data);
cleanupWebSocketData(false); // 閮ㄥ垎娓呯悊
};
-
onUnmounted(() => {
+ socketManager.closeAll();
clearInterval(cleanupInterval);
cleanupWebSocketData(true); // 缁勪欢鍗歌浇鏃跺畬鍏ㄦ竻鐞�
});
@@ -599,30 +630,25 @@
const numBoxes4 = ref(0);
const speed = 0.1;
const delayFrames = 600;
-
const maxCoords = {
box1: { x: 250, y: -165 },
box2: { x: 190, y: -75 },
box3: { x: 95, y: -85 },
box4: { x: 60, y: 0 },
};
-
let boxes = ref([]);
let boxes2 = ref([]);
let boxes3 = ref([]);
let boxes4 = ref([]);
-
const boxRefs = [];
const boxRefs2 = [];
const boxRefs3 = [];
const boxRefs4 = [];
let rafId = null;
-
// 鉁� 鍒濆鍖� boxes锛屽幓闄� style锛屼繚鐣� el
const initBoxes = (arr, countRef, direction) => {
const count = countRef.value;
const existing = arr.value;
-
for (let i = 0; i < count; i++) {
if (!existing[i]) {
existing.push({
@@ -646,14 +672,12 @@
existing.length = count;
}
};
-
// 鉁� 鍔ㄧ敾鍑芥暟
const animateBox = (box, maxX, maxY) => {
if (box.delay > 0) {
box.delay--;
return;
}
-
switch (box.direction) {
case 'firstup':
box.y -= speed;
@@ -689,16 +713,13 @@
}
break;
}
-
box.frameCount++;
if (box.frameCount % 2 === 0 && box.el) {
box.el.style.top = `${box.y}px`;
if (box.x > 0) {
-
- if(box.direction=="right"){
+ if (box.direction == "right") {
box.el.style.right = `-${box.x}px`;
-
- }else{
+ } else {
box.el.style.right = `${box.x}px`;
}
box.el.style.left = '';
@@ -708,23 +729,60 @@
}
}
};
-
+// 浼樺寲鍔ㄧ敾鎬ц兘
const animate = () => {
- boxes.value.forEach(box => animateBox(box, maxCoords.box1.x, maxCoords.box1.y));
- boxes2.value.forEach(box => animateBox(box, maxCoords.box2.x, maxCoords.box2.y));
- boxes3.value.forEach(box => animateBox(box, maxCoords.box3.x, maxCoords.box3.y));
- boxes4.value.forEach(box => animateBox(box, maxCoords.box4.x, maxCoords.box4.y));
-
- rafId = requestAnimationFrame(animate);
+ if (!rafId) {
+ const start = performance.now();
+ const updateBoxes = (boxes, maxX, maxY) => {
+ boxes.value.forEach(box => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+ // 绠�鍖栧姩鐢婚�昏緫
+ switch (box.direction) {
+ case 'firstup':
+ box.y = Math.max(box.y - speed, maxY);
+ if (box.y <= maxY) box.direction = 'firstleft';
+ break;
+ case 'firstleft':
+ box.x = Math.max(box.x - speed, -maxX);
+ if (box.x <= -maxX) {
+ box.x = 0;
+ box.y = 0;
+ box.direction = 'firstup';
+ }
+ break;
+ // 鍏朵粬case绠�鍖�...
+ }
+ // 鎵归噺鏇存柊DOM
+ requestAnimationFrame(() => {
+ if (box.el) {
+ box.el.style.transform = `translate(${box.x}px, ${box.y}px)`;
+ }
+ });
+ });
+ };
+ updateBoxes(boxes, maxCoords.box1.x, maxCoords.box1.y);
+ updateBoxes(boxes2, maxCoords.box2.x, maxCoords.box2.y);
+ updateBoxes(boxes3, maxCoords.box3.x, maxCoords.box3.y);
+ updateBoxes(boxes4, maxCoords.box4.x, maxCoords.box4.y);
+ rafId = requestAnimationFrame(animate);
+ }
};
-
+// const animate = () => {
+// boxes.value.forEach(box => animateBox(box, maxCoords.box1.x, maxCoords.box1.y));
+// boxes2.value.forEach(box => animateBox(box, maxCoords.box2.x, maxCoords.box2.y));
+// boxes3.value.forEach(box => animateBox(box, maxCoords.box3.x, maxCoords.box3.y));
+// boxes4.value.forEach(box => animateBox(box, maxCoords.box4.x, maxCoords.box4.y));
+// rafId = requestAnimationFrame(animate);
+// };
const boxStart = () => {
initBoxes(boxes, numBoxes, 'firstup');
initBoxes(boxes2, numBoxes2, 'firstup');
initBoxes(boxes3, numBoxes3, 'secondleft');
initBoxes(boxes4, numBoxes4, 'right');
};
-
watch(
() => boxes.value,
async (newVal) => {
@@ -734,7 +792,6 @@
});
},
{ deep: true, immediate: true }
-
);
watch(
() => boxes2.value,
@@ -746,7 +803,6 @@
},
{ deep: true, immediate: true }
);
-
watch(
() => boxes3.value,
async (newVal) => {
@@ -757,7 +813,6 @@
},
{ deep: true, immediate: true }
);
-
watch(
() => boxes4.value,
async (newVal) => {
@@ -772,7 +827,6 @@
boxStart();
animate();
});
-
onBeforeUnmount(() => {
cancelAnimationFrame(rafId);
rafId = null;
@@ -789,7 +843,6 @@
// onBeforeUnmount(() => {
// cancelAnimationFrame(rafId);
// });
-
//宓屽叆鍘嗗彶浠诲姟
const iframeUrl1 = ref('');
const iframe1 = ref(false);
@@ -857,6 +910,15 @@
iframe11.value = true;
iframeUrl11.value = `${window.location.origin}/#/largescreendisplay/productionstatistics`;
};
+const iframeUrl12 = ref('');
+const iframe12 = ref(false);
+const handlehistorical12 = (key) => {
+ iframe12.value = true;
+ const params = new URLSearchParams({
+ key: key,
+ });
+ iframeUrl12.value = `${window.location.origin}/#/largescreendisplay/timeaxis?${params.toString()}`;
+};
const transposedData = computed(() => {
const keys = Object.keys(fieldNames); // 鎸� fieldNames 鐨勯『搴�
return keys.map(key => {
@@ -867,7 +929,6 @@
return row;
});
});
-
const fieldNames = {
date: t('large.date'),
countOutOne: t('large.countOutOne'),
@@ -883,8 +944,43 @@
hollowCountOutTwo: t('large.hollowCountOutTwo'),
hollowTotalAreaOutTwo: t('large.hollowTotalAreaOutTwo'),
};
-
-
+// 淇敼鍥捐〃鍒濆鍖栭�昏緫锛屾坊鍔犳噿鍔犺浇鍜岄攢姣佹満鍒�
+const chartInstances = {
+ chartLoad: null,
+ chartEdg: null,
+ chartTemp: null,
+ chartHollow: null,
+ chartRef: null,
+ chartRef2: null
+};
+const initChart = (refName, option) => {
+ if (!chartInstances[refName] && templateRefs[refName]) {
+ chartInstances[refName] = echarts.init(templateRefs[refName]);
+ chartInstances[refName].setOption(option);
+ }
+};
+const disposeChart = (refName) => {
+ if (chartInstances[refName]) {
+ chartInstances[refName].dispose();
+ chartInstances[refName] = null;
+ }
+};
+// 浣跨敤Intersection Observer瀹炵幇鍥捐〃鎳掑姞杞�
+const observer = new IntersectionObserver((entries) => {
+ entries.forEach(entry => {
+ if (entry.isIntersecting) {
+ const refName = entry.target.getAttribute('data-chart-name');
+ if (refName && !chartInstances[refName]) {
+ // 鍒濆鍖栧浘琛ㄩ�昏緫
+ }
+ }
+ });
+}, { threshold: 0.1 });
+onMounted(() => {
+ document.querySelectorAll('[data-chart-name]').forEach(el => {
+ observer.observe(el);
+ });
+});
</script>
<template>
<div style="height: 500px;">
@@ -925,25 +1021,29 @@
frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe10" top="5vh" width="95%" @close="iframeUrl10 = ''">
- <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="700px"
frameborder="0"></iframe>
</el-dialog>
<el-dialog v-model="iframe11" top="5vh" width="95%" @close="iframeUrl11 = ''">
<iframe :src="iframeUrl11" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
-
+ <el-dialog v-model="iframe12" top="5vh" width="95%" @close="iframeUrl12 = ''">
+ <iframe :src="iframeUrl12" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
+ </el-dialog>
<div class="awatch" style="display: flex;">
<!-- 鐢熶骇缁熻 -->
<div style="height: 100px;width: 25%;float: right;">
<div id="ss" style="width: 100%; display: flex; justify-content: center;">
- <div ref="chartRef" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()"></div>
+ <div ref="chartRef" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()">
+ </div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartLoad" style="width: 100%;"></div>
+ <div ref="chartLoad" style="width: 100%;" @dblclick="handlehistorical12(1)"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartEdg" style="width: 100%;"></div>
+ <div ref="chartEdg" style="width: 100%;" @dblclick="handlehistorical12(2)"></div>
</div>
</div>
<div style="width: 50%;">
@@ -1008,7 +1108,6 @@
$t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaIn : 0 }}m虏</div>
</div>
-
<!-- 閽㈠寲鑹插潡 -->
<div v-if="temperingGlassInfoInList > 0" class="tempering"
style="width: 44px;height: 19px;top: 284px;left: 178px;position: absolute;background-color: #911005;"></div>
@@ -1116,16 +1215,15 @@
</el-table>
</div>
</div>
-
<div style="height: 100px;width: 25%;float: right;">
<div id="ss" style="width: 100%; display: flex; justify-content: center;">
<div ref="chartRef2" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartTemp" style="width: 100%;"></div>
+ <div ref="chartTemp" style="width: 100%;" @dblclick="handlehistorical12(3)"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartHollow" style="width: 100%;"></div>
+ <div ref="chartHollow" style="width: 100%;" @dblclick="handlehistorical12(4)"></div>
</div>
</div>
</div>
@@ -1205,19 +1303,16 @@
line-height: 20px;
margin-left: 100px;
}
-
#dta {
display: block;
float: left;
line-height: 20px;
margin-left: 80%;
}
-
#dialog-footer {
text-align: center;
margin-top: -15px;
}
-
#message {
text-align: center;
align-items: center;
@@ -1227,18 +1322,17 @@
background-color: #337ecc;
margin-left: 28%;
}
-
#awatch {
height: 460px;
}
-
+/* 浼樺寲鑳屾櫙鍥剧墖鍔犺浇 */
.img-screen {
/* max-width: 48%;
max-height: 100%; */
/* margin-top: 50px; */
/* float: left; */
position: relative;
- background-image: url('../../assets/screen.png');
+ background-image: url('/screen.png');
width: 795px;
height: 700px;
background-size: contain;
@@ -1247,8 +1341,9 @@
/* width: 100%;
height: 0;
padding-bottom: 50%; */
+ image-rendering: -webkit-optimize-contrast;
+ image-rendering: crisp-edges;
}
-
.clickable-area {
cursor: pointer;
/* 鎸囩ず杩欐槸涓�涓彲鐐瑰嚮鐨勫尯鍩� */
@@ -1257,14 +1352,12 @@
line-height: 95px;
/* 濡傛灉闇�瑕侊紝浣挎枃鏈瀭鐩村眳涓� */
}
-
/* .awatch{
height: 460px;
/* max-width: 100%; */
.box {
transition: transform 0.016s linear;
}
-
.lipiana {
width: 15px;
height: 9px;
@@ -1274,21 +1367,22 @@
transform: translateX(-50%);
animation: move-lipiana 1s infinite;
}
-
@keyframes move-lipiana {
0% {
right: 530px;
}
-
100% {
right: calc(100% - 350px);
}
}
-
+/* 浣跨敤CSS纭欢鍔犻�� */
.moving-rect {
width: 15px;
height: 15px;
background-color: #911005;
position: absolute;
+ will-change: transform;
+ backface-visibility: hidden;
+ perspective: 1000px;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0