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

xiangpei

2024-07-11 41aaf3c396081a45908c9a964c43e523cc4a1f4e

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

 src/views/answer/detail.vue

@@ -44,14 +44,15 @@
          <h3>{{ titleItem.title }}</h3>
          <el-card class="exampaper-item-box" v-if="titleItem.questionList.length !== 0">
            <el-form-item :key="questionItem.itemOrder" :label="questionItem.itemOrder + '.'"
                          v-for="questionItem in titleItem.questionList" class="exam-question-item"
                          label-width="50px" :id="'question-' + questionItem.itemOrder">
              v-for="questionItem in titleItem.questionList" class="exam-question-item" label-width="50px"
              :id="'question-' + questionItem.itemOrder">
              <MarkPaperShow :qType="questionItem.questionType" :question="questionItem" :answer="form.navbar"/>
            </el-form-item>
          </el-card>
        </el-row>
      </el-form>
    </div>
    <el-empty v-if="empty" style="width:1200px;height:500px;"></el-empty>
  </div>
</template>

@@ -70,13 +71,14 @@
      examPaperAnswerApi.read(id).then(re => {
        this.formLoading = true
        this.form = re.data
        console.log('this.form', this.form);
        if (!this.form.titleItems) this.empty = true;
        this.formLoading = false
      })
    }
  },
  data () {
    return {
      empty: false,
      paperQuestionList: [],
      form: {},
      formLoading: false,
@@ -131,7 +133,6 @@
</script>

<style scoped>

.paper-container {
  display: flex;
  flex-direction: row;
@@ -146,7 +147,8 @@
}

.paper-form {
  flex: 1; /* 占据剩余空间 */
  flex: 1;
  /* 占据剩余空间 */
  margin-left: 300px;
}

@@ -157,5 +159,4 @@
  font-size: 14px;
  margin-top: 10px;
}

</style>

 src/views/answer/info.vue

@@ -34,7 +34,13 @@
              </template>
            </el-table-column>
            <el-table-column prop="doTime" label="耗时" width="80px" align="center" />
            <el-table-column prop="submitTime" label="提交时间" width="240px" align="center" />
            <el-table-column prop="submitTime" label="提交时间" width="240px" align="center">
              <template slot-scope="{row}">
                <span :style="row.status === 0 ? '' : 'color: red'">
                  {{ row.status === 0 ? row.submitTime : '缺考' }}
                </span>
              </template>
            </el-table-column>
            <el-table-column label="操作" width="120px" align="center">
              <template slot-scope="{row}">
                <el-button size="mini" @click="view(row)">详情</el-button>