From e2c0e919d35db9048c99730ef9c367f31e65ebb7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 25 Mar 2024 13:48:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=A0=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/layout/AiDvSummary/AiDvSummary.vue |  1 -
 components/layout/AiDvTable/AiDvTable.vue     | 20 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue
index d5a6eaa8..0a4e1525 100644
--- a/components/layout/AiDvSummary/AiDvSummary.vue
+++ b/components/layout/AiDvSummary/AiDvSummary.vue
@@ -62,7 +62,6 @@ export default {
     },
 
     data: {
-      type: Array,
       default: () => []
     },
 
diff --git a/components/layout/AiDvTable/AiDvTable.vue b/components/layout/AiDvTable/AiDvTable.vue
index 4fb6cea7..68d37785 100644
--- a/components/layout/AiDvTable/AiDvTable.vue
+++ b/components/layout/AiDvTable/AiDvTable.vue
@@ -1,7 +1,11 @@
 <template>
   <section class="AiDvTable">
-    <el-table v-if="simple" class="simple" :data="tableData">
-      <el-table-column v-for="item in columns" :key="item.prop" v-bind="item"/>
+    <el-table v-if="simple" class="simple" :data="tableData" max-height="calc(100% - 40px)">
+      <el-table-column v-for="item in columns" :key="item.prop" v-bind="item">
+        <template v-slot="{row}">
+          <div :style="{color:item.color}" v-text="row[item.prop]"/>
+        </template>
+      </el-table-column>
     </el-table>
     <div v-else class="aiDvTable" :class="'aiDvTable-' + theme + ' aiDvTable-' + size">
       <div class="header" :style="headerStyle">
@@ -44,9 +48,9 @@
 </template>
 
 <script>
+
 export default {
   name: 'AiDvTable',
-
   components: {
     renderSlot: {
       functional: true,
@@ -66,7 +70,6 @@ export default {
       }
     }
   },
-
   props: {
     data: {
       type: Array,
@@ -105,7 +108,6 @@ export default {
     },
     simple: Boolean
   },
-
   data() {
     return {
       header: [],
@@ -116,10 +118,12 @@ export default {
     columns: v => v.header.map((e, i) => {
       let item = {}
       Object.values(e).forEach(label => {
-        const {align} = v.config[i]
+        const {align, width, color} = v.config[i]
         item.align = align
         item.prop = `col${i}`
         item.label = label
+        item.width = width
+        item.color = color
       })
       return item
     }),
@@ -177,6 +181,10 @@ export default {
 <style lang="scss" scoped>
 @import "../../dv";
 
+.AiDvTable {
+  height: 100%;
+}
+
 .aiDvTable {
   height: 100%;
   overflow: hidden;