diff --git a/continew-admin-ui/src/assets/style/global.less b/continew-admin-ui/src/assets/style/global.less index b6b80fff..11dfcba2 100644 --- a/continew-admin-ui/src/assets/style/global.less +++ b/continew-admin-ui/src/assets/style/global.less @@ -62,6 +62,16 @@ body { } } +.app-container { + padding: 0 20px 20px 20px; + .header { + margin-bottom: 16px; + &-query { + margin-bottom: 8px; + } + } +} + .general-card { border-radius: 4px; border: none; @@ -79,6 +89,14 @@ body { border-color: rgb(var(--gray-2)); } +:deep(.arco-table-th) { + &:last-child { + .arco-table-th-item-title { + margin-left: 16px; + } + } +} + .arco-table-cell { .circle { display: inline-block; diff --git a/continew-admin-ui/src/router/routes/modules/monitor.ts b/continew-admin-ui/src/router/routes/modules/monitor.ts index 0a3c863c..97fb13cb 100644 --- a/continew-admin-ui/src/router/routes/modules/monitor.ts +++ b/continew-admin-ui/src/router/routes/modules/monitor.ts @@ -7,8 +7,8 @@ const Monitor: AppRouteRecordRaw = { component: DEFAULT_LAYOUT, meta: { locale: 'menu.monitor', - requiresAuth: true, icon: 'icon-computer', + requiresAuth: true, order: 3, }, children: [ diff --git a/continew-admin-ui/src/router/routes/modules/system.ts b/continew-admin-ui/src/router/routes/modules/system.ts index b0c71c23..de283d57 100644 --- a/continew-admin-ui/src/router/routes/modules/system.ts +++ b/continew-admin-ui/src/router/routes/modules/system.ts @@ -7,8 +7,8 @@ const System: AppRouteRecordRaw = { component: DEFAULT_LAYOUT, meta: { locale: 'menu.system', - requiresAuth: true, icon: 'icon-settings', + requiresAuth: true, order: 2, }, children: [ diff --git a/continew-admin-ui/src/views/login/components/login-form.vue b/continew-admin-ui/src/views/login/components/login-form.vue index cf278bc9..f009d18b 100644 --- a/continew-admin-ui/src/views/login/components/login-form.vue +++ b/continew-admin-ui/src/views/login/components/login-form.vue @@ -83,8 +83,8 @@ rememberMe: true, username: 'admin', // 演示默认值 password: 'admin123', // 演示默认值 - // username: !debug ? '' : 'admin', // 演示默认值 - // password: !debug ? '' : 'admin123', // 演示默认值 + // username: debug ? 'admin' : '', // 演示默认值 + // password: debug ? 'admin123' : '', // 演示默认值 }); const data = reactive({ @@ -168,36 +168,30 @@ + diff --git a/continew-admin-ui/src/views/monitor/log/operation/index.vue b/continew-admin-ui/src/views/monitor/log/operation/index.vue index 70976b27..d7e330c5 100644 --- a/continew-admin-ui/src/views/monitor/log/operation/index.vue +++ b/continew-admin-ui/src/views/monitor/log/operation/index.vue @@ -1,11 +1,11 @@