diff --git a/src/api/index.js b/src/api/index.js index 48d1884..914dff5 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -180,6 +180,7 @@ export default { reviewListByStudent:`/management/practise/review/reviewListByStudent`, reviewDetail:`/management/practise/review/reviewDetail`, reviewByidPractice:`/management/practise/review/reviewByid`, + getWrongPractice:`/management/practise/review/getWrong`, // 练习成绩管理 AchievementDetail:`/management/practise/review/AchievementDetail`, @@ -190,5 +191,12 @@ export default { byClassIdGetPractise:`/management/practise/review/byClassIdGetPractise`, // 错题管理 + getPeopleInfo:`/management/wrongTopic/getPeopleInfo`, pageByNameWrong:`/management/wrongTopic/pageByName`, + + // 首页 + waitReply:`/management/index/waitReply`, + waitReview:`/management/index/waitReview`, + waitExam:`/management/index/waitExam`, + waitReplyDel:`/management/index/waitReplyDel`, } \ No newline at end of file diff --git a/src/assets/img/index/achievement.png b/src/assets/img/index/achievement.png new file mode 100644 index 0000000..34474e8 Binary files /dev/null and b/src/assets/img/index/achievement.png differ diff --git a/src/assets/img/index/assesment.png b/src/assets/img/index/assesment.png new file mode 100644 index 0000000..08bc6ae Binary files /dev/null and b/src/assets/img/index/assesment.png differ diff --git a/src/assets/img/index/bg.png b/src/assets/img/index/bg.png new file mode 100644 index 0000000..d4fdef2 Binary files /dev/null and b/src/assets/img/index/bg.png differ diff --git a/src/assets/img/index/bg1.png b/src/assets/img/index/bg1.png new file mode 100644 index 0000000..ece000e Binary files /dev/null and b/src/assets/img/index/bg1.png differ diff --git a/src/assets/img/index/bg2.png b/src/assets/img/index/bg2.png new file mode 100644 index 0000000..11b5f53 Binary files /dev/null and b/src/assets/img/index/bg2.png differ diff --git a/src/assets/img/index/bg3.png b/src/assets/img/index/bg3.png new file mode 100644 index 0000000..a58aa9c Binary files /dev/null and b/src/assets/img/index/bg3.png differ diff --git a/src/assets/img/index/bg4.png b/src/assets/img/index/bg4.png new file mode 100644 index 0000000..7043f1e Binary files /dev/null and b/src/assets/img/index/bg4.png differ diff --git a/src/assets/img/index/bg5.png b/src/assets/img/index/bg5.png new file mode 100644 index 0000000..f347fce Binary files /dev/null and b/src/assets/img/index/bg5.png differ diff --git a/src/assets/img/index/book.png b/src/assets/img/index/book.png new file mode 100644 index 0000000..6c409c5 Binary files /dev/null and b/src/assets/img/index/book.png differ diff --git a/src/assets/img/index/chengji拷贝.png b/src/assets/img/index/chengji拷贝.png new file mode 100644 index 0000000..6f54172 Binary files /dev/null and b/src/assets/img/index/chengji拷贝.png differ diff --git a/src/assets/img/index/class.png b/src/assets/img/index/class.png new file mode 100644 index 0000000..c2802d4 Binary files /dev/null and b/src/assets/img/index/class.png differ diff --git a/src/assets/img/index/datiqia拷贝.png b/src/assets/img/index/datiqia拷贝.png new file mode 100644 index 0000000..f4775c2 Binary files /dev/null and b/src/assets/img/index/datiqia拷贝.png differ diff --git a/src/assets/img/index/del.png b/src/assets/img/index/del.png new file mode 100644 index 0000000..1b1b066 Binary files /dev/null and b/src/assets/img/index/del.png differ diff --git a/src/assets/img/index/edit.png b/src/assets/img/index/edit.png new file mode 100644 index 0000000..9177f3b Binary files /dev/null and b/src/assets/img/index/edit.png differ diff --git a/src/assets/img/index/guanliyuan_guanliyuanliebiao拷贝2.png b/src/assets/img/index/guanliyuan_guanliyuanliebiao拷贝2.png new file mode 100644 index 0000000..1d2015f Binary files /dev/null and b/src/assets/img/index/guanliyuan_guanliyuanliebiao拷贝2.png differ diff --git a/src/assets/img/index/msg.png b/src/assets/img/index/msg.png new file mode 100644 index 0000000..87d5dfa Binary files /dev/null and b/src/assets/img/index/msg.png differ diff --git a/src/assets/img/index/pen.png b/src/assets/img/index/pen.png new file mode 100644 index 0000000..6c35df2 Binary files /dev/null and b/src/assets/img/index/pen.png differ diff --git a/src/assets/img/index/pingjiakaohe拷贝.png b/src/assets/img/index/pingjiakaohe拷贝.png new file mode 100644 index 0000000..6eeedaa Binary files /dev/null and b/src/assets/img/index/pingjiakaohe拷贝.png differ diff --git a/src/assets/img/index/plan.png b/src/assets/img/index/plan.png new file mode 100644 index 0000000..916e972 Binary files /dev/null and b/src/assets/img/index/plan.png differ diff --git a/src/assets/img/index/practice.png b/src/assets/img/index/practice.png new file mode 100644 index 0000000..8eb169f Binary files /dev/null and b/src/assets/img/index/practice.png differ diff --git a/src/assets/img/index/show.png b/src/assets/img/index/show.png new file mode 100644 index 0000000..6e97241 Binary files /dev/null and b/src/assets/img/index/show.png differ diff --git a/src/assets/img/index/system.png b/src/assets/img/index/system.png new file mode 100644 index 0000000..ec31c04 Binary files /dev/null and b/src/assets/img/index/system.png differ diff --git a/src/assets/img/index/testPaper-icon.png b/src/assets/img/index/testPaper-icon.png new file mode 100644 index 0000000..6144687 Binary files /dev/null and b/src/assets/img/index/testPaper-icon.png differ diff --git a/src/assets/img/index/testPaper.png b/src/assets/img/index/testPaper.png new file mode 100644 index 0000000..e86d018 Binary files /dev/null and b/src/assets/img/index/testPaper.png differ diff --git a/src/assets/img/index/tiku.png b/src/assets/img/index/tiku.png new file mode 100644 index 0000000..c9904af Binary files /dev/null and b/src/assets/img/index/tiku.png differ diff --git a/src/assets/img/index/xiaoxi.png b/src/assets/img/index/xiaoxi.png new file mode 100644 index 0000000..de911d1 Binary files /dev/null and b/src/assets/img/index/xiaoxi.png differ diff --git a/src/assets/img/index/zuopin.png b/src/assets/img/index/zuopin.png new file mode 100644 index 0000000..05f86b6 Binary files /dev/null and b/src/assets/img/index/zuopin.png differ diff --git a/src/assets/img/index/日期.png b/src/assets/img/index/日期.png new file mode 100644 index 0000000..8e54d02 Binary files /dev/null and b/src/assets/img/index/日期.png differ diff --git a/src/components/doReview/index.vue b/src/components/doReview/index.vue index 4002322..0b2bce6 100644 --- a/src/components/doReview/index.vue +++ b/src/components/doReview/index.vue @@ -47,10 +47,16 @@ 答案解析： {{item.answer_analysis}} -
- 考试得分： -
- 分 +
+
+ 题目分数： +
{{item.question_points}} 分
+
+
+ 考试得分： +
+ 分 +
@@ -270,6 +276,11 @@ export default { } } } + .point{ + .meta{ + margin: 0; + } + } } } \ No newline at end of file diff --git a/src/components/quill/index.vue b/src/components/quill/index.vue index d99f2be..f4d2118 100644 --- a/src/components/quill/index.vue +++ b/src/components/quill/index.vue @@ -26,6 +26,10 @@ type: Boolean, default: false }, + toTop: { + type: Boolean, + default: true + }, border: { type: Boolean, default: false @@ -112,9 +116,11 @@ this.Quill = new Quill(editor, this.options); // 默认值 this.Quill.pasteHTML(this.currentValue); - this.$nextTick(() => { - window.scrollTo(0,0) - }) + if(this.toTop){ + this.$nextTick(() => { + window.scrollTo(0,0) + }) + } // 绑定事件 this.Quill.on('text-change', (delta, oldDelta, source) => { const html = this.$refs.editor.children[0].innerHTML; diff --git a/src/components/testPaperDetail/index.vue b/src/components/testPaperDetail/index.vue index 42de91c..44d9cb2 100644 --- a/src/components/testPaperDetail/index.vue +++ b/src/components/testPaperDetail/index.vue @@ -120,11 +120,9 @@ export default { }, initMedia(item){ if(item.videoAudio && !item.player){ - // let fileId = '312d8a6efd1747ae9de519da574195db' this.$get(`${this.api.getPlayAuth}/${item.videoAudio}`).then(res => { let playAuth = res.data.playAuth this.$nextTick(() => { - console.log('初始化开始',item.mediaEleId) item.player = new Aliplayer({ id: item.mediaEleId, width: '100%', @@ -133,7 +131,6 @@ export default { playauth : playAuth, encryptType:1, //当播放私有加密流时需要设置。 }) - console.log('初始化结束') }) }).catch(res => {}) } @@ -162,14 +159,20 @@ export default { }, insertScript(){ const linkTag = document.createElement('link') + linkTag.id = 'aliplayerLink' linkTag.rel = 'stylesheet' linkTag.href = 'https://g.alicdn.com/de/prismplayer/2.8.2/skins/default/aliplayer-min.css' document.body.appendChild(linkTag) const scriptTag = document.createElement('script') + scriptTag.id = 'aliplayerScript' scriptTag.type = 'text/javascript' scriptTag.src = 'https://g.alicdn.com/de/prismplayer/2.8.2/aliplayer-min.js' document.body.appendChild(scriptTag) + this.$once('hook:beforeDestroy', function () { + document.body.removeChild(document.querySelector('#aliplayerLink')) + document.body.removeChild(document.querySelector('#aliplayerScript')) + }) }, }, }; @@ -238,6 +241,7 @@ export default { font-size: 14px; } .val{ + line-height: 1.6; color: #757575; font-size: 14px; } diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 64ec10e..e056dee 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -60,8 +60,13 @@ export default { collapse: false, defaultMenus: [ { - icon: 'el-icon-user', + icon: 'el-icon-folder-checked', index: '/index/list', + title: '首页' + }, + { + icon: 'el-icon-user', + index: '/student/list', title: '学生管理' }, { diff --git a/src/libs/util.js b/src/libs/util.js index 1c8fb9a..37d0731 100644 --- a/src/libs/util.js +++ b/src/libs/util.js @@ -72,7 +72,14 @@ const util = { isImg(ext) { if('jpg,jpeg,png,gif,svg,psd'.includes(ext)) return true return false - } + }, + // 循环去除html标签 + removeHtmlTag(list,attr) { + list.map(n => { + n[attr] = n[attr].replace(/<\/?.+?>/gi,'') + }) + return list + }, } export default util \ No newline at end of file diff --git a/src/pages/achievement/list/examResults.vue b/src/pages/achievement/list/examResults.vue index 730659b..3fdb627 100644 --- a/src/pages/achievement/list/examResults.vue +++ b/src/pages/achievement/list/examResults.vue @@ -1,104 +1,92 @@ + + \ No newline at end of file diff --git a/src/pages/messageBoard/list/index.vue b/src/pages/messageBoard/list/index.vue index fd5d70f..5e483c4 100644 --- a/src/pages/messageBoard/list/index.vue +++ b/src/pages/messageBoard/list/index.vue @@ -5,7 +5,7 @@
  • - +
    {{item.userName}} @@ -23,7 +23,7 @@
    - +
    提交
    @@ -32,7 +32,7 @@
    • - +
      {{reply.userName}} @@ -47,7 +47,7 @@
      - +
      提交
      @@ -69,7 +69,7 @@ >
      - +
      提交
      @@ -111,6 +111,7 @@ export default { }, handleList(list){ list.map(n => { + n.userAvatars = n.userAvatars ? n.userAvatars : 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png' n.showReply = false n.replyContent = '' n.children = [] @@ -207,89 +208,5 @@ export default { \ No newline at end of file diff --git a/src/pages/practice/doReview/index.vue b/src/pages/practice/doReview/index.vue index 93cb88e..b4a785b 100644 --- a/src/pages/practice/doReview/index.vue +++ b/src/pages/practice/doReview/index.vue @@ -47,10 +47,16 @@ 答案解析： {{item.answerAnalysis}}
      -
      - 考试得分： -
      - 分 +
      +
      + 题目分数： +
      {{item.questionPoints}} 分
      +
      +
      + 考试得分： +
      + 分 +
      @@ -110,7 +116,7 @@ export default { if(i.includes('option')) answer.push(n[i]) } n.answer = answer.join('|') - n.userAnswer = n.userAnswer.replace(/<>/g,'|') + n.userAnswer = n.userAnswer ? n.userAnswer.replace(/<>/g,'|') : '' } }) this.list = data.list @@ -118,15 +124,22 @@ export default { this.userName = data.stuName this.this_score = data.score this.duration = data.timeCost - }) - .catch(err => {}) + }).catch(err => {}) }, getWrong(){ - this.$post(`${this.api.getWrong}?assessmentId=${this.id}&userId=${this.stuId}&paperId=${this.paperId}`) + this.$post(`${this.api.getWrongPractice}?practiseId=${this.practiseId}&userId=${this.stuId}&identification=${this.identification}`) .then(res => { - this.list = res.data.list - }) - .catch(err => {}) + let list = res.data.list + list.map(n => { + n.userAnswer = n.user_answer + n.answerAnalysis = n.answer_analysis + n.knowledgePoints = n.knowledge_points + n.questionPoints = n.question_points + n.questionScore = n.question_score + n.questionStem = n.question_stem + }) + this.list = list + }).catch(err => {}) }, save(status) { let isEmpty = false @@ -135,7 +148,7 @@ export default { this.list.map(n => { if(n.questionScore === '') isEmpty = true if(isNaN(n.questionScore)) isNotNum = true - if(Number(n.questionScore) > Number(n.question_points)) invalid = true + if(Number(n.questionScore) > Number(n.questionPoints)) invalid = true }) if(status){ if(isEmpty) return this.$message.warning('请批阅完所有题目') @@ -269,6 +282,11 @@ export default { } } } + .point{ + .meta{ + margin: 0; + } + } } } \ No newline at end of file diff --git a/src/pages/practice/list/index.vue b/src/pages/practice/list/index.vue index 4c1b25d..88e9f85 100644 --- a/src/pages/practice/list/index.vue +++ b/src/pages/practice/list/index.vue @@ -2,15 +2,10 @@
      -
      -

      - 筛选 -
      -
      -
      -
      - -
      +
      筛选
      +
      +
      +
      @@ -18,10 +13,7 @@
      -
      -

      - 练习列表 -
      +
      练习列表
      创建练习
      @@ -159,7 +151,7 @@ - +
      @@ -462,9 +454,6 @@ export default { }