theme color update

src/assets/styles/mixin.less

@@ -209,7 +209,7 @@
             tr {
                 box-shadow: 0px 1px 0px 0px @m-black17;
                 th {
-                    line-height: 34px;
+                    line-height: 26px;
                     background: @m-black34;
                     padding-top: 0;
                     padding-bottom: 0;
@@ -223,12 +223,12 @@
         .ant-table-tbody {
             tr {
                 td {
-                    height: 34px;
-                    line-height: 34px;
+                    height: 30px;
+                    line-height: 30px;
                     padding: 0 8px;
                     border-right: 1px solid @m-black9;
                     border-bottom: 1px solid @m-black9;
-                    font-size: 16px;
+                    font-size: 14px;
                     color: @m-white1;
                 }
             }
@@ -267,7 +267,7 @@
         .ant-table-content {
             .ant-table-tbody {
                 .ant-table-expanded-row {
-                    width: calc(100vw - 180px);
+                    width: calc(100vw - 160px);
                 }
             }
         }
@@ -956,8 +956,8 @@
 .selectBtn.ant-btn,.operBtn.ant-btn {
     margin-left: 10px;
     width: 80px;
-    height: 30px;
-    line-height: 31px;
+    height: 28px;
+    line-height: 29px;
     text-align: center;
     background: linear-gradient(0deg, @m-grey39 0%, @m-grey40 98%);
     border: 0;
@@ -1013,7 +1013,7 @@
     margin-left: 10px;
     width: auto;
     min-width: 80px;
-    height: 30px;
+    height: 28px;
     line-height: 31px;
     text-align: center;
     background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
@@ -1862,13 +1862,14 @@ input:-internal-autofill-selected {
     background-color: @m-black1;
     .buy-sell-market-title {
         width: 100%;
-        height: 60px;
+        height: 40px;
         background: @m-black1;
         display: inline-flex;
         font-size: 14px;
         position: relative;
-        line-height: 60px;
+        line-height: 40px;
         border-bottom: 1PX solid @m-blue0;
+        padding-bottom: 2px;
         div {
             align-self: center;
             align-items: center;
@@ -1877,11 +1878,11 @@ input:-internal-autofill-selected {
         }
         .backIcon {
             width: 52px;
-            line-height: 60px;
+            line-height: 40px;
         }
         .titleBtn {
-             min-width: 90px;
-            height: 40px;
+            min-width: 90px;
+            height: 32px;
             display: inline-flex;
             .name {
                 background: @m-blue12;
@@ -1890,13 +1891,13 @@ input:-internal-autofill-selected {
                 padding: 0 16px;
                 .rounded-corners(3px, 0, 0, 3px);
                  color: @m-white9;
-                 height: 40px;
-                line-height: 40px;
-                font-size: 16px;
+                 height: 32px;
+                line-height: 32px;
+                font-size: 14px;
             }
             .arrowRightIcon,.arrowLeftIcon {
                 width: 12px;
-                height: 40px;
+                height: 32px;
                 background-image: @m-arrowRight;
                 background-position: 0 0;
                 background-repeat: no-repeat;
@@ -1931,10 +1932,10 @@ input:-internal-autofill-selected {
             min-width: 80px;
             margin-left: 15px;
             .first {
-                font-size: 14px;
+                font-size: 12px;
             }
             .last {
-                font-size: 18px;
+                font-size: 16px;
                 margin-left: 10px;
             }
         }
@@ -2008,6 +2009,10 @@ input:-internal-autofill-selected {
         .btn-list {
             position: absolute;
             right: 10px;
+            .operBtn.ant-btn {
+                margin-top: 0;
+                margin-bottom: 0;
+            }
         }
     }
 }
@@ -2031,7 +2036,7 @@ input:-internal-autofill-selected {
             tr {
                 box-shadow: 0px 1px 0px 0px @m-black17;
                 th {
-                    line-height: 34px;
+                    line-height: 26px;
                     background: @m-black34;
                     padding-top: 0;
                     padding-bottom: 0;
@@ -2048,12 +2053,12 @@ input:-internal-autofill-selected {
         .ant-table-tbody {
             tr {
                 td {
-                    height: 43px;
-                    line-height: 43px;
+                    height: 30px;
+                    line-height: 30px;
                     padding: 0 8px;
                     border-right: 1px solid @m-black10;
                     border-bottom: 1px solid @m-black10;
-                    font-size: 16px;
+                    font-size: 14px;
                     color: @m-grey17;
                     white-space: nowrap;
                     text-overflow: ellipsis;
@@ -2120,11 +2125,11 @@ input:-internal-autofill-selected {
 }
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
-        min-height: calc(100vh - 470px);
+        min-height: calc(100vh - 384px);
     }
     .ant-table {
         .ant-table-tbody {
-            min-height: calc(100vh - 470px);
+            min-height: calc(100vh - 384px);
         }
     }
 }
@@ -2140,11 +2145,11 @@ input:-internal-autofill-selected {
 // 没有底部时买卖大厅表格高度
 .buyHallTableHigh,.sellHallTableHigh {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
-        min-height: calc(100vh - 180px);
+        min-height: calc(100vh - 145px);
     }
     .ant-table {
         .ant-table-tbody {
-            min-height: calc(100vh - 180px);
+            min-height: calc(100vh - 145px);
         }
     }
 }
@@ -2275,7 +2280,7 @@ input:-internal-autofill-selected {
         width: 90px;
         background: transparent;
         font-size: 16px;
-        color: @m-white9;
+        color: @m-white6;
     }
     .ant-calendar-picker-icon {
         display: none;

src/assets/styles/theme.css

@@ -33,8 +33,8 @@
     --m-grey32: #7a8a94;
     --m-grey33: #88a0ae;
     --m-grey34: #88A0AE;
-    --m-grey35: #343D46;
-    --m-grey36: #38444F;
+    --m-grey35: #262e35;
+    --m-grey36: #283139;
     --m-grey37: transpant;
     --m-grey38: #88a0ae;
     --m-grey39: #455773;
@@ -129,6 +129,10 @@
     --m-blue29-hover: rgba(25, 55, 120, .8);
     --m-blue30: #172B56;
     --m-blue30-hover: rgba(23, 43, 86,.8);
+    --m-blue31: #26487c;
+    --m-blue31-hover: rgba(38, 72, 124, .8);
+    --m-blue32: #29538c;
+    --m-blue32-hover: rgba(41, 83, 140, .8);
 
     --body-bg: #e9eef3;
     --m-white0: #ffffff;
@@ -197,8 +201,8 @@
     --m-grey32: #7a8a94;
     --m-grey33: #88a0ae;
     --m-grey34: #88A0AE;
-    --m-grey35: #343D46;
-    --m-grey36: #38444F;
+    --m-grey35: #262e35;
+    --m-grey36: #283139;
     --m-grey37: transpant;
     --m-grey38: #88a0ae;
     --m-grey39: #455773;
@@ -292,6 +296,10 @@
     --m-blue29-hover: rgba(25, 55, 120, .8);
     --m-blue30: #172B56;
     --m-blue30-hover: rgba(23, 43, 86,.8);
+    --m-blue31: #26487c;
+    --m-blue31-hover: rgba(38, 72, 124, .8);
+    --m-blue32: #29538c;
+    --m-blue32-hover: rgba(41, 83, 140, .8);
 
     --body-bg: #e9eef3;
     --m-white0: #ffffff;
@@ -453,6 +461,10 @@
     --m-blue29-hover: rgba(81, 121, 226, .8);
     --m-blue30: #D4E0FF;
     --m-blue30-hover: rgba(212, 224, 255, .8);
+    --m-blue31: #5179E2;
+    --m-blue31-hover: rgba(81, 121, 226, .8);
+    --m-blue32: #5179E2;
+    --m-blue32-hover: rgba(81, 121, 226, .8);
 
     --body-bg: #FFFFFF;
     --m-white0: #ffffff;

src/assets/styles/variables.less

@@ -140,6 +140,10 @@
 @m-blue29-hover: var(--m-blue29-hover);
 @m-blue30: var(--m-blue30);
 @m-blue30-hover: var(--m-blue30-hover);
+@m-blue31: var(--m-blue31);
+@m-blue31-hover: var(--m-blue31-hover);
+@m-blue32: var(--m-blue32);
+@m-blue32-hover: var(--m-blue32-hover);
 
 @body-bg: #e9eef3;
 @m-white0: var(--m-white0);

src/common/components/filter/index.vue

@@ -64,14 +64,15 @@ export default defineComponent({
 <style lang="less">
 .filter-custom-table {
     display: inline-flex;
-    padding-top: 9px;
-    padding-bottom: 6px;
+    padding-top: 5px;
+    padding-bottom: 1px;
     .ant-select-single:not(.ant-select-customize-input) {
         margin-right: 10px;
         border: 1px solid @m-grey37;
+        height: 28px;
         .rounded-corners(3px);
         .ant-select-selector {
-            height: 30px;
+            height: 28px;
             padding: 0 8px;
             background: @m-grey9;
             border: none;

src/common/components/secondeMenu/index.vue

@@ -206,8 +206,8 @@ export default defineComponent({
         }
         .ant-layout-sider-trigger {
             width: 100%;
-            height: 40px;
-            line-height: 40px;
+            height: 30px;
+            line-height: 30px;
             background: @m-black0;
         }
     }

src/layout/components/bottom.vue

@@ -116,7 +116,7 @@ export default defineComponent({
     }
 }
 .layout-bottom-all {
-    height: 330px;
+    height: 280px;
 }
 .layout-bottom-hidden {
     height: 40px;
@@ -125,7 +125,7 @@ export default defineComponent({
     max-width: 100;
 }
 .main-some {
-    max-width: calc(100% - 180px);
+    max-width: calc(100% - 160px);
 }
 .layout-bottom {
     display: flex;

src/layout/components/main.vue

@@ -69,7 +69,7 @@ export default defineComponent({
             line-height: 34px;
             background: linear-gradient(0deg, @m-grey35 0%, @m-grey36 100%);
             margin-left: 3px;
-            font-size: 16px;
+            font-size: 14px;
             color: @m-grey38;
             border-radius: 5px 5px 0px 0px;
             cursor: pointer;
@@ -85,7 +85,7 @@ export default defineComponent({
         .ant-menu-item-selected {
             .noBorderBottom;
             color: @m-white0;
-            background: linear-gradient(0deg, @m-blue2 0%, @m-blue0 100%);
+            background: linear-gradient(0deg, @m-blue31 0%, @m-blue32 100%);
             &:hover {
                 color: @m-white0;
             }

src/layout/components/menu.vue

@@ -1,28 +1,26 @@
 <template>
-  <a-menu theme="dark"
-          mode="inline"
-          :class="['left-menu', isBottom ? 'left-menu_bottom' : 'left-menu_no_bottom']"
-          v-model:selectedKeys="selectedKeys"
-          v-model:openKeys="openKeys"
-          @click="menuClick">
-    <a-sub-menu v-for="item in filterMenu()"
-                :key="item.code">
-      <template #title>
-        <span>
-          <svg class="icon svg-icon"
-               aria-hidden="true">
-            <use :xlink:href="fontIcon(item.code)"></use>
-          </svg>
-          <span class="menu-item_title"
-                v-show="!collapsed">{{ item.title }}</span>
-        </span>
-      </template>
-      <a-menu-item :key="subItem.code"
-                   v-for="subItem in item.children">
-        <span>{{ subItem.title }}</span>
-      </a-menu-item>
-    </a-sub-menu>
-  </a-menu>
+    <a-menu
+        theme="dark"
+        mode="inline"
+        :class="['left-menu', isBottom ? 'left-menu_bottom' : 'left-menu_no_bottom']"
+        v-model:selectedKeys="selectedKeys"
+        v-model:openKeys="openKeys"
+        @click="menuClick"
+    >
+        <a-sub-menu v-for="item in filterMenu()" :key="item.code">
+            <template #title>
+                <span>
+                    <svg class="icon svg-icon" aria-hidden="true">
+                        <use :xlink:href="fontIcon(item.code)" />
+                    </svg>
+                    <span class="menu-item_title" v-show="!collapsed">{{ item.title }}</span>
+                </span>
+            </template>
+            <a-menu-item :key="subItem.code" v-for="subItem in item.children">
+                <span>{{ subItem.title }}</span>
+            </a-menu-item>
+        </a-sub-menu>
+    </a-menu>
 </template>
 
 <script lang="ts">
@@ -130,6 +128,6 @@ export default defineComponent({
     height: calc(100vh - 86px) !important;
 }
 .left-menu_bottom {
-    height: calc(100vh - 376px) !important;
+    height: calc(100vh - 316px) !important;
 }
 </style>

src/layout/components/top.vue

@@ -6,7 +6,7 @@
         <a-layout class="middleLayout">
             <a-layout-sider
                 class="m-layout-left"
-                width="180"
+                width="160"
                 v-model:collapsed="collapsed"
                 @collapse="collapse"
                 collapsible
@@ -131,8 +131,8 @@ export default defineComponent({
     flex-direction: column;
     .m-layout-header {
         width: 100%;
-        height: 40px;
-        line-height: 40px;
+        height: 32px;
+        line-height: 32px;
         background: @m-grey0;
         color: @m-grey32;
         padding: 0 20px;
@@ -171,7 +171,7 @@ export default defineComponent({
                 padding-left: 10px;
                 padding-right: 16px;
                 .ant-badge {
-                    margin-top: 7px;
+                    margin-top: 4px;
                     cursor: pointer;
                     > svg {
                         font-size: 24px;
@@ -191,8 +191,8 @@ export default defineComponent({
     .middleLayout {
         flex: 1;
         width: 100%;
-        height: calc(100% - 40px);
-        max-height: calc(100% - 40px);
+        height: calc(100% - 32px);
+        max-height: calc(100% - 32px);
         background: @m-grey18;
         .inlineflex;
         border-bottom: 1px solid @m-black2;
@@ -203,30 +203,29 @@ export default defineComponent({
             }
         }
         .m-layout-left {
-            min-height: calc(100vh - 376px);
+            min-height: calc(100vh - 316px);
             background: @m-black4;
             border-right: 1px solid @m-black32;
             overflow: hidden;
             .ant-layout-sider-children {
                 ul.ant-menu.ant-menu-inline.left-menu {
-                    height: calc(100vh - 376px);
+                    height: calc(100vh - 316px);
                     overflow-y: auto;
                     li.ant-menu-submenu {
                         padding-bottom: 0;
                         .ant-menu-submenu-title {
                             color: @m-grey33;
-                            font-size: 16px;
-                            height: 60px;
-                            line-height: 60px;
+                            font-size: 14px;
+                            height: 40px;
+                            line-height: 40px;
                             margin-top: 0;
                             margin-bottom: 0;
-                            padding: 5px 0;
                             .icon {
-                                font-size: 20px;
+                                font-size: 14px;
                             }
                             .menu-item_title {
                                 display: inline-block;
-                                font-size: 16px;
+                                font-size: 14px;
                                 margin-left: 15px;
                             }
                         }
@@ -235,6 +234,9 @@ export default defineComponent({
                                 padding-left: 60px !important;
                                 margin-top: 5px;
                                 margin-bottom: 5px;
+                                height: 30px;
+                                line-height: 30px;
+                                font-size: 13px;
                             }
                         }
                     }
@@ -261,24 +263,37 @@ export default defineComponent({
             }
             .ant-layout-sider-trigger {
                 width: 100%;
-                height: 40px;
-                line-height: 40px;
+                height: 30px;
+                line-height: 30px;
                 background: @m-black0;
                 position: absolute;
             }
         }
+        .ant-layout-sider-collapsed {
+            width: 60px !important;
+            min-width: 60px !important;
+            max-width: 60px !important;
+            .ant-layout-sider-children {
+                .ant-menu-inline-collapsed {
+                    width: 60px;
+                }
+            }
+            .ant-layout-sider-trigger {
+                width: 60px !important;
+            }
+        }
         .ant-layout-content {
             overflow: hidden;
             background: @m-black31 !important;
         }
         .ant-menu-vertical {
             .ant-menu-submenu-vertical {
-                height: 60px;
-                line-height: 60px;
+                height: 50px;
+                line-height: 50px;
                 padding: 5px 0;
                 .ant-menu-submenu-title {
-                    height: 50px;
-                    line-height: 50px;
+                    height: 40px;
+                    line-height: 40px;
                     .icon {
                         font-size: 20px;
                     }
@@ -300,5 +315,11 @@ export default defineComponent({
         height: @bottomHeight;
         .inlineflex;
     }
+    .ant-menu-inline-collapsed > .ant-menu-item,
+    .ant-menu-inline-collapsed > .ant-menu-item-group > .ant-menu-item-group-list > .ant-menu-item,
+    .ant-menu-inline-collapsed > .ant-menu-item-group > .ant-menu-item-group-list > .ant-menu-submenu > .ant-menu-submenu-title,
+    .ant-menu-inline-collapsed > .ant-menu-submenu > .ant-menu-submenu-title {
+        padding: 0 20px !important;
+    }
 }
 </style>

src/views/information/spot-contract/list/checkpending/index.vue

@@ -13,7 +13,7 @@
              :expandedRowKeys="expandedRowKeys"
              :customRow="Rowclick"
              :data-source="tableList"
-             :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
+             :scroll="{ x: 'calc(100% - 160px)', y: 'calc(100vh - 163px)' }">
       <!-- 额外的展开行 -->
       <!-- 额外的展开行 -->
       <template #expandedRowRender="{ record }">

src/views/information/spot-contract/list/finished/index.vue

@@ -1,79 +1,82 @@
 <template>
-  <!-- 现货合同: 已完成-->
-  <div class="spot-contract-done">
-    <filterCustomTable @search="updateColumn"
-                       :loading="loading">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="topTable"
-             :pagination="false"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"
-             :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
-      <!-- 额外的展开行 -->
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="secondBtn"
-                 class="btn-list-sticky"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <template #biztype="{ text }">
-        <a>{{ getBizTypeName(text) }}</a>
-      </template>
+    <!-- 现货合同: 已完成-->
+    <div class="spot-contract-done">
+        <filterCustomTable @search="updateColumn" :loading="loading">
+            <BtnList :btnList="firstBtn" @click="openComponent" />
+        </filterCustomTable>
+        <a-table
+            :columns="columns"
+            class="topTable"
+            :pagination="false"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+            :scroll="{ x: 'calc(100% - 160px)', y: 'calc(100vh - 163px)' }"
+        >
+            <!-- 额外的展开行 -->
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="secondBtn"
+                    class="btn-list-sticky"
+                    :record="record"
+                    @click="openComponent"
+                />
+            </template>
+            <template #biztype="{ text }">
+                <a>{{ getBizTypeName(text) }}</a>
+            </template>
 
-      <template #pricetype="{ text }">
-        <a>{{ getPriceTypeName(text) }}</a>
-      </template>
+            <template #pricetype="{ text }">
+                <a>{{ getPriceTypeName(text) }}</a>
+            </template>
 
-      <template #contracctstatus="{ text }">
-        <a>{{ getContractStatusName(text) }}</a>
-      </template>
+            <template #contracctstatus="{ text }">
+                <a>{{ getContractStatusName(text) }}</a>
+            </template>
 
-      <template #contracttype="{ text }">
-        <a>{{ getContractTypeName(text) }}</a>
-      </template>
-      <!-- 对手方 -->
-      <template #negative="{ record }">
-        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-      </template>
-      <template #startdate="{ record }">
-        <a>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</a>
-      </template>
-      <!-- 交收期 -->
-      <template #deliverystartdate="{ record }">
-        <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d")) }}</span>
-      </template>
+            <template #contracttype="{ text }">
+                <a>{{ getContractTypeName(text) }}</a>
+            </template>
+            <!-- 对手方 -->
+            <template #negative="{ record }">
+                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+            </template>
+            <template #startdate="{ record }">
+                <a>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</a>
+            </template>
+            <!-- 交收期 -->
+            <template #deliverystartdate="{ record }">
+                <span>
+                    {{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                    formatTime(record.deliveryenddate, "d")) }}
+                </span>
+            </template>
 
-      <!-- 业务员 -->
-      <template #saleuserid="{ record }">
-        <span>{{ findManagerName(record.saleuserid) }}</span>
-      </template>
+            <!-- 业务员 -->
+            <template #saleuserid="{ record }">
+                <span>{{ findManagerName(record.saleuserid) }}</span>
+            </template>
 
-      <!-- 跟单员 -->
-      <template #meruserid="{ record }">
-        <span>{{ findManagerName(record.meruserid) }}</span>
-      </template>
-      <!-- 合同量 -->
-      <template #qty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="secondBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+            <!-- 跟单员 -->
+            <template #meruserid="{ record }">
+                <span>{{ findManagerName(record.meruserid) }}</span>
+            </template>
+            <!-- 合同量 -->
+            <template #qty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/information/spot-contract/list/performance/index.vue

@@ -1,79 +1,82 @@
 <template>
-  <!-- 现货合同: 履约中-->
-  <div class="spot-contract-performance">
-    <filterCustomTable @search="updateColumn"
-                       :loading="loading">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="topTable"
-             :pagination="false"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList"
-             :scroll="{ x: 'calc(100% - 180px)', y: 'calc(100vh - 163px)' }">
-      <!-- 额外的展开行 -->
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="secondBtn"
-                 class="btn-list-sticky"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <template #biztype="{ text }">
-        <a>{{ getBizTypeName(text) }}</a>
-      </template>
+    <!-- 现货合同: 履约中-->
+    <div class="spot-contract-performance">
+        <filterCustomTable @search="updateColumn" :loading="loading">
+            <BtnList :btnList="firstBtn" @click="openComponent" />
+        </filterCustomTable>
+        <a-table
+            :columns="columns"
+            class="topTable"
+            :pagination="false"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="key"
+            :data-source="tableList"
+            :scroll="{ x: 'calc(100% - 160px)', y: 'calc(100vh - 163px)' }"
+        >
+            <!-- 额外的展开行 -->
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <BtnList
+                    :btnList="secondBtn"
+                    class="btn-list-sticky"
+                    :record="record"
+                    @click="openComponent"
+                />
+            </template>
+            <template #biztype="{ text }">
+                <a>{{ getBizTypeName(text) }}</a>
+            </template>
 
-      <template #pricetype="{ text }">
-        <a>{{ getPriceTypeName(text) }}</a>
-      </template>
+            <template #pricetype="{ text }">
+                <a>{{ getPriceTypeName(text) }}</a>
+            </template>
 
-      <template #contracctstatus="{ text }">
-        <a>{{ getContractStatusName(text) }}</a>
-      </template>
+            <template #contracctstatus="{ text }">
+                <a>{{ getContractStatusName(text) }}</a>
+            </template>
 
-      <template #contracttype="{ text }">
-        <a>{{ getContractTypeName(text) }}</a>
-      </template>
-      <!-- 对手方 -->
-      <template #negative="{ record }">
-        <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-      </template>
-      <!-- 点假期 -->
-      <template #startdate="{ record }">
-        <span>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</span>
-      </template>
-      <!-- 交收期 -->
-      <template #deliverystartdate="{ record }">
-        <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d")) }}</span>
-      </template>
-      <!-- 业务员 -->
-      <template #saleuserid="{ record }">
-        <span>{{ findManagerName(record.saleuserid) }}</span>
-      </template>
+            <template #contracttype="{ text }">
+                <a>{{ getContractTypeName(text) }}</a>
+            </template>
+            <!-- 对手方 -->
+            <template #negative="{ record }">
+                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
+            </template>
+            <!-- 点假期 -->
+            <template #startdate="{ record }">
+                <span>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</span>
+            </template>
+            <!-- 交收期 -->
+            <template #deliverystartdate="{ record }">
+                <span>
+                    {{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
+                    formatTime(record.deliveryenddate, "d")) }}
+                </span>
+            </template>
+            <!-- 业务员 -->
+            <template #saleuserid="{ record }">
+                <span>{{ findManagerName(record.saleuserid) }}</span>
+            </template>
 
-      <!-- 跟单员 -->
-      <template #meruserid="{ record }">
-        <span>{{ findManagerName(record.meruserid) }}</span>
-      </template>
-      <!-- 合同量 -->
-      <template #qty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="secondBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+            <!-- 跟单员 -->
+            <template #meruserid="{ record }">
+                <span>{{ findManagerName(record.meruserid) }}</span>
+            </template>
+            <!-- 合同量 -->
+            <template #qty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 145px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"
@@ -134,7 +134,8 @@ export default defineComponent({
 <style lang="less">
 .buy-sell-market {
     .btnDeafault.ant-btn {
-        height: 30px;
+        height: 28px;
+        line-height: 28px;
     }
 }
 </style>

src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 145px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"
@@ -131,7 +131,8 @@ export default defineComponent({
 <style lang="less">
 .buy-sell-market {
     .btnDeafault.ant-btn {
-        height: 30px;
+        height: 28px;
+        line-height: 28px;
     }
 }
 </style>

src/views/market/spot_trade/components/buy-sell-market/index.vue

@@ -238,11 +238,11 @@ export default defineComponent({
 .priceBar {
     .flex;
     flex-direction: column;
-    height: 40px;
+    height: 32px;
     .greenBar,
     .redBar {
-        height: 20px;
-        line-height: 20px;
+        height: 16px;
+        line-height: 16px;
     }
 }
 </style>

src/views/market/spot_trade/components/filter/index.vue

@@ -242,7 +242,8 @@ export default defineComponent({
     margin-top: 0;
 }
 .btnDeafault.ant-btn {
-    height: 30px;
+    height: 28px;
+    line-height: 28px;
 }
 </style>;
 

src/views/market/spot_trade/spot_trade_order_transaction/components/buy-sell-market/components/buy/index.vue

@@ -3,7 +3,7 @@
     <a-table
         :columns="handleColumn(columns)"
         :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
-        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 145px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"
@@ -134,7 +134,8 @@ export default defineComponent({
 <style lang="less">
 .buy-sell-market {
     .btnDeafault.ant-btn {
-        height: 30px;
+        height: 28px;
+        line-height: 28px;
     }
 }
 </style>

src/views/market/spot_trade/spot_trade_order_transaction/components/buy-sell-market/components/sell/index.vue

@@ -1,33 +1,35 @@
 <template>
-  <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
-  <a-table :columns="handleColumn(columns)"
-           :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
-           :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 180px)' }"
-           :pagination="false"
-           :loading="loading"
-           :expandedRowKeys="expandedRowKeys"
-           :customRow="Rowclick"
-           :expandIcon="expandIcon"
-           :expandIconAsCell="false"
-           rowKey="key"
-           :data-source="tableList">
-    <!-- 额外的展开行 -->
-    <template #expandedRowRender="{ record }">
-      <BtnList :btnList="btnList"
-               :record="record"
-               @click="openComponent" />
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " " }}{{text}}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :enumName="enumName"
-             :buyOrSell="BuyOrSell.sell"
-             :parantSelectedRow="parantSelectedRow"
-             @cancel="closeComponent"></component>
+    <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
+    <a-table
+        :columns="handleColumn(columns)"
+        :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 470px)' : 'calc(100vh - 145px)' }"
+        :pagination="false"
+        :loading="loading"
+        :expandedRowKeys="expandedRowKeys"
+        :customRow="Rowclick"
+        :expandIcon="expandIcon"
+        :expandIconAsCell="false"
+        rowKey="key"
+        :data-source="tableList"
+    >
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{ record }">
+            <BtnList :btnList="btnList" :record="record" @click="openComponent" />
+        </template>
+        <template #username="{text, record }">
+            <span>{{record.userid + " " }}{{text}}</span>
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :enumName="enumName"
+        :buyOrSell="BuyOrSell.sell"
+        :parantSelectedRow="parantSelectedRow"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">
@@ -128,7 +130,8 @@ export default defineComponent({
 <style lang="less">
 .buy-sell-market {
     .btnDeafault.ant-btn {
-        height: 30px;
+        height: 28px;
+        line-height: 28px;
     }
 }
 </style>