表格高度调整

src/assets/styles/mixin.less

@@ -2027,6 +2027,17 @@ input:-internal-autofill-selected {
 .bdf1 {
     border-left: 1PX solid @m-grey31;
 }
+// 上半部分表格高度
+.topTableHeight {
+    .srcollYTable {
+        .ant-table {
+            .ant-table-body {
+                min-height: calc(100vh - 413px);
+                background: @m-black2;
+            }
+        }
+    }
+}
 // 买卖大厅表格
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
@@ -2133,11 +2144,11 @@ input:-internal-autofill-selected {
 }
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
-        min-height: calc(100vh - 384px);
+        min-height: calc(100vh - 385px);
     }
     .ant-table {
         .ant-table-tbody {
-            min-height: calc(100vh - 384px);
+            min-height: calc(100vh - 385px);
         }
     }
 }

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 - 145px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : 'calc(100vh - 145px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

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 - 145px)' }"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : 'calc(100vh - 145px)' }"
         :pagination="false"
         :loading="loading"
         :expandedRowKeys="expandedRowKeys"

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

@@ -1,37 +1,43 @@
 <template>
-  <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
-  <a-table :columns="handleColumn(columns)"
-           :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', 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="btnListData"
-               :record="record"
-               class="btn-list-sticky"
-               @click="openComponent" />
-    </template>
-    <template #fixedprice="{record }">
-      <span>{{record.useorderpricerid }}</span>
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " "}}{{text}}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :parantSelectedRow="parantSelectedRow"
-             :buyOrSell="BuyOrSell.buy"
-             @cancel="closeComponent"></component>
+    <!--  现货贸易 - 买卖大厅 - 卖报价牌 -->
+    <a-table
+        :columns="handleColumn(columns)"
+        :class="['buyHallTable', isBottom ? '' : 'buyHallTableHigh', tableList.length ? '' : 'noDataTable']"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : '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="btnListData"
+                :record="record"
+                class="btn-list-sticky"
+                @click="openComponent"
+            />
+        </template>
+        <template #fixedprice="{record }">
+            <span>{{record.useorderpricerid }}</span>
+        </template>
+        <template #username="{text, record }">
+            <span>{{record.userid + " "}}{{text}}</span>
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :parantSelectedRow="parantSelectedRow"
+        :buyOrSell="BuyOrSell.buy"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">

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

@@ -1,35 +1,37 @@
 <template>
-  <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
-  <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="btnListData"
-               :record="record"
-               @click="openComponent" />
-    </template>
-    <template #username="{text, record }">
-      <span>{{record.userid + " " }}{{text}}</span>
-    </template>
-    <template #fixedprice="{record }">
-      <span>{{record.useorderpricerid }}</span>
-    </template>
-  </a-table>
-  <component :is="componentId"
-             v-if="componentId"
-             :selectedRow="selectedRow"
-             :parantSelectedRow="parantSelectedRow"
-             :buyOrSell="BuyOrSell.sell"
-             @cancel="closeComponent"></component>
+    <!-- 现货贸易 - 买卖大厅 - 买报价牌 -->
+    <a-table
+        :columns="handleColumn(columns)"
+        :class="['sellHallTable', isBottom ? '' : 'sellHallTableHigh', tableList.length ? '' : 'noDataTable']"
+        :scroll="{ x: '100%', y: isBottom ? 'calc(100vh- 385px)' : '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="btnListData" :record="record" @click="openComponent" />
+        </template>
+        <template #username="{text, record }">
+            <span>{{record.userid + " " }}{{text}}</span>
+        </template>
+        <template #fixedprice="{record }">
+            <span>{{record.useorderpricerid }}</span>
+        </template>
+    </a-table>
+    <component
+        :is="componentId"
+        v-if="componentId"
+        :selectedRow="selectedRow"
+        :parantSelectedRow="parantSelectedRow"
+        :buyOrSell="BuyOrSell.sell"
+        @cancel="closeComponent"
+    ></component>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_basis_difference/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer/index.vue

@@ -1,65 +1,67 @@
 <template>
