diff --git a/src/api/index.js b/src/api/index.js index 0af04e6..b2afc28 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -35,10 +35,10 @@ export default { updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update', // 课程笔记 - addNote: `${host1}nakadai/curriculumNotes/addNote`, - curriculumNoteList: `${host1}nakadai/curriculumNotes/curriculumNoteList`, - deleteNotes: `${host1}nakadai/curriculumNotes/deleteNotes`, - updateNote: `${host1}nakadai/curriculumNotes/updateNote`, + addNote: `nakadai/curriculumNotes/addNote`, + curriculumNoteList: `nakadai/curriculumNotes/curriculumNoteList`, + deleteNotes: `nakadai/curriculumNotes/deleteNotes`, + updateNote: `nakadai/curriculumNotes/updateNote`, // 能力测评 canExperiment: `occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验 @@ -54,6 +54,7 @@ export default { // 实验记录 schoolCourse: `nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程 + curriculumListForBeforeLogin: `nakadai/nakadai/curriculum/curriculumListForBeforeLogin`, experimentOverview: `occupationlab/occupationlab/achievement/experimentOverview`, //实验概览 queryAssessmentByStudent: `occupationlab/occupationlab/achievement/queryAssessmentByStudent`, //学生端考核成绩 queryPracticeByStudent: `occupationlab/occupationlab/achievement/queryPracticeByStudent`, //学生端练习成绩 diff --git a/src/assets/img/zxy/intro-bg4.png b/src/assets/img/zxy/intro-bg4.png index 90cbecd..45ec5eb 100644 Binary files a/src/assets/img/zxy/intro-bg4.png and b/src/assets/img/zxy/intro-bg4.png differ diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue index 1075ac1..5cc8878 100644 --- a/src/pages/activity/list/index.vue +++ b/src/pages/activity/list/index.vue @@ -11,7 +11,7 @@
@@ -20,7 +20,7 @@
筛选排序：
-
{{ item.name }}
+
{{ item.name }}
我的项目 @@ -109,12 +109,12 @@ export default { } ], form: { - sequence: 2, // 排序(1:近期排名 2.最近更新) - eventType: '' + filterSort: 0, + whetherToSignUp: '' }, sorts: [ { - id: 2, + id: 0, name: '最近更新' }, { @@ -133,11 +133,6 @@ export default { timerList: [], }; }, - computed: { - ...mapState('match', [ - 'eventType' - ]) - }, watch: { keyword: function(val) { clearTimeout(this.searchTimer); @@ -243,7 +238,7 @@ export default { }, // 获取redis缓存 getRedis() { - this.$post(this.api.getRedisCacheCompetition).then(({ data }) => { + this.$post(this.api.getRedisCacheActivity).then(({ data }) => { data && this.getList() }).catch(res => {}) }, @@ -252,17 +247,16 @@ export default { form.competitionScope = 3 form.provinceId = '' form.cityId = '' - form.sequence = 2 - form.eventType = type + form.filterSort = 2 + form.whetherToSignUp = type this.initData() }, // 筛选排序 changeSort(type) { - this.form.sequence = type + this.form.filterSort = type this.initData() }, toDetail(item) { - this.SET_TYPE(this.form.eventType) this.$router.push(`/activity/details?id=${item.id}`); }, handleCurrentChange(val) { diff --git a/src/pages/activity/manage/list/index.vue b/src/pages/activity/manage/list/index.vue index ed7fba3..be7f621 100644 --- a/src/pages/activity/manage/list/index.vue +++ b/src/pages/activity/manage/list/index.vue @@ -68,16 +68,14 @@ @@ -237,6 +235,9 @@ export default { } }) }, 1000) + list.map(e => { + if (e.schoolOpen) e.isOpen = 1 + }) this.activityData = list this.total = data.total this.$refs.table.clearSelection() diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue index 2de225c..af6e8be 100644 --- a/src/pages/screen/index.vue +++ b/src/pages/screen/index.vue @@ -327,7 +327,7 @@
-
+
@@ -504,7 +504,7 @@ export default { }).catch(res => {}) }, // 获取图标数据并渲染 - renderChart() { + async renderChart() { const animateChart = (chart, option, data, num = 6) => { // 每次向后滚动一个，最后一个从头开始。 if (option.dataZoom[0].endValue == data.length ) { @@ -701,9 +701,24 @@ export default { color2: 'rgba(156, 163, 2, 0.4)' } ] - this.$get(this.api.schoolCourse).then(({ data }) => { - const courseList = data - const ids = data.map(e => e.cid) + // 登录前登录后调的课程接口不一样 + const cousrseRes = this.token ? + await this.$get(this.api.schoolCourse) : + await this.$post(this.api.curriculumListForBeforeLogin, { + pageNum: 1, + pageSize: 100, + supplierId: '1,2,3,4', + curriculumName: '', + categoryId: '', + curriculumType: '', + professionalCategoryId: '', + professionalId: '', + }) + if (cousrseRes) { + const courseList = this.token ? + cousrseRes.data : + cousrseRes.page.records + const ids = courseList.map(e => e.cid) times.map(e => { e.cid = ids }) @@ -852,7 +867,7 @@ export default { // animateChart(chart[1], option, times) // }, 5000) }).catch(res => {}) - }).catch(err => {}) + } // 月人均在线学习时长情况 const date = new Date() diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 9b6870f..88e2b27 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -80,9 +80,9 @@
-

