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

src/assets/styles/mixin.less

@@ -257,6 +257,100 @@
         color:  @m-grey17;
     }
 }
+// 展开行操作按钮显示问题
+.topOrderTable {
+    .ant-table {
+        width: 100%;
+        table {
+            border: 0;
+        }
+        .ant-table-thead {
+            tr {
+                box-shadow: 0px 1px 0px 0px #2E3539;
+                th {
+                    line-height: 34px;
+                    background: @m-black8;
+                    padding-top: 0;
+                    padding-bottom: 0;
+                    color: @m-grey17;
+                    font-size: 14px;
+                    border-right: 1px solid @m-black9;
+                    border-bottom: 1px solid @m-black9;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                }
+            }
+        }
+        .ant-table-tbody {
+            tr {
+                td {
+                    height: 34px;
+                    line-height: 34px;
+                    padding: 0 8px;
+                    border-right: 1px solid @m-black9;
+                    border-bottom: 1px solid @m-black9;
+                    font-size: 16px;
+                    color: @m-white1;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                }
+            }
+            tr.ant-table-expanded-row:hover { //tr.ant-table-expanded-row, 
+                td {
+                    background-color: @m-blue3;
+                }
+            }
+            tr.ant-table-expanded-row {
+                td {
+                    text-align: right;
+                }
+                td:last-child {
+                    position: relative;
+                    .btn-list {
+                        position: absolute;
+                        left: calc(100vw - 530px);
+                        top: 4px;
+                        width: 300px;
+                        text-align: right;
+                        .operBtn.ant-btn {
+                            margin-top: 0;
+                            margin-bottom: 0;
+                            height: 26px;
+                            line-height: 26px;
+                        }
+                    }
+                }
+            }
+        }
+        .ant-table-placeholder {
+            border: 0;
+            background: @m-black2;
+        }
+    }
+    .ant-table-row-expand-icon {
+        border-color: @m-grey17;
+        background-color: transparent;
+        color:  @m-grey17;
+    }
+}
+// 折叠菜单后右侧表格中展开后操作按钮的位置
+.collapsed {
+    .topOrderTable {
+        .ant-table {
+            .ant-table-tbody {
+                tr.ant-table-expanded-row {
+                    td:last-child {
+                        .btn-list {
+                            left: calc(100vw - 430px);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 // 弹窗表格
 .dialogTable {
     .ant-table {
@@ -1325,3 +1419,6 @@ input:-internal-autofill-selected {
       background-color: transparent;
   }
 
+  .ant-layout-sider-has-trigger {
+      padding-bottom: 40px;
+  }

src/layout/components/top.vue

@@ -163,6 +163,12 @@ export default defineComponent({
         width: 100%;
         .inlineflex;
         border-bottom: 1px solid @m-black2;
+        .ant-layout-sider-has-trigger {
+            background: @m-black4;
+            .ant-layout-sider-children {
+                background: @m-grey18;
+            }
+        }
         .m-layout-left {
             height: calc(100vh - 40px);
             background: @m-black4;

src/views/business/exposure/list/spot/index.vue

@@ -133,6 +133,17 @@ export default defineComponent({
 .exposure-spot {
     position: relative;
     overflow: hidden;
+    .bottomTable {
+        width: 100%;
+        .flex;
+        flex-direction: column;
+        .topTable {
+            height: calc(100% - 46px);
+            .ant-table {
+                background-color: transparent;
+            }
+        }
+    }
 }
 </style
 >;

src/views/business/plan/list/uncommitted/index.vue

@@ -113,5 +113,13 @@ export default defineComponent({
 
 <style lang="less">
 .plan-uncommitted {
+  .topTable {
+    .operBtn.ant-btn {
+      margin-top: 0;
+      margin-bottom: 0;
+      height: 26px;
+      line-height: 26px;
+    }
+  }
 }
 </style>;

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

@@ -7,7 +7,7 @@
     </filterCustomTable>
     <contextMenu :contextMenuList="forDataBtn">
       <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
+               class="topOrderTable hiddenFirstCol"
                :pagination="false"
                :expandedRowKeys="expandedRowKeys"
                :customRow="Rowclick"