From 24d16e65d3a3ea454b66e1590a018ac7225c2329 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 22 Mar 2023 14:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppExaminationManage/components/Add.vue     | 13 +++++++++++--
 .../app/AppExaminationManage/components/Detail.vue  |  1 +
 .../app/AppExaminationManage/components/List.vue    |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/project/qujing/app/AppExaminationManage/components/Add.vue b/project/qujing/app/AppExaminationManage/components/Add.vue
index 3b02c338..02c45e1d 100644
--- a/project/qujing/app/AppExaminationManage/components/Add.vue
+++ b/project/qujing/app/AppExaminationManage/components/Add.vue
@@ -33,6 +33,14 @@
                 <el-radio :label="item.dictValue" :key="item.dictValue" v-for="item in dict.getDict('qjEIChooseType')">{{ item.dictName }}</el-radio>
               </el-radio-group>
             </el-form-item>
+            <el-form-item prop="examinationType" label="考试类型" :rules="[{required: true, message: '请选择选题方式', trigger: 'change'}]">
+              <ai-select
+                v-model="form.examinationType"
+                clearable
+                placeholder="请选择"
+                :selectList="dict.getDict('qjExaminationType')">
+              </ai-select>
+            </el-form-item>
             <el-form-item prop="subjectConfigs" style="width: 100%;" label="题目设置" :rules="[{required: true, message: '请选择题目设置', trigger: 'change'}]">
               <div class="type-list">
                 <div class="choose-item" v-for="(item, index) in form.subjectConfigs" :key="index">
@@ -152,6 +160,7 @@
         form: {
           examinationName: '',
           title: '',
+          examinationType: '',
           showIndex: '',
           chooseType: '0',
           questions: [],
@@ -222,7 +231,7 @@
 
     created () {
       this.getList()
-      this.dict.load(['qjQBType', 'qjEIChooseType', 'qjEACondition', 'qjEAType']).then(() => {
+      this.dict.load(['qjQBType', 'qjEIChooseType', 'qjEACondition', 'qjEAType', 'qjExaminationType']).then(() => {
         if (this.params && this.params.id) {
           this.id = this.params.id
           this.getInfo(this.params.id)
@@ -522,7 +531,7 @@
       }
 
       .type-name {
-        width: 50px;
+        width: 80px;
       }
 
       span {
diff --git a/project/qujing/app/AppExaminationManage/components/Detail.vue b/project/qujing/app/AppExaminationManage/components/Detail.vue
index 45e44f05..f6e5d469 100644
--- a/project/qujing/app/AppExaminationManage/components/Detail.vue
+++ b/project/qujing/app/AppExaminationManage/components/Detail.vue
@@ -14,6 +14,7 @@
             <ai-info-item label="成绩评核" isLine :value="assessmentsName"></ai-info-item>
             <ai-info-item label="选题方式" isLine :value="dict.getLabel('qjEIChooseType', info.chooseType)">
             </ai-info-item>
+            <ai-info-item label="考试类型" isLine :value="dict.getLabel('qjExaminationType', info.examinationType)"></ai-info-item>
             <ai-info-item label="试题总数" :value="info.questions && info.questions.length"></ai-info-item>
             <ai-info-item label="总分数" :value="info.subjectScore"></ai-info-item>
             <ai-info-item label="考试人数" :value="info.examinationNumber"></ai-info-item>
diff --git a/project/qujing/app/AppExaminationManage/components/List.vue b/project/qujing/app/AppExaminationManage/components/List.vue
index 36c0e231..fc871ccf 100644
--- a/project/qujing/app/AppExaminationManage/components/List.vue
+++ b/project/qujing/app/AppExaminationManage/components/List.vue
@@ -93,6 +93,7 @@
         total: 10,
         colConfigs: [
           { prop: 'examinationName',  label: '考试名称', align: 'left', width: 400 },
+          { prop: 'examinationType', label: '考试类型', align: 'center', format: v => this.dict.getLabel('qjExaminationType', v) },
           { prop: 'allSubjectNumber',  label: '试题总数', align: 'center' },
           { prop: 'passScore',  label: '通过分数', align: 'center' },
           { prop: 'status', label: '状态', align: 'center', format: v => this.dict.getLabel('qjEIStatus', v) },
@@ -124,7 +125,7 @@
 
     created() {
       this.search.areaId = this.$store.state.user.info.areaId
-      this.dict.load('qjEIStatus').then(() => {
+      this.dict.load(['qjEIStatus', 'qjExaminationType']).then(() => {
         this.getList()
       })
     },