From 642d31285d7aff59415a5eb37f87a79f41d308a8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 25 三月 2025 17:29:49 +0800
Subject: [PATCH] 新增自动评估扬尘监测数据统计结果上传功能（待完成）
---
src/views/fysp/data-product/components/BaseDataProduct.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/fysp/data-product/components/BaseDataProduct.vue b/src/views/fysp/data-product/components/BaseDataProduct.vue
index b53953e..7054740 100644
--- a/src/views/fysp/data-product/components/BaseDataProduct.vue
+++ b/src/views/fysp/data-product/components/BaseDataProduct.vue
@@ -68,16 +68,16 @@
:prop="item1.name"
:label="item1.name"
>
- <template v-if="item1.children" #default="{ row1 }">
- <span v-html="row1[item1.name]"></span>
+ <template v-if="item1.children" #default="scope1">
+ <span v-html="scope1.row[item1.name]"></span>
<el-table-column
v-for="(item2, index2) in item1.children"
:key="index2"
:prop="item2.name"
:label="item2.name"
>
- <template v-if="item2.children" #default="{ row2 }">
- <span v-html="row2[item2.name]"></span>
+ <template v-if="item2.children" #default="scope2">
+ <span v-html="scope2.row[item2.name]"></span>
</template>
</el-table-column>
</template>
@@ -218,14 +218,18 @@
if (matchTxt) {
matchTxt.forEach((txt) => {
- let newTxt = txt.replace(new RegExp(/\n/, 'g'), '<br />');
+ // let newTxt = txt.replace(new RegExp(/\n/, 'g'), '</span><br/><span>');
+ // newTxt = newTxt.replace(new RegExp(/"/, 'g'), '');
+ // tableData = tableData.replace(txt, `<span>${newTxt}</span>`);
+ let newTxt = txt.replace(new RegExp(/\n/, 'g'), '');
newTxt = newTxt.replace(new RegExp(/"/, 'g'), '');
tableData = tableData.replace(txt, newTxt);
});
- // console.log(tableData);
}
+ // console.log(tableData);
const t = strToTableObj(tableData);
+ console.log(t);
// console.log(head);
// console.log(data);
excelDatas.value.set(sheetName, t);
--
Gitblit v1.9.3