From 84315607bce4f532202cea29f6fb714426227f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Fri, 22 Sep 2023 10:27:00 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=9D=A2=E5=8C=85=E5=B1=91=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  4 +--
 src/components/layouts/TabLayout.vue          | 36 ++++++++++---------
 src/components/tools/Breadcrumb.vue           | 20 +++++++----
 .../documentSplit/DocumentSplitDetail.vue     |  1 -
 4 files changed, 35 insertions(+), 26 deletions(-)

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 @@
       <!-- update-begin- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
       <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" style="z-index: 9999;" @select="onMenuSelect" />
       <!-- update-end- author:sunjianlei --- date:20191009 --- for: 提升右键菜单的层级 -->
-      <a-tabs
-        @contextmenu.native="e => onContextmenu(e)"
-        v-if="multipage"
-        :active-key="activePage"
-        class="tab-layout-tabs"
-        style="height:52px"
-        :hide-add="true"
-        type="editable-card"
-        @change="changePage"
-        @tabClick="tabCallBack"
-        @edit="editPage">
-        <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList">
-          <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
-        </a-tab-pane>
-      </a-tabs>
+      <!--<a-tabs-->
+      <!--  @contextmenu.native="e => onContextmenu(e)"-->
+      <!--  v-if="multipage"-->
+      <!--  :active-key="activePage"-->
+      <!--  class="tab-layout-tabs"-->
+      <!--  style="height:52px"-->
+      <!--  :hide-add="true"-->
+      <!--  type="editable-card"-->
+      <!--  @change="changePage"-->
+      <!--  @tabClick="tabCallBack"-->
+      <!--  @edit="editPage">-->
+      <!--  <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList">-->
+      <!--    <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>-->
+      <!--  </a-tab-pane>-->
+      <!--</a-tabs>-->
+
+      <breadcrumb/>
       <div style="margin: 12px 12px 0;">
         <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
         <keep-alive v-if="multipage">
@@ -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 @@
 </template>
 
 <script>
+import '@assets/less/common.less'
+
 export default {
   data () {
     return {
@@ -22,15 +24,12 @@ export default {
   },
   methods: {
     getBreadcrumb () {
-      console.log('this.$route.matched', this.$route.matched)
-
       this.breadList = []
-      this.breadList.push({ name: 'dashboard-analysis', path: '/dashboard/analysis', meta: { title: '首页' } })
-
       this.name = this.$route.name
       this.$route.matched.forEach((item) => {
-        // item.meta.name === 'dashboard' ? item.path = '/dashboard' : this.$route.path === item.path
-        this.breadList.push(item)
+        if (!(!item.path && item.name === 'dashboard')) {
+          this.breadList.push(item)
+        }
       })
     }
   },
@@ -42,6 +41,13 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+.ant-breadcrumb {
+  margin: 12px;
+}
 
+.ant-breadcrumb > span:last-child {
+  color: @primary-color;
+  font-weight: 550;
+}
 </style>
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,