From 8114ef9bf2704a2bc05a15a36ab677808195a274 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 10:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hellowslicecagehistory.vue | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/views/hollow/hellowslicecagehistory.vue b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
index f5379ce..c96557e 100644
--- a/UI-Project/src/views/hollow/hellowslicecagehistory.vue
+++ b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
@@ -21,8 +21,42 @@
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>
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="handleClick()">{{$t('reportmanage.inquire')}}</el-button>
</div>
+ <div style="margin-bottom: 10px;margin-top: 20px;margin-left: 20px;">
+ <el-form>
+ <el-row style="margin-top: -15px;margin-bottom: -2px;">
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.hollowCountOutOne')" style="width: 14vw">
+ {{ hollowCountOutOne }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="5">
+ <div id="dta" style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.hollowCountOutTwo')" style="width: 14vw">
+ {{ hollowCountOutTwo }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.hollowTotalAreaOutOne')" style="width: 14vw">
+ {{ hollowTotalAreaOutOne }}
+ </el-form-item>
+ </div>
+ </el-col>
+ <el-col :span="4">
+ <div id="dt" style="font-size: 15px;">
+ <el-form-item :label="$t('hellow.hollowTotalAreaOutTwo')" style="width: 14vw">
+ {{ hollowTotalAreaOutTwo }}
+ </el-form-item>
+ </div>
+ </el-col>
+ </el-row>
+ </el-form>
+ </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="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" />
@@ -86,6 +120,10 @@
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
+const hollowCountOutOne = ref(0)
+const hollowCountOutTwo = ref(0)
+const hollowTotalAreaOutOne = ref(0)
+const hollowTotalAreaOutTwo = ref(0)
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
@@ -107,6 +145,33 @@
targetSlot.value = '';
}
};
+const Daily = async () => {
+try {
+let startTime = window.localStorage.getItem('startTime')
+ const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowDailyProduction", {
+ pageNo: 1,
+ pageSize: 20,
+ glassId: '',
+ startSlot: 0,
+ targetSlot: 0,
+ taskStateList: [],
+ taskTypeList: [],
+ beginDate: startTime,
+ endDate: getglobalDate
+ })
+ if (response.code == 200) {
+ hollowCountOutOne.value = response.data.hollowCountOutOne
+ hollowCountOutTwo.value = response.data.hollowCountOutTwo
+ hollowTotalAreaOutOne.value = response.data.hollowTotalAreaOutOne
+ hollowTotalAreaOutTwo.value = response.data.hollowTotalAreaOutTwo
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(error);
+}
+}
const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
@@ -144,6 +209,7 @@
console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
+Dailya(currentPage2.value);
};
const historicala = async (page) => {
try {
@@ -202,6 +268,62 @@
console.error(error);
}
}
+const Dailya = async (page) => {
+try {
+let celllist=[]
+let stateList=[]
+let pstartSlot= ''
+let ptargetSlot=''
+if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+}
+if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
+ if(selectValuesa[1]!=""){
+ stateList=[selectValuesa[1]];
+ }
+}
+if(startSlot.value != ""){
+ pstartSlot = startSlot.value
+}else{
+ pstartSlot = '0'
+}
+if(targetSlot.value != ""){
+ ptargetSlot = targetSlot.value
+}else{
+ ptargetSlot = '0'
+}
+let page = window.localStorage.getItem('pagenumber')
+let startTime = window.localStorage.getItem('startTime')
+ const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowDailyProduction", {
+ pageNo: page,
+ pageSize: 20,
+ glassId: glassId.value,
+ startSlot: pstartSlot,
+ targetSlot: ptargetSlot,
+ taskStateList: celllist,
+ taskTypeList: stateList,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ })
+ if (response.code == 200) {
+ hollowCountOutOne.value = response.data.hollowCountOutOne
+ hollowCountOutTwo.value = response.data.hollowCountOutTwo
+ hollowTotalAreaOutOne.value = response.data.hollowTotalAreaOutOne
+ hollowTotalAreaOutTwo.value = response.data.hollowTotalAreaOutTwo
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(error);
+}
+}
+const handleClick = async () => {
+ await sethistorical();
+ await Dailyhistorical();
+};
// 鍘嗗彶鏌ヨ
const sethistorical = async () => {
try {
@@ -252,7 +374,61 @@
}));
// tableDatax.value = response.data.records;
tableDatax.value = formattedData;
+ console.log(tableDatax.value);
+ console.log(formattedData);
totalRecords.value = response.data.total/2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(error);
+}
+}
+const Dailyhistorical = async () => {
+try {
+let startTime = window.localStorage.getItem('startTime')
+let celllist=[]
+let stateList=[]
+let pstartSlot= ''
+let ptargetSlot=''
+if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+}
+if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
+ if(selectValuesa[1]!=""){
+ stateList=[selectValuesa[1]];
+ }
+}
+if(startSlot.value != ""){
+ pstartSlot = startSlot.value
+}else{
+ pstartSlot = '0'
+}
+if(targetSlot.value != ""){
+ ptargetSlot = targetSlot.value
+}else{
+ ptargetSlot = '0'
+}
+let page = window.localStorage.getItem('pagenumber')
+const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowDailyProduction", {
+ pageNo: 1,
+ pageSize: 20,
+ glassId: glassId.value,
+ startSlot: pstartSlot,
+ targetSlot: ptargetSlot,
+ taskStateList: celllist,
+ taskTypeList: stateList,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ })
+ if (response.code == 200) {
+ hollowCountOutOne.value = response.data.hollowCountOutOne
+ hollowCountOutTwo.value = response.data.hollowCountOutTwo
+ hollowTotalAreaOutOne.value = response.data.hollowTotalAreaOutOne
+ hollowTotalAreaOutTwo.value = response.data.hollowTotalAreaOutTwo
} else {
ElMessage.error(response.message);
}
@@ -330,6 +506,7 @@
onMounted(() => {
parseAndSetTime();
historical();
+Daily()
});
</script>
<style scoped>
--
Gitblit v1.8.0