From 188ed082e2911f533391bb8ce5c8874910bf310d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 15:00:04 +0800
Subject: [PATCH] dd

---
 src/views/modules/base/epidemic/antiInfo.vue | 11 +++----
 src/views/modules/base/epidemic/travel.vue   | 15 +++++-----
 src/views/modules/base/epidemic/vaccin.vue   | 30 ++++++++++----------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 866daaaa..8388bc4d 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -341,7 +341,7 @@ export default {
     this.getGridList()
     this.getValiheList()
     await this.loadTable()
-    this.sHeight = this.$refs.div_search.offsetHeight + 240
+    this.sHeight = this.$refs.div_search.offsetHeight + 230
   },
 
   methods: {
@@ -605,12 +605,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - this.sHeight)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
-    
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index bf63e0e6..9091d65d 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -206,6 +206,7 @@ export default {
       pageSize: 10,
       pageNo: 0,
       tableLoading: false,
+      sHeight: 0,
 
       agencyId: '',
 
@@ -241,6 +242,7 @@ export default {
 
 
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -540,14 +542,13 @@ export default {
   },
   computed: {
     tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
-      return (this.clientHeight - 360)
-
-    },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
     },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index bf63e0e6..452751e3 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -113,27 +113,27 @@
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
         <el-table-column prop="time"
                          header-align="center"
                          align="center"
-                         label="检测时间"
+                         label="接种时间"
                          width="120">
         </el-table-column>
         <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测机构"
+                         label="接种地点"
                          min-width="230">
         </el-table-column>
         <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测结果"
-                         min-width="80">
+                         label="疫苗厂家"
+                         min-width="180">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -148,7 +148,7 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <!-- <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -156,7 +156,7 @@
             <el-button type="text"
                        class="div-table-button--delete--noline "
                        size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                       @click="handleDelete(scope.row)">删除</el-button> -->
 
           </template>
         </el-table-column>
@@ -206,7 +206,7 @@ export default {
       pageSize: 10,
       pageNo: 0,
       tableLoading: false,
-
+      sHeight: 0,
       agencyId: '',
 
       timeRange: [],
@@ -241,6 +241,7 @@ export default {
 
 
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -540,14 +541,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 360)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {