diff --git a/sub-government-affairs-service/src/App.vue b/sub-government-affairs-service/src/App.vue index d92e3ff..a788e4c 100644 --- a/sub-government-affairs-service/src/App.vue +++ b/sub-government-affairs-service/src/App.vue @@ -23,5 +23,5 @@ const size = computed(() => SettingStore.themeConfig.globalComSize); diff --git a/sub-government-affairs-service/src/components/CustCard.vue b/sub-government-affairs-service/src/components/CustCard.vue index 1215c93..cfd5ba2 100644 --- a/sub-government-affairs-service/src/components/CustCard.vue +++ b/sub-government-affairs-service/src/components/CustCard.vue @@ -15,7 +15,7 @@ const props = defineProps({ diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue index da96b8c..84b091d 100644 --- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue @@ -70,10 +70,11 @@ const logOut = async () => { .layout-avatar { &-name { margin-left: 8px; - @include ellipsis(); + @include ellipsis; } .el-dropdown-link { - @include flex-row(); + @include flex-row; + align-items: center; cursor: pointer; } diff --git a/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue b/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue index e499339..298510c 100644 --- a/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue @@ -38,7 +38,8 @@ const matched = computed(() => route.matched.filter((item) => item.meta && item. diff --git a/sub-government-affairs-service/src/layouts/component/Sider/index.vue b/sub-government-affairs-service/src/layouts/component/Sider/index.vue index 37eab49..6704ba0 100644 --- a/sub-government-affairs-service/src/layouts/component/Sider/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Sider/index.vue @@ -57,32 +57,28 @@ const activeMenu = computed(() => { diff --git a/sub-government-affairs-service/src/styles/common/define.scss b/sub-government-affairs-service/src/styles/common/define.scss index 386479b..92bb5fc 100644 --- a/sub-government-affairs-service/src/styles/common/define.scss +++ b/sub-government-affairs-service/src/styles/common/define.scss @@ -8,27 +8,25 @@ flex-direction: column; } } - .custom-page { padding: 20px; - background: #fff; border-radius: 10px; + background: #ffffff; } - .custom-form { &__title { padding: 10px 0; font-size: 15px; font-weight: bold; color: $color-333; - &::before { - @include icon-space(); - width: 4px; - background: $color-primary; - height: 1.15em; - vertical-align: -0.25em; + @include icon-space; + margin-right: 8px; + width: 4px; + height: 1.15em; + background: $color-primary; + vertical-align: -0.25em; } } &__panel { @@ -79,10 +77,7 @@ &__img, &__icon { position: absolute !important; - top: 0; - right: 0; - bottom: 0; - left: 0; + inset: 0; margin: auto; } &__img { @@ -117,7 +112,7 @@ &__tips { padding-left: 3px; font-size: 12px; - color: #999; + color: #999999; } &__note { font-size: 12px; @@ -131,7 +126,6 @@ display: flex; flex-direction: row; align-items: center; - .el-tooltip__trigger { margin: 0 3px; } diff --git a/sub-government-affairs-service/src/styles/style.scss b/sub-government-affairs-service/src/styles/style.scss index c88848f..5ee6df3 100644 --- a/sub-government-affairs-service/src/styles/style.scss +++ b/sub-government-affairs-service/src/styles/style.scss @@ -1,7 +1,6 @@ -@import 'common/base.scss'; -@import 'common/define.scss'; +@import 'common/base'; +@import 'common/define'; @import '@/assets/fonts/iconfont.css'; - #app { position: relative; width: 100%; @@ -11,7 +10,6 @@ -moz-osx-font-smoothing: grayscale; background-color: #f5f5f5; } - .el-dialog__body { overflow: hidden auto; height: auto; diff --git a/sub-government-affairs-service/src/styles/utils/_scrollable.scss b/sub-government-affairs-service/src/styles/utils/_scrollable.scss index 33e99d9..0c5d4e0 100644 --- a/sub-government-affairs-service/src/styles/utils/_scrollable.scss +++ b/sub-government-affairs-service/src/styles/utils/_scrollable.scss @@ -1,5 +1,4 @@ @mixin scrollable() { - overflow-x: hidden; - overflow-y: auto; + overflow: hidden auto; -webkit-overflow-scrolling: touch; } diff --git a/sub-government-affairs-service/src/styles/utils/_scrollbar.scss b/sub-government-affairs-service/src/styles/utils/_scrollbar.scss index e5e6b70..4e8e1f4 100644 --- a/sub-government-affairs-service/src/styles/utils/_scrollbar.scss +++ b/sub-government-affairs-service/src/styles/utils/_scrollbar.scss @@ -12,11 +12,9 @@ width: $size; height: $size; } - ::-webkit-scrollbar-thumb { background: $foreground-color; } - ::-webkit-scrollbar-track { background: $background-color; } diff --git a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue index c1012e2..8bd08e6 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue @@ -1,19 +1,197 @@ - + diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue index 9a7623f..0b979be 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -155,8 +155,8 @@ function handleResetSearch() { diff --git a/sub-government-affairs-service/src/views/trace/search/index.vue b/sub-government-affairs-service/src/views/trace/search/index.vue index 3714609..7049436 100644 --- a/sub-government-affairs-service/src/views/trace/search/index.vue +++ b/sub-government-affairs-service/src/views/trace/search/index.vue @@ -49,42 +49,37 @@ const onSearch = () => {