Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/components/capitalInfo/index.vue

@@ -119,7 +119,7 @@ export default defineComponent({
                     flex-direction: column;
                     .capitalItem {
                         width: 100%;
-                        padding-top: 2px;
+                        padding-top: 10px;
                         font-size: 14px;
                         color: @m-grey1;
                         .firstLine {
@@ -135,13 +135,13 @@ export default defineComponent({
                         }
                         .numBar {
                             width: 100%;
-                            margin-top: 10px;
+                            margin-top: 8px;
                             height: 16px;
                             line-height: 16px;
                             font-size: 16px;
                             text-align: left;
                             color: @m-white0;
-                            margin-bottom: 10px;
+                            margin-bottom: 5px;
                         }
                         .green {
                             color: @m-green0;

src/common/components/quoteTable/index.vue

@@ -6,7 +6,7 @@
             :data-source="dataSource"
             bordered
             :pagination="false"
-            :scroll="{ x: '100%', y: '223px' }"
+            :scroll="{ x: '100%', y: '261px' }"
         >
             <template #action>
                 <a>action</a>
@@ -49,11 +49,11 @@ export default defineComponent({
 <style lang="less">
 .quoteTable {
     width: 100%;
-    max-height: calc(100% - 68px);
+    // max-height: calc(100% - 68px);
     flex: 1;
 }
 .quote-table {
-    height: 223px;
+    height: 261px;
     .ant-spin-nested-loading {
         .ant-spin-container {
         }

src/layout/components/top.vue

@@ -110,7 +110,7 @@ export default defineComponent({
 .layout-top {
     .flex;
     width: 100%;
-    height: calc(100% - 336px);
+    height: calc(100vh - 336px);
     flex-direction: column;
     .m-layout-header {
         width: 100%;
@@ -243,6 +243,9 @@ export default defineComponent({
                 position: absolute;
             }
         }
+        .ant-layout-content {
+            overflow: hidden;
+        }
         .ant-menu-vertical {
             .ant-menu-submenu-vertical {
                 height: 60px;