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

修改table的高度

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!7

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

@@ -390,7 +390,10 @@ export default {
             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
+                        let height = window.innerHeight-50-140-10-160-document.getElementsByClassName('from-box')[0].clientHeight
+                        if(height > 300) {
+                            this.tableHeight = height
+                        }
                     }
                 })
             },20)