Merge remote-tracking branch 'origin/master'

src/router/router_plan.js

@@ -21,58 +21,73 @@ const router = [
     },
     //目标管理首页
     {
-        path: '/xjc-integratedmachine/plan/aim_management_index',
+        path: '/xjc-integratedmachine/plan/aim/aim_management_index',
         component: () => import('@/views/xjc-integratedmachine/plan/aim/aim_management_index.vue'),
     },
     //目标管理知识讲解
     {
-        path: '/xjc-integratedmachine/plan/aim_explanation_knowledge',
+        path: '/xjc-integratedmachine/plan/aim/aim_explanation_knowledge',
         component: () => import('@/views/xjc-integratedmachine/plan/aim/aim_explanation_knowledge.vue'),
     },
     //目标管理交互
     {
-        path: '/xjc-integratedmachine/plan/aim_management_interaction',
+        path: '/xjc-integratedmachine/plan/aim/aim_management_interaction',
         component: () => import('@/views/xjc-integratedmachine/plan/aim/aim_management_interaction.vue'),
     },
     //时间管理菜单页
     {
-        path: '/xjc-integratedmachine/plan/time_management_menu',
+        path: '/xjc-integratedmachine/plan/time/time_management_menu',
         component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_menu.vue'),
     },
+    //时间管理4D法首页
+    {
+        path: '/xjc-integratedmachine/plan/time/time_management_4d_index',
+        component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_4d_index.vue'),
+    },
     //时间管理4D法讲解
     {
-        path: '/xjc-integratedmachine/plan/time_management_4d',
-        component: () => import('@/views/xjc-integratedmachine/plan/time_management_4d.vue'),
+        path: '/xjc-integratedmachine/plan/time/time_management_4d_explanation',
+        component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_4d_explanation.vue'),
+    },
+    //时间管理测评首页
+    {
+        path: '/xjc-integratedmachine/plan/time/time_management_assessment_index',
+        component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_assessment.vue'),
     },
     //时间管理测评知识讲解
     {
-        path: '/xjc-integratedmachine/plan/time_management_knowledge',
-        component: () => import('@/views/xjc-integratedmachine/plan/time_management_knowledge.vue'),
+        path: '/xjc-integratedmachine/plan/time/time_management_assessment_explanation',
+        component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_assessment_explanation.vue'),
     },
     //时间管理测评
     {
-        path: '/xjc-integratedmachine/plan/time_management_assessment',
-        component: () => import('@/views/xjc-integratedmachine/plan/time_management_assessment.vue'),
+        path: '/xjc-integratedmachine/plan/time/time_management_assessment',
+        component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_assessment.vue'),
     },
     //时间管理测评网页报告
     {
-        path: '/xjc-integratedmachine/plan/time_management_webreport',
-        component: () => import('@/views/xjc-integratedmachine/plan/time_management_webreport.vue'),
+        path: '/xjc-integratedmachine/plan/time/time_management_assessment_webreport',
+        component: () => import('@/views/xjc-integratedmachine/plan/time/time_management_assessment_webreport.vue'),
+    },
+    //自控力测评首页
+    {
+        path: '/xjc-integratedmachine/plan/self_control/self_control/self_control_index',
+        component: () => import('@/views/xjc-integratedmachine/plan/self_control/self_control_index.vue'),
     },
     //自控力测评知识讲解
     {
-        path: '/xjc-integratedmachine/plan/explanation_ control_assessment_knowledge',
-        component: () => import('@/views/xjc-integratedmachine/plan/explanation_ control_assessment_knowledge.vue'),
+        path: '/xjc-integratedmachine/plan/self_control/self_control_explanation',
+        component: () => import('@/views/xjc-integratedmachine/plan/self_control/self_control_explanation.vue'),
     },
     //自控力测评
     {
-        path: '/xjc-integratedmachine/plan/self_control_assessment',
-        component: () => import('@/views/xjc-integratedmachine/plan/self_control_assessment.vue'),
+        path: '/xjc-integratedmachine/plan/self_control/self_control_assessment',
+        component: () => import('@/views/xjc-integratedmachine/plan/self_control/self_control_assessment.vue'),
     },
     //自控力测评网页报告
     {
-        path: '/xjc-integratedmachine/plan/self_control_assessment_webreport',
-        component: () => import('@/views/xjc-integratedmachine/plan/self_control_assessment_webreport.vue'),
+        path: '/xjc-integratedmachine/plan/self_control/self_control_assessment_webreport',
+        component: () => import('@/views/xjc-integratedmachine/plan/self_control/self_control_assessment_webreport.vue'),
     },
     //生涯成熟度复测知识讲解
     {

src/views/xjc-integratedmachine/plan/index.vue

@@ -5,11 +5,11 @@
             <div class="page-img-box">
                 <div class="img-box">
                     <img src="@/assets/images/plan/index/card1.png" @click="jumpTo('/xjc-integratedmachine/plan/develop_career_plan1')">
-                    <img src="@/assets/images/plan/index/card2.png" @click="jumpTo('/xjc-integratedmachine/plan/aim_management_index')">
-                    <img src="@/assets/images/plan/index/card3.png" @click="jumpTo('/xjc-integratedmachine/plan/time_management_menu')">
+                    <img src="@/assets/images/plan/index/card2.png" @click="jumpTo('/xjc-integratedmachine/plan/aim/aim_management_index')">
+                    <img src="@/assets/images/plan/index/card3.png" @click="jumpTo('/xjc-integratedmachine/plan/time/time_management_menu')">
                 </div>
                 <div class="bottom-img common-img-button">
-                    <img src="@/assets/images/plan/index/card4.png" @click="jumpTo('/xjc-integratedmachine/plan/studyocc_information')">
+                    <img src="@/assets/images/plan/index/card4.png" @click="jumpTo('/xjc-integratedmachine/plan/self_control/self_control_index')">
                     <img src="@/assets/images/plan/index/card5.png" @click="jumpTo('/xjc-integratedmachine/plan/ai_career_interview')">
                 </div>
             </div>

src/views/xjc-integratedmachine/plan/time_management_assessment.vue

@@ -1,5 +1,5 @@
 <template>
-    时间管理测评
+    自控力测评首页
 </template>
 
 <script setup>

src/views/xjc-integratedmachine/plan/time/time_management_4d_explanation.vue

@@ -0,0 +1,11 @@
+<template>
+    时间管理4D法知识讲解
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/xjc-integratedmachine/plan/time_management_4d.vue

@@ -1,5 +1,5 @@
 <template>
-    时间管理4D法讲解
+    时间管理4D法首页
 </template>
 
 <script setup>

src/views/xjc-integratedmachine/plan/time/time_management_assessment.vue

@@ -0,0 +1,11 @@
+<template>
+    时间管理测评测评页
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/xjc-integratedmachine/plan/time/time_management_assessment_index.vue

@@ -0,0 +1,11 @@
+<template>
+    时间管理测评首页
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>