-  <!--订单交易 挂牌转让-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="goodscode"
-             ref="tableRef"
-             :data-source="getQuoteList()">
-      <template #totalturnover="{ text }">
-        <span>{{changeUnit(text)}}</span>
-      </template>
-      <!-- 涨跌 -->
-      <template #change="{ record }">
-        <span>{{quoteChange(record, record.decimalplace)}}</span>
-      </template>
-      <!-- 幅度 -->
-      <template #amplitude="{ record }">
-        <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
-      </template>
-      <!-- 振幅 -->
-      <template #vibration="{ record }">
-        <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
-      </template>
-      <template #index="{ index }">
-        <span>{{index + 1}}</span>
-      </template>
-      <!-- 买价 -->
-      <template #bid="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 卖价 -->
-      <template #ask="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最新价 -->
-      <template #last="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最低价 -->
-      <template #lowest="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最高价 -->
-      <template #highest="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="btnList"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               :deliverGoods="findDeilverGoodsByGoodsCode(selectedRow.goodscode)"
-               @cancel="closeComponent"></component>
-  </div>
+    <!--订单交易 挂牌转让-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="goodscode"
+            ref="tableRef"
+            :data-source="getQuoteList()"
+        >
+            <template #totalturnover="{ text }">
+                <span>{{changeUnit(text)}}</span>
+            </template>
+            <!-- 涨跌 -->
+            <template #change="{ record }">
+                <span>{{quoteChange(record, record.decimalplace)}}</span>
+            </template>
+            <!-- 幅度 -->
+            <template #amplitude="{ record }">
+                <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
+            </template>
+            <!-- 振幅 -->
+            <template #vibration="{ record }">
+                <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
+            </template>
+            <template #index="{ index }">
+                <span>{{index + 1}}</span>
+            </template>
+            <!-- 买价 -->
+            <template #bid="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 卖价 -->
+            <template #ask="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最新价 -->
+            <template #last="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最低价 -->
+            <template #lowest="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最高价 -->
+            <template #highest="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="btnList"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :selectedRow="selectedRow"
+            :deliverGoods="findDeilverGoodsByGoodsCode(selectedRow.goodscode)"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/spot_trade_reference_market/index.vue

@@ -1,65 +1,67 @@
 <template>
-  <!--参考行情-->
-  <div class="topTableHeight">
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="goodscode"
-             ref="tableRef"
-             :data-source="goodsList">
-      <template #totalturnover="{ text }">
-        <span>{{changeUnit(text)}}</span>
-      </template>
-      <!-- 涨跌 -->
-      <template #change="{ record }">
-        <span>{{quoteChange(record, record.decimalplace)}}</span>
-      </template>
-      <!-- 幅度 -->
-      <template #amplitude="{ record }">
-        <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
-      </template>
-      <!-- 振幅 -->
-      <template #vibration="{ record }">
-        <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
-      </template>
-      <template #index="{ index }">
-        <span>{{index + 1}}</span>
-      </template>
-      <!-- 买价 -->
-      <template #bid="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 卖价 -->
-      <template #ask="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最新价 -->
-      <template #last="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最低价 -->
-      <template #lowest="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-      <!-- 最高价 -->
-      <template #highest="{ text, record }">
-        <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
-      </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="firstBtn"></contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :enumName="name"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!--参考行情-->
+    <div class="topTableHeight">
+        <a-table
+            :columns="columns"
+            class="srcollYTable"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
+            :pagination="false"
+            :loading="loading"
+            :expandedRowKeys="expandedRowKeys"
+            :customRow="Rowclick"
+            rowKey="goodscode"
+            ref="tableRef"
+            :data-source="goodsList"
+        >
+            <template #totalturnover="{ text }">
+                <span>{{changeUnit(text)}}</span>
+            </template>
+            <!-- 涨跌 -->
+            <template #change="{ record }">
+                <span>{{quoteChange(record, record.decimalplace)}}</span>
+            </template>
+            <!-- 幅度 -->
+            <template #amplitude="{ record }">
+                <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
+            </template>
+            <!-- 振幅 -->
+            <template #vibration="{ record }">
+                <span>{{quoteAmplituOfVibration(record, record.decimalplace)}}</span>
+            </template>
+            <template #index="{ index }">
+                <span>{{index + 1}}</span>
+            </template>
+            <!-- 买价 -->
+            <template #bid="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 卖价 -->
+            <template #ask="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最新价 -->
+            <template #last="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最低价 -->
+            <template #lowest="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+            <!-- 最高价 -->
+            <template #highest="{ text, record }">
+                <span :class="handleQuotePriceColor(text, record.presettle)">{{text}}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="firstBtn"></contextMenu>
+        <component
+            :is="componentId"
+            v-if="componentId"
+            :enumName="name"
+            :selectedRow="selectedRow"
+            @cancel="closeComponent"
+        ></component>
+    </div>
 </template>
 
 <script lang="ts">

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_floating_price/index.vue

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/warehouse_pre_sale/warehouse_pre_sale_price/index.vue

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_floating_price/index.vue

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/market/spot_trade/warehouse_receipt_trade/warehouse_receipt_trade_price/index.vue

@@ -5,7 +5,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_commission_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_contract_summary/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_delivery_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_commodity_contract/search_document_records_transaction_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_protocol_specified_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"

src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_protocol_specified_record/index.vue

@@ -4,7 +4,7 @@
         <a-table
             :columns="columns"
             class="srcollYTable"
-            :scroll="{ x: '100%', y: 'calc(100vh - 384px)' }"
+            :scroll="{ x: '100%', y: 'calc(100vh - 413px)' }"
             :pagination="false"
             :loading="loading"
             :expandedRowKeys="expandedRowKeys"