diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 779d81ca..9f9b8c86 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -1,7 +1,7 @@ @primary-color: #D52C26; /* 页面不出全局滚动条的高度,如果在vue文件使用,就只能在style里引入common.less */ -/*59px是用户信息那块,52px是标签,12px是上下的留白*/ -@page-content-h: calc(100vh - 59px - 52px - 12px); +/*59px是用户信息那块,21px是面包屑,24px是上下的留白*/ +@page-content-h: calc(100vh - 59px - 21px - 24px); /*列表上方操作按钮区域*/ /*.ant-card-body .table-operator { diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue index 29d1529e..402c6031 100644 --- a/src/components/layouts/TabLayout.vue +++ b/src/components/layouts/TabLayout.vue @@ -4,21 +4,23 @@ - - - {{ page.meta.title }} - - + + + + + + + + + + + + + + + + +
@@ -42,6 +44,7 @@ import { triggerWindowResizeEvent } from '@/utils/util' import Vue from 'vue' import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types' import BlankLayout from './BlankLayout.vue' +import Breadcrumb from '../tools/Breadcrumb.vue' const indexKey = '/' @@ -50,7 +53,8 @@ export default { components: { BlankLayout, GlobalLayout, - Contextmenu + Contextmenu, + Breadcrumb }, mixins: [mixin, mixinDevice], data () { diff --git a/src/components/tools/Breadcrumb.vue b/src/components/tools/Breadcrumb.vue index 0d950d49..044fdd01 100644 --- a/src/components/tools/Breadcrumb.vue +++ b/src/components/tools/Breadcrumb.vue @@ -10,6 +10,8 @@ - diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index 18996b9c..cd217259 100644 --- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -191,7 +191,6 @@ import SplitDetailNodeAdd from './modules/SplitDetailNodeAdd.vue' // 批量设置弹框 import SplitDetailBatchSetting from './modules/SplitDetailBatchSetting.vue' import { mapGetters } from 'vuex' -import { getAction } from '../../../api/manage.js' import { ConfigurableTableMixin } from '../../../mixins/ConfigurableTableMixin.js' import { getDocSplitTableHeader,