Merge branch 'vite' of https://gitlab.ezijing.com/ezijing/x-learn into vite

src/components/base/AppList.vue

@@ -101,7 +101,7 @@ export default {
     // 是否含有翻页
     hasPagination: { type: Boolean, default: true },
     // 每页多少条数据
-    limit: { type: Number, default: 20 },
+    limit: { type: Number, default: 10 },
     pagationLayout: { type: String, default: 'total, prev, pager, next, sizes, jumper' }
   },
   data() {

src/components/exam/result/resultCard.vue

@@ -54,8 +54,7 @@ export default {
       order: []
     }
   },
-  computed: {
-  },
+  computed: {},
   mounted() {
     this.changeQuestion = this.setData()
   },
@@ -69,22 +68,27 @@ export default {
         list.question_list.map(item => {
           const isOptions = Array.isArray(item.question_options) ? item.question_options[0] : item.question_options
           if (!isOptions) {
-            this.data.score_items[list.question_item_id][item.id].checked_flag ? item.cardStust = 4 : item.cardStust = 5
+            this.data.score_items[list.question_item_id][item.id].checked_flag
+              ? (item.cardStust = 4)
+              : (item.cardStust = 5)
             return item
           } else {
-            const ans = this.data.answers[list.question_item_id][item.id].answer || this.data.answers[list.question_item_id][item.id].answers
+            const ans =
+              this.data.answers[list.question_item_id][item.id].answer ||
+              this.data.answers[list.question_item_id][item.id].answers
             if (!ans.length) {
               item.cardStust = 3
               return item
             } else {
-              this.data.score_items[list.question_item_id][item.id].is_right ? (item.cardStust = 1) : (item.cardStust = 2)
+              this.data.score_items[list.question_item_id][item.id].is_right
+                ? (item.cardStust = 1)
+                : (item.cardStust = 2)
               return item
             }
           }
         })
         data.push(list)
       })
