From 588df7ce32bfe494043948c9a820e494c856852a Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 14 Jul 2023 18:25:18 +0800 Subject: [PATCH] fix --- src/api/index.js | 3 + src/layouts/header/index.vue | 11 +- src/layouts/navbar/index.vue | 473 +++---- src/pages/record/list/ass.vue | 178 ++- src/pages/record/list/index.vue | 325 +++-- src/pages/record/list/practice.vue | 154 ++- src/pages/record/show/index.vue | 8 +- src/pages/screen/index.vue | 1971 ++++++++++++++------------- src/pages/station/preview/index.vue | 5 +- src/store/modules/project.js | 2 +- 10 files changed, 1649 insertions(+), 1481 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 1a7d4ba..3abb6e2 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -35,6 +35,7 @@ export default { saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save', updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update', maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList', + listOfGoods: `nakadai/mall/listOfGoods`, // 课程笔记 addNote: `nakadai/curriculumNotes/addNote`, @@ -80,6 +81,8 @@ export default { exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`, queryBcJudgmentPointByBcId: 'judgment/judgment/bcJudgmentPoint/queryBcJudgmentPointByBcId', editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData', + getSystemIdBySchool: `occupationlab/occupationlab/projectManage/getSystemIdBySchool`, + getSchoolEffectiveCourse: `nakadai/nakadai/curriculum/getSchoolEffectiveCourse`, // 考核列表 pageStuAssessment: `occupationlab/occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表 diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index fa6a6db..3ee5238 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -327,7 +327,7 @@ $height: 64px; border-radius: 6px; } } -@media (max-width: 1680px) { +@media (max-width: 1870px) { .header { .logo { left: 20px; @@ -337,4 +337,13 @@ $height: 64px; } } } +@media (max-width: 1550px) { + .header { + .logo { + img { + max-width: 260px; + } + } + } +} diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 4425751..0423736 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -1,14 +1,21 @@ - - \ No newline at end of file diff --git a/src/pages/record/list/index.vue b/src/pages/record/list/index.vue index c3da27f..a60f575 100644 --- a/src/pages/record/list/index.vue +++ b/src/pages/record/list/index.vue @@ -1,64 +1,80 @@ @@ -169,21 +216,21 @@ export default { display: flex; justify-content: space-between; .item:nth-child(1) { - background: url(../../../assets/img/record1-1.png) (88% 25px)/auto no-repeat, - url(../../../assets/img/record1.png) 0 0/100% 100% no-repeat; + background: url(../../../assets/img/record1-1.png) (88% 25px) / auto no-repeat, + url(../../../assets/img/record1.png) 0 0/100% 100% no-repeat; } .item:nth-child(2) { - background: url(../../../assets/img/record2-1.png) (88% 15px)/auto no-repeat, - url(../../../assets/img/record2.png) 0 0/100% 100% no-repeat; + background: url(../../../assets/img/record2-1.png) (88% 15px) / auto no-repeat, + url(../../../assets/img/record2.png) 0 0/100% 100% no-repeat; } .item:nth-child(3) { - background: url(../../../assets/img/record3-1.png) (88% 20px)/auto no-repeat, - url(../../../assets/img/record3.png) 0 0/100% 100% no-repeat; + background: url(../../../assets/img/record3-1.png) (88% 20px) / auto no-repeat, + url(../../../assets/img/record3.png) 0 0/100% 100% no-repeat; } .item:nth-child(4) { margin-right: 0; - background: url(../../../assets/img/record4-1.png) (88% 18px)/auto no-repeat, - url(../../../assets/img/record4.png) 0 0/100% 100% no-repeat; + background: url(../../../assets/img/record4-1.png) (88% 18px) / auto no-repeat, + url(../../../assets/img/record4.png) 0 0/100% 100% no-repeat; } .item { width: 22%; @@ -219,7 +266,7 @@ export default { line-height: 34px; border-radius: 4px; background-color: #fff; - border: 1px solid #CACFDB; + border: 1px solid #cacfdb; cursor: pointer; &.active { color: #fff; diff --git a/src/pages/record/list/practice.vue b/src/pages/record/list/practice.vue index 082dcc1..a81eb0a 100644 --- a/src/pages/record/list/practice.vue +++ b/src/pages/record/list/practice.vue @@ -1,79 +1,111 @@ \ No newline at end of file diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue index a04f4d5..0df6e14 100644 --- a/src/pages/record/show/index.vue +++ b/src/pages/record/show/index.vue @@ -142,7 +142,7 @@ label="判分点" width="200" align="center"> - -