From f8b34dee9ed59136d2e15132b5cd8d6b697d83ac Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Mon, 23 Jun 2025 11:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                     |   6 +-
 src/assets/separator.png        | Bin 0 -> 662 bytes
 src/components/Breadcrumb.vue   | 166 +++++++++++++++++++++++-----------------
 src/components/Breadcrumb1.vue  |  77 +++++++++++++++++++
 src/components/SetLeftMenu.vue  |   2 +-
 src/router/index.js             |  51 +++++++-----
 src/store/index.js              |  24 ++++++
 src/views/DoctorInformation.vue |   8 +-
 src/views/HomeView.vue          |  42 ++++++++--
 src/views/HosInformation.vue    |  10 +--
 10 files changed, 278 insertions(+), 108 deletions(-)
 create mode 100644 src/assets/separator.png
 create mode 100644 src/components/Breadcrumb1.vue

diff --git a/src/App.vue b/src/App.vue
index 1c31f16..c4fac0d 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,7 @@
       </el-header>
       <el-container :class="(showHeader ? 'short-container' : '')">
         <SliderMenu v-if="showSidebar" :menuData="slidermenu" :customize="customize"></SliderMenu>
-        <el-container>
+        <el-container class="main-right-content">
           <!-- 面包屑导航 -->
           <Breadcrumb />
           <el-main class="app-content">
