diff --git a/src/assets/css/components/components/rightBox/report/builtinReportBox.scss b/src/assets/css/components/components/rightBox/report/builtinReportBox.scss index a8ffcd96..90f8cd48 100644 --- a/src/assets/css/components/components/rightBox/report/builtinReportBox.scss +++ b/src/assets/css/components/components/rightBox/report/builtinReportBox.scss @@ -1,6 +1,13 @@ .right-box.right-box-report { .right-box__container { .container__form { + .el-checkbox { + margin-right: 24px; + line-height: 28px; + } + .el-checkbox-group { + line-height: 28px; + } .el-height.el-form-item { margin-bottom: 18px; .el-form-item__content { @@ -19,6 +26,7 @@ border: 1px solid #E7EAED; border-right: none; line-height: 32px; + color: #333; } .enable-tabs:nth-of-type(4) { border-right: 1px solid #E7EAED; @@ -26,17 +34,16 @@ .enable-tabs.active { border: 1px solid #1890FF; border-radius: 2px; + color: #1890FF; + } + .enable-tabs.disable { + cursor: not-allowed; } } .enable-tabs-per-month { margin-top: 10px; .enable-month-tab { display: flex; - .el-checkbox { - height: 32px; - line-height: 32px; - margin-left: 14px; - } .enable-month-tabs { height: 32px; width: 290px; @@ -44,6 +51,7 @@ border: 1px solid #E7EAED; border-right: none; line-height: 32px; + color: #333; } .enable-month-tabs:nth-of-type(2) { border-right: 1px solid #E7EAED; @@ -51,58 +59,36 @@ .enable-month-tabs.active { border: 1px solid #1890FF; border-radius: 2px; + color: #1890FF; + } + .enable-month-tabs.disable { + cursor: not-allowed; + } + .el-checkbox { + padding-left: 10px; + margin-right: 0; } } .enable-month-data-tab { margin-bottom: 20px; - .enable-month-data-tabs { - .el-checkbox-group { - width: calc(100% + 20px); - .el-checkbox:nth-of-type(10) { - margin-right: 0; - } - .el-checkbox { - height: 20px; - width: 36px; - line-height: 20px; - } - } - } .enable-month-value { - width: 393px; - height: 17px; font-size: 12px; color: #666666; - letter-spacing: 0; - font-weight: 400; + height: 16px; + line-height: 16px; } } } - .enable-month-moon { - .enable-month-moon-custom { - height: 30px; - } - .enable-month-all { - display: flex; - .enable-month-all-months.el-checkbox { - margin-right: 20px; - } - } - .enable-month-week { - display: flex; - .enable-month-week-all.el-checkbox { - margin-right: 20px; - height: 35px; - line-height: 35px; - } - .el-checkbox-group { - width: calc(100% - 52px); - height: 35px; - .el-checkbox { - line-height: 35px; - } - } - } + .enable-month-moon-custom, .enable-tabs-custom { + height: 32px; + line-height: 40px; + color: #666; + } + .enable-month-all, .enable-month-data-tabs { + display: flex; + } + .enable-month-week { + display: flex; } .el-input-single { width: 200px; @@ -111,6 +97,12 @@ .el-input__inner { text-align: center; } + .el-input-group__prepend, .el-input-group__append { + padding: 0 10px; + i { + font-size: 12px; + } + } } .right-box__select-single { width: 430px; diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue new file mode 100644 index 00000000..b982ab1f --- /dev/null +++ b/src/components/rightBox/report/ReportBox.vue @@ -0,0 +1,427 @@ + + + diff --git a/src/components/rightBox/report/reportTestBox.vue b/src/components/rightBox/report/reportTestBox.vue index 46c921ac..f38db7de 100644 --- a/src/components/rightBox/report/reportTestBox.vue +++ b/src/components/rightBox/report/reportTestBox.vue @@ -1,5 +1,5 @@