From ed722acfaf6f10ba2e6c3e1b4d68a2552bdde245 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 16:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java | 2
UI-Project/src/lang/zh.js | 15 +++----
UI-Project/src/views/largescreendisplay/screendisplay.vue | 50 +++++++++++++++---------
3 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index a157b3a..875f0a2 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -573,14 +573,13 @@
historicaltasks1:'鍘熺墖浠撳偍',
historicaltasks2:'涓婄墖涓�绾�',
historicaltasks3:'涓婄墖浜岀嚎',
- historicaltasks4:'纾ㄨ竟浠诲姟',
- historicaltasks5:'鍗у紡涓�绾�',
- historicaltasks6:'鍗у紡浜岀嚎',
- historicaltasks7:'閽㈠寲澶х悊鐗�',
- historicaltasks8:'涓┖涓�绾�',
- historicaltasks9:'涓┖浜岀嚎',
- historicaltasks10:'涓┖澶х悊鐗�',
- historicaltasks11:'鐢熶骇缁熻',
+ historicaltasks4:'鍗у紡涓�绾�',
+ historicaltasks5:'鍗у紡浜岀嚎',
+ historicaltasks6:'閽㈠寲澶х悊鐗�',
+ historicaltasks7:'涓┖涓�绾�',
+ historicaltasks8:'涓┖浜岀嚎',
+ historicaltasks9:'涓┖澶х悊鐗�',
+ historicaltasks10:'鐢熶骇缁熻',
date:'鏃ユ湡',
countOutOne: '鍒囧壊涓�绾挎暟閲�',
totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index ff2b4c3..427749a 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -385,27 +385,25 @@
const iframe4 = ref(false);
const handlehistorical4 = () => {
iframe4.value = true;
-
- iframeUrl4.value =`${window.location.origin}/#/StockBasicData/stockhistory`;;
+ iframeUrl4.value =`${window.location.origin}/#/Caching/cachingbeforehistory`;
};
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`;
+ iframeUrl5.value = `${window.location.origin}/#/Caching/cachingunhistory`;
};
const iframeUrl6 = ref('');
const iframe6 = ref(false);
const handlehistorical6 = () => {
iframe6.value = true;
- iframeUrl6.value = `${window.location.origin}/#/Slicecage/slicecagehistory`;
+ 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`;
+ iframeUrl7.value = `${window.location.origin}/#/hollow/hellowquiphistory`;
};
const iframeUrl8 = ref('');
const iframe8 = ref(false);
@@ -417,7 +415,13 @@
const iframe9 = ref(false);
const handlehistorical9 = () => {
iframe9.value = true;
- iframeUrl9.value = `${window.location.origin}/#/largescreendisplay/statistics`;
+ iframeUrl9.value = `${window.location.origin}/#/hollow/hellowslicecagehistory`;
+};
+const iframeUrl10 = ref('');
+const iframe10 = ref(false);
+const handlehistorical10 = () => {
+ iframe10.value = true;
+ iframeUrl10.value = `${window.location.origin}/#/largescreendisplay/statistics`;
};
</script>
<template>
@@ -443,11 +447,17 @@
<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="iframe8" top="10vh" width="95%">
+ <iframe :src="iframeUrl8" 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>
+ <el-dialog v-model="iframe10" top="10vh" width="95%">
+ <iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px" frameborder="0"></iframe>
+ </el-dialog>
<!-- 鐢熶骇缁熻 -->
- <div style="height: 190px;width: 88%;float: right;position: absolute;" @click="handlehistorical9">
+ <div style="height: 100px;width: 88%;float: right;position: absolute;" @click="handlehistorical10">
<el-table height="100" 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" />
@@ -562,17 +572,19 @@
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> -->
+ <div style="height: 190px;width: 52%;float: right;">
+ <div>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical1">{{ $t('large.historicaltasks1') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical2">{{ $t('large.historicaltasks2') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical3">{{ $t('large.historicaltasks3') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical4">{{ $t('large.historicaltasks4') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical5">{{ $t('large.historicaltasks5') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical6">{{ $t('large.historicaltasks6') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical7">{{ $t('large.historicaltasks7') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical8">{{ $t('large.historicaltasks8') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 5px;" id="searchButton" type="info" @click="handlehistorical9">{{ $t('large.historicaltasks9') }}</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" />
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java
index 84b1f1c..45774e9 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java
@@ -82,7 +82,7 @@
// 2灏嗙┖鏍煎瓙鐨勫昂瀵哥疆涓哄垵濮嬪昂瀵�
this.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
.set(HollowBigStorageCage::getRemainWidth, slotWidth)
- .notIn(HollowBigStorageCage::getSlot, "select distinct slot from hollow_big_storage_cage_details where state in( 100 , 102 , 103 ,104)"));
+ .notInSql(HollowBigStorageCage::getSlot, "select distinct slot from hollow_big_storage_cage_details where state in( 100 , 102 , 103 ,104)"));
// 3銆佸皢涓嶅湪绗煎唴鐨勬祦绋嬪崱鐨勫叧绯昏〃閲嶇疆
// 浠呰幏鍙栫悊鐗囩鍐呯殑娴佺▼鍗′俊鎭伩鍏嶇幓鐠�
List<FlowCardVirtualSlotDTO> list = hollowBigStorageCageDetailsService.queryFlowCardIdsAndLayer();
--
Gitblit v1.8.0