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 f54da686e..29abf1c91 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/backupsBox.scss @@ -48,8 +48,10 @@ } .start_at{ .el-form-item__content{ + .el-date-editor--date{ margin-right: 20px; + width: 40%; } } } 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 311a99fce..e21e7225c 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 @@ -4,13 +4,18 @@ .table-operation-items { display: flex; justify-content: center; - + .el-dropdown{ + .table-operation-item{ + width: 30px !important; + height: 30px !important; + } + } .table-operation-del { background: $--button-primary-color; border: 1px solid #DEDEDE; border-radius: 2px; - width: 22px; - height: 22px; + width: 30px; + height: 30px; } .table-operation-button { border: none; @@ -18,13 +23,14 @@ color: $--button-primary-color; display: flex; text-align: center; - line-height: 22px; + line-height: 30px; justify-content: center; align-items: center; - height: 22px; + height: 30px; // width: 130px; max-width: 98px; min-width: 74px; + padding: 0 5px 0 5px; margin-right: 10px; cursor: pointer; } diff --git a/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue b/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue index 3751e3df6..047566a82 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/backupsBox.vue @@ -442,12 +442,7 @@ export default { checkdays.push(6); } }); - // for (let i in checkdays) { - // this.checkDay.push(this.week[i]); - // } this.$set(this.editBackup, "checkDay", checkdays); - - // this.editBackup.checkDay = checkdays } else if (this.editBackup.type == 4) { this.editBackup.nums.forEach((e) => { if (e === -1) { @@ -459,9 +454,6 @@ export default { this.$set(this.editBackup, "checkDays", checkdays); } console.log("editBackupNow", this.editBackup); - // this.$nextTick(() => { - // this.$forceUpdate(); - // }); this.$forceUpdate(); }, }, @@ -508,17 +500,6 @@ export default { ); }, }, - // "editBackup.checkDays": { - // deep: true, - // handler(n) { - // n.forEach((e, i) => { - // if (e === 31) { - // this.editBackup.checkDays[i] = -2; - // } - // }); - // console.log("checkDays", this.editBackup.checkDays); - // }, - // }, }, }; diff --git a/nezha-fronted/src/components/common/table/settings/backupsTable.vue b/nezha-fronted/src/components/common/table/settings/backupsTable.vue index 4d1be266e..6c7aba32a 100644 --- a/nezha-fronted/src/components/common/table/settings/backupsTable.vue +++ b/nezha-fronted/src/components/common/table/settings/backupsTable.vue @@ -20,13 +20,13 @@ {{ tableData[0].retention }} - {{ tableData[0].schedule && utcTimeToTimezoneStr(tableData[0].schedule.stime) }} + {{ tableData[0].schedule && utcTimeToTimezoneStr(tableData[0].schedule.stime) ?utcTimeToTimezoneStr(tableData[0].schedule.stime):'' }} - {{ scope.row.time ? scope.row.time : "-" }} + {{ scope.row.time ? scope.row.time : "" }} {{ scope.row.size ? scope.row.size : "" }} @@ -146,6 +146,11 @@ export default { await post('/sys/backup/list').then((res) => { if (res.code === 200) { if (res.data) { + // res.data.forEach((e,i)=>{ + // this.tableData2[i].fileName = e.fileName + // this.tableData2[i].size = bus.getNumStr(e.size) + // this.tableData2[i].time = e.time + // }) for (const i in res.data) { this.tableData2[i].fileName = res.data[i].fileName this.tableData2[i].size = bus.getNumStr(res.data[i].size) diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue index 5e4494fe5..c76625d8b 100644 --- a/nezha-fronted/src/components/page/config/backups.vue +++ b/nezha-fronted/src/components/page/config/backups.vue @@ -81,7 +81,9 @@ export default { ], tableData2: [ { - list: {} + list: { + + } } ], rightBoxshow: false, @@ -100,7 +102,11 @@ export default { methods: { edit (row) { - this.object = { ...row } + this.object = { ...row , + checkDay:'', + checkDays:'', + datepicker:'' + } this.object.name = this.$t('backup.edit') if (this.object.schedule) { for (const i in this.object.schedule) {