@@ -87,6 +87,10 @@ export default {
 .short-container {
   height: calc(100vh - 62px);
 }
+.main-right-content{
+  display: flex;
+  flex-direction: column;
+}
 
 ::v-deep .el-container .el-main {
   // padding: 12px;
diff --git a/src/assets/separator.png b/src/assets/separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ff4277ab6dd1266044a1ecb534bb1e8d391b976
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZrKuJVFRA_<imrst<Fcii=J4q?9$q~w$f*L5TDi*Xi
zffLZ4VCV^E<^*sAZjkOgOh6vdvZhDqW+Y%zKQ=|`1l6hkBqKzATSxEtdoS;^4Ky?~
zG&D5)!?3$ZDunFtDCj9-o6(CW3zt~63rMAmAE-zI=l}p?SRiM!!Qk<gO+4;%bH~um
z!zp%~2LK|BDIh7b<vW{rwRS)V+2O6|`=NEEXkz+H)!KpJUi4nKu840;W7Z}>WXmxT
z#)sA!!{VjI9MmR&bEd8Sc1v@sxOUqy<04z#8r&iTe6Y3C$_1oS#*E`c^T~#O-B?v0
zs6oI(6`cTx53MUj=c7@wwvAt@fXmBoJp!hhPu4%e{LCdswH*lQRJ%@UHc1j=>)fZZ
zgG^-0G3P8jn3!QPc-Eb`=BcCusg!Y5wppYS0mb`H5eA&O-a`N2UBIsTZ#AE6uDQK!
z7V$3NzKTv!Vw<jmyN}l)E*o3`>*4e6BcD0Fb|46t?!<*s^u}jCz@q^1<?HLR+orF<
z-N%c7RLYoxYpcKgdE>qMfF}V**`~vNM~AZjA!Mgc+brTNfVWy&+a!g#PuncwWTU0F
zNw^yJyNOGVGMqY4YMVqem-xqEE#M+sP4B`si&zOb=9yTPZ5FW-u(Qp|o{1(H3)tN@
zwbgfhCYoR@pq+<3-MWJNGtmSq8~yZoCBg8Q5MR$k6Rc)n*zYDv(Hy|7O8a^yn&5Ph
wrBcT2Je)GdUNNZiVgKnzUmI&^X!uX~4SomE<RVsL{{R3007*qoM6N<$f|d<6-2eap

literal 0
HcmV?d00001

diff --git a/src/components/Breadcrumb.vue b/src/components/Breadcrumb.vue
index 7dea213..c0b0094 100644
--- a/src/components/Breadcrumb.vue
+++ b/src/components/Breadcrumb.vue
@@ -1,77 +1,101 @@
 <template>
-    <el-breadcrumb v-if="showBreadcrumb" separator="/">
-      <el-breadcrumb-item
-        v-for="(item, index) in breadcrumbList"
-        :key="index"
-      >
-        <i v-if="item.icon" :class="item.icon"></i>
-        <span>{{ item.title }}</span>
-      </el-breadcrumb-item>
-    </el-breadcrumb>
-  </template>
-  
-  <script>
-  export default {
-    data() {
-      return {
-        breadcrumbList: [],
-        showBreadcrumb: false // 控制是否显示面包屑导航
-      };
-    },
-    watch: {
-      $route() {
-        this.updateBreadcrumb();
-      }
-    },
-    mounted() {
-      this.updateBreadcrumb();
-    },
-    methods: {
-      updateBreadcrumb() {
-        const currentPath = this.$route.path;
-        // 判断是否为子页面
-        if(!this.$parent.menuData)return
-        const isSubPage = this.isSubPage(currentPath);
-        this.showBreadcrumb = isSubPage;
-  
-        if (isSubPage) {
-          this.breadcrumbList = this.getBreadcrumbList(currentPath);
+  <div v-if="breadcrumbs.length > 0" class="breadcrumb-container">
+    <nav>
+      <ol class="breadcrumb">
+        <li
+          v-for="(item, index) in breadcrumbs"
+          :key="index"
+          class="breadcrumb-item"
+          :class="{ active: index === breadcrumbs.length - 1 }"
+        >
+          <template v-if="index !== breadcrumbs.length - 1">
+            <router-link :to="item.path">{{ item.title }}</router-link>
+            <!-- <span class="separator">/</span> -->
+            <img class="separator" src="@/assets/separator.png" alt="">
+          </template>
+          <template v-else>
+            <span>{{ item.title }}</span>
+          </template>
+        </li>
+      </ol>
+    </nav>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Breadcrumb',
+  computed: {
+    breadcrumbs() {
+      if (this.$route.meta.hideBreadcrumb) return []
+
+      const crumbs = []
+      let currentRoute = this.$route
+
+      // 递归查找所有父级路由
+      while (currentRoute) {
+        crumbs.unshift({
+          path: currentRoute.path,
+          title: this.getTitle(currentRoute)
+        })
+
+        // 通过 meta.breadcrumbParent 查找父级路由
+        if (currentRoute.meta.breadcrumbParent) {
+          currentRoute = this.$router.options.routes.find(
+            r => r.name === currentRoute.meta.breadcrumbParent
+          )
         } else {
-          this.breadcrumbList = [];
-        }
-      },
-      isSubPage(path) {
-        console.log(this.$parent.menuData,'this.$parent.menuData==');
-        // 判断当前路径是否为子页面
-        for (const menu of this.$parent.menuData) {
-          for (const subMenu of menu.children) {
-            if (subMenu.path === path) {
-              return true;
-            }
-          }
+          currentRoute = null
         }
-        return false;
-      },
-      getBreadcrumbList(path) {
-        const breadcrumbList = [];
-        // 遍历菜单数据，查找匹配的面包屑路径
-        for (const menu of this.$parent.menuData) {
-          for (const subMenu of menu.children) {
-            if (subMenu.path === path) {
-              breadcrumbList.push({ title: menu.title, icon: menu.icon });
-              breadcrumbList.push({ title: subMenu.title });
-              break;
-            }
-          }
-        }
-        return breadcrumbList;
       }
+
+      return crumbs
+    }
+  },
+  methods: {
+    getTitle(route) {
+      return typeof route.meta.title === 'function'
+        ? route.meta.title(route)
+        : route.meta.title || route.name
     }
-  };
-  </script>
-  
-  <style scoped>
-  .el-breadcrumb {
-    margin-bottom: 20px;
   }
-  </style>
\ No newline at end of file
+}
+</script>
+<style scoped>
+/* 保持之前的样式不变 */
+.breadcrumb-container {
+  padding: 16px 12px;
+  background-color: #f5f5f5;
+  border-radius: 4px;
+}
+
+.breadcrumb {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+.breadcrumb-item {
+  display: flex;
+  align-items: center;
+}
+
+.breadcrumb-item a {
+  color: #626573;
+  text-decoration: none;
+}
+
+.breadcrumb-item.active span {
+  color: #1E2226;;
+
+}
+
+.separator {
+  /* margin: 0 5px;
+  color: #6c757d;; */
+  width: 12px;
+  height: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Breadcrumb1.vue b/src/components/Breadcrumb1.vue
new file mode 100644
index 0000000..7dea213
--- /dev/null
+++ b/src/components/Breadcrumb1.vue
@@ -0,0 +1,77 @@
+<template>
+    <el-breadcrumb v-if="showBreadcrumb" separator="/">
+      <el-breadcrumb-item
+        v-for="(item, index) in breadcrumbList"
+        :key="index"
+      >
+        <i v-if="item.icon" :class="item.icon"></i>
+        <span>{{ item.title }}</span>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+  </template>
+  
+  <script>
+  export default {
+    data() {
+      return {
+        breadcrumbList: [],
+        showBreadcrumb: false // 控制是否显示面包屑导航
+      };
+    },
+    watch: {
+      $route() {
+        this.updateBreadcrumb();
+      }
+    },
+    mounted() {
+      this.updateBreadcrumb();
+    },
+    methods: {
+      updateBreadcrumb() {
+        const currentPath = this.$route.path;
+        // 判断是否为子页面
+        if(!this.$parent.menuData)return
+        const isSubPage = this.isSubPage(currentPath);
+        this.showBreadcrumb = isSubPage;
+  
+        if (isSubPage) {
+          this.breadcrumbList = this.getBreadcrumbList(currentPath);
+        } else {
+          this.breadcrumbList = [];
+        }
+      },
+      isSubPage(path) {
+        console.log(this.$parent.menuData,'this.$parent.menuData==');
+        // 判断当前路径是否为子页面
+        for (const menu of this.$parent.menuData) {
+          for (const subMenu of menu.children) {
+            if (subMenu.path === path) {
+              return true;
+            }
+          }
+        }
+        return false;
+      },
+      getBreadcrumbList(path) {
+        const breadcrumbList = [];
+        // 遍历菜单数据，查找匹配的面包屑路径
+        for (const menu of this.$parent.menuData) {
+          for (const subMenu of menu.children) {
+            if (subMenu.path === path) {
+              breadcrumbList.push({ title: menu.title, icon: menu.icon });
+              breadcrumbList.push({ title: subMenu.title });
+              break;
+            }
+          }
+        }
+        return breadcrumbList;
+      }
+    }
+  };
+  </script>
+  
+  <style scoped>
+  .el-breadcrumb {
+    margin-bottom: 20px;
+  }
+  </style>
\ No newline at end of file
diff --git a/src/components/SetLeftMenu.vue b/src/components/SetLeftMenu.vue
index 2329ce1..7de414e 100644
--- a/src/components/SetLeftMenu.vue
+++ b/src/components/SetLeftMenu.vue
@@ -1,6 +1,6 @@
 <template>
   <aside class="sidebar">
-    <ul>
+    <ul style="margin: 0;">
       <li v-for="(item, index) in menuList" :key="item.path + random()">
         <div
           :class="[($route.path == item.path) || (item.noToPath && curIndex == index) ? 'active' : '', 'flex', ($route.path == item.path) ? curIndex = index : '']"
diff --git a/src/router/index.js b/src/router/index.js
index b682905..526255a 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,35 +2,45 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 import store from '../store';
 import HomeView from '../views/HomeView.vue';
-// import UserPosts from '../views/UserPosts.vue';
-// import Franchise from '../views/Franchise.vue'
 
 Vue.use(VueRouter)
 const whiteSlideList = [ '/ui', '/hosInformation']; //侧边导航白名单
-const whiteHeaderList = ['/','/doctorInformation', '/hosInformation','/addNewTreatment'
-]; //头部导航白名单
+const blackHeaderList = [
+]; //头部导航黑名单
 const whiteFooterList = ['/','/doctorInformation' ,'/hosInformation','/addNewTreatment'
 ]; //底部白名单
-const routes = [{
+const routes = [
+  {
     path: '/',
     name: '首页',
     component: HomeView,
-    // component: Franchise
+    meta: { 
+      title: '医生列表',
+      hideBreadcrumb: true // 首页不显示面包屑
+    }
   },
   {
     path: '/doctorInformation',
-    component: () => import( /* webpackChunkName: "doctorInformation" */ '../views/DoctorInformation.vue'),
     name: '医生信息',
-    children: [
-    ]
+    component: () => import('../views/DoctorInformation.vue'),
+    meta: { 
+      title: '编辑信息',
+      breadcrumbParent: '首页' // 手动指定父级
+    }
   },
   {
     path: '/hosInformation',
-    component: () => import( /* webpackChunkName: "hosInformation" */ '../views/HosInformation.vue'),
     name: '医院信息',
-    children: [
-    ]
+    component: () => import('../views/HosInformation.vue'),
+    meta: { 
+      title: '编辑医院',
+      breadcrumbParent: '医生信息' // 手动指定父级
+// r如果想隐藏中间层级
+      // breadcrumbParent: '首页', // 跳过医生信息
+      // hideInBreadcrumb: true // 可选：隐藏当前项
+    }
   },
+  
   {
     path: '/addNewTreatment',
     component: () => import( /* webpackChunkName: "addNewTreatment" */ '../views/AddNewTreatment.vue'),
@@ -41,7 +51,11 @@ const routes = [{
   {
     path: '/ui',
     name: 'ui组件',
-    component: () => import( /* webpackChunkName: "ui" */ '../views/elementGroups.vue')
+    component: () => import( /* webpackChunkName: "ui" */ '../views/elementGroups.vue'),
+    meta: {
+      title: 'ui示例',
+      breadcrumbTitle: route => `ui ${route.params.userId}` // 自定义面包屑标题
+    }
   },
   {
     path: '/super/ranking',
@@ -63,21 +77,20 @@ const router = new VueRouter({
   routes
 })
 router.beforeEach((to, from, next) => {
-  console.log(to.path, 'to.path-----');
   if (whiteSlideList.includes(to.path)) {
     store.commit('SET_SIDEBAR', true); // 登录页面不显示侧边栏
   } else {
     store.commit('SET_SIDEBAR', false); // 其他页面显示侧边栏
   }
   if (whiteFooterList.includes(to.path)) {
-    store.commit('SET_FOOTER', true); // 登录页面不显示侧边栏
+    store.commit('SET_FOOTER', true); // 登录页面不显示底部信息
   } else {
-    store.commit('SET_FOOTER', false); // 其他页面显示侧边栏
+    store.commit('SET_FOOTER', false); // 其他页面显示底部信息
   }
-  if (whiteHeaderList.includes(to.path)) {
-    store.commit('SET_HEADER', true); // 登录页面不显示侧边栏
+  if (blackHeaderList.includes(to.path)) {
+    store.commit('SET_HEADER', false); // 登录页面不显示顶部
   } else {
-    store.commit('SET_HEADER', false); // 其他页面显示侧边栏
+    store.commit('SET_HEADER', true); // 其他页面显示顶部
   }
   next();
 });
diff --git a/src/store/index.js b/src/store/index.js
index f7db4e6..c1feb2f 100755
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,6 +52,30 @@ export default new Vuex.Store({
         },
       ]
     }],
+    menuData: [
+      {
+        index: '1',
+        title: '首页',
+        path:'/',
+        icon: 'home',
+      },
+      {
+        index: '2',
+        title: '订单列表',
+        icon: 'orderList',
+        children: [{
+            index: '2-1',
+            title: '站点列表',
+            path: '/agent/siteList'
+          },
+          {
+            index: '2-2',
+            title: 'ui页面',
+            path: '/ui'
+          }
+        ]
+      },
+    ],
     pageName:'医生管理'
 
   },
diff --git a/src/views/DoctorInformation.vue b/src/views/DoctorInformation.vue
index 03d8de9..110e4bd 100644
--- a/src/views/DoctorInformation.vue
+++ b/src/views/DoctorInformation.vue
@@ -219,11 +219,11 @@ export default {
         ...mapState(['pageTitle']) // 从Vuex映射showSidebar状态到组件的计算属性中
     },
     mounted() {
-        const id = this.$route.query.id; // 获取 id 参数
-        this.doctorId = id;
-        if (id) {
+        const doctorId = this.$route.query.doctorId; // 获取 id 参数
+        this.doctorId = doctorId;
+        if (doctorId) {
             // 请求医生信息
-            this.fetchDoctorData(id);
+            this.fetchDoctorData(doctorId);
         }
     },
     methods: {
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 2b02d0b..f110206 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,5 +1,6 @@
 <template>
-    <div class="min-width" style="background: #F5F7FA;">
+    <div class="min-width pagePadding " style="background: #F5F7FA;" >
+        <p class="pageTitle bold mb24">基础信息</p>
         <div class="doctor-list-wrap ">
             <p class="pageTitle">医生列表</p>
             <el-form>
@@ -100,6 +101,7 @@ import GuipTable from '@/components/GuipTable.vue';
 import GuipButton from '@/components/GuipButton.vue';
 import GuipSwitch from '@/components/GuipSwitch.vue';
 import GuipInput from '@/components/GuipInput.vue';
+import { mapState } from 'vuex';
 
 export default {
     data() {
@@ -217,6 +219,8 @@ export default {
         this.calculateTotalNum()
     },
     mounted(){
+        store.commit('SET_CUSTOMIZE', false); 
+        store.commit('SET_SLIDER_MENU','menuData'); 
         this.getInitData()
     },
     render() {
@@ -224,6 +228,7 @@ export default {
         return 'a';
     },
     computed: {
+        ...mapState(['menuData']) // 从Vuex映射showSidebar状态到组件的计算属性中
     },
     methods: {
         // 初始化请求
@@ -353,13 +358,41 @@ export default {
             // })
         },
         addDoctor() {
-            this.$router.push(`/doctorInformation`)
+            this.$router.push({
+                name: '医生信息',
+            })
+            // this.$router.push({
+            //     name: '医生信息',
+            //     // query: { 
+            //     //     doctorId: 123,
+            //     //     from: 'home' 
+            //     // }
+            //     })
+
+// 生成的URL：/doctorInformation?doctorId=123&from=home
+            
         },
         addHospital(item) {
-            this.$router.push(`/hosInformation?doctorId=${item.id}`)
+            // this.$router.push(`/hosInformation?doctorId=${item.id}`)
+            this.$router.push({
+            name: '医院信息',
+            query: { doctorId: item.id }
+            })
         },
         editDoctor(item) {
-            this.$router.push(`/doctorInformation?id=${item.id}`)
+            // this.$router.push(`/doctorInformation`)
+            this.$router.push({
+                name: '医生信息',
+                query: { doctorId: item.id }
+            })
+
+            // this.$router.push({
+            //     name: '医生信息',
+            //     query: { 
+            //         doctorId: item.id,
+            //     }
+            //     })
+            // this.$router.push(`/doctorInformation?doctorId=${item.id}`)
         },
         // 单个表格的选择变化
         handleSelectionChange(index, selection) {
@@ -449,7 +482,6 @@ export default {
 }
 
 .doctor-list-wrap {
-    margin: 12px;
     background: #fff;
     padding: 32px 36px;
     height: 100%;
diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue
index c902f5a..62fc80a 100644
--- a/src/views/HosInformation.vue
+++ b/src/views/HosInformation.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="site-setting-wrap pagePadding min-flex-right">
-        <p class="pageTitle bold mt24 mb24">基础信息</p>
+        <p class="pageTitle bold mb24">基础信息</p>
         <div class="siteMessage flex-common" id="siteMessage1">
             <p class="littleTitle mb32">基础信息</p>
             <el-form :model="form" :rules="siteFormrules" ref="siteForm">
@@ -90,9 +90,9 @@
                     <div class="flex-right">
                         <GuipFormItem column="column" label="每周出诊安排" :required="true">
                             <div class="flex weekPlan" slot="formDom">
-                                <GuipSelect v-for="day in weekDays" :key="day.id" v-model="form.worktimes[day.id].plan"
+                                <!-- <GuipSelect v-for="day in weekDays" :key="day.id" v-model="form.worktimes[day.id].plan"
                                     :options="options_weekPlan" @change="weekChange()" :label="day.name" placeholder="休息">
-                                </GuipSelect>
+                                </GuipSelect> -->
                             </div>
                         </GuipFormItem>
                     </div>
@@ -895,10 +895,6 @@ export default {
     }
 }
 
-.el-form-item {
-    margin-bottom: 0;
-}
-
 .siteMessage {
     border-radius: 4px;
     transition: all .5s;