Merge branch 'dev-consultation-0506-all' into 'release'

优化高度设置

See merge request !1

src/views/IM/diagnosis-admin/diagnosis-list.vue

@@ -370,7 +370,7 @@ export default {
         }
     },
     created() {
-        this.setTableHeight()
+        
     },
     mounted() {
         this.liveBack = this.$route.query.liveBack || false
@@ -381,17 +381,19 @@ export default {
         //     this.activeName = 'second'
         //     this.searchParam.status = 2
         // }
-        
+        this.setTableHeight()
         this.search()
     },
     methods: {
         // 设置table的高度
         setTableHeight() {
-            this.$nextTick(() => {
-                if (document.getElementsByClassName('from-box') && document.getElementsByClassName('from-box')[0].clientHeight) {
-                    this.tableHeight = window.innerHeight-50-140-10-160-document.getElementsByClassName('from-box')[0].clientHeight
-                }
-            })
+            setTimeout(() => {
+                this.$nextTick(() => {
+                    if (document.getElementsByClassName('from-box') && document.getElementsByClassName('from-box')[0].clientHeight) {
+                        this.tableHeight = window.innerHeight-50-140-10-160-document.getElementsByClassName('from-box')[0].clientHeight
+                    }
+                })
+            },20)
         },
         changeBeginTime(val) {
             this.beginFlag = false