diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss index 29abf1c91..cc29fc3ea 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss @@ -1,50 +1,105 @@ .right-box{ + .right-box__container{ - + .form-item__switch{ + text-align: unset !important; + } .container__form{ - .el-tabs--card>.el-tabs__header{ - .el-tabs__nav{ - width: 100%; - > div{ - width: 25%; - box-sizing: border-box; - text-align: center; - padding: 0!important; + .form-tabs{ + + .el-tabs--card>.el-tabs__header{ + .el-tabs__nav{ + width: 100%; + > div{ + width: 25%; + box-sizing: border-box; + text-align: center; + padding: 0!important; + } } } - } - .el-tabs--card>.el-tabs__header .el-tabs__item.is-active { - color: $--color-primary; - border: 1px solid $--color-primary; - - } - .el-tabs--card>.el-tabs__header .el-tabs__item{ - border-bottom: 1px solid $--border-color-light ; - - } - .el-tabs--card>.el-tabs__content{ - display: none; + .el-tabs--card>.el-tabs__header .el-tabs__item.is-active { + color: $--color-primary; + border: 1px solid $--color-primary; + + } + .el-tabs--card>.el-tabs__header .el-tabs__item{ + border-bottom: 1px solid $--border-color-light ; + + } + .el-tabs--card>.el-tabs__content{ + display: none; + } } .check_box{ + .el-form-item__content{ + text-align: unset !important; + .el-checkbox-button{ width: calc(100% / 7); .el-checkbox-button__inner{ width: 100%; padding: 11px 3px; } + + } + .el-checkbox-button .is-focus { + .el-checkbox-button__inner{ + border: none; + } } } } .check-month_box{ .el-form-item__content{ .el-checkbox-button{ - width: calc(100% / 7); + border: 1px solid $--border-color-base; + width: calc((100% / 7) - 2px); .el-checkbox-button__inner{ width: 100%; - } + border: none; } } + .el-checkbox-button .is-checked{ + border: none; + } + .el-checkbox-button .is-focus{ + border: 1px solid $--border-color-base; + + } + + // .el-checkbox-button:nth-of-type(8){ + // border-left: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(15){ + // border-left: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(22){ + // border-left: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(29){ + // border-left: 1px solid $--border-color-base; + // border-bottom: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(26){ + // border-bottom: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(27){ + // border-bottom: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(28){ + // border-bottom: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(30){ + // border-bottom: 1px solid $--border-color-base; + // } + // .el-checkbox-button:nth-of-type(31){ + // border-bottom: 1px solid $--border-color-base; + // } + // .el-checkbox-button:last-of-type{ + // border-bottom: 1px solid $--border-color-base; + // } } .start_at{ .el-form-item__content{ @@ -57,4 +112,5 @@ } } } +} } \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/common/table/settings/backupsTable.scss b/nezha-fronted/src/assets/css/components/common/table/settings/backupsTable.scss index e21e7225c..882b3fec1 100644 --- a/nezha-fronted/src/assets/css/components/common/table/settings/backupsTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/settings/backupsTable.scss @@ -1,39 +1,54 @@ - -.nz-table2 { - .el-table:not(.chart-table) { - .table-operation-items { - display: flex; - justify-content: center; - .el-dropdown{ - .table-operation-item{ - width: 30px !important; - height: 30px !important; +.backups-table{ + .nz-table2 { + .el-table__row{ + td:last-of-type{ + // border-bottom: 1px solid $--border-color-light !important; + border: none !important; } } - .table-operation-del { - background: $--button-primary-color; - border: 1px solid #DEDEDE; - border-radius: 2px; - width: 30px; - height: 30px; - } - .table-operation-button { - border: none; - background-color: $--color-primary; - color: $--button-primary-color; + } + .el-table:not(.chart-table) { + .table-operation-items { display: flex; - text-align: center; - line-height: 30px; justify-content: center; - align-items: center; - height: 30px; - // width: 130px; - max-width: 98px; - min-width: 74px; - padding: 0 5px 0 5px; - margin-right: 10px; - cursor: pointer; + + .table-operation-edit { + background: $--background-color-2; + border: 1px solid $--border-color-base; + border-radius: 2px; + width: 22px; + height: 22px; + i{ + font-size: 12px !important; + } + } + .table-operation-del{ + background: $--background-color-2; + border: 1px solid $--border-color-base; + border-radius: 2px; + width: 22px; + height: 22px; + i{ + font-size: 12px !important; + } + } + .table-operation-button { + border: none; + background-color: $--color-primary; + color: $--button-primary-color; + display: flex; + text-align: center; + line-height: 22px; + justify-content: center; + align-items: center; + height: 22px; + // width: 130px; + max-width: 98px; + min-width: 74px; + padding: 0 5px 0 5px; + margin-right: 10px; + cursor: pointer; + } } } - } } diff --git a/nezha-fronted/src/assets/css/components/page/config/backups.scss b/nezha-fronted/src/assets/css/components/page/config/backups.scss index ab1b2c929..0112b458d 100644 --- a/nezha-fronted/src/assets/css/components/page/config/backups.scss +++ b/nezha-fronted/src/assets/css/components/page/config/backups.scss @@ -37,4 +37,16 @@ } } } + .backup_box{ + .el-form-item:last-of-type { + + .el-form-item__content { + margin-left: 0 !important; + text-align: unset !important; + } + .nz-btn { + margin: 0 10px; + } + } + } } diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index 753387373..e4802fd36 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -1,4 +1,6 @@ import vm from '../../../main' +import lodash from 'lodash' + // ipv4 ip校验 export function host (rule, value, callback) { if (!value || value.trim() == '') { @@ -197,6 +199,15 @@ export function arrLength (rule, value, callback) { // 校验数组 callback(new Error(vm.$t('validate.required'))) } } +export function datePicker (rule, value, callback) { // 校验时间选择 + if(value[0]&&value[1]){ + callback() + }else{ + callback(new Error(vm.$t('validate.required'))) + } + + } + export function sysObjectIdInput (rule, value, callback) { const sysId = /^(\d{1,9}\.){0,}[\d]+$/ diff --git a/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue b/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue index 047566a82..12ee46133 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue @@ -17,7 +17,11 @@ label-width="120px" ref="backupsForm" > - + - + + - - + + + + + - - - + + + + - - - - - + @@ -167,7 +171,8 @@ diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue index c76625d8b..cc1a81178 100644 --- a/nezha-fronted/src/components/page/config/backups.vue +++ b/nezha-fronted/src/components/page/config/backups.vue @@ -14,7 +14,6 @@ ref="backupsTable1" :custom-table-title="customTableTitle" :is-configurations="true" - :is-state ='isState' @edit="edit" > @@ -42,7 +41,7 @@ - + @@ -82,12 +81,11 @@ export default { tableData2: [ { list: { - + } } ], rightBoxshow: false, - isState: '', isRefresh: '' } }, @@ -117,13 +115,10 @@ export default { }, closeRightBox (refresh) { if (refresh) { - this.$refs.backupsTable1.getTableData('backupsTable1') + this.$refs.backupsTable1.getTableData('backup') } this.rightBoxshow = false }, - statechange (Boolean) { - this.isState = Boolean - } }, watch: {}