Merge branch 'master' of http://172.16.90.201:3000/veterans/veterans_client_web

src/layout/index.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-10 11:30:36
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-23 15:17:05
+ * @LastEditTime: 2022-08-26 17:51:07
  * @FilePath: \veterans_client_web\src\layout\index.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -45,7 +45,9 @@
       </div>
     </div>
     <div class="main">
-      <router-view />
+      <!-- <keep-alive> -->
+        <router-view />
+      <!-- </keep-alive> -->
     </div>
     <div class="footer" height="100px">
       <div class="footer-link">

src/router/index.js

@@ -156,6 +156,15 @@ const routes = [
           title: '学历提升详情'
         }
       },
+      {
+        path: 'educationpromote/recruitstudents',
+        name: 'RecruitStudentsIndex',
+        component: () =>
+          import('@/views/EducationPromote/RecruitStudents/RecruitStudentsIndex.vue'),
+        meta: {
+          title: '招生简章'
+        }
+      },
       {
         path: 'adaptivetraining',
         name: 'AdaptiveTrainingIndex',

src/views/EducationPromote/EducationPromoteIndex.vue

@@ -2,8 +2,8 @@
  * @Description: 学历提升
  * @Author: 空白格
  * @Date: 2022-08-12 13:47:26
- * @LastEditors: gcz
- * @LastEditTime: 2022-08-26 16:50:01
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-26 18:03:35
  * @FilePath: \veterans_client_web\src\views\EducationPromote\EducationPromoteIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -20,7 +20,10 @@
         ></el-image>
       </div>
       <!-- 特点 -->
-      <div class="education-promote-effect" @click="jumpPage('/educationpromote/details')">
+      <div
+        class="education-promote-effect"
+        @click="jumpPage('/educationpromote/details')"
+      >
         <div class="education-promote-effect-item">
           <p>提升作用</p>
           <p>学历提升</p>
@@ -61,7 +64,15 @@
               </div>
             </el-col>
             <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <div class="epah-right">
+              <div
+                class="epah-right"
+                @click="
+                  jumpPage('/educationpromote/recruitstudents', {
+                    id: currentSchool.id,
+                    name: currentSchool.school_name,
+                  })
+                "
+              >
                 <div class="epah-right-text">招生简章</div>
                 <div class="epah-right-btn">立即查看</div>
               </div>
@@ -130,7 +141,8 @@ export default {
       },
       activityList: [],
       total: 0,
-      loading: false
+      loading: false,
+      currentSchool: {},
     };
   },
   created() {
@@ -146,6 +158,7 @@ export default {
       getSchoolListData().then((res) => {
         this.schoolList = res.data;
         this.queryParams.schoolId = res.data[0].id;
+        this.currentSchool = res.data[0];
         this.getACtivityList();
       });
     },
@@ -155,11 +168,11 @@ export default {
      * @returns {any}
      */
     getACtivityList() {
-      this.loading = true
+      this.loading = true;
       getActivityBySchool(this.queryParams).then((res) => {
         this.activityList = res.rows;
         this.total = Number(res.total);
-        this.loading = false
+        this.loading = false;
       });
     },
     /**
@@ -179,8 +192,13 @@ export default {
      * @returns {any}
      */
     schoolChange(val) {
-      this.queryParams.schoolId = val
-      this.queryParams.pageNum = 1
+      this.schoolList.forEach((item) => {
+        if (val === item.id) {
+          this.currentSchool = item;
+        }
+      });
+      this.queryParams.schoolId = val;
+      this.queryParams.pageNum = 1;
       this.getACtivityList();
     },
     /**
@@ -189,9 +207,9 @@ export default {
      * @param {any} path
      * @returns {any}
      */
-    jumpPage(path, param) {
+    jumpPage(path, query) {
       if (path) {
-        this.$router.push({ path, param });
+        this.$router.push({ path, query });
       }
     },
   },

src/views/EducationPromote/RecruitStudents/RecruitStudentsIndex.vue

@@ -0,0 +1,12 @@
+<!--
+ * @Description: 招生简章
+ * @Author: 空白格
+ * @Date: 2022-08-26 17:56:21
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-26 17:56:22
+ * @FilePath: \veterans_client_web\src\views\EducationPromote\RecruitStudents\RecruitStudentsIndex.vue
+ * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
+-->
+<template>
+  <div>招生简章</div>
+</template>