From a7fe814641483ac8a02ffa672fea3bc534c0f749 Mon Sep 17 00:00:00 2001
From: "jialong.yu" <Yujialong.123>
Date: Wed, 26 Jan 2022 19:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E8=AE=B0=E5=BD=95=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E8=AF=BE=E7=A8=8B=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/record/details/index.vue |  2 --
 src/pages/record/list/ass.vue      |  5 +++++
 src/pages/record/list/index.vue    |  8 ++++----
 src/pages/record/list/practice.vue |  6 +++++-
 src/store/modules/project.js       | 10 +++++-----
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue
index 685ee97..6819144 100644
--- a/src/pages/record/details/index.vue
+++ b/src/pages/record/details/index.vue
@@ -54,7 +54,6 @@
 </template>
 
 <script>
-import { mapState, mapActions } from "vuex";
 import axios from 'axios'
 import Setting from "@/setting";
 import util from "@/libs/util";
@@ -126,7 +125,6 @@ export default {
             }
         },
         toReport(row) {
-            // this.setSystemId(this.systemId);
             this.$router.push(`/record/show?reportId=${row.reportId}`);
         }
     }
diff --git a/src/pages/record/list/ass.vue b/src/pages/record/list/ass.vue
index 154c155..6996737 100644
--- a/src/pages/record/list/ass.vue
+++ b/src/pages/record/list/ass.vue
@@ -34,6 +34,7 @@
 </template>
 
 <script>
+import { mapActions } from "vuex";
 export default {
     props: ["curriculumId"],
     data() {
@@ -56,6 +57,9 @@ export default {
         }
     },
     methods: {
+        ...mapActions({
+            setCurriculum: "project/setCurriculum"
+        }),
         tableRowStyle({ row, column, rowIndex, columnIndex }) {
             if (rowIndex % 2 === 0) {
                 return "background-color: #FFF";
@@ -78,6 +82,7 @@ export default {
             }).catch(err => {});
         },
         toReport(row) {
+            this.setCurriculum(this.curriculumId)
             this.$router.push(`show?id=${row.id}&recordId=${row.recordid}&reportId=${row.reportId}`);
         }
     }
diff --git a/src/pages/record/list/index.vue b/src/pages/record/list/index.vue
index c978dd4..ddf6763 100644
--- a/src/pages/record/list/index.vue
+++ b/src/pages/record/list/index.vue
@@ -84,9 +84,9 @@ export default {
         };
     },
     computed: {
-        ...mapState({
-            'lastRecordType': state => state.project.lastRecordType
-        })
+        ...mapState("project", [
+            'lastRecordType', 'currId'
+        ])
     },
     created() {
         this.active = this.lastRecordType ? this.lastRecordType : "practice";
@@ -103,7 +103,7 @@ export default {
             this.$get(this.api.schoolCourseByAchievement).then(res => {
                 if (res.data && res.data.length) {
                     this.curriculumList = res.data;
-                    this.curriculumId = this.curriculumList[0].cid;
+                    this.curriculumId = this.currId || this.curriculumList[0].cid
                 }
             }).catch(err => {
                 console.log(err);
diff --git a/src/pages/record/list/practice.vue b/src/pages/record/list/practice.vue
index dfa879a..a57e7e7 100644
--- a/src/pages/record/list/practice.vue
+++ b/src/pages/record/list/practice.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-
+import { mapActions } from "vuex";
 export default {
     props: ["curriculumId"],
     data() {
@@ -46,6 +46,9 @@ export default {
         }
     },
     methods: {
+        ...mapActions({
+            setCurriculum: "project/setCurriculum"
+        }),
         tableRowStyle({ row, column, rowIndex, columnIndex }) {
             if (rowIndex % 2 === 0) {
                 return "background-color: #FFF";
@@ -68,6 +71,7 @@ export default {
             }).catch(err => {});
         },
         toDetails(row) {
+            this.setCurriculum(this.curriculumId)
             this.$router.push(`/record/details?curriculumId=${this.curriculumId}&projectId=${row.projectId}`);
         }
     }
diff --git a/src/store/modules/project.js b/src/store/modules/project.js
index 8c8a93c..73d0746 100644
--- a/src/store/modules/project.js
+++ b/src/store/modules/project.js
@@ -4,20 +4,20 @@
 export default {
     namespaced: true,
     state: {
-        lastSystemId: 1,
+        currId: '',
         lastRecordType: "practice"
     },
     mutations: {
-        SET_SYSTEM_ID: (state, systemId) => {
-            state.lastSystemId = systemId;
+        SET_CURRICULUM: (state, currId) => {
+            state.currId = currId
         },
         SET_RECORD: (state, type) => {
             state.lastRecordType = type;
         }
     },
     actions: {
-        setSystemId({ state, commit }, systemId) {
-            commit("SET_SYSTEM_ID", systemId);
+        setCurriculum({ state, commit }, currId) {
+            commit("SET_CURRICULUM", currId);
         },
         setRecord({ state, commit }, active) {
             commit('SET_RECORD', active)