From e2a1ce94392a0794af18dd9a2bb2f60c231f528b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 23 五月 2025 15:35:12 +0800
Subject: [PATCH] 更新语言
---
UI-Project/src/views/largescreendisplay/timeaxis.vue | 437 +++++++++++++++++++++++++++++++
UI-Project/src/lang/en.js | 10
UI-Project/src/lang/zh.js | 10
UI-Project/src/router/index.js | 12
UI-Project/src/views/largescreendisplay/screendisplay.vue | 212 +++++++--------
UI-Project/src/views/largescreendisplay/statistics.vue | 143 +++++++++
6 files changed, 708 insertions(+), 116 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index bbb3108..f489c3a 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -511,6 +511,16 @@
createTime: 'Return date',
},
large: {
+ Productionsituation:'Production situation',
+ Productionandoperationstatus:'Production and operation status',
+ cuttingState:'Operation status on the day of cutting',
+ edgingState:'Operation status on the day of edge grinding',
+ temperingState:'Operation status of tempered steel on the day of tempering',
+ hollowState:'Production and operation status of hollow on the same day',
+ switch: 'Switch',
+ running: 'Running',
+ stopping:'Stopping',
+ diffMinutes:'diffMinutes',
loadstart:'Load start',
loadend:'Load end',
loadtotal: 'Load total',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 69cea14..f2adb78 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -513,6 +513,16 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ Productionsituation:'鐢熶骇鎯呭喌',
+ Productionandoperationstatus:'鐢熶骇杩愯鎯呭喌',
+ cuttingState:'鍒囧壊褰撳ぉ杩愯鎯呭喌',
+ edgingState:'纾ㄨ竟褰撳ぉ杩愯鎯呭喌',
+ temperingState:'閽㈠寲褰撳ぉ杩愯鎯呭喌',
+ hollowState:'涓┖褰撳ぉ杩愯鎯呭喌',
+ switch:'鍒囨崲',
+ running:'杩愯涓�',
+ stopping:'鍋滄涓�',
+ diffMinutes:'鍒嗛挓',
loadstart:'鍒囧壊寮�濮嬫椂闂�',
loadend:'鍒囧壊缁撴潫鏃堕棿',
loadtotal: '鍒囧壊鎬绘椂闂�',
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 2e3ce53..ac5b19f 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -502,6 +502,18 @@
},
]
},
+ {
+ path: '/timeaxis',
+ name: 'timeaxis',
+ component: () => import('../views/largescreendisplay/timeaxis.vue'),
+ children: [
+ {
+ path: '/largescreendisplay/timeaxis',
+ name: 'timeaxis',
+ component: () => import('../views/largescreendisplay/timeaxis.vue')
+ },
+ ]
+ }
]
})
// 瀵艰埅瀹堝崼
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 007521b..2a858e4 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -51,8 +51,10 @@
numBoxes2.value = edgTwoTasks.value.length;
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([])
@@ -87,7 +89,7 @@
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/largenScreen`;
const 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; // 寤鸿璁句负澶栭儴鍙橀噺閬垮厤閲嶅鍒濆鍖�
@@ -99,6 +101,34 @@
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) {
@@ -119,24 +149,25 @@
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', // 鏀寔涓嶅悓棰滆壊
@@ -161,7 +192,21 @@
trigger: 'axis',
axisPointer: { type: 'line' },
backgroundColor: 'rgba(50,50,50,0.7)',
- textStyle: { color: '#fff' }
+ textStyle: { color: '#fff' },
+ formatter: (params) => {
+ const items = params
+ .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 +248,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,83 +261,12 @@
...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
- }
]
};
@@ -304,7 +278,7 @@
const socketUrl4 = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/largenScreen`;
const 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;
@@ -334,13 +308,12 @@
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
}
- // myChart = echarts.init(chartDom);
if (!myChart) {
myChart = echarts.init(chartDom);
}
- // else {
- // myChart.clear();
- // }
+
+
+
const option = {
@@ -375,6 +348,7 @@
};
myChart.setOption(option);
+
const chartDom2 = chartRef2.value;
if (!chartDom2) {
@@ -454,7 +428,7 @@
const exportToExcel = async () => {
try {
- window.open('http://'+{WebSocketHost}+':10011/largenScreen/exportDailyProduction', '_blank');
+ window.open('http://' + { WebSocketHost } + ':10011/largenScreen/exportDailyProduction', '_blank');
// const response = await request.get('/cacheGlass/largenScreen/exportDailyProduction');
// if (response.code == 200) {
// ElMessage.success(response.message);
@@ -536,7 +510,7 @@
orderDTOS.value = orderDTOS.value.slice(-MAX_ITEMS);
// ...鍏朵粬鏁扮粍
}
-
+
// 娓呯悊鍥捐〃
[myChart, myChart2, myChartLoad, myChartEdg, myChartTemp, myChartHollow].forEach(chart => {
if (chart) {
@@ -566,15 +540,15 @@
const cleanupInterval = setInterval(() => {
cleanupWebSocketData(true); // 瀹屽叏娓呯悊
- }, 3000);
-
+ }, 300000);
+
// 姣忔鏀跺埌娑堟伅鏃舵鏌ユ暟鎹噺
const originalHandleMessage = handleMessage;
handleMessage = (data) => {
originalHandleMessage(data);
cleanupWebSocketData(false); // 閮ㄥ垎娓呯悊
};
-
+
onUnmounted(() => {
clearInterval(cleanupInterval);
cleanupWebSocketData(true); // 缁勪欢鍗歌浇鏃跺畬鍏ㄦ竻鐞�
@@ -694,11 +668,11 @@
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 = '';
@@ -857,6 +831,17 @@
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 => {
@@ -925,14 +910,17 @@
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"
- frameborder="0"></iframe>
+ <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;">
@@ -940,10 +928,10 @@
<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%;">
@@ -1122,10 +1110,10 @@
<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>
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
index 430287d..892dead 100644
--- a/UI-Project/src/views/largescreendisplay/statistics.vue
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -8,8 +8,9 @@
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
$t('reportmanage.inquire') }}</el-button>
<el-button type="primary" @click="exportToExcel">{{$t('large.ExporttoExcel')}}</el-button>
+ <el-button type="primary" @click="showchart=!showchart" style="margin-left: 10px;">{{ $t('large.switch') }}</el-button>
</div>
- <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax"
+ <el-table v-show="!showchart" ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />
<el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />
@@ -27,10 +28,16 @@
<el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
min-width="40" />
</el-table>
- <div style="margin-top: 20px;margin-left: 40%;">
+ <div v-show="!showchart" style="margin-top: 20px;margin-left: 40%;">
<el-pagination v-model:current-page="currentPage2" :page-size="pageSize" :size="large" :disabled="disabled"
layout="prev, pager, next, jumper" :total="totalRecords" @current-change="handlePageChange2"
style="margin-top: 10px;" />
+ </div>
+ <div v-show="showchart" id="ss" style="width: 100%; display: flex; justify-content: center;">
+ <div ref="chartRef" style="width: 1770px; height: 320px;"></div>
+ </div>
+ <div v-show="showchart" id="ss" style="width: 100%; display: flex; justify-content: center;">
+ <div ref="chartRef2" style="width: 1770px; height: 320px;"></div>
</div>
</div>
</template>
@@ -39,9 +46,10 @@
import { useRouter } from "vue-router"
import request from "@/utils/request"
import { host, WebSocketHost } from '@/utils/constants'
-import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
+import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref , nextTick} from "vue";
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
+import * as echarts from 'echarts';
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
import { inject } from 'vue';
@@ -76,6 +84,7 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
+ createchart(tableDatax);
totalRecords.value = response.data.total / 2 || 0
} else {
ElMessage.error(response.message);
@@ -121,6 +130,7 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
+ createchart(tableDatax);
totalRecords.value = response.data.total / 2 || 0
} else {
ElMessage.error(response.message);
@@ -163,6 +173,7 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
+ createchart(tableDatax);
totalRecords.value = response.data.total / 2 || 0
} else {
ElMessage.error(response.message);
@@ -266,8 +277,132 @@
// 瀵煎嚭涓烘枃浠�
const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
const blob = new Blob([excelBuffer], { type: 'application/octet-stream' });
- saveAs(blob, '鐢熶骇鎯呭喌瀵煎嚭.xlsx');
+ saveAs(blob, t('large.Productionsituation'));
};
+let categories = ref([]); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
+let totalAreaOutOne = ref([]);
+let countIn = ref([]);
+let totalAreaOutTwo = ref([]);
+let totalAreaOut = ref([]);
+let countOut = ref([]);
+let hollowTotalAreaOutTwo = ref([]);
+let hollowCountOutOne = ref([]);
+let countOutTwo = ref([]);
+let hollowCountOutTwo = ref([]);
+let hollowTotalAreaOutOne = ref([]);
+let totalAreaIn = ref([]);
+let countOutOne = ref([]);
+let myChart = null;
+let myChart2 = null;
+const chartRef = ref(null)
+const chartRef2 = ref(null)
+const showchart = ref(false)
+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);
+ totalAreaOutTwo = productionVO.value.map(item => item.totalAreaOutTwo);
+ totalAreaOut = productionVO.value.map(item => item.totalAreaOut);
+ countOut = productionVO.value.map(item => item.countOut);
+ hollowTotalAreaOutTwo = productionVO.value.map(item => item.hollowTotalAreaOutTwo);
+ hollowCountOutOne = productionVO.value.map(item => item.hollowCountOutOne);
+ countOutTwo = productionVO.value.map(item => item.countOutTwo);
+ hollowCountOutTwo = productionVO.value.map(item => item.hollowCountOutTwo);
+ hollowTotalAreaOutOne = productionVO.value.map(item => item.hollowTotalAreaOutOne);
+ totalAreaIn = productionVO.value.map(item => item.totalAreaIn);
+ countOutOne = productionVO.value.map(item => item.countOutOne);
+ //鍥捐〃
+ nextTick() // 纭繚 DOM 鍔犺浇瀹屾垚
+ const chartDom = chartRef.value;
+ if (!chartDom) {
+ console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+ return;
+ }
+ if (!myChart) {
+ myChart = echarts.init(chartDom);
+ }
+
+ const option = {
+ title: { text: '' },
+ tooltip: { trigger: 'axis' },
+ legend: {
+ data: [
+ t('large.countOutOne'),
+ t('large.totalAreaOutOne'),
+ t('large.countOutTwo'),
+ t('large.totalAreaOutTwo'),
+ t('large.countIn'),
+ t('large.totalAreaIn')
+ ]
+ },
+ grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+ toolbox: { feature: { saveAsImage: {} } },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: categories // 杩欐槸鏃ユ湡鏁版嵁
+ },
+ yAxis: { type: '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 }
+ ]
+ };
+
+ myChart.setOption(option);
+
+
+ const chartDom2 = chartRef2.value;
+ if (!chartDom2) {
+ console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+ return;
+ }
+ // myChart2 = echarts.init(chartDom2);
+ if (!myChart2) {
+ myChart2 = echarts.init(chartDom2);
+ }
+ // else {
+ // myChart2.clear();
+ // }
+ const option2 = {
+ title: { text: '' },
+ tooltip: { trigger: 'axis' },
+ legend: {
+ data: [
+ t('large.totalAreaOut'),
+ t('large.countOut'),
+ t('large.hollowTotalAreaOutOne'),
+ t('large.hollowCountOutOne'),
+ t('large.hollowCountOutTwo'),
+ t('large.hollowTotalAreaOutTwo')
+ ]
+ },
+ grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+ toolbox: { feature: { saveAsImage: {} } },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: categories // 杩欐槸鏃ユ湡鏁版嵁
+ },
+ yAxis: { type: '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 }
+ ]
+ };
+
+ myChart2.setOption(option2);
+}
+
+
</script>
<style scoped></style>
\ No newline at end of file
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
new file mode 100644
index 0000000..5f449c6
--- /dev/null
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -0,0 +1,437 @@
+<template>
+ <div>
+ <div style="display: flex;width: 1770px;justify-content: center;">
+ <el-date-picker v-model="timeRange[1]" type="date" :placeholder="$t('reportmanage.starttime')"
+ value-format="YYYY-MM-DD" style="margin-left: 15px;">
+ </el-date-picker>
+
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
+ $t('reportmanage.inquire') }}</el-button>
+ <el-button type="primary" @click="exportToExcel">{{ $t('large.ExporttoExcel') }}</el-button>
+ </div>
+ <div style="width: 100%;height: 20%;display: flex;justify-content: center;">
+ <div ref="chart" style="width: 100%;"></div>
+ </div>
+ <el-table ref="table" style="margin-top: 20px;height: 500px;width: 100%;" :data="tableDataTime(true)"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
+ <el-table-column prop="firstTimestamp" align="center" :label="$t('large.starttime')" min-width="70" />
+ <el-table-column prop="secondTimestamp" align="center" :label="$t('large.endtime')" min-width="70" />
+ <!-- <el-table-column prop="diffMinutes" align="center" :label="$t('large.diffMinutes')" min-width="70" /> -->
+ <el-table-column prop="state" align="center" :label="$t('large.warehousing')" min-width="70">
+ <template #default="scope">
+ <span v-if="scope.row.state === 1">{{ $t('large.running') }}</span>
+ <span v-else>{{ $t('large.stopping') }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <div style="margin-top: 20px;margin-left: 40%;">
+ <el-pagination v-model:current-page="currentPage2" :page-size="pageSize" :size="large" :disabled="disabled"
+ layout="prev, pager, next, jumper" :total="totalRecords" @current-change="handlePageChange2"
+ style="margin-top: 10px;" />
+ </div> -->
+ </div>
+</template>
+<script lang="ts" setup>
+import { useI18n } from 'vue-i18n'
+import { useRouter, useRoute } from "vue-router"
+import request from "@/utils/request"
+import { host, WebSocketHost } from '@/utils/constants'
+import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
+import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
+import { ElMessage, ElMessageBox } from 'element-plus'
+import * as echarts from 'echarts';
+import { inject } from 'vue';
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+const globalDate = inject('globalDate');
+const router = useRoute()
+const key = router.query.key;
+const timeRange = ref([])
+const selectValuesa = reactive([]);
+const tableDatax = ref([])
+const currentPage2 = ref(1)
+const totalRecords = ref(0)
+const rawGlassHeight = ref('');
+const rawGlassThickness = ref('');
+const rawGlassWidth = ref('');
+const rawGlassfilmsId = ref('');
+const slot = ref('');
+let getglobalDate = window.localStorage.getItem('getglobalDate')
+const historical = async () => {
+ try {
+ let startTime = window.localStorage.getItem('startTime')
+ const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ // const formattedData = response.data.records.map(record => ({
+ // ...record,
+ // formattedCreateTime: formatTimestamp(record.createTime),
+ // formattedUpdateTime: formatTimestamp(record.updateTime),
+ // }));
+ tableDatax.value = response.data;
+ timeAxisCreate("", chart.value, myChart, tableDataTime(false));
+ // tableDatax.value = formattedData;
+ // totalRecords.value = response.data.total / 2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+const handlePageChange2 = (newPage) => {
+ currentPage2.value = newPage;
+ window.localStorage.setItem('pagenumber', currentPage2.value)
+ historicala(currentPage2.value);
+};
+
+const tableDataTime = (result) => {
+ const tableData = [];
+ if (tableDatax.value.length > 0) {
+ tableDatax.value.forEach((item, index) => {
+ tableData.push({
+ firstTimestamp: index == 0 ? item.startTimestamp : tableDatax.value[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 historicala = async (page) => {
+ try {
+ let pslot = ''
+ let celllist = []
+ if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
+ if (selectValuesa[0] != "") {
+ celllist = [selectValuesa[0]];
+ }
+ }
+ if (slot.value != "") {
+ pslot = slot.value
+ } else {
+ pslot = '0'
+ }
+ let page = window.localStorage.getItem('pagenumber')
+ let startTime = window.localStorage.getItem('startTime')
+ const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ // const formattedData = response.data.records.map(record => ({
+ // ...record,
+ // formattedCreateTime: formatTimestamp(record.createTime),
+ // formattedUpdateTime: formatTimestamp(record.updateTime),
+ // }));
+ tableDatax.value = response.data;
+ timeAxisCreate("", chart.value, myChart, tableDataTime(false));
+ // tableDatax.value = formattedData;
+ // totalRecords.value = response.data.total / 2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+// 鍘嗗彶鏌ヨ鐐瑰嚮
+const sethistorical = async () => {
+ try {
+ let pslot = ''
+ let celllist = []
+ if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
+ if (selectValuesa[0] != "") {
+ celllist = [selectValuesa[0]];
+ }
+ }
+ if (slot.value != "") {
+ pslot = slot.value
+ } else {
+ pslot = '0'
+ }
+ let startTime = window.localStorage.getItem('startTime')
+ let page = window.localStorage.getItem('pagenumber')
+ const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ if (response.code == 200) {
+ currentPage2.value = 1
+ ElMessage.success(response.message);
+ // const formattedData = response.data.records.map(record => ({
+ // ...record,
+ // formattedCreateTime: formatTimestamp(record.createTime),
+ // formattedUpdateTime: formatTimestamp(record.updateTime),
+ // }));
+ tableDatax.value = response.data;
+ timeAxisCreate("", chart.value, myChart, tableDataTime(false));
+ // tableDatax.value = formattedData;
+ // totalRecords.value = response.data.total / 2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ return `${year}-${month}-${day}`;
+}
+// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
+const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+function parseAndSetTime() {
+ const backendTime = new Date(getglobalDate);
+ const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ oneWeekAgo.setHours(0, 0, 0, 0);
+ backendTime.setHours(0, 0, 0, 0);
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+}
+
+function getStatusTypeb(taskState: number) {
+ switch (taskState) {
+ case 0:
+ return 'primary';
+ case 1:
+ return 'success';
+ case 2:
+ return 'info';
+ }
+}
+function getStatusTextb(taskState: number) {
+ switch (taskState) {
+ case 0:
+ return t('searchOrder.empty');
+ case 1:
+ return t('film.execution');
+ case 2:
+ return t('searchOrder.endtask');
+ }
+}
+function getStatusTypea(taskRunning: number) {
+ switch (taskRunning) {
+ case 0:
+ return 'primary';
+ case 1:
+ return 'success';
+ }
+}
+onMounted(() => {
+ parseAndSetTime();
+ historical();
+});
+
+import * as XLSX from 'xlsx';
+import { saveAs } from 'file-saver';
+
+const exportToExcel = () => {
+ // 琛ㄦ牸鏁版嵁锛堟繁鎷疯礉闃叉姹℃煋锛�
+ const data = JSON.parse(JSON.stringify(tableDatax.value));
+
+ // 琛ㄥご杞崲涓轰腑鏂囨垨鍥介檯鍖栨枃鏈�
+ const headerMap = {
+ date: t('large.date'),
+ countOutOne: t('large.countOutOne'),
+ totalAreaOutOne: t('large.totalAreaOutOne'),
+ countOutTwo: t('large.countOutTwo'),
+ totalAreaOutTwo: t('large.totalAreaOutTwo'),
+ countIn: t('large.countIn'),
+ totalAreaIn: t('large.totalAreaIn'),
+ countOut: t('large.countOut'),
+ totalAreaOut: t('large.totalAreaOut'),
+ hollowCountOutOne: t('large.hollowCountOutOne'),
+ hollowTotalAreaOutOne: t('large.hollowTotalAreaOutOne'),
+ hollowCountOutTwo: t('large.hollowCountOutTwo'),
+ hollowTotalAreaOutTwo: t('large.hollowTotalAreaOutTwo')
+ };
+
+ // 灏嗘暟鎹腑鐨� key 鏇挎崲涓轰腑鏂囪〃澶�
+ const exportData = data.map(row => {
+ const newRow = {};
+ for (const key in headerMap) {
+ newRow[headerMap[key]] = row[key];
+ }
+ return newRow;
+ });
+
+ // 杞崲涓哄伐浣滆〃
+ const worksheet = XLSX.utils.json_to_sheet(exportData);
+ const workbook = XLSX.utils.book_new();
+ XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+
+ // 瀵煎嚭涓烘枃浠�
+ const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+ const blob = new Blob([excelBuffer], { type: 'application/octet-stream' });
+ saveAs(blob, t('large.Productionandoperationstatus'));
+};
+
+let myChart = null;
+const chart = ref(null)
+const timeAxisCreate = (title, chartDom, mychart, RunTimes) => {
+ if (!chartDom) {
+ console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
+ return;
+ }
+
+ if (!mychart) {
+ mychart = echarts.init(chartDom);
+ }
+ let firstTime = null;
+ let secondTime = null;
+ if (RunTimes.length == 0) {
+ firstTime = "00-00-00 00:00:00";
+ secondTime = "00-00-00 00:00:00";
+ } else {
+ firstTime = RunTimes[0].startTimestamp;
+ secondTime = RunTimes[0].endTimestamp;
+ }
+
+ // 鏋勫缓绾挎鏁扮粍
+ const segments = RunTimes.map(item => ({
+ type: 'line',
+ symbol: 'none',
+ data: [
+ {
+ 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', // 鏀寔涓嶅悓棰滆壊
+ width: 4
+ },
+ z: 1
+ }));
+
+
+ const optionOne = {
+ title: {
+ text: title,
+ left: 'center',
+ top: '5%',
+ textStyle: {
+ fontSize: 16,
+ fontWeight: 'bold',
+ color: '#333'
+ }
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: { type: 'line' },
+ backgroundColor: 'rgba(50,50,50,0.7)',
+ textStyle: { color: '#fff' },
+ formatter: (params) => {
+ const items = params
+ .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%',
+ left: '5%',
+ right: '5%',
+ bottom: '15%'
+ },
+ xAxis: {
+ type: 'time',
+ axisLabel: {
+ formatter: function (value) {
+ const date = new Date(value);
+ return (
+ date.getHours().toString().padStart(2, '0') + ':' +
+ date.getMinutes().toString().padStart(2, '0') + ':' +
+ date.getSeconds().toString().padStart(2, '0')
+ );
+ },
+ fontSize: 10,
+ color: '#666'
+ },
+ splitLine: { show: false },
+ axisLine: { lineStyle: { color: '#aaa' } }
+ },
+ yAxis: {
+ type: 'value',
+ min: -1,
+ max: 1,
+ show: false
+ },
+ series: [
+ // 涓绘椂闂寸嚎锛堣摑鑹叉笎鍙橈紝绋嶅井鍔犵矖锛�
+ {
+ type: 'line',
+ symbol: 'none',
+ data: [
+ [firstTime, 0],
+ [secondTime, 0]
+ ],
+ lineStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+ { offset: 0, color: 'red' },
+ { offset: 1, color: 'red' }
+ ]),
+ width: 5,
+ shadowColor: 'rgba(0,0,0,0.2)',
+ shadowBlur: 8
+ },
+ z: 0
+ },
+ // 灏忔鏃堕棿绾匡紙缁熶竴鏌斿拰鐨勯粍鑹诧級
+ ...segments.map(seg => ({
+ ...seg,
+ lineStyle: {
+ color: '#4facfe',
+ width: 3,
+ shadowColor: 'rgba(255,204,0,0.5)',
+ shadowBlur: 5
+ }
+ })),
+ ]
+ };
+
+ mychart.setOption(optionOne);
+};
+
+</script>
+<style scoped></style>
\ No newline at end of file
--
Gitblit v1.8.0