Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase

杨磊

2025-03-31 2153eb58afd80010a1ec506198a401f918892663

 src/router/index.js

@@ -2,12 +2,11 @@
import VueRouter from "vue-router";
import HomeLayout from "@/layout";
import Home from "@/views/home";


import Honor from "@/views/honors";

const originalPush = VueRouter.prototype.push;
VueRouter.prototype.push = function push(location) {
  return originalPush.call(this, location).catch(err => err);
  return originalPush.call(this, location).catch((err) => err);
};

Vue.use(VueRouter);
@@ -17,19 +16,28 @@
    name: "HomeLayout",
    component: HomeLayout,
    redirect: {
      name: "home"
      name: "honor",
    },
    children: [
      // 在主框架内
      {
        path: "/home",
        name: "home",
        path: "/chronology",
        name: "chronology",
        meta: {
          name: "首页",
          authentication: false, // 是否需要登录验证
          keepAlive: false // 是否需要缓存
          keepAlive: false, // 是否需要缓存
        },
        component: Home
        component: () => import("@/views/chronology/index.vue")
      },

      {
        path: "/honor",
        name: "honor",
        meta: {
          name: "荣誉奖项",
        },
        component: Honor,
      },

      // {
@@ -42,20 +50,30 @@
      //   component: () => import("@/views/login/login")
      // },


    ]
  },

  // 不在主框架内

  {
    path: "/home",
    name: "home",
    meta: {
      name: "首页",
      authentication: false, // 是否需要登录验证
      keepAlive: false // 是否需要缓存
    },
    component: Home
  },
  // {
  //   path: "/pdf",
  //   name: "pdf",
  //   component: () => import("@/components/play/pdf")
  // },

];

const router = new VueRouter({
  routes
  routes,
});

export default router;