-      // console.log(data, '=123')
       this.order = data
     },
     goQuestion(id) {

src/modules/exam/test/views/Result.vue

@@ -155,7 +155,6 @@ export default {
         //   this.accuracText = parseInt((rightNum / totalNum) * 100)
         // }
         this.data = data
-        console.log(data)
         // this.accuracScore = parseInt(totalNum)
         this.status = data.sheet.status
         let subjectQuestionTotal = 0
@@ -167,7 +166,6 @@ export default {
             return a.concat(b)
           }, [])
           const currentQuestionScore = data.sheet.score_items[item.question_item_id]
-          // console.log(item)
           item.question_list.forEach(it => {
             const currentItem = currentQuestionScore[it.id]
             if (Array.isArray(it.question_options) && it.question_options.length) {

src/modules/teacher/data/course/views/ClassLIst.vue

@@ -56,7 +56,6 @@ export default {
       })
     },
     sortChange(columns) {
-      console.log(columns, '123')
       if (columns.order === 'ascending') {
         this.tableOptions.remote.params.sort = columns.prop
       } else {

src/modules/teacher/data/course/views/List.vue

@@ -2,9 +2,7 @@
   <app-container>
     <app-list v-bind="tableOptions" ref="list" @sort-change="sortChange">
       <!-- 操作 -->
-      <template v-slot:table-img="{ row }">
-        <img :src="row.course_picture" alt="" style="width: 100px; height: 100px" />
-      </template>
+      <template v-slot:table-img="{ row }"> <img :src="row.course_picture" alt="" style="width: 100px" /> </template>
       <template v-slot:table-operate="{ row }">
         <el-button type="text" size="mini" @click="toClassData(row)">班级数据</el-button>
         <el-button type="text" size="mini" @click="toPersonal(row)">个人数据</el-button>
@@ -61,7 +59,6 @@ export default {
   },
   methods: {
     sortChange(columns) {
-      console.log(columns, '123')
       if (columns.order === 'ascending') {
         this.tableOptions.remote.params.sort = columns.prop
       } else {
@@ -74,11 +71,9 @@ export default {
     getCourseNameList() {
       getCourseNameList().then(res => {
         this.conditionList = res.data
-        console.log(res, 'fdd')
       })
     },
     toClassData(row) {
-      console.log(row)
       this.$router.push({
         path: '/teacher/data/course/classDatas',
         query: {

src/modules/teacher/data/course/views/PersonalList.vue

@@ -49,7 +49,6 @@ export default {
       })
     },
     sortChange(columns) {
-      console.log(columns, '123')
       if (columns.order === 'ascending') {
         this.tableOptions.remote.params.sort = columns.prop
       } else {

src/modules/teacher/data/course/views/Process.vue

@@ -2,7 +2,7 @@
   <app-card>
     <app-list v-bind="tableOptions" ref="list">
       <template v-slot:course_picture="{ row }">
-        <el-image :src="row.course_picture"></el-image>
+        <el-image :src="row.course_picture" style="width: 100px"></el-image>
       </template>
       <template v-slot:progress="{ row }">
         <el-progress :percentage="row.progress"></el-progress>
@@ -54,7 +54,6 @@ export default {
       })
     },
     toDetail(row) {
-      // console.log(row)
       this.$router.push({
         path: '/teacher/data/course/processDetail',
         query: {

src/modules/teacher/data/exam/components/Finished.vue

@@ -67,7 +67,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.type, '123dfs')
   },
   methods: {
     toPersonal(row) {
@@ -85,7 +84,6 @@ export default {
       })
     },
     sortChange(columns) {
-      console.log(columns, '123')
       if (columns.order === 'ascending') {
         this.$parent.$parent.$parent.$parent.getClassList()
         return columns.prop

src/modules/teacher/data/exam/components/QuestionType.vue

@@ -97,7 +97,6 @@ export default {
   mounted() {
     this.initEchart()
     this.initCorrectRate()
-    // console.log(this.dataInfo.questions_info_2, '12')
   },
   methods: {
     initEchart() {
@@ -117,7 +116,6 @@ export default {
     },
     initCorrectRate() {
       this.correctRate = this.dataInfo.questions_info_2.reduce((a, b) => ({ ...a, [b.type]: b }), {})
-      // console.log(this.correctRate, '=123')
     }
   }
 }

src/modules/teacher/data/exam/components/RankingAll.vue

 <template>
   <app-list v-bind="tableOptions" ref="list" @sort-change="sortChange">
     <template v-slot:paper_title="{ row }">
-      <div :class="`paper-title active${row.paper_title}`">{{ row.paper_title }}</div>
+      <div :class="`paper-title active${row.ranking}`">{{ row.ranking }}</div>
     </template>
     <template v-slot:table_operate="{ row }">
       <el-button type="text" @click="toDetail(row)" v-if="tabActive === 'finished'">查看</el-button>
@@ -32,7 +32,7 @@ export default {
       return {
         data: this.scoreRanking.list,
         columns: [
-          { label: '排名', slots: 'paper_title', prop: 'paper_title', align: 'center' },
+          { label: '排名', slots: 'paper_title', prop: 'ranking', align: 'center' },
           { label: '姓名', prop: 'personal_name', align: 'center' },
           { label: '客观题', prop: 'subjective', align: 'center', sortable: 'custom', minWidth: 100 },
           { label: '主观题', prop: 'objective', align: 'center', sortable: 'custom', minWidth: 100 },
@@ -60,7 +60,6 @@ export default {
           stu_id: data.student_id
         }
       })
-      console.log(data)
     },
     // 根据首次缴费时间排序
     sortChange(columns) {

src/modules/teacher/data/exam/components/ScoreRanking.vue

@@ -93,7 +93,6 @@ export default {
       })
     },
     handleClick(tab, event) {
-      // console.log(tab, event)
       if (tab.index === 1) {
         // 待评价
         this.getScoreRanking()

src/modules/teacher/data/exam/components/SetScoreRange.vue

@@ -66,7 +66,6 @@ export default {
         this.tags.sort((a, b) => a - b)
         this.tagInput = ''
       }
-      console.log(this.recordScoreRange, '===123')
     },
     // 删除标签
     removeTag(index) {

src/modules/teacher/data/exam/components/TitleData.vue

@@ -157,7 +157,6 @@ export default {
       })
     },
     sortChange(columns) {
-      console.log(columns, '123')
       if (columns.order === 'ascending') {
         this.tableOptions.remote.params.sort = columns.prop
       } else {
@@ -167,7 +166,6 @@ export default {
       this.$refs.list.refetch()
     },
     toDetail(row) {
-      console.log(row, 'uyeruywgr')
       this.$router.push({
         path: '/teacher/data/exam/examData/topicData',
         query: {

src/modules/teacher/data/exam/components/detail/QuestionListItem.vue

@@ -141,15 +141,12 @@ export default {
     handleChange() {
       this.$emit('change', this.data)
     }
-  },
-  mounted() {
-    console.log(this.data, '===123')
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.question-list-public__title{
+.question-list-public__title {
   font-size: 20px;
   font-weight: bold;
   color: #222;
@@ -181,14 +178,14 @@ export default {
   color: #222;
   line-height: 25px;
 }
-.question-list-item-hd__score{
+.question-list-item-hd__score {
   margin-left: auto;
   padding-top: 10px;
   font-size: 16px;
   // font-weight: bold;
   color: #222;
   line-height: 25px;
-  white-space:nowrap;
+  white-space: nowrap;
   padding-left: 30px;
 }
 .question-option-item {
@@ -239,7 +236,7 @@ export default {
   flex: 1;
   overflow: hidden;
 }
-.question-list-item-score{
+.question-list-item-score {
   margin-left: auto;
   padding-top: 10px;
   font-size: 16px;

src/modules/teacher/data/exam/views/ClassDetail.vue

@@ -41,10 +41,12 @@ export default {
         this.data = JSON.parse(response.data).sheet
         const status = { 3: '考卷生成', 0: '已缓存', 1: '已提交', 2: '已批阅' }
         this.infoData = this.infoData.reduce((a, b) => {
-          a.push(b.map(item => {
-            item.key === 'status' ? item.value = status[this.data[item.key]] : item.value = this.data[item.key]
-            return item
-          }))
+          a.push(
+            b.map(item => {
+              item.key === 'status' ? (item.value = status[this.data[item.key]]) : (item.value = this.data[item.key])
+              return item
+            })
+          )
           return a
         }, [])
         this.setExamData()
@@ -68,7 +70,6 @@ export default {
         prev.push({ ...cur, list })
         return prev
       }, [])
-      console.log(this.examData, '123')
     }
   }
 }

src/modules/teacher/data/exam/views/ClassList.vue

@@ -2,7 +2,9 @@
   <div>
     <div style="font-size: 32px; margin-bottom: 15px">{{ $route.query.examination_name }}</div>
     <app-card>
-      <h1 class="title" style="font-size: 28px">班级排名</h1>
+      <h1 class="title" style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">
+        班级排名
+      </h1>
       <el-button type="text" style="float: right; margin-top: -40px" @click="exportClassList">导出</el-button>
       <el-tabs v-model="tabActive" style="margin-top: 30px" @tab-click="handleClick">
         <el-tab-pane :label="`已结束${classList.checked_count}`" name="finished">
@@ -73,7 +75,6 @@ export default {
   },
   created() {
     this.getClassList()
-    console.log(this.$route.query.type, 'type123')
   },
   methods: {
     getClassList() {
@@ -84,13 +85,11 @@ export default {
         type: this.$route.query.type,
         status: this.status
       }
-      console.log(this.$route.query.type, 'type')
       getClassList(params).then(res => {
         this.classList = res.data
       })
     },
     handleClick(tab, event) {
-      console.log(tab, event)
       if (tab.index === 1) {
         // 待评价
         this.getClassList()

src/modules/teacher/data/exam/views/ExamData.vue

@@ -13,21 +13,19 @@
   >
     <section slot="pdf-content" :key="value">
       <div class="container">
-        <el-row type="flex" class="row-bg" justify="space-between" style="margin-bottom: 30px">
-          <el-col
-            ><h1 style="padding-left: 0px; font-size: 30px">
-              {{ $route.query.examination_name }}
-              <span style="color: #c01540; font-size: 14px">*部分数据未进行评价</span>
-            </h1>
-          </el-col>
-          <el-col :span="10">
+        <div style="display: flex; justify-content: space-between">
+          <h1 style="font-size: 30px">
+            {{ $route.query.examination_name }} <span style="color: #c01540; font-size: 14px">*部分数据未进行评价</span>
+          </h1>
+          <div style="margin-right: 60px">
             <el-select v-model="value" placeholder="全部数据" @change="refreshPage" clearable>
               <el-option v-for="item in dataInfo.class_map" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
-            <el-button type="text" style="margin-left: 30px" @click="$refs.html2Pdf.generatePdf()">导出pdf</el-button>
-          </el-col>
-        </el-row>
+            <el-button type="text" style="margin-left: 10px" @click="$refs.html2Pdf.generatePdf()">导出pdf</el-button>
+          </div>
+        </div>
+
         <template v-if="dataInfo.paper_info">
           <el-row :gutter="10" class="row-bg">
             <el-col :span="8" class="col"><exam-info :dataInfo="dataInfo" /></el-col>

src/modules/teacher/data/exam/views/PersonalList.vue

@@ -46,9 +46,6 @@ export default {
       }
     }
   },
-  mounted() {
-    console.log(this.$route.query.type, 'fughdkugh')
-  },
   methods: {
     toExamData(row) {
       // this.$router.push({
@@ -59,7 +56,6 @@ export default {
       // })
     },
     sortChange(columns) {
-      console.log(columns, '123')
       if (columns.order === 'ascending') {
         this.tableOptions.remote.params.sort = columns.prop
       } else {

src/modules/teacher/data/exam/views/TopicData.vue

@@ -108,22 +108,21 @@ export default {
         prev.push({ ...cur, list })
         return prev
       }, [])
-      console.log(this.examData, '123')
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.flex-box{
+.flex-box {
   margin: 20px 0;
   display: flex;
-  .flex{
+  .flex {
     flex: 1;
-    &:nth-child(1){
+    &:nth-child(1) {
       margin-right: 10px;
       min-height: 200px;
     }
-    &:nth-child(2){
+    &:nth-child(2) {
       margin-left: 10px;
     }
   }