+

{{ i + 1 }}. - {{ item.name }} + {{ item.projectName }}

@@ -94,121 +94,123 @@
{{ item.name }}
- - + @@ -396,25 +398,23 @@ export default { // 1正常显示资源，0显示续费 this.overdue = isRenew this.getChapter(1) + this.getProgress() }).catch(res => {}) }, // 获取章节小节 - async getChapter(first) { - let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}`); + async getChapter() { + let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`); this.chapterList = res.chapterList; - const list = [] - res.chapterList.forEach(e => { - e.subsectionList.forEach(n => { - n.chapterId = e.id - list.push(n) - }) - }) - this.progressList = list - this.schedule = +(res.schedule.replace('%', '')) - if (first && this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) { + if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) { this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1); } }, + // 获取学习进度 + async getProgress() { + let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}`); + this.progressList = res.list + this.schedule = +(res.schedule.replace('%', '')) + }, // 目录和进度切换 typeChange(id) { this.getChapter() @@ -502,14 +502,13 @@ export default { studySection(item) { item.whetherToStudyOrNot ? this.$post(`${this.api.deleteLearningProgress}?id=${item.learningProgressId}`).then(res => { - this.getChapter() + this.getProgress() }).catch(res => {}) : this.$post(this.api.saveLearningProgress, { - chapterId: item.chapterId, cid: this.courseId, - subsectionId: item.id, + projectId: item.projectId, }).then(res => { - this.getChapter() + this.getProgress() }).catch(res => {}) }, preview(row, chapterName, showDia = 0) { @@ -1076,6 +1075,9 @@ $height: 700px; } } } +.tab-content { + width: 80%; +} @media (max-width: 1430px) { .wrap { padding: 12px 100px 20px; diff --git a/src/styles/page/screen.scss b/src/styles/page/screen.scss index 75f98a7..e0df23f 100644 --- a/src/styles/page/screen.scss +++ b/src/styles/page/screen.scss @@ -228,7 +228,7 @@ body { } .num5 { bottom: 319px; - right: 36px; + right: 57px; } } .main_table { diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss index 92695ed..27e0301 100644 --- a/src/styles/page/station.scss +++ b/src/styles/page/station.scss @@ -80,8 +80,11 @@ } /deep/.timeline { - padding-left: 12%; + padding-left: 10%; overflow: hidden; + .el-timeline-item { + padding-bottom: 40px; + } .el-timeline-item__node--normal { top: 30px; } @@ -96,7 +99,7 @@ .sign { position: relative; display: inline-block; - margin-left: -15%; + margin-left: -12.5%; font-size: 14px; color: #9076FF; } @@ -110,7 +113,7 @@ justify-content: space-between; align-items: center; padding-bottom: 10px; - margin: -32px 0 20px; + margin: -22px 0 20px; font-size: 18px; color: #9076FF; border-bottom: 1px dashed #bfbfbf;