From d119fe276b711994b6df568c88592c9eac503aa9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 08:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/hollow/hollowequipment.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
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 {
--
Gitblit v1.8.0