Merge remote-tracking branch 'origin/develop' into develop

2022-06-20 14:38:00 +08:00
parent e0581080ee c181cd79dd
commit 5cc6e4424d
2 changed files with 4 additions and 4 deletions
@@ -1860,13 +1860,13 @@ export default {
  overflow: auto !important;
 }
 #my-questions{
-  height: 100%;
+  height: calc(100vh - 75px);
  display: flex;
  flex-direction: column;
  background: #F5F7FA;
  margin-bottom: 10px;
  .tab-box{
-    height: 100%;
+    height: 93%;
  }
  .type-tabs {
    /deep/.el-tabs__header {
@@ -1258,13 +1258,13 @@ export default {
  overflow: auto;
 }
 #my-questions{
-  height: 100%;
+  height: calc(100vh - 75px);
  display: flex;
  flex-direction: column;
  background: #F5F7FA;
  margin-bottom: 10px;
  .tab-box{
-    height: 100%;
+    height: 93%;
  }
  .type-tabs {
    /deep/.el-tabs__header {