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

src/assets/styles/mixin.less

@@ -313,7 +313,6 @@
         .ant-table-placeholder {
             border    : 0;
             background: @m-black2;
-            min-height: 190px;
         }
     }
 

src/common/components/tableScroll/index.less

@@ -13,4 +13,20 @@
         flex      : 1;
         overflow-y: auto;
     }
+
+    .ant-table-wrapper,
+    .ant-table-content,
+    .ant-table-scroll,
+    .ant-table-body {
+        height          : 100%;
+        background-color: transparent !important;
+    }
+
+    .ant-table {
+        background-color: transparent;
+    }
+
+    .ant-table-empty .ant-table-body {
+        display: none;
+    }
 }

src/common/components/tableScroll/index.vue

@@ -57,6 +57,6 @@ export default defineComponent({
 })
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import './index.less';
 </style>

src/layout/components/bottom.vue

@@ -4,6 +4,7 @@
     <main :class="[isCapitalLeft ? 'main-some' : 'main-all']">
       <firstMenu :list="orderList" :value="'title'" @selectMenu="selectMenu">
         <div class="right-menu-content">
+          <a-button class="operBtn" @click="getTradeAccountList">刷新</a-button>
           <!-- 资金信息 -->
           <a-select class="capitalSelect" style="width: 180px" placeholder="请选择账户" @change="tradeAccountChange" v-model:value="selectedAccountId">
             <a-select-option v-for="item in tradeAccountList" :value="item.accountid" :key="item.accountid">{{item.accountid}}</a-select-option>
@@ -71,6 +72,7 @@ export default defineComponent({
       componentId.value = value.code;
     }
     return {
+      getTradeAccountList,
       selectMenu,
       componentId,
       orderList,
@@ -88,6 +90,7 @@ export default defineComponent({
 <style lang="less">
 .right-menu-content {
     display: flex;
+    align-items: center;
     .capitalSelect {
         margin-top: 2px;
         margin-right: 10px;
@@ -118,6 +121,9 @@ export default defineComponent({
     width: 100%;
     transition: height 300ms;
     overflow: hidden;
+    .operBtn {
+        margin-right: 8px;
+    }
     .capital-info-container {
         border-right: 1px solid @m-black2;
     }

src/services/bus/system.ts

@@ -1,5 +1,6 @@
 import { parseReceivePush } from '@/services/socket/quota/adapter/index';
 import eventBus from '@/utils/eventBus';
+import { throttle } from '@/utils/time'
 
 /**
  * 交易通知处理，涉及各个方面
@@ -29,7 +30,10 @@ export const notice = (logout: Function) => {
     eventBus.$onOnly('quoteReceiveNtf', (msg: any) => {
         if (msg) {
             // console.warn(msg);
-            parseReceivePush(msg);
+            // 节流优化，降低推送频率，防止页面渲染更新太快导致cpu占用率过高
+            throttle(() => {
+                parseReceivePush(msg);
+            }, 100)
         }
     });
 };

src/services/socket/order/interface/index.ts

@@ -36,7 +36,7 @@ export interface CancelOrderReq {
     ClientOrderTime?: string; // 客户端委托时间
     ClientType?: number; // 终端类型
     OperateType?: number; // 操作类型
-    OldOrderId: number; // 原委托单号
+    OldOrderId: string; // 原委托单号
     AccountID: number; // 交易账号
     OrderSrc?: number; // 单据来源
     OperatorID?: number; // 操作员账号ID

src/views/order/futures_information/components/futures_information_entrust/setup.tsx

@@ -29,7 +29,7 @@ export const cancel = defineComponent({
             loading.value = true;
             const { orderid, marketid, goodsid } = props.selectedRow;
             const param: CancelOrderReq = {
-                OldOrderId: Number(orderid),
+                OldOrderId: orderid,
                 AccountID: getSelectedAccountId(), // uint64 资金账号
                 OperatorID: geLoginID_number() ?? 0, // uint64 操作员账号ID
                 MarketID: marketid,

src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -3,11 +3,11 @@
   <!-- 汇总损益报表 -->
   <mtp-table-scroll>
     <template #default="{ scroll }">
-      <a-table :columns="getColumns()" class="srcollYTable" :scroll="scroll" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="customRow" :rowKey="(record,index)=>index" :data-source="tableList"></a-table>
+      <a-table :columns="getColumns()" class="srcollYTable" :scroll="scroll" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :rowKey="(record,index)=>index" :data-source="tableList"></a-table>
     </template>
   </mtp-table-scroll>
-  <!-- 明细 -->
-  <mtp-table-detail :columns="columnsDetail" :data-source="detailTableList" :tabs="tabList" v-model:visible="visible" @change="changeTab">
+  <!-- 明细，日报表不显示“损益明细“标签页 -->
+  <mtp-table-detail :columns="columnsDetail" :data-source="detailTableList" :tabs="tabList" v-model:visible="visible" @change="changeTab" v-show="cycletype > 0">
     <!-- 出现浮点失真  强行处理 * 2-->
     <template #spotactualpl="{ record }">
       <span>{{ record.spotactualpl.toFixed(2) }}</span>
@@ -96,15 +96,6 @@ export default defineComponent({
     // 当前选中的标签
     const tabIndex = ref(0);
 
-    // 自定义表格事件
-    const customRow = (record: Ermcp3ArealSumPL, index: number) => {
-      // 日报表不显示“损益明细“标签页
-      if (cycletype.value === 0) {
-        return {};
-      }
-      return Rowclick(record, index);
-    };
-
     // 切换明细
     function changeTab(index: number) {
       tabIndex.value = index;
@@ -163,9 +154,10 @@ export default defineComponent({
       detailTableList,
       expandedRowKeys,
       selectedRow,
-      customRow,
+      Rowclick,
       tabList,
       changeTab,
+      cycletype,
     };
   },
 });