From 2c08bfb96d6523dfbf5ae543e94495c151aadbf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 三月 2025 17:53:18 +0800
Subject: [PATCH] 大屏嵌入历史任务，生产统计显示
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/FlowCardService.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 2
UI-Project/src/lang/en.js | 20 +
UI-Project/src/lang/zh.js | 25 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/FlowCardMapper.java | 12
hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml | 61 +++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java | 22 +
UI-Project/src/router/index.js | 12
UI-Project/src/views/largescreendisplay/screendisplay.vue | 483 ++++++++++++++++++++---------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java | 12
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java | 16
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 11
UI-Project/src/views/largescreendisplay/statistics.vue | 238 ++++++++++++++
15 files changed, 753 insertions(+), 173 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 8756cce..f27b961 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -568,6 +568,26 @@
reportWorkQuantity:'reportWorkQuantity',
reportWorkQuantityCount:'reporting_work_num_count',
processId:'processId',
+ historicaltasks1:'historicaltasks1',
+ historicaltasks2:'historicaltasks2',
+ historicaltasks3:'historicaltasks3',
+ historicaltasks4:'historicaltasks4',
+ historicaltasks5:'historicaltasks5',
+ historicaltasks6:'historicaltasks6',
+ historicaltasks7:'historicaltasks7',
+ date:'date',
+ countOutOne:'countOutOne',
+ totalAreaOutOne:'totalAreaOutOne',
+ countOutTwo:'countOutTwo',
+ totalAreaOutTwo:'totalAreaOutTwo',
+ countIn:'countIn',
+ totalAreaIn:'totalAreaIn',
+ countOut:'countOut',
+ totalAreaOut:'totalAreaOut',
+ hollowCountOutOne:'hollowCountOutOne',
+ hollowTotalAreaOutOne:'hollowTotalAreaOutOne',
+ countOut:'countOut',
+ hollowCountOutTwo:'hollowCountOutTwo',
},
reportmanage:{
productiontime :'production time',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 63fca01..e4c7426 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -567,6 +567,31 @@
reportWorkQuantity:'瀹屽伐鏁伴噺',
reportWorkQuantityCount:'鐮存崯鏁伴噺',
processId:'娴佺▼鍗″彿',
+
+ historicaltasks1:'鍘熺墖浠撳偍',
+ historicaltasks2:'涓婄墖涓�绾�',
+ historicaltasks3:'涓婄墖浜岀嚎',
+ historicaltasks4:'纾ㄨ竟浠诲姟',
+ historicaltasks5:'鍗у紡涓�绾�',
+ historicaltasks6:'鍗у紡浜岀嚎',
+ historicaltasks7:'閽㈠寲澶х悊鐗�',
+ historicaltasks8:'涓┖涓�绾�',
+ historicaltasks9:'涓┖浜岀嚎',
+ historicaltasks10:'涓┖澶х悊鐗�',
+ historicaltasks11:'鐢熶骇缁熻',
+ date:'鏃ユ湡',
+ countOutOne:'鍒囧壊涓�绾挎暟閲�',
+ totalAreaOutOne:'鍒囧壊涓�绾块潰绉�',
+ countOutTwo:'鍒囧壊浜岀嚎鏁伴噺',
+ totalAreaOutTwo:'鍒囧壊涓�绾块潰绉�',
+ countIn:'閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ totalAreaIn:'閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
+ countOut:'閽㈠寲鏁伴噺',
+ totalAreaOut:'閽㈠寲闈㈢Н',
+ hollowCountOutOne:'涓┖涓�绾挎暟閲�',
+ hollowTotalAreaOutOne:'涓┖涓�绾块潰绉�',
+ countOut:'涓┖浜岀嚎鏁伴噺',
+ hollowCountOutTwo:'涓┖涓�绾块潰绉�',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index ad0ba8d..9851eb8 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -446,6 +446,18 @@
},
]
},
+ {
+ path: '/statistics',
+ name: 'statistics',
+ component: () => import('../views/largescreendisplay/statistics.vue'),
+ children: [
+ {
+ path: '/largescreendisplay/statistics',
+ name: 'statistics',
+ component: () => import('../views/largescreendisplay/statistics.vue')
+ },
+ ]
+ },
]
})
// 瀵艰埅瀹堝崼
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 2ce830e..26cb371 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -31,11 +31,11 @@
edgTwoTasks.value = data.edgTwoTasks[0];
engineeringOne.value = data.engineeringOne[0];
engineeringTwo.value = data.engineeringTwo[0];
- if(numBoxes.value != edgOneTasks.value.length){
+ if (numBoxes.value != edgOneTasks.value.length) {
numBoxes.value = edgOneTasks.value.length;
boxStart();
}
- if(numBoxes2.value != edgTwoTasks.value.length){
+ if (numBoxes2.value != edgTwoTasks.value.length) {
numBoxes2.value = edgTwoTasks.value.length;
boxStart2();
}
@@ -48,13 +48,13 @@
const handleMessage2 = (data) => {
temperingTaskType.value = data.temperingTaskType[0];
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
- if(numBoxes3.value !=temperingTaskType.value){
- numBoxes3.value =temperingTaskType.value;
+ if (numBoxes3.value != temperingTaskType.value) {
+ numBoxes3.value = temperingTaskType.value;
boxStart3();
}
temperingGlassInfoOutList.value = data.temperingGlassInfoOutList[0];
- if(numBoxes4.value !=temperingGlassInfoOutList.value){
- numBoxes4.value =temperingGlassInfoOutList.value;
+ if (numBoxes4.value != temperingGlassInfoOutList.value) {
+ numBoxes4.value = temperingGlassInfoOutList.value;
boxStart3();
}
};
@@ -70,6 +70,13 @@
const handleMessage4 = (data) => {
hollowBigStorageCageUsage.value = data.hollowBigStorageCageUsage[0];
};
+let socket5 = null;
+const productionVO = ref([])
+const socketUrl5 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreenProduction`;
+const handleMessage5 = (data) => {
+ productionVO.value = data.productionVO;
+};
+
const tableDatad = ref([]);
const patternUsage = async () => {
try {
@@ -85,7 +92,45 @@
console.error(error);
}
}
-const ptnusage=ref({
+
+const tableData = ref([]);
+const dynamicColumns = ref([]);
+const flowCardDetail = async (orderId) => {
+ blinda.value= true;
+ try {
+ const response = await request.post('/glassStorage/flow_card/flowCardReportForms?orderId=' + orderId );
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableData.value = response.data;
+ // 瑙ｆ瀽鏁版嵁骞剁敓鎴愬姩鎬佸垪
+ if (response.data.length > 0) {
+ // 瑙ｆ瀽绗竴涓璞＄殑 reportWorkQuantity锛岀‘瀹氬姩鎬佸垪
+ const firstItem = response.data[0];
+ const reportData = JSON.parse(firstItem.reportWorkQuantity || "{}");
+ dynamicColumns.value = Object.keys(reportData).map((key) => ({
+ prop: key,
+ label: key,
+ }));
+
+ // 瑙ｆ瀽鏁版嵁骞跺皢 JSON 瀛楃涓茶浆鎹负瀵硅薄
+ tableData.value = response.data.map((item) => {
+ const reportData = JSON.parse(item.reportWorkQuantity || "{}");
+ return {
+ ...item,
+ ...reportData, // 鎶� JSON 瀛楁鍚堝苟鍒板钩閾哄璞�
+ };
+ });
+ }
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+
+const ptnusage = ref({
width: '',
height: '',
thickness: '',
@@ -108,6 +153,7 @@
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'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
// 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
@@ -123,6 +169,7 @@
closeWebSocket(socket2);
closeWebSocket(socket3);
closeWebSocket(socket4);
+ closeWebSocket(socket5);
}
});
onBeforeUnmount(() => {
@@ -130,7 +177,7 @@
closeWebSocket();
});
const numBoxes = ref(5);
-const numBoxes2 = ref(5);
+const numBoxes2 = ref(5);
const numBoxes3 = ref(5);
const numBoxes4 = ref(1);
const speed = 0.1;
@@ -151,74 +198,74 @@
const boxStart = () => {
boxes.value = [];
for (let i = 0; i < numBoxes.value; i++) {
- boxes.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'up',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
-}
+ boxes.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'up',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+ }
}
const boxStart2 = () => {
boxes2.value = [];
for (let i = 0; i < numBoxes2.value; i++) {
- boxes2.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'up',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
-}
+ boxes2.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'up',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+ }
}
const boxStart3 = () => {
boxes3.value = [];
for (let i = 0; i < numBoxes3.value; i++) {
- boxes3.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'left',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
-}
+ boxes3.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'left',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+ }
}
const boxStart4 = () => {
boxes4.value = [];
for (let i = 0; i < numBoxes4.value; i++) {
- boxes4.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'right',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
-}
+ boxes4.value.push({
+ x: 0,
+ y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
+ direction: 'right',
+ delay: i * delayFrames,
+ style: {
+ width: '15px',
+ height: '15px',
+ backgroundColor: i % 2 === 0 ? '#911005' : 'blue',
+ position: 'absolute',
+ transform: `translate(0px, 0px)`
+ }
+ });
+ }
}
const animate = () => {
boxes.value.forEach((box) => {
@@ -285,7 +332,7 @@
} else if (box.direction === 'left') {
box.x -= speed;
if (box.x <= -maxX3) {
-
+
box.direction = 'up';
}
}
@@ -306,7 +353,7 @@
box.x = 0;
box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
}
- }
+ }
box.style = {
...box.style,
transform: `translate(${box.x}px, ${box.y}px)`
@@ -314,67 +361,216 @@
});
requestAnimationFrame(animate);
};
+//宓屽叆鍘嗗彶浠诲姟
+const iframeUrl1 = ref('');
+const iframe1 = ref(false);
+const handlehistorical1 = () => {
+ iframe1.value = true;
+ iframeUrl1.value = `${window.location.origin}/#/GlassStorage/rawhistory`;
+};
+const iframeUrl2 = ref('');
+const iframe2 = ref(false);
+const handlehistorical2 = () => {
+ iframe2.value = true;
+ iframeUrl2.value =`${window.location.origin}/#/Returns/upreturnhistory`;;
+};
+const iframeUrl3 = ref('');
+const iframe3 = ref(false);
+const handlehistorical3 = () => {
+ iframe3.value = true;
+ iframeUrl3.value = `${window.location.origin}/#/Returns/upreturnhistory2`;
+};
+const iframeUrl4 = ref('');
+const iframe4 = ref(false);
+const handlehistorical4 = () => {
+ iframe4.value = true;
+
+ iframeUrl4.value =`${window.location.origin}/#/StockBasicData/stockhistory`;;
+};
+const iframeUrl5 = ref('');
+const iframe5 = ref(false);
+const handlehistorical5 = () => {
+ iframe5.value = true;
+ iframeUrl5.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
+ iframeUrl5.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
+};
+const iframeUrl6 = ref('');
+const iframe6 = ref(false);
+const handlehistorical6 = () => {
+ iframe6.value = true;
+ iframeUrl6.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
+};
+const iframeUrl7 = ref('');
+const iframe7 = ref(false);
+const handlehistorical7 = () => {
+ iframe7.value = true;
+ iframeUrl7.value = `${window.location.origin}/#/hollow/hellowquiptwohistory`;
+};
+const iframeUrl8 = ref('');
+const iframe8 = ref(false);
+const handlehistorical8 = () => {
+ iframe8.value = true;
+ iframeUrl8.value = `${window.location.origin}/#/hollow/hellowquiptwohistory`;
+};
+const iframeUrl9 = ref('');
+const iframe9 = ref(false);
+const handlehistorical9 = () => {
+ iframe9.value = true;
+ iframeUrl9.value = `${window.location.origin}/#/largescreendisplay/statistics`;
+};
</script>
<template>
<div style="height: 500px;">
-
+ <el-dialog v-model="iframe1" top="10vh" width="95%">
+ <iframe :src="iframeUrl1" marginwidth="2000px" marginheight="2000px" width="100%" height="700px" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe2" top="10vh" width="95%">
+ <iframe :src="iframeUrl2" marginwidth="2000px" marginheight="2000px" width="100%" height="700px" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe3" top="10vh" width="95%">
+ <iframe :src="iframeUrl3" marginwidth="2000px" marginheight="2000px" width="100%" height="700" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe4" top="10vh" width="95%">
+ <iframe :src="iframeUrl4" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe5" top="10vh" width="95%">
+ <iframe :src="iframeUrl5" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe6" top="10vh" width="95%">
+ <iframe :src="iframeUrl6" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe7" top="10vh" width="95%">
+ <iframe :src="iframeUrl7" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ </el-dialog>
+ <el-dialog v-model="iframe9" top="10vh" width="95%">
+ <iframe :src="iframeUrl9" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ </el-dialog>
+ <!-- 鐢熶骇缁熻 -->
+ <div style="height: 190px;width: 43%;float: right;position: absolute;" @click="handlehistorical9">
+ <el-table height="700" ref="table" :data="productionVO"
+ :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" />
+ <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
+ <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
+ <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="40" />
+ <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="40" />
+ <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="40" />
+ <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
+ <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
+ <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')" min-width="40" />
+ <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
+ <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
+ <!-- <el-table-column align="center" :label="$t('large.operate')" min-width="50">
+ <template #default="scope">
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"
+ @click="flowCardDetail(scope.row.orderId)">{{ $t('large.mes') }}</el-button>
+ </template>
+ </el-table-column> -->
+ </el-table>
+ </div>
<div class="awatch">
<div class="img-screen" alt="Screen">
<!-- 閽㈠寲鑹插潡 -->
- <div v-if="temperingGlassInfoList>0" class="tempering" style="width: 50px;height: 22px;top: 354px;left: 228px;position: absolute;background-color: #911005;"></div>
- <div v-if="temperingGlassInfoList>1" class="tempering" style="width: 50px;height: 22px;top: 354px;left: 284px;position: absolute;background-color: #911005;"></div>
+ <div v-if="temperingGlassInfoList > 0" class="tempering"
+ style="width: 50px;height: 22px;top: 354px;left: 228px;position: absolute;background-color: #911005;"></div>
+ <div v-if="temperingGlassInfoList > 1" class="tempering"
+ style="width: 50px;height: 22px;top: 354px;left: 284px;position: absolute;background-color: #911005;"></div>
<!-- 鍒囧壊鍙拌壊鍧� -->
- <div v-if="engineeringOne.length>1" class="slicing" style="width: 50px;height: 22px;top: 575px;left: 453px;position: absolute;background-color: #911005;"></div>
- <div v-if="engineeringTwo.length>1" class="slicing" style="width: 50px;height: 22px;top: 625px;left: 453px;position: absolute;background-color: #911005;"></div>
+ <div v-if="engineeringOne.length > 1" class="slicing"
+ style="width: 50px;height: 22px;top: 575px;left: 453px;position: absolute;background-color: #911005;"></div>
+ <div v-if="engineeringTwo.length > 1" class="slicing"
+ style="width: 50px;height: 22px;top: 625px;left: 453px;position: absolute;background-color: #911005;"></div>
<!-- 鍘熺墖浠撳偍鑹插潡 -->
<div class="raw" style="width: 31px;height: 32px;top: 571px;left: 300px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(0,7)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: #911005;"'></div>
+ <div v-for="(item, index) in rawGlassStorageDetailList.slice(0, 7)" :key="index"
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
</div>
<div class="raw" style="width: 31px;height: 47px;top: 610px;left: 300px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(8,17)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: #911005;"'></div>
+ <div v-for="(item, index) in rawGlassStorageDetailList.slice(8, 17)" :key="index"
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
</div>
<div class="raw" style="width: 31px;height: 13px;top: 675px;left: 300px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(18,20)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: #911005;"'></div>
+ <div v-for="(item, index) in rawGlassStorageDetailList.slice(18, 20)" :key="index"
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
</div>
<div class="raw" style="width: 31px;height: 22px;top: 657px;left: 370px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(21,25)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: #911005;"'></div>
+ <div v-for="(item, index) in rawGlassStorageDetailList.slice(21, 25)" :key="index"
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
</div>
<div class="raw" style="width: 31px;height: 9px;top: 561px;left: 370px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(26,27)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: #911005;"'></div>
+ <div v-for="(item, index) in rawGlassStorageDetailList.slice(26, 27)" :key="index"
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
</div>
<div class="raw" style="width: 31px;height: 9px;top: 612px;left: 370px;position: absolute;">
- <div v-for="(item,index) in rawGlassStorageDetailList.slice(28,29)" :key="index" :style='"width: "+(item.remainQuantity / 5)+"px;height: 5px;background-color: #911005;"'></div>
+ <div v-for="(item, index) in rawGlassStorageDetailList.slice(28, 29)" :key="index"
+ :style='"width: " + (item.remainQuantity / 5) + "px;height: 5px;background-color: #911005;"'></div>
</div>
<!-- 纾ㄨ竟鑹插潡 -->
- <div class="container" style="position: relative;width: 20px;height: 20px;top: 572px;left: 648px;border: 1px solid #000;position: absolute;">
- <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
+ <div class="container"
+ style="position: relative;width: 20px;height: 20px;top: 572px;left: 648px;position: absolute;">
+ <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style" ></div>
</div>
- <div class="container" style="position: relative;width: 20px;height: 20px;top: 625px;left: 700px;border: 1px solid #000;position: absolute;">
- <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style"></div>
+ <div class="container"
+ style="position: relative;width: 20px;height: 20px;top: 625px;left: 700px;position: absolute;">
+ <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style" ></div>
</div>
<!-- 閽㈠寲杩愬姩鑹插潡 -->
- <div class="container" style="position: relative;width: 20px;height: 20px;top: 438px;left: 196px;border: 1px solid #000;position: absolute;">
+ <div class="container"
+ style="position: relative;width: 20px;height: 20px;top: 438px;left: 196px;position: absolute;">
<div v-for="(box, index) in boxes3" :key="index" class="box" :style="box.style"></div>
</div>
- <div class="container" style="position: relative;width: 20px;height: 20px;top: 355px;left: 496px;border: 1px solid #000;position: absolute;">
+ <div class="container"
+ style="position: relative;width: 20px;height: 20px;top: 355px;left: 496px;position: absolute;">
<div v-for="(box, index) in boxes4" :key="index" class="box" :style="box.style"></div>
</div>
<!-- 閽㈠寲鍓嶅ぇ鐞嗙墖鑹插潡 -->
- <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(0,1)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 447px;left: 314px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(1,2)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 463px;left: 314px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(2,3)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 478px;left: 314px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in bigStorageCageUsage.slice(3,4)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 493px;left: 314px;position: absolute;background-color: #911005;"'></div>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(0, 1)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 447px;left: 314px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(1, 2)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 463px;left: 314px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(2, 3)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 478px;left: 314px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in bigStorageCageUsage.slice(3, 4)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 493px;left: 314px;position: absolute;background-color: #911005;"'>
+ </div>
<!-- 涓┖鍓嶅ぇ鐞嗙墖鑹插潡 -->
- <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(0,1)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 337px;left: 671px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(1,2)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 353px;left: 671px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(2,3)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 369px;left: 671px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(3,4)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 385px;left: 671px;position: absolute;background-color: #911005;"'></div>
- <div class="container" v-for="(item,index) in hollowBigStorageCageUsage.slice(4,5)" :key="index" :style='"position: relative;width: "+(38*item.percentage/100)+"px;height: 13px;top: 401px;left: 671px;position: absolute;background-color: #911005;"'></div>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(0, 1)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 337px;left: 671px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(1, 2)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 353px;left: 671px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(2, 3)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 369px;left: 671px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(3, 4)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 385px;left: 671px;position: absolute;background-color: #911005;"'>
+ </div>
+ <div class="container" v-for="(item, index) in hollowBigStorageCageUsage.slice(4, 5)" :key="index"
+ :style='"position: relative;width: " + (38 * item.percentage / 100) + "px;height: 13px;top: 401px;left: 671px;position: absolute;background-color: #911005;"'>
+ </div>
</div>
+
<div class="clickable-area" @click="handlehistorical"
- style="position: relative;width: 110px;height: 140px;top: 603px;left: 297px;"></div>
+ style="position: relative;width: 110px;height: 100px;top: 603px;left: 297px;"></div>
</div>
+ <!-- 璁㈠崟鎯呭喌 -->
<div style="height: 190px;width: 48%;float: right;">
+ <div>
+ <el-button style="margin-top: 5px;margin-left: 50px;" id="searchButton" type="info" @click="handlehistorical1">{{ $t('large.historicaltasks1') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical2">{{ $t('large.historicaltasks2') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical3">{{ $t('large.historicaltasks3') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical4">{{ $t('large.historicaltasks4') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical5">{{ $t('large.historicaltasks5') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical7">{{ $t('large.historicaltasks7') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical6">{{ $t('large.historicaltasks6') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical8">{{ $t('large.historicaltasks8') }}</el-button>
+ </div>
<el-table height="700" ref="table" :data="orderDTOS"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
@@ -384,47 +580,26 @@
<el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
<el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
<el-table-column prop="percent" align="center" :label="$t('large.percent')" min-width="50" />
- <!-- <el-table-column align="center" :label="$t('large.warehousing')" min-width="50" prop="warehousing">
+ <el-table-column align="center" :label="$t('large.operate')" min-width="50">
<template #default="scope">
- <el-tag :type="getStatusType(scope.row.warehousing)">
- {{ getStatusText(scope.row.warehousing) }}
- </el-tag>
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"
+ @click="flowCardDetail(scope.row.orderId)">{{ $t('large.mes') }}</el-button>
</template>
- </el-table-column> -->
- <!-- <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-column>
</el-table>
</div>
</div>
- <!-- 鐐瑰嚮涓嬫柟寮圭獥 -->
+ <!-- 鍘熺墖浣跨敤璇︽儏 -->
<el-dialog v-model="blindb" top="10vh" width="90%">
<div style="display: flex;">
- <el-input v-model="ptnusage.width" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable :placeholder="$t('screendisplay.pwidth')" />
- <el-input v-model="ptnusage.height" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable :placeholder="$t('screendisplay.pheight')" />
- <el-input v-model="ptnusage.thickness" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable :placeholder="$t('searchOrder.inthickness')" />
- <el-input v-model="ptnusage.films" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable :placeholder="$t('film.infilms')" />
- <!-- <el-select :placeholder="$t('basicData.coatingtypes')" clearable style="width: 270px;margin-left: 10px;"
- v-model="taskStat">
- <el-option v-for="item in optionsa" :key="item.value" :label="item.label" :value="item.value" />
- </el-select> -->
- <!-- <span class="demonstration" style="margin-left: 20px;margin-top: 3px;">{{ $t('workOrder.time') }}</span> -->
- <!-- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
- style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker> -->
- <!-- <el-date-picker
- v-model="timeRange"
- type="datetimerange"
- range-separator="鑷�"
- :start-placeholder="$t('reportmanage.starttime')"
- style="margin-left: 15px;"
- value-format="YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
- </el-date-picker> -->
+ <el-input v-model="ptnusage.width" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable
+ :placeholder="$t('screendisplay.pwidth')" />
+ <el-input v-model="ptnusage.height" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable
+ :placeholder="$t('screendisplay.pheight')" />
+ <el-input v-model="ptnusage.thickness" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable
+ :placeholder="$t('searchOrder.inthickness')" />
+ <el-input v-model="ptnusage.films" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" clearable
+ :placeholder="$t('film.infilms')" />
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="patternUsage()">{{
$t('reportmanage.inquire')
}}</el-button>
@@ -441,36 +616,33 @@
<el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="120" />
</el-table>
</el-dialog>
+ <!-- 娴佺▼鍗¤繘搴� -->
<el-dialog v-model="blinda" top="5vh" width="85%">
<el-table height="650" ref="table" :data="tableData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
- <el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId1')" 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="processId" fixed align="center" :label="$t('large.processId')" min-width="110" />
+ <el-table-column prop="glassChild" align="center" :label="$t('large.productname')" 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="technologyNumber" align="center" :label="$t('large.slicemarker')" 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="quantity" align="center" :label="$t('large.quantity')" min-width="110" />
+ <el-table-column prop="brokenNum" align="center" :label="$t('large.brokenNum')" min-width="100" />
+ <el-table-column prop="inventory" align="center" :label="$t('large.inventory')" min-width="100" />
+ <el-table-column prop="inventoryArea" align="center" :label="$t('large.inventoryarea')" min-width="100" />
+ <el-table-column prop="shippedQuantity" align="center" :label="$t('large.shippedQuantity')" min-width="110" />
+ <!-- <el-table-column prop="reportWorkQuantity" align="center" :label="$t('large.reportWorkQuantity')" min-width="110" />
+ <el-table-column prop="reportWorkQuantityCount" align="center" :label="$t('large.reportWorkQuantityCount')" min-width="110" /> -->
+ <!-- 鍔ㄦ�佺敓鎴愮殑 reportWorkQuantity 鍒� -->
+ <el-table-column
+ v-for="column in dynamicColumns"
+ :key="column.prop"
+ :prop="column.prop"
+ :label="column.label"
+ align="center"
+ min-width="110"
+ />
</el-table>
- <template #footer>
- <div id="dialog-footer" style="text-align: center;">
- <el-button @click="blinda = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
</el-dialog>
</template>
<style scoped>
@@ -480,16 +652,19 @@
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;
@@ -499,9 +674,11 @@
background-color: #337ecc;
margin-left: 28%;
}
+
#awatch {
height: 460px;
}
+
.img-screen {
max-width: 48%;
max-height: 100%;
@@ -518,6 +695,7 @@
height: 0;
padding-bottom: 50%; */
}
+
.clickable-area {
cursor: pointer;
/* 鎸囩ず杩欐槸涓�涓彲鐐瑰嚮鐨勫尯鍩� */
@@ -526,6 +704,7 @@
line-height: 95px;
/* 濡傛灉闇�瑕侊紝浣挎枃鏈瀭鐩村眳涓� */
}
+
/* .awatch{
height: 460px;
/* max-width: 100%; */
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
new file mode 100644
index 0000000..fd0d194
--- /dev/null
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -0,0 +1,238 @@
+<template>
+ <div>
+ <div style="display: flex;width: 1770px;">
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�"
+ :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 15px;" value-format="YYYY-MM-DD hh:mm:ss"
+ :end-placeholder="$t('reportmanage.endtime')">
+ </el-date-picker>
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"
+ @click="sethistorical()">{{ $t('reportmanage.inquire') }}</el-button>
+ </div>
+ <el-table 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" />
+ <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
+ <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
+ <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="40" />
+ <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="40" />
+ <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="40" />
+ <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
+ <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
+ <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')"
+ min-width="40" />
+ <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
+ <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
+ </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 } 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'
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+import { inject } from 'vue';
+const globalDate = inject('globalDate');
+const router = useRouter()
+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.post("/loadGlass/largenScreen/queryDailyProduction", {
+ pageNo: 1,
+ pageSize: 20,
+ beginDate: startTime,
+ endDate: getglobalDate
+ })
+ 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.records;
+ tableDatax.value = formattedData;
+ console.log(response.data.pages);
+ totalRecords.value = response.data.total / 2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+const handlePageChange2 = (newPage) => {
+ currentPage2.value = newPage;
+ console.log(currentPage2.value);
+ window.localStorage.setItem('pagenumber', currentPage2.value)
+ historicala(currentPage2.value);
+};
+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.post("/loadGlass/largenScreen/queryDailyProduction", {
+ pageNo: page,
+ pageSize: 20,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && 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.records;
+ 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')
+ console.log(page);
+ const response = await request.post("/loadGlass/largenScreen/queryDailyProduction", {
+ pageNo: 1,
+ pageSize: 20,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && 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.records;
+ 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}`;
+}
+// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
+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澶�
+ console.log(formatTimestamp(oneWeekAgo));
+ console.log(oneWeekAgo);
+ 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';
+ }
+}
+function getStatusTexta(taskRunning: number) {
+ switch (taskRunning) {
+ case 0:
+ return t('basicData.untask');
+ case 1:
+ return t('basicData.up');
+ }
+}
+onMounted(() => {
+ parseAndSetTime();
+ historical();
+});
+</script>
+<style scoped></style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 4e5b280..7d98caa 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -55,8 +55,8 @@
WorkAssignmentMapper workAssignmentMapper;
- // private final static String ERP_URL = "http://192.168.2.100:8086";
- private final static String ERP_URL = "http://10.153.19.174:8086";
+// private final static String ERP_URL = "http://192.168.2.100:8086";
+ private final static String ERP_URL = "http://10.153.19.26:8086";
/**
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java
index a265c19..670a88a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/FlowCardController.java
@@ -1,9 +1,19 @@
package com.mes.pp.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.pp.service.FlowCardService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -13,9 +23,19 @@
* @author wu
* @since 2024-08-07
*/
+@Api(tags = "娴佺▼鍗�")
@RestController
-@RequestMapping("/flow_card/flow-card")
+@RequestMapping("/flow_card")
public class FlowCardController {
+ @Resource
+ FlowCardService flowCardService;
+
+ @ApiOperation("鏍规嵁璁㈠崟id鏌ヨ娴佺▼鍗¤繘搴�")
+ @PostMapping("/flowCardReportForms")
+ public Result flowCardReportForms(String orderId) {
+ return Result.build(200, "鏌ヨ鎴愬姛", flowCardService.flowCardReportForms(orderId));
+ }
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
index ecebba7..ab9dd3e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/dto/FlowCardDTO.java
@@ -53,6 +53,16 @@
private Integer technologyNumber;
/**
+ * 璁㈠崟搴忓彿
+ */
+ private Double width;
+
+ /**
+ * 灞傚彿
+ */
+ private Double height;
+
+ /**
* 璁㈠崟鏁伴噺
*/
private Integer quantity;
@@ -75,7 +85,7 @@
/**
* 鐮存崯鏁伴噺
*/
- private String broken_num;
+ private String brokenNum;
/**
* 搴撳瓨鏁伴噺
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/FlowCardMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/FlowCardMapper.java
index 865ca5c..b1b4828 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/FlowCardMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/FlowCardMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.mes.pp.entity.FlowCard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.pp.entity.dto.FlowCardDTO;
import feign.Param;
import java.util.List;
@@ -10,7 +11,7 @@
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author wu
@@ -19,9 +20,12 @@
@DS("pp")
public interface FlowCardMapper extends BaseMapper<FlowCard> {
- List<Map<String, Object>> selectProject(@Param("processId") String processId,@Param("technologyNumber") Integer technologyNumber);
+ List<Map<String, Object>> selectProject(@Param("processId") String processId, @Param("technologyNumber") Integer technologyNumber);
- List<Map<String, Object>> selectFlowCard(@Param("processId") String processId,@Param("technologyNumber") Integer technologyNumber);
+ List<Map<String, Object>> selectFlowCard(@Param("processId") String processId, @Param("technologyNumber") Integer technologyNumber);
- List<Map<String, Object>> selectLabel(@Param("processId") String processId,@Param("technologyNumber") Integer technologyNumber);
+ List<Map<String, Object>> selectLabel(@Param("processId") String processId, @Param("technologyNumber") Integer technologyNumber);
+
+ List<FlowCardDTO> flowCardReportForms(@Param("orderId") String orderId);
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/FlowCardService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/FlowCardService.java
index 7120afb..70728a9 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/FlowCardService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/FlowCardService.java
@@ -2,6 +2,7 @@
import com.mes.pp.entity.FlowCard;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.pp.entity.dto.FlowCardDTO;
import java.util.List;
import java.util.Map;
@@ -21,4 +22,6 @@
List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber);
List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber);
+
+ List<FlowCardDTO> flowCardReportForms(String orderId);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
index 3fed7cc..74225cc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
@@ -1,6 +1,7 @@
package com.mes.pp.service.impl;
import com.mes.pp.entity.FlowCard;
+import com.mes.pp.entity.dto.FlowCardDTO;
import com.mes.pp.mapper.FlowCardMapper;
import com.mes.pp.service.FlowCardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,7 +12,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -21,17 +22,22 @@
public class FlowCardServiceImpl extends ServiceImpl<FlowCardMapper, FlowCard> implements FlowCardService {
@Override
- public List<Map<String, Object>> selectProject(String processId, Integer technologyNumber){
- return baseMapper.selectProject(processId,technologyNumber);
+ public List<Map<String, Object>> selectProject(String processId, Integer technologyNumber) {
+ return baseMapper.selectProject(processId, technologyNumber);
}
@Override
- public List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber){
+ public List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber) {
return baseMapper.selectFlowCard(processId, technologyNumber);
}
@Override
- public List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber){
+ public List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber) {
return baseMapper.selectLabel(processId, technologyNumber);
}
+
+ @Override
+ public List<FlowCardDTO> flowCardReportForms(String orderId) {
+ return baseMapper.flowCardReportForms(orderId);
+ }
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
index 40292ce..62b8661 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/FlowCardMapper.xml
@@ -122,5 +122,66 @@
group by od.order_number, od.width, od.height
</select>
+ <select id="flowCardReportForms" resultType="com.mes.pp.entity.dto.FlowCardDTO">
+ select a.product_name,
+ b.glass_child,
+ d.order_type,
+ concat(c.process_id, '/', c.technology_number) as process_id,
+ c.order_number,
+ c.technology_number,
+ a.width,
+ a.height,
+ c.quantity,
+ e.reportWorkQuantity,
+ e.reportWorkQuantityCount,
+ e.reportWorkTime,
+ e.brokenNum ,
+ ifnull(f.inventory, 0) as inventory,
+ round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
+ ifnull(dd.quantity, 0) as shippedQuantity,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')), '') AS glassNumber
+ from pp.flow_card as c
+ left join
+ sd.order_detail as a
+ on c.order_id = a.order_id
+ and c.order_number = a.order_number
+ left join sd.order_glass_detail as b
+ on c.order_id = b.order_id
+ and b.order_number = c.order_number
+ and c.technology_number = b.technology_number
+ left join sd.`order` as d
+ on c.order_id = d.order_id
+ left join mm.finished_goods_inventory as f
+ on c.order_id = f.order_id and f.order_number = c.order_number
+ left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
+ left join (SELECT process_id,
+ order_number,
+ technology_number,
+ ifnull(sum(a.broken_num),0) as brokenNum,
+ concat('{',
+ GROUP_CONCAT(concat('"', process, '":"', reporting_work_num, '"')),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat('"', process, '":"', reporting_work_num_count, '"')),
+ '}'
+ ) as reportWorkQuantityCount,
+ concat('{',
+ GROUP_CONCAT(concat('"', process, '":"', '"')),
+ '}'
+ ) as reportWorkTime
+ FROM sd.order_process_detail as a
+ where a.order_id = #{orderId}
+ GROUP BY process_id, a.order_number, a.technology_number) as e
+ on e.process_id = c.process_id
+ and e.technology_number = c.technology_number
+ and e.order_number = c.order_number
+ where a.order_id = #{orderId}
+ and d.create_order > 0
+ group by c.order_number,
+ c.technology_number,
+ c.process_id
+ order by c.process_id, c.order_number, c.technology_number
+ </select>
</mapper>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index ca32684..bf42980 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -11,6 +11,7 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.DateRequest;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -146,10 +147,10 @@
}
}
- @Scheduled(fixedDelay = 30000)
+ @Scheduled(fixedDelay = 1000)
public void querySameDayProductionTask() {
JSONObject jsonObject = new JSONObject();
- DailyProductionVO productionVO = largenScreenService.querySameDayProduction(null);
+ DailyProductionVO productionVO = largenScreenService.querySameDayProduction(new DateRequest());
jsonObject.append("productionVO", productionVO);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index 62af15a..c7451b1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -183,7 +183,7 @@
// damageService.insertDamage(damage);
Damage damage=damageService.getOne(
new LambdaQueryWrapper<Damage>()
- .eq(Damage::getGlassId,"P24082703|1|80")
+ .eq(Damage::getGlassId,"P24071503|12|4")
);
damageService.submitReport(damage);
}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
index a43235c..283a128 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -28,10 +28,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -368,7 +365,11 @@
}
));
List<FlowCardGlassInfoDTO> resultList = new ArrayList<>(result.values());
- return resultList;
+ List<FlowCardGlassInfoDTO> sortedList = resultList.stream()
+ .sorted(Comparator.comparing(FlowCardGlassInfoDTO::getRealCount).reversed() // 绗竴涓瓧娈靛�掑簭
+ .thenComparing(FlowCardGlassInfoDTO::getSumCount, Comparator.reverseOrder())) // 绗簩涓瓧娈靛�掑簭
+ .collect(Collectors.toList());
+ return sortedList;
}
@Override
--
Gitblit v1.8.0