diff --git a/src/assets/img/product/bg1.png b/src/assets/img/product/bg1.png new file mode 100644 index 0000000..30d7a74 Binary files /dev/null and b/src/assets/img/product/bg1.png differ diff --git a/src/assets/img/product/bg2.png b/src/assets/img/product/bg2.png new file mode 100644 index 0000000..d8e0105 Binary files /dev/null and b/src/assets/img/product/bg2.png differ diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 50baf58..9308a20 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -1,42 +1,61 @@ \ No newline at end of file diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue index 26d3516..68c1afb 100644 --- a/src/pages/achievement/list/index.vue +++ b/src/pages/achievement/list/index.vue @@ -48,12 +48,14 @@
  • - + + +
  • { - e.id = e.mallId - e.label = e.curriculumName - e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统 - }) - this.curs = res.data - this.mallIds = [this.mallId || res.data[0].mallId, this.systemId || data[0].id] - this.getData(); - console.log("🚀 ~ file: index.vue:431 ~ getSystemData ~ res.data:", this.mallIds) - } + const { data } = await this.$get(this.api.getSchoolEffectiveCourse) + this.curs = data + this.mallId = this.mallId || data[0].mallId + this.initData(); }, // 课程选择回调 - curChange (val) { - const id = val[0] - if (val.length === 1) { - // 如果选择的是课程，则默认选中下面第一个系统 - this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id] - } + curChange (id) { this.$router.push({ path: 'list', query: { ...this.$route.query, - mallId: this.mallIds[0], - systemId: this.mallIds[1], + mallId: id } }) - this.getData() + this.initData() }, getClassData () { // 获取班级下拉框数据 @@ -283,20 +269,20 @@ export default { background: "rgba(255,255,255,.6)" }); const per = this.projectPermissions - const { mallIds } = this - const cur = this.curs.find(e => e.mallId == mallIds[0]) + const { mallId } = this + const cur = this.curs.find(e => e.mallId == mallId) || {} let data = { classId: this.classId, permissions: per, curriculumId: cur.cid, - mallId: mallIds[0], + mallId, keyWord: this.keyword, startTime: this.startingtime, endTime: this.endTime, month: this.month, pageNum: this.page, pageSize: this.pageSize, - systemId: mallIds[1] + systemId: cur.systemId }; this.$post(this.api.getAchievementInfo, data).then(res => { let list = [] diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue index fc76b60..296ca89 100644 --- a/src/pages/achievement/show/index.vue +++ b/src/pages/achievement/show/index.vue @@ -251,7 +251,8 @@ export default { laboratory: form.laboratory, submitTime: form.submitTime, score: form.score, - userName: form.userName + userName: form.userName, + className: form.className } const data = report.data this.userScores = userScores diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue index e3b014a..9097571 100644 --- a/src/pages/assessment/list/index.vue +++ b/src/pages/assessment/list/index.vue @@ -50,12 +50,20 @@
  • - + + + +
    • @@ -269,7 +277,12 @@ export default { keyWord: "", // 搜索框筛选条件 searchTimer: null, mallIds: [], - curs: [], + curs: [ + { + id: '', + curriculumName: '不限' + } + ], form: { type: "", status: "", @@ -367,15 +380,15 @@ export default { getData (counddown) { this.listLoading = true; const { mallIds } = this - const cur = this.curs.find(e => e.mallId == mallIds[0]) + // const cur = this.curs.find(e => e.mallId == mallIds[0]) let data = { ...this.form, keyWord: this.keyWord, pageNum: this.pageNum, pageSize: this.pageSize, - cid: cur.cid, - mallId: mallIds[0], - systemId: mallIds[1] + // cid: cur.cid, + mallId: this.mallId, + // systemId: mallIds[1] }; this.$post(this.api.pageByCondition, data).then(res => { this.listData = res.list; @@ -417,27 +430,21 @@ export default { // 获取课程 async getCourse () { - const { data } = await this.$get(this.api.getSystemIdBySchool) - const res = await this.$get(this.api.getSchoolEffectiveCourse) - if (res.data.length) { - res.data.map(e => { - e.id = e.mallId - e.label = e.curriculumName - e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统 - }) - this.curs = res.data - this.mallIds = [res.data[0].mallId, data[0].id] - this.pageNum = 1 - this.getData(1) - console.log("🚀 ~ file: index.vue:431 ~ getSystemData ~ res.data:", this.mallIds) - } + const { data } = await this.$get(this.api.getSchoolEffectiveCourse) + this.curs.push(...data) + this.pageNum = 1 + this.getData(1) }, // 课程选择回调 curChange (val) { const id = val[0] - if (val.length === 1) { + if (id) { // 如果选择的是课程，则默认选中下面第一个系统 - this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id] + if (val.length === 1) this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id] + } else { + this.mallId = '' + this.cid = '' + this.systemId = '' } this.initData() }, diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue index 3347515..fafb039 100644 --- a/src/pages/product/list/index.vue +++ b/src/pages/product/list/index.vue @@ -18,142 +18,183 @@ -
    -
    -
    - - -
      -
    • {{ tab.name }}
      • -
    -
    -
    - - -
    -
    -
    -
    -
    学科专业
    - -
    -
    -
    产品标签
    -
    -
    全部
    -
    {{ item.tagsName }}
    +
    +
    +
    +
    + + +
      +
    • {{ tab.name }}
      • +
    -
    -
    -
    产品类型
    -
    -
    全部
    -
    {{ item.typeName }}
    +
    + +
    -
    -
    -
    购买状态
    -
    {{ item.name }}
    -
    -
    +
    +
    +
    +
    学科专业
    +
    全部
    +
    不限
    -
    -
    -
    {{ item.name }}
    -
    发布时间
    - - - - -
    -
    + + + {{ categoryName }} + + + {{ item.disciplineName }} + + + + + {{ professionalCategoryName }} + + + {{ item.professionalClassName }} + + + + + {{ professionalName }} + + + {{ item.professionalName }} + + + + +
    +
    +
    产品标签
    +
    +
    全部
    +
    {{ item.tagsName }}
    +
    +
    +
    +
    产品类型
    +
    +
    全部
    +
    {{ item.typeName }}
    +
    +
    +
    +
    购买状态
    +
    {{ item.name }}
    +
    +
    -
    - +
    @@ -191,15 +232,15 @@ export default { form: { isShelves: 0, hotTag: 1, - // categoryId: '', - // professionalCategoryId: '', - // professionalId: '', productType: '', productName: '', purchaseStatus: '', sort: 0, tagId: '' }, + categoryId: '', + professionalCategoryId: '', + professionalId: '', category: [], // 学科动态加载 props: { @@ -251,6 +292,9 @@ export default { subjectList: [], //专业学科 professionalClassList: [], //专业类 professionalList: [], //专业 + categoryName: '', + professionalCategoryName: '', + professionalName: '', classifications: [], status: [ { @@ -312,7 +356,7 @@ export default { this.getSubject() this.getLabel() this.getClass() - this.initData() + // this.initData() }, methods: { // 获取banner @@ -327,15 +371,14 @@ export default { }, // 获取列表 getData () { - const { category } = this this.loadIns = Loading.service() this.$post(this.api.listOfGoods, { ...this.form, - categoryId: category[0] || '', - professionalCategoryId: category[1] || '', - professionalId: category[2] || '', pageNum: this.page, pageSize: this.pageSize, + categoryId: this.categoryId, + professionalCategoryId: this.categoryId ? this.professionalCategoryId : '', + professionalId: this.categoryId ? this.professionalId : '', }).then(({ page }) => { const list = page.records list && list.forEach(e => { @@ -366,50 +409,99 @@ export default { }, // 获取学科类别 getSubject () { - this.$get(this.api.courseDiscipline).then(res => { - this.subjectList = res.list; + this.$get(this.api.courseDiscipline).then(({ list }) => { + this.subjectList = list.slice(1) + this.getProfessionalClassData(list[1].disciplineId) }).catch(err => { }); }, - // 清除学科类别 - clearClass () { - this.form.professionalCategoryId = ""; - this.form.professionalId = ""; - }, - // 获取专业类 - getProfessionalClass () { - this.clearClass(); - this.getProfessionalClassData(); - this.initData(); - }, - getProfessionalClassData () { + getProfessionalClassData (id) { let data = { - disciplineId: this.form.categoryId + disciplineId: id || this.categoryId }; - this.$get(this.api.courseProfessionalClass, data).then(res => { - this.professionalClassList = res.list; + const i = id === 1 ? 1 : 0 + this.$get(this.api.courseProfessionalClass, data).then(({ list }) => { + this.professionalClassList = list.slice(i) + if (id) this.professionalCategoryId = list[i].professionalClassId + this.getProfessionalData(list[i].professionalClassId) }).catch(err => { }); }, - // 清除专业类 - clearProfess () { - this.form.professionalId = ""; - }, // 获取专业 - getProfessional () { - this.clearProfess(); - this.getProfessionalData(); - this.initData(); - }, - getProfessionalData () { + getProfessionalData (id) { let data = { - professionalClassId: this.form.professionalCategoryId + professionalClassId: id || this.professionalCategoryId }; - this.$get(this.api.courseProfessional, data).then(res => { - this.professionalList = res.list; + const i = id === 1 ? 1 : 0 + this.$get(this.api.courseProfessional, data).then(({ list }) => { + this.professionalList = list.slice(i) + if (id) this.professionalId = list[i].professionalId + this.handleCategoryName() + this.initData() }).catch(err => { }); }, + // 返回学科name + handleCategoryName () { + if (this.subjectList.length) { + const id = this.categoryId + const list = this.subjectList + if (list.length) { + if (id === '' || id === 1) { + this.categoryName = list[0].disciplineName + } else { + const item = list.find(e => e.disciplineId == id) + this.categoryName = item ? item.disciplineName : '' + } + } + } + + if (this.professionalClassList.length) { + const id = this.professionalCategoryId + const list = this.professionalClassList + if (list.length) { + if (id === '' || id === 1) { + this.professionalCategoryName = list[0].professionalClassName + } else { + const item = list.find(e => e.professionalClassId == id) + this.professionalCategoryName = item ? item.professionalClassName : '' + } + } + } + if (this.professionalList.length) { + const id = this.professionalId + const list = this.professionalList + if (list.length) { + if (id === '' || id === 1) { + this.professionalName = list[0].professionalName + } else { + const item = list.find(e => e.professionalId == id) + this.professionalName = item ? item.professionalName : '' + } + } + } + }, + // 学科点击回调 + catetoryClick (id) { + this.categoryId = id + this.professionalCategoryId = id + this.professionalId = id + this.initData() + }, + // 学科类别下拉 + categoryDropdown (id, prop) { + this[prop] = id + if (prop === 'categoryId') { + this.getProfessionalClassData(id) + } + if (prop === 'professionalCategoryId') { + this.getProfessionalData(id) + } + if (prop === 'professionalId') { + this.handleCategoryName() + this.initData() + } + }, // 获取产品类型 getClass () { this.$get(this.api.productTypeList).then(res => { @@ -483,11 +575,17 @@ export default { color: #2e2d31; } } + .inner-wrap { + padding: 18px 0; + background: url(../../../assets/img/product/bg1.png) 0 159px no-repeat, + url(../../../assets/img/product/bg2.png) bottom right no-repeat; + background-color: #f3f6fa; + } .inner { width: 1146px; - margin: 18px auto; + margin: 0 auto; } - .typw-wrap { + .type-wrap { display: flex; justify-content: space-between; margin-bottom: 18px; @@ -565,6 +663,9 @@ export default { color: #9278ff; } } + .category { + margin: 5px 10px 0; + } } .vals { display: inline-flex; diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue index 06bda65..8fa9bef 100644 --- a/src/pages/product/show/index.vue +++ b/src/pages/product/show/index.vue @@ -311,7 +311,7 @@ export default { // 跳转播放资源 toPreview (i, j) { this.form.goodsRes.logoOfOurSchool ? - this.$router.push(`/station/preview?courseId=${this.form.mall.associatedProduct}&curriculumName=${this.form.mall.associatedProductName}&mallId=${this.id}&chapter=${i}§ion=${j}&admin=1`) : + this.$router.push(`/station/preview?courseId=${this.form.mall.associatedProduct}&curriculumName=${this.form.mall.productName}&mallId=${this.id}&chapter=${i}§ion=${j}&admin=1`) : this.toTrail() }, // 勾选/取消勾选学习进度 @@ -335,7 +335,7 @@ export default { toStation () { if (this.isCourse) { // 如果是课程，直接进入实验台 this.$post(`${this.api.addLearningRecord}?mallId=${this.id}`).then(res => { - this.$router.push('/station/preview?courseId=' + this.form.mall.associatedProduct + '&curriculumName=' + this.form.mall.associatedProductName + '&mallId=' + this.id) + this.$router.push('/station/preview?courseId=' + this.form.mall.associatedProduct + '&curriculumName=' + this.form.mall.productName + '&mallId=' + this.id) }).catch(res => { }) } else if (this.withLink) { // 如果没有绑定产品，并且有设置关联链接，则弹框选择链接 this.linkVisible = true @@ -377,7 +377,10 @@ export default {