diff --git a/src/assets/styles/diythem.scss b/src/assets/styles/diythem.scss index e61d8e2..a023aa2 100644 --- a/src/assets/styles/diythem.scss +++ b/src/assets/styles/diythem.scss @@ -39,25 +39,25 @@ } // 表格 - .el-table .el-table__header-wrapper th { - font-size: 12px; - font-weight: 400; - // height: 35px; - color: #666; - background-color: #f2f2f2; - } - .el-table--medium .el-table__cell { - padding: 3px 0; - // height: 35px; - font-size: 12px; - color: #666; - } + // .el-table .el-table__header-wrapper th { + // font-size: 12px; + // font-weight: 400; + // // height: 35px; + // color: #666; + // background-color: #f2f2f2; + // } + // .el-table--medium .el-table__cell { + // padding: 3px 0; + // // height: 35px; + // font-size: 12px; + // color: #666; + // } - .el-table .fixed-width .el-button--mini { - font-size: 12px; - padding: 6px 6px; - width: inherit; - } + // .el-table .fixed-width .el-button--mini { + // font-size: 12px; + // padding: 6px 6px; + // width: inherit; + // } //分页 } // 弹窗 diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 27c4c04..df22a48 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -167,23 +167,23 @@ h6 { } } -.el-table .fixed-width .el-button--mini { - padding-left: 0; - padding-right: 0; - width: inherit; -} +// .el-table .fixed-width .el-button--mini { +// padding-left: 0; +// padding-right: 0; +// width: inherit; +// } -/** 表格更多操作下拉样式 */ -.el-table .el-dropdown-link, -.el-table .el-dropdown-selfdefine { - cursor: pointer; - margin-left: 5px; -} +// /** 表格更多操作下拉样式 */ +// .el-table .el-dropdown-link, +// .el-table .el-dropdown-selfdefine { +// cursor: pointer; +// margin-left: 5px; +// } -.el-table .el-dropdown, -.el-icon-arrow-down { - font-size: 12px; -} +// .el-table .el-dropdown, +// .el-icon-arrow-down { +// font-size: 12px; +// } .el-tree-node__content>.el-checkbox { margin-right: 8px; diff --git a/src/views/newLogin.vue b/src/views/newLogin.vue index deb76b4..7f7fd60 100644 --- a/src/views/newLogin.vue +++ b/src/views/newLogin.vue @@ -270,9 +270,12 @@ export default { color: #1e2b3f; font-family: "Alibaba-PuHuiTi-Regular.otf"; } -.el-checkbox { +.lg-centerbox{ + .el-checkbox { margin-bottom: 22px !important; } +} + .login-form { width: 340px; height: 360px; diff --git a/src/views/yingji/echarts/completePlan.vue b/src/views/yingji/echarts/completePlan.vue index 1a92b8c..2a11939 100644 --- a/src/views/yingji/echarts/completePlan.vue +++ b/src/views/yingji/echarts/completePlan.vue @@ -131,6 +131,7 @@ export default { label: { show: false, //是否显示标签 }, + data: [63, 115, 167, 210, 225, 245, 283, 300, 321,678, 1000], barWidth: 12, itemStyle: { @@ -152,7 +153,10 @@ export default { ], }, }, - z: 2, + emphasis: { + disabled: true, + }, + z:102, }, { // name: '背景', @@ -171,7 +175,7 @@ export default { tooltip: { show: false, }, - z: 1, + z: 101, }, ], };