整体布局优化调整，做事商列表优化
This commit is contained in:
parent
6a714a77a9
commit
aadff7e389
|
|
@ -1,85 +1,93 @@
|
|||
@use './user.scss';
|
||||
@use './system.scss';
|
||||
|
||||
* {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
html,
|
||||
body,
|
||||
#app {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
overflow: hidden;
|
||||
/* 隐藏全局滚动条 */
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
overflow: hidden;
|
||||
/* 隐藏全局滚动条 */
|
||||
}
|
||||
|
||||
.app-container {
|
||||
width: inherit;
|
||||
height: inherit;
|
||||
display: flex;
|
||||
.layout {
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
flex: 1;
|
||||
|
||||
aside {
|
||||
width: 200px;
|
||||
height: 100%;
|
||||
border-right: solid 1px var(--el-menu-border-color);
|
||||
}
|
||||
.layout {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex: 1;
|
||||
|
||||
.main-container {
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
main {
|
||||
padding: 20px;
|
||||
overflow: auto;
|
||||
max-height: calc(1080px - 200px);
|
||||
height: 100%;
|
||||
}
|
||||
aside {
|
||||
width: 200px;
|
||||
height: 100%;
|
||||
border-right: solid 1px var(--el-menu-border-color);
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.main-container {
|
||||
width: calc(100% - 200px);
|
||||
flex: 1 1 auto;
|
||||
height: 100%;
|
||||
|
||||
main {
|
||||
padding: 20px;
|
||||
overflow: auto;
|
||||
max-height: calc(1080px - 200px);
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 全局通知样式
|
||||
.global-notification {
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
|
||||
// 2. 重写动画：从顶部淡入（取消右侧滑入）
|
||||
&.el-notification-fade-enter-active,
|
||||
&.el-notification-fade-leave-active {
|
||||
transition: all 0.3s ease-out !important;
|
||||
transform: translate(-50%, -150%) !important;
|
||||
}
|
||||
// 2. 重写动画：从顶部淡入（取消右侧滑入）
|
||||
&.el-notification-fade-enter-active,
|
||||
&.el-notification-fade-leave-active {
|
||||
transition: all 0.3s ease-out !important;
|
||||
transform: translate(-50%, -150%) !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* 页面级过渡动画样式（name="fade" 对应前缀 fade-） */
|
||||
/* 1. 进入/离开的初始状态 */
|
||||
.global-enter-from,
|
||||
.global-leave-to {
|
||||
opacity: 0;
|
||||
/* 初始透明 */
|
||||
transform: translateX(20px);
|
||||
/* 初始右移20px */
|
||||
opacity: 0;
|
||||
/* 初始透明 */
|
||||
transform: translateX(20px);
|
||||
/* 初始右移20px */
|
||||
}
|
||||
|
||||
/* 2. 进入/离开的过渡过程 */
|
||||
.global-enter-active,
|
||||
.global-leave-active {
|
||||
transition: all 0.5s ease;
|
||||
/* 过渡时长、缓动效果 */
|
||||
transition: all 0.5s ease;
|
||||
/* 过渡时长、缓动效果 */
|
||||
}
|
||||
|
||||
/* 3. 进入完成/离开开始的状态 */
|
||||
.global-enter-to,
|
||||
.global-leave-from {
|
||||
opacity: 1;
|
||||
/* 最终不透明 */
|
||||
transform: translateX(0);
|
||||
/* 最终回到原位 */
|
||||
opacity: 1;
|
||||
/* 最终不透明 */
|
||||
transform: translateX(0);
|
||||
/* 最终回到原位 */
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
<el-table
|
||||
ref="tableRef"
|
||||
height="100%"
|
||||
style="width: 100%"
|
||||
:data="tableData"
|
||||
:row-key="rowKey"
|
||||
:tree-props="treeProps"
|
||||
|
|
|
|||
|
|
@ -5,40 +5,45 @@ export const marketSearch = [
|
|||
]
|
||||
|
||||
export const marketTableColumns = [
|
||||
// id
|
||||
{ label: 'ID', prop: 'id', align: 'center' as const },
|
||||
//代理关系
|
||||
{ label: '代理关系', prop: 'agentRelation', align: 'center' as const, width: '200px' },
|
||||
//账户名
|
||||
{ label: '账户名', prop: 'accountName', align: 'center' as const },
|
||||
//级别
|
||||
{ label: '级别', prop: 'level', align: 'center' as const },
|
||||
//基本账户
|
||||
{ label: '基本账户', prop: 'basicAccount', align: 'center' as const },
|
||||
//保证金
|
||||
{ label: '保证金', prop: 'margin', align: 'center' as const },
|
||||
//停止接单保证金
|
||||
{ label: '停止接单保证金', prop: 'stopOrderMargin', align: 'center' as const, width: '160px' },
|
||||
//持仓转移保证金
|
||||
{ label: '持仓转移保证金', prop: 'positionTransferMargin', align: 'center' as const, width: '160px' },
|
||||
//头寸比率
|
||||
{ label: '头寸比率', prop: 'positionRatio', align: 'center' as const },
|
||||
//点差返佣
|
||||
{ label: '点差返佣', prop: 'pointSpreadCommission', align: 'center' as const },
|
||||
//点差
|
||||
{ label: '点差', slotName: 'pointSpread', align: 'center' as const },
|
||||
//手续费比例
|
||||
{ label: '手续费比例', prop: 'commissionRatio', align: 'center' as const },
|
||||
//手续费返佣
|
||||
{ label: '手续费返佣', prop: 'commissionReturn', align: 'center' as const },
|
||||
//浮动盈亏
|
||||
{ label: '浮动盈亏', prop: 'floatProfitLoss', align: 'center' as const },
|
||||
//平仓盈亏
|
||||
{ label: '平仓盈亏', prop: 'closeProfitLoss', align: 'center' as const },
|
||||
//风险金
|
||||
{ label: '风险金', prop: 'riskMargin', align: 'center' as const },
|
||||
//服务费
|
||||
{ label: '服务费', prop: 'serviceFee', align: 'center' as const },
|
||||
// id
|
||||
{ label: 'ID', prop: 'id', align: 'center' as const, width: '100px' },
|
||||
//代理关系
|
||||
{ label: '代理关系', prop: 'agentRelation', align: 'center' as const, width: '200px' },
|
||||
//账户名
|
||||
{ label: '账户名', prop: 'accountName', align: 'center' as const, width: '120px' },
|
||||
//级别
|
||||
{ label: '级别', prop: 'level', align: 'center' as const, width: '120px' },
|
||||
//基本账户
|
||||
{ label: '基本账户', prop: 'basicAccount', align: 'center' as const, width: '200px' },
|
||||
//保证金
|
||||
{ label: '保证金', prop: 'margin', align: 'center' as const, width: '200px' },
|
||||
//停止接单保证金
|
||||
{ label: '停止接单保证金', prop: 'stopOrderMargin', align: 'center' as const, width: '200px' },
|
||||
//持仓转移保证金
|
||||
{
|
||||
label: '持仓转移保证金',
|
||||
prop: 'positionTransferMargin',
|
||||
align: 'center' as const,
|
||||
width: '200px',
|
||||
},
|
||||
//头寸比率
|
||||
{ label: '头寸比率', prop: 'positionRatio', align: 'center' as const, width: '150px' },
|
||||
//点差返佣
|
||||
{ label: '点差返佣', prop: 'pointSpreadCommission', align: 'center' as const, width: '200px' },
|
||||
//点差
|
||||
{ label: '点差', slotName: 'pointSpread', align: 'center' as const, width: '150px' },
|
||||
//手续费比例
|
||||
{ label: '手续费比例', prop: 'commissionRatio', align: 'center' as const, width: '150px' },
|
||||
//手续费返佣
|
||||
{ label: '手续费返佣', prop: 'commissionReturn', align: 'center' as const, width: '150px' },
|
||||
//浮动盈亏
|
||||
{ label: '浮动盈亏', prop: 'floatProfitLoss', align: 'center' as const, width: '100px' },
|
||||
//平仓盈亏
|
||||
{ label: '平仓盈亏', prop: 'closeProfitLoss', align: 'center' as const, width: '150px' },
|
||||
//风险金
|
||||
{ label: '风险金', prop: 'riskMargin', align: 'center' as const, width: '150px' },
|
||||
//服务费
|
||||
{ label: '服务费', prop: 'serviceFee', align: 'center' as const, width: '150px' },
|
||||
]
|
||||
|
||||
//做市商添加配置
|
||||
|
|
|
|||
Loading…
Reference in New Issue