From d0aac8847a45473a64e9f44abfd5e85e819b5dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Tue, 16 Jul 2024 13:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=AE=A3=E4=BC=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/promotionTab/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 020def2b7..1a804284d 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -29,17 +29,17 @@
       </div>
 
       <el-table class="table" :data="tableData" border v-loading="tableLoading"
-        style="width: 100%">
+      :height="tableHeight"   style="width: 100%">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
-        <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" width="380">
+        <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
-        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
+        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
           <template slot-scope="scope">
             <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
+        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
         </el-table-column>
 
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
@@ -80,6 +80,7 @@
 </template>
 
     <script>
+      import { mapGetters } from 'vuex'
      import AddpromotionTab from './AddpromotionTab.vue'
      import viewPromotionalTags from './viewPromotionalTags.vue'
     import { Loading } from 'element-ui' // 引入Loading服务
@@ -109,6 +110,13 @@
         ],
         }
       },
+      computed:{
+        tableHeight() {
+          return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
+
+        },
+        ...mapGetters(['clientHeight', 'iframeHeight'])
+      },
       components: {
         AddpromotionTab,viewPromotionalTags
       },