diff --git a/src/assets/stylus/index.styl b/src/assets/stylus/index.styl index a7bb178..7b1b38c 100644 --- a/src/assets/stylus/index.styl +++ b/src/assets/stylus/index.styl @@ -44,6 +44,13 @@ height: var(--el-component-custom-height) !important; } + +.el-button:focus-visible { + outline none !important + outline-offset unset !important + transition none !important +} + // circle 按钮宽度优化 .el-button--default.is-circle { width: var(--el-component-custom-height) !important; diff --git a/src/common/router/index.ts b/src/common/router/index.ts index bdb0a09..4d888e6 100644 --- a/src/common/router/index.ts +++ b/src/common/router/index.ts @@ -77,12 +77,9 @@ router.beforeEach((to, from) => { } } else { let routeName = router.getRoutes().find((it) => it.path === to.path)?.name as string - console.log('reloadRouter11', routeName, Strings.isBlank(routeName)) if (Strings.isBlank(routeName)) { routeName = SpecialPage.Home - ElMessage.error('页面不存在222') } - console.log('reloadRouter', to, router.getRoutes(), routeName) setTimeout(() => { Nav.open(routeName) }) diff --git a/src/components/page/FormPage.vue b/src/components/page/FormPage.vue index fbd473d..a8d57ba 100644 --- a/src/components/page/FormPage.vue +++ b/src/components/page/FormPage.vue @@ -443,7 +443,6 @@ onMounted(doSearch) .tool-bar-left { flex 1 - } .tool-bar-right { @@ -456,6 +455,7 @@ onMounted(doSearch) :deep(.el-form) { display flex gap 10px + flex-shrink 0 .el-form-item { margin: 0; @@ -477,6 +477,11 @@ onMounted(doSearch) } } + + :deep(.el-dropdown) { + flex-shrink 0 + } + :deep(.el-button--default).filter-btn-active { color var(--main-color) } @@ -551,4 +556,18 @@ onMounted(doSearch) } } } + +@media (max-width: 900px) { + .tool-bar { + flex-direction column + align-items start + gap 10px + justify-content space-between + + .tool-bar-right { + width 100% + justify-content space-between !important + } + } +} diff --git a/src/components/page/Page.vue b/src/components/page/Page.vue index fca7cfd..267389a 100644 --- a/src/components/page/Page.vue +++ b/src/components/page/Page.vue @@ -13,7 +13,7 @@ height 100% width 100%; overflow hidden - padding 5px + padding 0 5px 5px 5px contain: layout paint; transform: translateZ(0); box-sizing border-box diff --git a/src/dts/components.d.ts b/src/dts/components.d.ts index 0f866c9..7114cd6 100644 --- a/src/dts/components.d.ts +++ b/src/dts/components.d.ts @@ -16,6 +16,7 @@ declare module 'vue' { ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] @@ -74,6 +75,7 @@ declare global { const ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] const ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] const ElButton: typeof import('element-plus/es')['ElButton'] + const ElCard: typeof import('element-plus/es')['ElCard'] const ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] const ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] const ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] diff --git a/src/pages/a-frame/AFrame.vue b/src/pages/a-frame/AFrame.vue index 96387c7..78fcae2 100644 --- a/src/pages/a-frame/AFrame.vue +++ b/src/pages/a-frame/AFrame.vue @@ -81,18 +81,19 @@ onUnmounted(() => { height 100% .a-frame-header { - height 100px - padding: 0 10px 0 0 - - background-color white + height 110px + padding 0 + background-color: #FAFBFC; & > div:nth-child(1) { height 60px width 100% - + background-color white display flex justify-content space-between box-sizing border-box + border-bottom 1px solid #EAEBF1; + padding-right 5px & > div:nth-child(1) { height: 100%; diff --git a/src/pages/a-frame/ATabbar.vue b/src/pages/a-frame/ATabbar.vue index 43c01c5..40d688a 100644 --- a/src/pages/a-frame/ATabbar.vue +++ b/src/pages/a-frame/ATabbar.vue @@ -1,8 +1,12 @@