diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss new file mode 100644 index 000000000..d525e0e9f --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss @@ -0,0 +1,37 @@ +.right-box{ + .right-box__container{ + + .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; + } + } + } + .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; + } + .start_at{ + .el-form-item__content{ + .el-date-editor:first{ + margin-right: 20px; + } + } + } + } + } +} \ 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 new file mode 100644 index 000000000..73194e35a --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/table/settings/backupsTable.scss @@ -0,0 +1,32 @@ + +.nz-table2 { + .el-table:not(.chart-table) { + .table-operation-items { + display: flex; + justify-content: center; + + .table-operation-del { + background: $--button-primary-color; + border: 1px solid #DEDEDE; + border-radius: 2px; + width: 30px; + height: 22px; + } + .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; + cursor: pointer; + // border-radius: $--button-border-radius; + // outline: none; + } + } + } +} diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 58b86386d..2c3fa5198 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -33,6 +33,7 @@ @import './common/project/topology.scss'; @import './common/project/topologyL5.scss'; @import './common/rightBox/asset/assetBox.scss'; +@import './common/rightBox/backupsBox.scss'; @import './common/rightBox/trafficSetting/subBox.scss'; @import './common/rightBox/trafficSetting/trafficSettingTab.scss'; @import './common/rightBox/addEndpointBox.scss'; @@ -54,6 +55,7 @@ @import './common/table/alert/alertSilenceTable.scss'; @import './common/table/asset/assetTable.scss'; @import './common/table/settings/userTable.scss'; +@import './common/table/settings/backupsTable.scss'; @import './common/table/settings/switchTab.scss'; @import './common/table/special/endpointQuery.scss'; @import './common/globalSearch/globalSearch'; @@ -84,6 +86,7 @@ @import './page/config/about.scss'; @import './page/config/agent.scss'; @import './page/config/assetMeta.scss'; +@import './page/config/backups.scss'; @import './page/config/mibBrowser.scss'; @import './page/config/operationRecord.scss'; @import './page/config/profile.scss'; diff --git a/nezha-fronted/src/assets/css/components/page/config/backups.scss b/nezha-fronted/src/assets/css/components/page/config/backups.scss new file mode 100644 index 000000000..ac22e2b4e --- /dev/null +++ b/nezha-fronted/src/assets/css/components/page/config/backups.scss @@ -0,0 +1,39 @@ +.system { + padding-top: 40px; + .system-config-form { + padding-bottom: 20px; + .system-title { + font-family: Roboto-Medium; + font-size: 14px; + color: $--license-left-title-color; + letter-spacing: 0; + font-weight: 500; + margin-bottom: -2px; + } + + #modelTable { + .main-list { + .main-container { + border: none; + padding: inherit; + + .el-table__header-wrapper { + .table-operation-items { + .items-button { + background: $--color-warning; + border-radius: 2px; + width: 98px; + height: 30px; + font-family: PingFangSC-Regular; + font-size: 14px; + color: $--license-left-title-color; + font-weight: 400; + } + } + + } + } + } + } + } +} diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 12728adf0..2e6cb5dc8 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -367,7 +367,8 @@ export const fromRoute = { link: 'link', ipam: 'ipam', apiKey: 'apiKey', - chartTemp: 'chartTemp' + chartTemp: 'chartTemp', + backups:'backups' } export const chartdatasource = [ diff --git a/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue b/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue new file mode 100644 index 000000000..791426d7d --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue @@ -0,0 +1,510 @@ + + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 6ada1b406..e1e4c344c 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -642,6 +642,7 @@ export default { handler (n, o) { this.isEdit = true this.editAlertRule = JSON.parse(JSON.stringify(n)) + console.log(this.editAlertRule); if (this.editAlertRule.id || this.editAlertRule.name) { this.expressions = [this.editAlertRule.expr] this.showTypeSelect = true // 当 edit 时禁用 type下拉框 diff --git a/nezha-fronted/src/components/common/table/settings/backupsTable.vue b/nezha-fronted/src/components/common/table/settings/backupsTable.vue new file mode 100644 index 000000000..16bebd9b3 --- /dev/null +++ b/nezha-fronted/src/components/common/table/settings/backupsTable.vue @@ -0,0 +1,199 @@ + + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue new file mode 100644 index 000000000..d0a06c134 --- /dev/null +++ b/nezha-fronted/src/components/page/config/backups.vue @@ -0,0 +1,126 @@ + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue index b693e9e9d..354d409be 100644 --- a/nezha-fronted/src/components/page/config/roles.vue +++ b/nezha-fronted/src/components/page/config/roles.vue @@ -82,6 +82,7 @@ export default { }, methods: { edit (row, copyFlag) { + console.log(row,copyFlag); this.object = { ...row } if (copyFlag) { this.object.name = this.object.name + '-copy' diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index 689e1eb13..8fde30b2c 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -193,7 +193,11 @@ export default new Router({ { path: '/chartTemp', component: resolve => require(['../components/page/config/template/chartTemp.vue'], resolve) - } + }, + { + path: '/backup', + component: resolve => require(['../components/page/config/backups.vue'], resolve) + }, ] } ]