Merge branch 'dev0124' into dev0515

# Conflicts: # src/router/index.js
2025-12-17 14:56:44 +08:00 · 2024-06-11 17:33:27 +08:00
parent 176e9c91e0 549b74d47d
commit 37600adfa4
20 changed files with 1662 additions and 66 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,70 +47,84 @@ export const constantRoutes = [{
 //   name: 'gratefulIndex',
 //   meta: { title: '感恩教师首页', icon: 'dashboard', noCache: true, affix: false },
 // },
-  {
-    path: '/grateful',
-    component: Grateful,
-    redirect: '/grateful/index',
-    children: [
-      {
-        path: 'index',
-        hidden: true,
-        component: (resolve) => require(['@/views/grateful/GratefulHomePage'], resolve),
-        name: 'GratefulHomePage',
-        meta: {title: '感恩教师首页', icon: 'dashboard', noCache: true, affix: true, hidden: false}
-      },
-      {
-        path: 'teacherEmpowerment',
-        hidden: true,
-        component: (resolve) => require(['@/views/grateful/TeacherEmpowerment'], resolve),
-        name: 'TeacherEmpowerment',
-        meta: {title: '教师赋能', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-      },
-      {
-        path: 'toolDown',
-        hidden: true,
-        component: (resolve) => require(['@/views/grateful/ToolDown'], resolve),
-        name: 'ToolDown',
-        meta: {title: '工具下载', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-      },
-      {
-        path: 'gratefulNotice',
-        hidden: true,
-        component: (resolve) => require(['@/views/grateful/GratefulNotice'], resolve),
-        name: 'GratefulNotice',
-        meta: {title: '通知列表', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-      },
-      {
-        path: 'noticeDetail',
-        hidden: true,
-        component: (resolve) => require(['@/views/grateful/NoticeDetail'], resolve),
-        name: 'NoticeDetail',
-        meta: {title: '通知详情', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-      },
-      {
-        path: 'teacherOpinion',
-        hidden: true,
-        component: (resolve) => require(['@/views/grateful/TeacherOpinion'], resolve),
-        name: 'TeacherOpinion',
-        meta: {title: '师资大全', icon: 'dashboard', noCache: true, affix: true, hidden: true}
-      },
-    ]
-  },
-  {
-    path: '/forward',
-    hidden: true,
-    component: (resolve) => require(['@/views/Forward'], resolve),
-    name: 'forward',
-    meta: {title: '详细信息', icon: 'dashboard', noCache: true, affix: false},
-  },
-  {
-    path: '/course',
-    hidden: true,
-    component: (resolve) => require(['@/views/portal/course/Index'], resolve),
-    name: 'course',
-    meta: {title: '课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
-  },
-  {
+{
+  path: '/grateful',
+  component: Grateful,
+  redirect: '/grateful/index',
+  children: [
+    {
+      path: 'index',
+      hidden: true,
+      component: (resolve) => require(['@/views/grateful/GratefulHomePage'], resolve),
+      name: 'GratefulHomePage',
+      meta: { title: '感恩教师首页', icon: 'dashboard', noCache: true, affix: true, hidden:false }
+    },
+    {
+      path: 'teacherEmpowerment',
+      hidden: true,
+      component: (resolve) => require(['@/views/grateful/TeacherEmpowerment'], resolve),
+      name: 'TeacherEmpowerment',
+      meta: { title: '教师赋能', icon: 'dashboard', noCache: true, affix: true, hidden:true }
+    },
+    {
+      path: 'toolDown',
+      hidden: true,
+      component: (resolve) => require(['@/views/grateful/ToolDown'], resolve),
+      name: 'ToolDown',
+      meta: { title: '工具下载', icon: 'dashboard', noCache: true, affix: true, hidden:true }
+    },
+    {
+      path: 'gratefulNotice',
+      hidden: true,
+      component: (resolve) => require(['@/views/grateful/GratefulNotice'], resolve),
+      name: 'GratefulNotice',
+      meta: { title: '通知列表', icon: 'dashboard', noCache: true, affix: true, hidden:true }
+    },
+    {
+      path: 'noticeDetail',
+      hidden: true,
+      component: (resolve) => require(['@/views/grateful/NoticeDetail'], resolve),
+      name: 'NoticeDetail',
+      meta: { title: '通知详情', icon: 'dashboard', noCache: true, affix: true, hidden:true }
+    },
+    {
+      path: 'teacherOpinion',
+      hidden: true,
+      component: (resolve) => require(['@/views/grateful/TeacherOpinion'], resolve),
+      name: 'TeacherOpinion',
+      meta: { title: '师资大全', icon: 'dashboard', noCache: true, affix: true, hidden:true }
+    },
+  ]
+},
+{
+  path: '/forward',
+  hidden: true,
+  component: (resolve) => require(['@/views/Forward'], resolve),
+  name: 'forward',
+  meta: { title: '详细信息', icon: 'dashboard', noCache: true, affix: false },
+},
+{
+  path: '/course',
+  hidden: true,
+  component: (resolve) => require(['@/views/portal/course/Index'], resolve),
+  name: 'course',
+  meta: { title: '课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
+},
+// {
+//   path: '/growth',
+//   hidden: true,
+//   component: (resolve) => require(['@/views/study/Growth'], resolve),
+//   name: 'growth',
+//   meta: { title: '成长路径', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
+// },
+{
+  path: '/growthpath',
+  hidden: true,
+  component: (resolve) => require(['@/views/study/GrowthPath'], resolve),
+  name: 'growthpath',
+  meta: { title: '成长路径图', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
+},
+{
    path: '/courseRecommended',
    hidden: true,
    component: (resolve) => require(['@/views/portal/course/CourseRecommended'], resolve),