Merge remote-tracking branch 'origin/master' into test

fuliqi

2024-10-28 4800366c4ae36b4900b34b7f183390fd9cd0d33b

 src/views/exam-list/data-list/index.vue

@@ -35,7 +35,7 @@
          <div class="right-container">
            <div class="button-container">
              <el-button type="primary" size="large" @click="examClick(item)"
                :disabled="stateList[item.status].disabled || item.submitStatus ==='finish'">开始考试</el-button>
                :disabled="stateList[item.status].disabled">开始考试</el-button>
            </div>
          </div>
        </div>
@@ -62,7 +62,7 @@
});

const stateList = {
  1: {
  'not_start': {
    text: '未开始',
    type: 'primary',
    disabled: true
@@ -76,6 +76,11 @@
    text: '已结束',
    type: 'info',
    disabled: true
  },
  'cancel': {
    text: '已作废',
    type: 'danger',
    disabled: true
  }
};