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 22db0c342..4c40ffceb 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 @@ -2,7 +2,6 @@ .nz-table-list { .el-table__row { td:last-of-type { - // border-bottom: 1px solid $--border-color-light !important; border: none !important; } } @@ -11,10 +10,6 @@ .table-operation-items { display: flex; justify-content: center; - .table-operation-item.delete-button { - background: $--background-color-2 !important; - border: 1px solid $--border-color-base !important; - } .table-operation-edit { background: $--background-color-2; border: 1px solid $--border-color-base; @@ -25,16 +20,6 @@ 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; @@ -59,9 +44,6 @@ .nz-icon-shujubeifenhuifu::before { font-size: 12px; } - .el-table--border td:first-child .cell { - padding-left: 20px !important; - } .el-table__empty-block { .el-table__empty-text { diff --git a/nezha-fronted/src/assets/css/components/page/config/agent.scss b/nezha-fronted/src/assets/css/components/page/config/agent.scss index b5337d957..579d3586f 100644 --- a/nezha-fronted/src/assets/css/components/page/config/agent.scss +++ b/nezha-fronted/src/assets/css/components/page/config/agent.scss @@ -43,3 +43,104 @@ color: $--color-text-primary; text-align: center; } + +.collectors{ + display: flex; + flex-direction: column; + background-color: $--background-color-empty; + .system-title { + font-family: Roboto-Medium; + font-size: 14px; + color: $--license-left-title-color; + letter-spacing: 0; + font-weight: 700; + margin-left: 0; + margin-bottom: 0px; + padding-left: 20px; + padding-top: 20px; + } + .list-page{ + flex: 1; + } + .collectors-settingTable{ + &.list-page{ + height: unset; + flex: unset; + background: unset; + padding: 0; + padding-top: 20px; + .nz-table-list{ + height: unset; + } + } + .el-table{ + flex: unset; + td { + padding: 8px 0; + border-bottom: 1px solid $--border-color-light; + border-right: none !important; + } + tr { + background-color: $--table-row-background-color; + } + th { + border-color: $--border-color-light; + padding: 8px 0; + } + thead { + color: $--color-text-primary; + } + .cell{ + padding: 0 20px !important; + } + .el-table__fixed-body-wrapper { + td:not(.is-hidden) { + border-left: 1px solid $--border-color-light; + } + } + .el-table__fixed-header-wrapper { + th:not(.is-hidden) { + border-left: 1px solid $--border-color-light; + } + th:last-of-type { + border-right: none !important; + } + } + .el-table--border:not(.chart-table)::after, .el-table--group:not(.chart-table)::after { + width: 0; + } + .table-operation-items { + display: flex; + justify-content: center; + .table-operation-edit { + background: $--background-color-2; + border: 1px solid $--border-color-base; + border-radius: 2px; + width: 30px; + 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: 30px; + padding: 0 5px 0 5px; + margin-right: 10px; + cursor: pointer; + i.nz-icon-beifen.nz-icon::before { + font-size: 12px; + } + } + } + } + } +} \ No newline at end of file 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 933cb92d2..06235a32d 100644 --- a/nezha-fronted/src/assets/css/components/page/config/backups.scss +++ b/nezha-fronted/src/assets/css/components/page/config/backups.scss @@ -1,21 +1,20 @@ .system.backup { box-sizing: border-box; height: 100% !important; - padding-top: 40px; + padding: 20px 0; .system-config-backup { width: 100% !important; } .system-config-form { - padding-bottom: 10px; .system-title { font-family: Roboto-Medium; font-size: 14px; color: $--license-left-title-color; letter-spacing: 0; font-weight: 700; - margin-top: 20px; - margin-left: 10px; - margin-bottom: -2px; + margin-left: 0; + margin-bottom: 0px; + padding-left: 20px; } #modelTable { @@ -23,7 +22,6 @@ .main-container { border: none; padding: inherit; - .el-table__header-wrapper { .table-operation-items { .items-button { @@ -180,33 +178,13 @@ } } } - } } - .el-table_1_column_1 .cell{ - padding-left: 20px !important; - } - .el-table_2_column_5 .cell{ - padding-left: 20px !important; - } - .el-table--border th:first-child .cell { - padding-left: 20px !important; - } - .el-checkbox-button__inner{ - background-color:$--background-color-empty; - } - .el-checkbox-button.is-checked{ - border: 1px solid #fbb569 !important; - } - .el-checkbox-button.is-checked .el-checkbox-button__inner { - color: #fff; - background-color: #FA901C; - border-color: #FA901C; - // margin-right: -1px; - -webkit-box-shadow: -1px 0 0 0 #fcbc77; - box-shadow: -1px 0 0 0 #fcbc77; - border-radius: 0; + + .el-table .cell{ + padding: 0 20px !important; } + .nz-icon-delete:before{ color: $--color-text-regular; } diff --git a/nezha-fronted/src/components/common/rightBox/configurationBox.vue b/nezha-fronted/src/components/common/rightBox/configurationBox.vue new file mode 100644 index 000000000..f04ead376 --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/configurationBox.vue @@ -0,0 +1,122 @@ + + + diff --git a/nezha-fronted/src/components/page/config/backups.vue b/nezha-fronted/src/components/page/config/backups.vue index a74710bd1..3da9bb552 100644 --- a/nezha-fronted/src/components/page/config/backups.vue +++ b/nezha-fronted/src/components/page/config/backups.vue @@ -24,7 +24,7 @@
-
{{ $t("backup.recent") }}
+
{{ $t("backup.recent") }}
+
+
{{ $t("buttons.system.monitor") }}
+
+
+ + + + + + +
+
+ +
+
+
+ +
+
+
+ +
{{ $t("overall.collectors") }}
+ + + + + + + + + + + + + +
+ +
{{ $t("overall.download") }}
+
+ + + + {{ item.label }} + + + + + + {{ + $t("overall.downloading") + }} + +
+ {{ $t("config.agent.agent.autoScript") }} +
+
+ + + + + {{ item.name }} + + + + + + + {{ item.label }} + + + + + + + + + + + + + + + + + +
+
+
+
+ + diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index 5d7425dfb..6370790aa 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -66,7 +66,7 @@ export default new Router({ }, { path: '/agent', - component: resolve => require(['@/components/page/config/agent'], resolve) + component: resolve => require(['@/components/page/config/collectors'], resolve) }, { path: '/recordRule',