diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index faf2cc7..5af2bbe 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -106,7 +106,7 @@ export default { classList: [], curriculumId: "", curriculumList: [], - projectPermissions: this.$route.query.per ? Number(this.$route.query.per) : 0, + projectPermissions: 0, keyword: "", searchTimer: null, startingtime: "", @@ -169,6 +169,14 @@ export default { } }, mounted() { + let per = this.$route.query.per + console.log(per) + if(per == '1'){ + per = 1 + }else{ + per = 0 + } + this.projectPermissions = per this.getschoolCourse(); this.getClassData(); }, diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue index a5ce34b..c5848b1 100644 --- a/src/pages/achievement/teach/index.vue +++ b/src/pages/achievement/teach/index.vue @@ -101,7 +101,7 @@ export default { total: 0, peopleNum: 0, // 总人数 avgScore: 0, // 平均分 - token: btoa(util.local.get(Setting.tokenKey)), + token: util.local.get(Setting.tokenKey), }; }, watch: { diff --git a/src/pages/achievement/vir/index.vue b/src/pages/achievement/vir/index.vue index d96dd8e..f73d1f9 100644 --- a/src/pages/achievement/vir/index.vue +++ b/src/pages/achievement/vir/index.vue @@ -83,7 +83,7 @@ export default { total: 0, peopleNum: 0, // 总人数 avgScore: 0, // 平均分 - token: btoa(util.local.get(Setting.tokenKey)), + token: util.local.get(Setting.tokenKey), }; }, watch: { @@ -95,7 +95,6 @@ export default { } }, mounted() { - console.log(this.$route.query.permissions) this.getData(); }, methods: { @@ -117,7 +116,6 @@ export default { }); }, show(row) { - console.log(row) if (this.permissions) { this.$router.push(`show?id=${row.projectId}&projectId=${this.projectId}&reportId=${row.reportId}`); } else { @@ -215,7 +213,7 @@ export default { }); }, goBack() { - this.$router.back(); + this.$router.push("/achievement/list?per=2"); } } }; diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue index e6b2d21..e34ffa0 100644 --- a/src/pages/project/add/index.vue +++ b/src/pages/project/add/index.vue @@ -194,7 +194,7 @@ export default { return { projectId: this.$route.query.projectId, systemList: [], - token: btoa(util.local.get(Setting.tokenKey)), + token: util.local.get(Setting.tokenKey), isDetail: Boolean(this.$route.query.show), projectManage: { diff --git a/src/pages/project/add/index.vue.copy b/src/pages/project/add/index.vue.copy index ded8b39..a5df029 100644 --- a/src/pages/project/add/index.vue.copy +++ b/src/pages/project/add/index.vue.copy @@ -279,7 +279,7 @@ export default { isHh: Setting.isHh, id: this.$route.query.id, systemList: Setting.systemList, - token: btoa(util.local.get(Setting.tokenKey)), + token: util.local.get(Setting.tokenKey), userIdEd: this.userId, systemId: this.$store.state.project.lastSystemId, isDetail: Boolean(this.$route.query.show),