diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss index 97c7984..d9312ec 100644 --- a/src/style/theme/common.scss +++ b/src/style/theme/common.scss @@ -180,8 +180,8 @@ body { margin: 0 auto; } .min-flex-right { - min-width: 1033px; - max-width: 1556px; + min-width: 1020px; + // max-width: 1556px; width: 84.75%; margin: 0 auto; .flex-common{ @@ -727,8 +727,76 @@ body { color: #1E2226; } } +.nowrap{ + white-space: nowrap !important; + overflow: hidden !important; + text-overflow: ellipsis !important; +} +.tableHeaderSelect{ + height: 18px !important; +} +/* 小屏幕下调整 */ +@media screen and (max-width: 1440px) { +.el-table th.el-table__cell > .cell{ + white-space: nowrap !important; + } + .cell-content { + display: inline-block; + max-width:60%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + .svg-icon-wrapper{ + width: 12px !important; + height: 12px !important; + } +} +@media screen and (min-width: 1321px) and (max-width: 1440px){ +.el-table{ + th,td{ + font-size: 13px !important; + } +} +// body{ +// font-size: 13px !important; +// } +.tableHeaderSelect .el-input__inner{ + font-size: 13px !important; +} +} +@media screen and (max-width: 1320px){ +// body{ +// font-size: 12px !important; +// } +.el-table{ + th,td{ + font-size: 12px !important; + } +} +.tableHeaderSelect .el-input__inner{ + font-size: 12px !important; +} + +} +@media screen and (min-width: 1440px) { +.el-table{ + th,td{ + font-size: 14px !important; + } +} +.cell-content { + white-space: normal; + max-width: none; +} +.svg-icon-wrapper{ + // width: 12px !important; + // height: 12px !important; + } +} + // table start .el-table{ min-height: 258px; @@ -737,12 +805,17 @@ body { font-weight: normal; letter-spacing: 0.08em; color: #1E2226; - height: 56px; - padding: 18px 16px !important; + // height: 56px; + padding: 8px 10px !important; box-sizing: border-box !important; } td{ } + .tableColumn{ + display: flex; + flex-direction: column; + justify-content: flex-start; + } } .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell { background-color: #F6F7FA; @@ -762,7 +835,12 @@ body { // height: auto !important; // background: transparent !important; // } - +.el-table th.el-table__cell > .cell{ + padding-left: 0 !important; + padding-right: 0 !important; + display: flex; + align-items: center; +} .el-table th.el-table__cell { background: #F6F7FA; padding: 10px 0; @@ -778,8 +856,8 @@ body { } .el-table .cell { - padding-left: 16px; - padding-right: 16px; + padding-left: 0px; + padding-right: 0px; } .el-table .el-form-item { margin-bottom: 0; @@ -788,10 +866,12 @@ body { // 表格行内小图标 默认隐藏 .el-table .svg-icon-wrapper{ display: none !important; + margin-left: 8px; } //划过时 显示 .el-table__row:hover{ .svg-icon-wrapper{ + margin-left: 8px; display: block !important; } } @@ -881,6 +961,9 @@ body { display: flex; align-items: center; } +.flex-end{ + align-items: flex-end !important; +} // 公共圆角类名 .br4{ border-radius: 4px; diff --git a/src/views/super/Ranking/RankBatchList.vue b/src/views/super/Ranking/RankBatchList.vue index 4e31fe3..dd6b547 100644 --- a/src/views/super/Ranking/RankBatchList.vue +++ b/src/views/super/Ranking/RankBatchList.vue @@ -64,7 +64,7 @@ 查看更多 - 关闭 + @@ -86,7 +86,7 @@ 查看更多 - 关闭 + @@ -134,7 +134,8 @@ key="top" prop="top" label="代理商排行" width="250" fixed="right">