Merge remote-tracking branch 'origin/vite' into vite

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

@@ -101,12 +101,11 @@ export default {
   methods: {
     initEchart() {
       const type = { 1: '单选', 2: '多选', 3: '问答', 5: '案例', 6: '判断', 7: '实操', 8: '情景' }
+      console.log(this.dataInfo.questions_info, '=123')
       const data = this.dataInfo.questions_info.reduce(
         (prev, cur) => {
-          if ([1, 2, 6].includes(cur.type)) {
-            prev.x.push(type[cur.type])
-            prev.y.push(cur.rate)
-          }
+          prev.x.push(type[cur.type])
+          prev.y.push(cur.rate)
           return prev
         },
         { x: [], y: [] }

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

@@ -26,19 +26,6 @@
         </el-checkbox-group>
       </template>
     </div>
-    <!-- 简答题 -->
-    <template v-if="questionType === 3">
-      <el-input
-        type="textarea"
-        v-model="data.answer[0]"
-        placeholder="请输入答案内容"
-        :autosize="{ minRows: 4, maxRows: 6 }"
-        :disabled="disabled"
-        @blur="handleChange"
-        :maxlength="100"
-        :show-word-limit="true"
-      ></el-input>
-    </template>
     <!-- <div class="question-list-item-score">得分：{{ data.score }}</div> -->
     <div class="question-list-item-ft" v-if="data.analysis">
       <h3 class="question-list-item-ft__title">答案解析</h3>

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

 <template>
   <div v-if="Object.keys(examData).length">
-    <question-details class="exam" :data="examData" v-if="examData.type != 3"></question-details>
+    <question-details class="exam" :data="examData"></question-details>
     <div class="flex-box">
       <topic-data-info :data="topicInfo" class="flex"></topic-data-info>
       <topic-data-chart :data="examData" class="flex" v-if="examData.type != 3"></topic-data-chart>
@@ -9,6 +9,11 @@
       <div slot="header" style="display: flex; align-items: center">
         <h1 style="font-size: 16px">概述信息</h1>
       </div>
+      <!-- <div style="display: flex; justify-content: flex-start">
+        <el-input v-model="search" clearable style="width: 200px; margin-right: 20px" placeholder="学生姓名" />
+        <el-button type="primary" icon="el-icon-search" @click="searchChange">搜索</el-button>
+        <el-button icon="el-icon-refresh-left" @click="reset">重置</el-button>
+      </div> -->
       <app-list v-bind="tableOptions" ref="list"></app-list>
     </el-card>
   </div>
@@ -62,6 +67,8 @@ export default {
     this.getTopic()
   },
   methods: {
+    searchChange() {
+    },
     getTopic() {
       const query = this.$route.query
       const params = { type: query.type, course_id: query.course_id, examination_id: query.examination_id, chapter_id: query.chapter_id, question_id: query.question_id }