diff --git a/dist.tar b/dist.tar index 6c1b55d..026dde5 100644 Binary files a/dist.tar and b/dist.tar differ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index e959221..088668e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -77,7 +77,9 @@ const useUserStore = defineStore( this.roles = [] this.permissions = [] User.removeToken() - + User.removeUserId() + User.removeUserName() + User.removeSchoolId() resolve() }) }, diff --git a/src/utils/auth.js b/src/utils/auth.js index 633db8b..dd53c5b 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -3,7 +3,7 @@ import Cookies from 'js-cookie' const TokenKey = 'Admin-Token' const userId = 'userid' const userName = 'username' -const schoolId = 'schoolid' +const schoolId = 'schoolId' // 存储学校id export function getSchoolId() { return Cookies.get(schoolId) diff --git a/src/utils/request.js b/src/utils/request.js index d19b690..e403d1e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,9 +15,9 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 // baseURL: import.meta.env.VITE_APP_BASE_API, // baseURL: 'http://118.31.7.2:8800/', - // baseURL: 'http://192.168.2.17:8800/', - // baseURL: 'http://120.79.54.255:8800/', - baseURL: 'http://qkljr.sztzjy.com:91/', + baseURL: 'http://192.168.2.17:8800/', + // baseURL: 'http://202.199.90.115:8800/', + // baseURL: 'http://qkljr.sztzjy.com:91/', // 超时 timeout: 60000 }) diff --git a/src/views/login.vue b/src/views/login.vue index 2983b86..f034918 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -120,6 +120,7 @@ watch( (newRoute) => { // redirect.value = newRoute.query && newRoute.query.redirect; if(newRoute.query.token){ + loadpage.value=true loginForm.value.TOKEN = newRoute.query.token return handleLogin() @@ -154,9 +155,7 @@ function handleLogin() { userStore .login(params) .then(() => { - if(params.token){ - time.value=setTimeout(() => { loadpage.value=false return router.push({ path: redirect.value || "/enterprise/wallet" }); diff --git a/src/views/study/index.vue b/src/views/study/index.vue index 132f39a..75867c9 100644 --- a/src/views/study/index.vue +++ b/src/views/study/index.vue @@ -51,7 +51,7 @@ - + @@ -59,6 +59,14 @@ 实训报告 +

+基于本模块的学习,分析以下问题,提交实训报告:
+1、从国内环境和国际环境两个方面,分析中国为什么要推出数字人民币?
+2、数字人民币和传统的人民币有什么优缺点?
+3、在数字人民币的运行机制中,中央银行承担了什么作用,商业银行承担了什么作用?
+4、在国家宏观经济调控中,数字人民币能发挥什么作用,能够弥补传统的人民币在哪些方面的不足?
+5、学习心得
+

@@ -133,7 +141,7 @@ const tabaData = reactive([ unit: "次", actual: "", Standard: "次数<8次得0分,次数≥8次得60分,每增加一次得5分,满分100分", - weight: "0.2", + weight: "0.1", score: "/", }, { @@ -142,7 +150,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "个数<4得0分,个数≥4个得60分,每增加一个得10分,满分100分", - weight: "0.2", + weight: "0.05", score: "/", }, { @@ -151,7 +159,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "个数<2得0分,个数≥2个得60分,每增加一个得10分,满分100分", - weight: "0.2", + weight: "0.1", score: "/", }, { @@ -160,7 +168,7 @@ const tabaData = reactive([ unit: "e-CNY", actual: "", Standard: "金额<5万得0分,金额≥5万得60分,每增加10万得10分,满分100分", - weight: "0.2", + weight: "0.05", score: "/", }, { @@ -169,7 +177,7 @@ const tabaData = reactive([ unit: "e-CNY", actual: "", Standard: "次数<2次得0分,次数≥2次得60分,每增加一次得10分,满分100分", - weight: "0.2", + weight: "0.05", score: "/", }, { @@ -196,7 +204,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "个数<2得0分,个数≥2个得60分,每增加一个得10分,满分100分", - weight: "", + weight: "0.05", score: "/", }, { @@ -205,7 +213,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "个数<2得0分,个数≥2个得60分,每增加一个得10分,满分100分", - weight: "", + weight: "0.05", score: "/", }, { @@ -214,7 +222,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "开通1个得100分,否则0分", - weight: "", + weight: "0.05", score: "/", }, { @@ -223,7 +231,7 @@ const tabaData = reactive([ unit: "次", actual: "", Standard: "次数<2次得0分,次数≥2次得60分,每增加一次得10分,满分100分", - weight: "", + weight: "0.05", score: "/", }, { @@ -232,7 +240,7 @@ const tabaData = reactive([ unit: "e-CNY", actual: "", Standard: "金额<5万得0分,金额≥5万得60分,每增加10万得10分,满分100分", - weight: "", + weight: "0.05", score: "/", }, { @@ -268,7 +276,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "个数<2得0分,个数≥2个得60分,每增加一个得10分,满分100分", - weight: "0.2", + weight: "0.05", score: "/", }, { @@ -277,7 +285,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "个数<2得0分,个数≥2个得60分,每增加一个得10分,满分100分", - weight: "", + weight: "0.05", score: "/", }, { @@ -286,7 +294,7 @@ const tabaData = reactive([ unit: "个", actual: "", Standard: "开通1个得100分,否则0分", - weight: "", + weight: "0.05", score: "/", }, { @@ -295,7 +303,7 @@ const tabaData = reactive([ unit: "次", actual: "", Standard: "次数<2次得0分,次数≥2次得60分,每增加一次得10分,满分100分", - weight: "", + weight: "0.1", score: "/", }, { @@ -304,7 +312,7 @@ const tabaData = reactive([ unit: "e-CNY", actual: "", Standard: "次数<2次得0分,次数≥2次得60分,每增加一次得10分,满分100分", - weight: "0.2", + weight: "0.05", score: "/", }, { @@ -340,7 +348,7 @@ const tabaData = reactive([ unit: "e-CNY", actual: "", Standard: "教师评分", - weight: "", + weight: "0.1", score: "/", }, ]); @@ -426,7 +434,7 @@ const getFilePDF=(e)=>{ const queryParasm = { module: "数字货币", userId: userStore.userId, - schoolId: "1" + schoolId: userStore.schoolid, }; const formData = new FormData(); formData.append("file", file); @@ -689,7 +697,7 @@ line-height: 61px; // padding: 20px; :deep(.el-button--primary){ width: 172px; - height: 51px; + height: 36px; border: 2px solid #25F4F9; background: linear-gradient(0deg, #0654B5 0%, #003155 50%, #2CD1E4 100%); box-shadow: 0px 5px 6px 0px rgba(0,48,255,0.77);