From 13432b351db1d041bf5cca839012e03f8b46fcea Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 8 Aug 2024 16:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportForms/statistics/index.vue          | 25 +++++++++++--------
 src/views/system/reportForms/luckysheet.vue   | 20 ++++++++++++---
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index b2db2fbe..eb7b6559 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -95,21 +95,24 @@ const tableStore = new TableStore({
         tableStore.table.params.lineId = dotList.value.id
     },
     loadCallback: () => {
-        console.log(tableStore.table.data)
         tableStore.table.data.forEach((item: any) => {
+            item.data1 ? (item.data = JSON.parse(item.data1)) : ''
             item.celldata.forEach((k: any) => {
-                item.data[k.r][k.c].v = k.v
+                item.data[k.r][k.c].v ? (item.data[k.r][k.c].v = k.v) : ''
             })
         })
-        luckysheet.create({
-            container: 'luckysheet',
-            title: '', // 表 头名
-            lang: 'zh', // 中文
-            showtoolbar: false, // 是否显示工具栏
-            showinfobar: false, // 是否显示顶部信息栏
-            showsheetbar: true, // 是否显示底部sheet按钮
-            data: tableStore.table.data
-        })
+        console.log(tableStore.table.data)
+        setTimeout(() => {
+            luckysheet.create({
+                container: 'luckysheet',
+                title: '', // 表 头名
+                lang: 'zh', // 中文
+                showtoolbar: false, // 是否显示工具栏
+                showinfobar: false, // 是否显示顶部信息栏
+                showsheetbar: true, // 是否显示底部sheet按钮
+                data: tableStore.table.data
+            })
+        }, 10)
     }
 })
 provide('tableStore', tableStore)
diff --git a/src/views/system/reportForms/luckysheet.vue b/src/views/system/reportForms/luckysheet.vue
index 38ea6510..7d3eff66 100644
--- a/src/views/system/reportForms/luckysheet.vue
+++ b/src/views/system/reportForms/luckysheet.vue
@@ -85,6 +85,15 @@ const beforeUpload = (file: any) => {
         }
         luckysheet.destroy()
         options.value.title = exportJson.info.name
+        console.log('🚀 ~ exportJson.sheets:', exportJson.sheets)
+        exportJson.sheets.forEach((item: any) => {
+            // item.celldata = []
+            // item.data = []
+            item.celldata.forEach((k: any) => {
+                k.v.ct.s ? (k.v.v = k.v.ct.s[0].v) : ''
+                k.v.ct.s ? (k.v.m = k.v.ct.s[0].v) : ''
+            })
+        })
         options.value.data = exportJson.sheets
         luckysheet.create(options.value)
     })
@@ -95,9 +104,14 @@ const preservation = () => {
 }
 // 新增
 const submitForm = (formdata: any, text: string) => {
-    console.log('🚀 ~ submitForm ~ text:', text)
-    let userStr = JSON.stringify(luckysheet.getAllSheets())
-    let blob = new Blob([userStr], {
+    // let userStr = JSON.stringify(luckysheet.getAllSheets())
+    let userStr = luckysheet.getAllSheets()
+    console.log('🚀 ~ submitForm ~ userStr:', userStr)
+    userStr.forEach((item: any) => {
+        item.data1 = JSON.stringify(item.data)
+    })
+
+    let blob = new Blob([JSON.stringify(userStr)], {
         type: 'application/json;charset=UTF-8'
     })
     let files = new window.File([blob], 'content.json', {