From c9e4231d2d09508d536185c01c4979d6ef5456d6 Mon Sep 17 00:00:00 2001
From: xcool <2350444842@qq.com>
Date: Wed, 12 Oct 2022 00:56:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kndiagram/components/maxdiff/barchart.vue |  2 +-
 .../kndiagram/components/maxdiff/lctable.vue  | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/DataAnalyse/kndiagram/components/maxdiff/barchart.vue b/src/views/DataAnalyse/kndiagram/components/maxdiff/barchart.vue
index dbe52a02..1dc22d65 100644
--- a/src/views/DataAnalyse/kndiagram/components/maxdiff/barchart.vue
+++ b/src/views/DataAnalyse/kndiagram/components/maxdiff/barchart.vue
@@ -128,7 +128,7 @@ export default defineComponent({
               canvas.height = img.height
               canvas.getContext('2d').drawImage(img, 0, 0, img.width, img.height);
               dataURL = canvas.toDataURL('image/png');
-              dataArr[index].param.nodePicBase64 = dataURL
+              //dataArr[index].param.nodePicBase64 = dataURL
             }
             xData[index].label.backgroundColor = { image: title + '?time=' + new Date() }
             title = ''
diff --git a/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue b/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue
index c3c70aa9..35783e3d 100644
--- a/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue
+++ b/src/views/DataAnalyse/kndiagram/components/maxdiff/lctable.vue
@@ -111,11 +111,13 @@
             <div v-if="text.value!='3'&&text.value!='2'&&text.value!='1'">
               {{ text.value }}</div>
           </div>
+       
           <div v-else-if="col.dataIndex === 'option_title'">
+            
             <div class="mxd-lc-detail-table-row"
-                 v-if="text.type === 0 || text.type === 1"
+                 v-if="text.type == 0 ||   text.type == 1"
                  v-html="text.value"></div>
-            <img v-if="text.type === 2"
+            <img v-if="text.type == 2"
                  :src="text.value"
                  style="width: 40px; height: 40px" />
           </div>
@@ -154,11 +156,12 @@
             <div v-if="text.value!='3'&&text.value!='2'&&text.value!='1'">
               {{ text.value }}</div>
           </div>
+      
           <div v-else-if="col.dataIndex === 'option_title'">
             <div class="mxd-lc-detail-table-row"
-                 v-if="text.type === 0 || text.type === 1"
+                 v-if="text.type == 0 || text.type == 1"
                  v-html="text.value"></div>
-            <img v-if="text.type === 2"
+            <img v-if="text.type == 2"
                  :src="text.value"
                  style="width: 40px; height: 40px" />
           </div>
@@ -305,13 +308,18 @@ watch(() => props.info, (info) => {
   const _c1 = [].concat(info.raw_data.columns)
   c1.value = []
   c1.value = _c1.map((item) => {
+    if (item?.children) {
+       item.children.map((e) => { e.dataIndex = e.key; childrenlist.push(e.key) })
+     } 
     if (item?.children) {
       item.children.map((e) => { e.dataIndex = e.key; childrenlist.push(e.key) })
     } else {
       item.slots = { customRender: item.key }
       item.dataIndex = item.key
       item.fixed = item.key === 'sort' ? 'left' : null
+     // childrenlist.push(item.key )
     }
+    // }
     return {
       ...item,
       width: 200,
@@ -319,6 +327,7 @@ watch(() => props.info, (info) => {
     }
   })
   // 处理表格data数据
+  debugger;
   d1.value = info.raw_data.data.map((item, index) => {
     for (let i in item) {
       if (childrenlist.indexOf(i) > -1 && item[i].value == 0) {
@@ -337,6 +346,7 @@ watch(() => props.info, (info) => {
   const _c2 = [].concat(info.zero_data.columns)
   c2.value = []
   // 带children的key存进去
+  
   c2.value = _c2.map(item => {
     if (item?.children) {
       item.children.map((e) => { e.dataIndex = e.key; childrenlist2.push(e.key) })
@@ -344,6 +354,7 @@ watch(() => props.info, (info) => {
       item.slots = { customRender: item.key }
       item.dataIndex = item.key
       item.fixed = item.key === 'sort' ? 'left' : null
+     // childrenlist2.push(item.key)
     }
     return {
       ...item,
@@ -351,6 +362,7 @@ watch(() => props.info, (info) => {
       align: 'center'
     }
   })
+  debugger;
   d2.value = info.zero_data.data.map((item, index) => {
     for (let i in item) {
       if (childrenlist2.indexOf(i) > -1 && item[i].value == 0) {