From 64adf0faa3ee49de1d4ba3abe6c9de5bb565f44b Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 12 九月 2024 11:37:21 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/dream_web --- src/views/home/index.vue | 1 - src/layout/index.vue | 16 +--------------- src/settings.js | 2 +- src/views/student/index.vue | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/layout/index.vue b/src/layout/index.vue index dee6d98..76e9193 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -44,23 +44,9 @@ } }, mounted() { - // 鑾峰彇鍦板潃鏍廲ode - let code = this.$route.query.code; - if (code) { - this.getUserDate(code); - } - // else { - // this.$router.push("/login"); - // } + }, methods: { - getUserDate(code) { - login({ - code: code, - }).then((res) => { - localStorage.setItem("user", JSON.stringify(res)); - }); - }, handleClickOutside() { this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) } diff --git a/src/settings.js b/src/settings.js index ae3c494..209b307 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: 'Vue Admin Template', + title: '鍙綋寰暀鍔�', /** * @type {boolean} true | false diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 52c1a30..d23d265 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -16,7 +16,6 @@ <script> import { mapGetters } from "vuex"; -import { login } from "@/api/user"; import Chart from "./components/chart.vue"; export default { diff --git a/src/views/student/index.vue b/src/views/student/index.vue index 905a089..af99cd8 100644 --- a/src/views/student/index.vue +++ b/src/views/student/index.vue @@ -120,6 +120,7 @@ <script> import { getData, getRenew, getExpire, getDeleted, handleExport } from "@/api/student"; import StudentCreate from "./components/create.vue"; +import { login } from "@/api/user"; export default { filters: { @@ -158,11 +159,38 @@ }; }, created() { - this.fetchData(); + // 鑾峰彇鍦板潃鏍廲ode + let code = this.$route.query.code; + if (code) { + if (localStorage.getItem("code")) { + if (code !== localStorage.getItem("code")) { + this.getUserDate(code); + } + } else { + this.getUserDate(code); + } + } else { + if (!localStorage.getItem("user")) { + this.$router.push("/login"); + } + } + if (localStorage.getItem("user")) { + this.fetchData(); + } }, methods: { + getUserDate(code) { + let that = this; + login({ + code: code, + }).then((res) => { + localStorage.setItem("user", JSON.stringify(res)); + localStorage.setItem("code", code); + that.fetchData(); + }); + }, handleExport() { - this.download('exportPlayer', { + this.download('exportPlayer?orgId=' + JSON.parse(localStorage.getItem("user")).staffs[0].org.id, { }, `瀵煎嚭_${new Date().getTime()}.xlsx`) }, handleExport2() { -- Gitblit v1.8.0