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

杨磊

2025-03-31 2153eb58afd80010a1ec506198a401f918892663

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

 package-lock.json

Diff too large

 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,7 +16,7 @@
    name: "HomeLayout",
    component: HomeLayout,
    redirect: {
      name: "home"
      name: "honor",
    },
    children: [
      // 在主框架内
@@ -27,9 +26,18 @@
        meta: {
          name: "首页",
          authentication: false, // 是否需要登录验证
          keepAlive: false // 是否需要缓存
          keepAlive: false, // 是否需要缓存
        },
        component: ()=> import("@/views/chronology/index.vue")
        component: () => import("@/views/chronology/index.vue")
      },

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

      // {
@@ -44,7 +52,7 @@

    ]
  },
  

  // 不在主框架内

  {
@@ -62,11 +70,10 @@
  //   name: "pdf",
  //   component: () => import("@/components/play/pdf")
  // },

];

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

export default router;

 src/views/home/index.vue

@@ -1,6 +1,7 @@
<template>
  <div class="home">
    <div class="profilePhoto"></div>
    <div class="profilePhoto">
    </div>
  </div>
</template>


 src/views/honors/index.vue

New file
@@ -0,0 +1,16 @@
<template>
    <div class="honors">
        <div></div>
        <div></div>
    </div>
</template>

<script>
export default {};
</script>

<style>
    .honors{
        
    }
</style>

 yarn.lock

Diff too large