From 3622bac41d3f55a4f2b8f2c8436f185d93d1fa73 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 31 三月 2025 13:46:04 +0800
Subject: [PATCH] 卧式缓存二线历史任务字段更改，中空创建任务新增字段，所有模块历史任务按钮修改为每次打开重新加载进行查询
---
UI-Project/src/views/Caching/cachingun.vue | 2
UI-Project/src/views/Returns/upreturns.vue | 2
UI-Project/src/views/Slicecage/slicecage.vue | 2
UI-Project/src/views/hollow/hollowequipmenthree.vue | 17 ++++++--
UI-Project/src/views/StockBasicData/stockBasicData.vue | 2
UI-Project/src/views/hollow/hollowslicecage.vue | 2
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 2
UI-Project/src/views/Returns/upreturns2.vue | 2
UI-Project/src/views/Caching/cachingbefore.vue | 2
UI-Project/src/views/hollow/hollowequipment.vue | 17 ++++++--
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 17 ++++++--
UI-Project/src/views/Caching/cachingunhistory.vue | 8 ++--
12 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index e6130a3..3ec1940 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -438,7 +438,7 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="5vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 0e3010a..3a5b1ed 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -415,7 +415,7 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="5vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index 0548fb6..0f6606b 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.vue
@@ -38,14 +38,14 @@
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('hellow.countOutTwo')" style="width: 14vw">
- {{ countOutTwo }}
+ {{ countOutOne }}
</el-form-item>
</div>
</el-col>
<el-col :span="5">
<div id="dta" style="font-size: 15px;">
<el-form-item :label="$t('hellow.totalAreaOutTwo')" style="width: 14vw">
- {{ totalAreaOutTwo }}
+ {{ totalAreaOutOne }}
</el-form-item>
</div>
</el-col>
@@ -117,8 +117,8 @@
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
-const countOutTwo = ref(0)
-const totalAreaOutTwo = ref(0)
+const countOutOne = ref(0)
+const totalAreaOutOne = ref(0)
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index acd1d7d..f875465 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -702,7 +702,7 @@
</el-table>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="5vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index c0d5889..16a3edc 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -583,7 +583,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindbd" top="5vh" width="95%">
+ <el-dialog v-model="blindbd" top="5vh" width="95%" @close="iframeUrl=''">
<iframe :src="iframeUrl" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 868a296..fff5ebb 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -500,7 +500,7 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindbd" top="5vh" width="95%">
+ <el-dialog v-model="blindbd" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 6b1190f..70f6a20 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1379,7 +1379,7 @@
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="5vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 182644c..2747e44 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -225,7 +225,7 @@
</el-card>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="95%">
+<el-dialog v-model="blindb" top="10vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index b312e36..d69481d 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -117,6 +117,7 @@
</template>
</el-table-column>
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -946,7 +947,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindb" top="5vh" width="95%">
+ <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -1636,10 +1637,16 @@
}
};
const parseData = (rawData) => {
- return Object.keys(rawData).map(projectNumber => ({
- projectNumber,
- records: rawData[projectNumber]
- }));
+ return Object.entries(rawData).map(([compositeKey, records]) => {
+ const [projectNumber, productName] = compositeKey.split(':');
+ return {
+ projectNumber,
+ productname: productName,
+ records: records.map(record => ({
+ ...record,
+ }))
+ };
+ });
};
const fetchFlowBind = async (flowCardId, layer, page) => {
try {
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index 1ba6c37..ae7ebe9 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -91,6 +91,7 @@
</template>
</el-table-column>
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -478,7 +479,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindb" top="5vh" width="95%">
+ <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -857,10 +858,16 @@
}
};
const parseData = (rawData) => {
- return Object.keys(rawData).map(projectNumber => ({
- projectNumber,
- records: rawData[projectNumber]
- }));
+ return Object.entries(rawData).map(([compositeKey, records]) => {
+ const [projectNumber, productName] = compositeKey.split(':');
+ return {
+ projectNumber,
+ productname: productName,
+ records: records.map(record => ({
+ ...record,
+ }))
+ };
+ });
};
const fetchFlowBind = async (flowCardId, layer, page) => {
try {
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index ebaa490..b232214 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -91,6 +91,7 @@
</template>
</el-table-column>
<el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
+ <el-table-column prop="productname" fixed align="center" :label="$t('large.productname')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -478,7 +479,7 @@
</template>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
- <el-dialog v-model="blindb" top="5vh" width="95%">
+ <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
@@ -859,10 +860,16 @@
}
};
const parseData = (rawData) => {
- return Object.keys(rawData).map(projectNumber => ({
- projectNumber,
- records: rawData[projectNumber]
- }));
+ return Object.entries(rawData).map(([compositeKey, records]) => {
+ const [projectNumber, productName] = compositeKey.split(':');
+ return {
+ projectNumber,
+ productname: productName,
+ records: records.map(record => ({
+ ...record,
+ }))
+ };
+ });
};
const fetchFlowBind = async (flowCardId, layer, page) => {
try {
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index 458ad48..fbb0c9a 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -982,7 +982,7 @@
</div>
</el-dialog>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="5vh" width="95%">
+<el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0