diff --git a/src/api/index.js b/src/api/index.js index 07ca1d5..589d65b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -38,9 +38,9 @@ export default { queryAssessmentByStudent: `occupationlab/achievement/queryAssessmentByStudent`, //学生端考核成绩 queryPracticeByStudent: `occupationlab/achievement/queryPracticeByStudent`, //学生端练习成绩 exportAssessmentByStudent: `occupationlab/achievement/exportAssessmentByStudent`, // 批量导出考核成绩 - exportPracticeByStudent: `occupationlab/achievement/exportPracticeByStudent`, // 批量导出练习成绩 + exportPracticeByStudent: `${host}occupationlab/achievement/exportPracticeByStudent`, // 批量导出练习成绩 practiceByStudentDetail: `occupationlab/achievement/practiceByStudentDetail`, // 学生端练习实验情况 - exportPracticeByStudentDetail: `occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况 + exportPracticeByStudentDetail: `${host}occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况 reportDetail: `occupationlab/achievement/reportDetail`, // 成绩报告详情 updateReport: `occupationlab/achievement/updateReport`, // 更新成绩报告 schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程 diff --git a/src/assets/img/log-bg.png b/src/assets/img/log-bg.png index 7f32bdc..f6de30e 100644 Binary files a/src/assets/img/log-bg.png and b/src/assets/img/log-bg.png differ diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 0d9e54e..14d7a89 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -103,7 +103,7 @@ export default { }, // 获取日志状态 getLogStatus() { - this.$get(this.api.logNotification, { + util.local.get(Setting.tokenKey) && this.$get(this.api.logNotification, { platformId: Setting.platformId }).then(({ notification }) => { this.SET_LOG() // 把查看日志状态设置为true @@ -153,7 +153,7 @@ export default { position: absolute; top: 250px; left: 50%; - width: 450px; + width: 550px; transform: translateX(-50%); background-color: #fff; border-radius: 6px; @@ -164,7 +164,7 @@ export default { .bg2 { position: absolute; top: -130px; - left: 6px; + left: 48px; max-width: 100%; height: 250px; } @@ -204,6 +204,7 @@ export default { } .cover { max-width: 250px; + max-height: 160px; margin: 10px 0 20px; } .detail { @@ -227,7 +228,7 @@ export default { p { position: relative; font-size: 13px; - color: #505050; + color: #727272; } } } diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index d5bac3c..97f216f 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -338,8 +338,13 @@ export default { } else if (status == 200) { // 如果返回的是数组,则弹框给用户选择登录哪个用户,否则,直接登录 if (data instanceof Array) { - this.users = data - this.userVisible = true + // 如果只查询到一个用户,则直接登录,否则,弹框让用户选择 + if (data.length === 1) { + this.chooseUser(data[0]) + } else { + this.users = data + this.userVisible = true + } } else { this.queryClient(data.token) } diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue index 3e9b3cd..36bb54b 100644 --- a/src/pages/station/list/index.vue +++ b/src/pages/station/list/index.vue @@ -10,6 +10,7 @@
暂无数据
+