diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue index 31847037..201aa3b6 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/layout/components/AppMain.vue @@ -56,7 +56,9 @@ function addIframe() { height: calc(100vh - 50px); width: 100%; position: relative; - overflow: hidden; + /* 滚动容器收敛在这里:唯一纵向滚动发生在这一层 */ + overflow-y: auto; + overflow-x: hidden; } .fixed-header + .app-main { @@ -65,7 +67,7 @@ function addIframe() { .hasTagsView { .app-main { - height: calc(100vh - 84px); + height: calc(100vh - 118px); } .fixed-header + .app-main { diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/router/index.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/router/index.ts index 5ee8b410..09073e56 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/router/index.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/router/index.ts @@ -191,7 +191,7 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '', component: () => import('@/views/supervision/educationServices/add.vue'), name: 'EducationServicesAdd', - meta: { title: '新增涉企服务', icon: 'plus' } + meta: { title: '新增普法服务', icon: 'plus' } } ] }, @@ -204,7 +204,7 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '', component: () => import('@/views/supervision/educationServices/repost.vue'), name: 'EducationServicesRepost', - meta: { title: '转载涉企服务', icon: 'plus' } + meta: { title: '转载普法服务', icon: 'plus' } } ] }, @@ -217,7 +217,7 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '', component: () => import('@/views/supervision/educationServices/draft.vue'), name: 'EducationServicesDraft', - meta: { title: '涉企服务草稿箱', activeMenu: '/supervision/educationServices' } + meta: { title: '普法服务草稿箱', activeMenu: '/supervision/educationServices' } } ] }, @@ -230,7 +230,7 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '', component: () => import('@/views/supervision/educationServices/edit.vue'), name: 'EducationServicesEdit', - meta: { title: '编辑涉企服务', activeMenu: '/supervision/educationServices' } + meta: { title: '编辑普法服务', activeMenu: '/supervision/educationServices' } } ] }, @@ -243,7 +243,7 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '', component: () => import('@/views/supervision/educationServices/detail.vue'), name: 'EducationServicesDetail', - meta: { title: '涉企服务详情', activeMenu: '/supervision/educationServices' } + meta: { title: '普法服务详情', activeMenu: '/supervision/educationServices' } } ] }, diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/add.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/add.vue index b9253981..bd4dffb7 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/add.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/nos/add.vue @@ -1,7 +1,7 @@