fix

src/views/match/add/set.vue

@@ -87,12 +87,10 @@
     <template v-else>
       <el-card shadow="hover" class="mgr20 m-b-20">
         <div>
-          <p class="m-b-20">系统</p>
+          <p class="m-b-20">课程</p>
           <div class="inline-input">
-            <el-select v-model="systemId" placeholder="请选择系统" @change="getProject">
+            <el-cascader ref="cur" v-model="mallIds" :options="curs" :props="{ checkStrictly: true, value: 'id' }"
-              <el-option v-for="(item, i) in systems" :key="i" :label="item.systemName" :value="item.systemId">
+              popper-class="course-cas" @expand-change="curChange" @change="curChange"></el-cascader>
-              </el-option>
-            </el-select>
           </div>
         </div>
       </el-card>
@@ -157,7 +155,8 @@ export default {
       difficults: TestPaperConst.difficults,
       paperTypes: TestPaperConst.paperTypes,
       loadIns: null,
-      systems: [],
+      mallIds: [],
+      curs: [],
       paperLibraries: [],
       testPapers: [],
       keyword: '',
@@ -166,7 +165,7 @@ export default {
       pageSize: 5,
       total: 0,
       libraryId: '',
-      systemId: '',
+      sysId: '',
       paperId: '',
       paperName: '',
       permissionsKeys: ['练习', '考核', '竞赛'],
@@ -201,19 +200,59 @@ export default {
     // 获取课程
     async getCourse () {
       const sid = this.$store.state.dataPer.find(e => e.permissionName === '服务配置')
-      const res = await this.$post(this.api.queryServiceConfig, {
+      const { serviceList } = await this.$post(this.api.queryServiceConfig, {
         pageNum: 1,
         pageSize: 1000,
         supplierId: sid ? sid.supplierId : ''
       })
-      const { records } = res.serviceList
+      const { page } = await this.$post(this.api.listOfGoods, {
+        pageNum: 1,
+        pageSize: 10000,
+        hotTag: 1,
+        sort: 0,
+        isAssociatedProduct: 1,
+        isShelves: 0,
+      })
+      const { records } = page
+      const { mallId, cid, systemId } = this.form
       if (records.length) {
-        this.systems = records
+        serviceList.records.map(e => {
-        this.systemId = records[0].systemId
+          e.id = +e.systemId
+          e.label = e.systemName
+        })
+        records.map(e => {
+          e.id = +e.mallId
+          e.label = e.productName
+          e.children = serviceList.records.filter(n => e.systemId && e.systemId.split(',').includes(n.systemId)) // 筛选出该课程下的系统
+        })
+        this.curs = records
+
+        // 查询项目
+        const first = records[0]
+        this.mallIds = [mallId || first.mallId, systemId || first.children[0].id]
+        this.form.mallId = mallId || first.mallId
+        this.form.cid = cid || +first.associatedProduct
+        this.form.systemId = systemId || first.systemId
+        this.sysId = systemId || first.systemId
         this.loadIns = Loading.service()
         this.getProject()
       }
     },
+    // 课程选择回调
+    curChange (val) {
+      const id = val[0]
+      const item = this.curs.find(e => e.id == id)
+      if (val.length === 1) {
+        // 如果选择的是课程，则默认选中下面第一个系统
+        this.mallIds = [id, item.children[0].id]
+      }
+      this.form.mallId = id
+      this.form.cid = +item.associatedProduct
+      this.form.systemId = this.mallIds[1]
+      this.sysId = this.mallIds[1]
+      this.loadIns = Loading.service()
+      this.getProject()
+    },
     // 查询试卷库
     async getLibrary () {
       try {
@@ -248,11 +287,12 @@ export default {
           this.total = res.pageList.total
         } else {
           // 实训查询项目
-          const { data } = await this.$post(this.api.getCompetitionProjectByMiddleGround, {
+          const { data } = await this.$post(this.api.getProjectAssessmentByCompetition, {
             pageNum: this.page,
             pageSize: this.pageSize,
+            cid: this.form.cid,
             projectName: this.keyword,
-            systemId: this.systemId,
+            systemId: this.sysId,
             permissions: 2
           })
           this.projects = data.records
@@ -311,7 +351,6 @@ export default {
       if (!form.time.length) return util.warningMsg('请选择比赛时间')
       const { playStartTime, playEndTime } = this.step1
       if (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
-
       // 理论试卷存试卷库等
       if (this.isTheory) {
         if (!this.libraryId) return util.warningMsg('请选择试卷库')

src/views/match/manage/theoryReport.vue

@@ -17,7 +17,8 @@
                 item.targetScore }}分）</h6>
               <ul class="serials">
                 <template v-for="(ques, j) in item.userAnswerList">
-                  <li v-if="!sheetStatus || sheetStatus === ques.isCorrect" :key="j" :class="'status' + ques.isCorrect">
+                  <li v-if="!sheetStatus || sheetStatus === ques.isCorrect" :key="j" :class="'status' + ques.isCorrect"
+                    @click="scrollToQues(ques)">
                     <p :class="['serial', { answered: ques.answered, partAnswer: ques.partAnswer }]">{{ j + 1 }}</p>
                     <p class="score">{{ ques.userScore }}</p>
                   </li>
@@ -101,7 +102,7 @@
             </el-table>
           </div>
 
-          <ul v-if="paper" class="ques-wrap">
+          <ul v-if="paper" class="ques-wrap" id="quesWrap">
             <li v-for="(item, i) in paper" :key="i">
               <div class="outline">
                 {{ arabicToChinese(i + 1) }}、{{ item.questionTypeName }}（本题共{{ item.questionNum }}小题，共{{
@@ -110,7 +111,7 @@
                   @click="item.shrink = !item.shrink">
               </div>
               <div :class="['ques', { hide: item.shrink }]">
-                <div v-for="(ques, j) in item.userAnswerList" :key="j" class="item">
+                <div v-for="(ques, j) in item.userAnswerList" :key="j" class="item" :id="'ques' + ques.id">
                   <div class="stem-wrap">
                     <div class="labels">
                       <span class="label">{{ j + 1 }} / {{ item.questionNum }}</span>
@@ -126,9 +127,10 @@
                     v-if="item.questionType !== 'fill_blank' && item.questionType !== 'essay' && ques.questionAnswerVersionsList"
                     class="m-b-10">
                     <div v-for="(opt, j) in ques.questionAnswerVersionsList" :key="j" class="opt">
-                      <el-checkbox v-if="item.questionType === 'multiple_choice'" v-model="opt.answerIsCorrect"
+                      <img v-if="opt.optCorrect === 1" src="@/assets/img/right.svg" alt="" class="icon">
-                        :true-label="1"></el-checkbox>
+                      <img v-else-if="!opt.optCorrect" src="@/assets/img/wrong.svg" alt="" class="icon">
-                      <el-radio v-else v-model="opt.answerIsCorrect" :true-label="1" :label="1" disabled></el-radio>
+                      <span v-else class="icon not-ans"></span>
+
                       <span>{{ numToLetter(j) }}.&nbsp;</span>
                       <div class="text" v-html="opt.optionText"></div>
                     </div>
@@ -164,7 +166,8 @@
                       </div>
                       <div class="line">
                         <span>考生答案：</span>
-                        <div v-html="ques.answerContent"></div>
+                        <div v-if="ques.answerContent" v-html="ques.answerContent"></div>
+                        <div v-else>未作答</div>
                       </div>
                       <div v-if="ques.attachmentUrl" class="line">
                         <span>考生上传附件：</span>
@@ -179,7 +182,7 @@
                         <p v-if="item.questionType !== 'fill_blank'">{{ ques.userAnswerStr }}</p>
                         <div v-else-if="ques.userAnswerFill" class="fill-answers">
                           <p v-for="(ans, j) in ques.userAnswerFill" :key="j" class="fill-answer">
-                            填空{{ j + 1 }}：{{ ans.studentAnswer }}
+                            填空{{ j + 1 }}：{{ ans.studentAnswer || '未作答' }}
                             <img v-if="ans.correct" src="@/assets/img/right.svg" alt="" class="icon">
                             <img v-else src="@/assets/img/wrong.svg" alt="" class="icon">；
                           </p>
@@ -288,17 +291,26 @@ export default {
 
             const opts = n.questionAnswerVersionsList
             if (type !== 'fill_blank' && type !== 'essay') { // 选择题
+              if (!n.userScore) n.userScore = 0
               n.isCorrect = n.userScore && n.userScore === n.questionScore ? 1 : 2
+
+              // 用户选择结果
+              let { userAnswer } = n
+              if (userAnswer) {
+                userAnswer = JSON.parse(userAnswer)
+                n.userAnswerStr = userAnswer.length ? userAnswer.map(m => numToLetter(+m - 1)).join('') : '未作答'
+              } else {
+                userAnswer = []
+              }
+
               const quesAnswer = []
               opts && opts.map((m, j) => {
+                const selected = userAnswer.includes(m.optionNumber)
+                m.optCorrect = m.answerIsCorrect ? (selected ? 1 : -1) : (selected ? 0 : -1) // 用户选择的结果跟正确答案是否匹配(1正确，0错误，-1未选择)
                 m.answerIsCorrect && quesAnswer.push(numToLetter(j))
               })
               n.quesAnswer = quesAnswer.join('')
-              let { userAnswer } = n
+
-              if (userAnswer) {
-                userAnswer = JSON.parse(userAnswer)
-                n.userAnswerStr = userAnswer.map(m => numToLetter(+m - 1)).join('')
-              }
             } else if (type === 'fill_blank') { // 填空题
               // 学生做的填空题答案及分数
               let { jsonText } = n
@@ -321,6 +333,7 @@ export default {
                 }
               }
 
+              if (!n.userScore) n.userScore = 0
               // 填空题需要区分部分正确还是正确、错误
               let rightLen = 0
               if (n.userAnswerFill) rightLen = n.userAnswerFill.filter(m => m.correct).length // 正确的空的数量
@@ -349,6 +362,26 @@ export default {
         this.loading = false
       }
     },
+    scrollToSmooth (position, duration) {
+      let startTime = Date.now()
+
+      function scroll () {
+        let now = Date.now()
+        let progress = Math.min(1, (now - startTime) / duration)
+        document.querySelector('#quesWrap').scrollTo(0, position * progress)
+
+        if (progress < 1) {
+          window.requestAnimationFrame(scroll)
+        }
+      }
+
+      window.requestAnimationFrame(scroll)
+    },
+    // 答题卡题目点击滚动
+    scrollToQues (e) {
+      const el = document.querySelector('#ques' + e.id)
+      el && this.scrollToSmooth(el.offsetTop - document.querySelector('#quesWrap').offsetTop, 200)
+    },
     // 答题卡筛选
     filterStatus (e) {
       this.sheetStatus = this.sheetStatus === e ? '' : e
@@ -446,7 +479,7 @@ samp {
   font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
 }
 
-.report {
+/deep/.report {
   display: flex;
 
   .r-title {
@@ -550,7 +583,7 @@ samp {
     }
   }
 
-  /deep/ .table th {
+  .table th {
     background-color: #e5dfff !important;
 
     .cell {
@@ -603,6 +636,11 @@ samp {
         margin: 7px 9px;
         font-size: 13px;
         text-align: center;
+        cursor: pointer;
+
+        &:hover {
+          opacity: .9;
+        }
       }
 
       .serial {
@@ -723,6 +761,7 @@ samp {
     padding: 10px;
     background-color: #fff;
     overflow: auto;
+    outline: none;
 
     &>li {
       margin-bottom: 15px;
@@ -873,24 +912,26 @@ samp {
     .opt {
       display: flex;
       flex-wrap: wrap;
-      align-items: baseline;
+      align-items: flex-start;
       padding-left: 10px;
       margin-bottom: 5px;
       font-size: 14px;
       color: #707070;
       line-height: 1.6;
 
-      .el-radio,
+      &>.icon {
-      .el-checkbox {
+        margin-right: 12px;
-        margin-right: 15px;
       }
 
-      .el-radio__label {
+      .not-ans {
-        display: none;
+        width: 18px;
+        height: 18px;
+        border: 1px solid #ccc;
+        border-radius: 50%;
       }
 
       .text {
-        max-width: calc(100% - 48px);
+        max-width: calc(100% - 55px);
       }
     }
   }