From f54f91704ce7cab076f74f0f759b61a8a38f30eb Mon Sep 17 00:00:00 2001
From: zjxxxxxx02 <z1040874720@163.com>
Date: Wed, 10 May 2023 21:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=A4=9A=E9=80=89=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=94=E6=A1=88=E9=83=A8=E5=88=86=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Show.vue                    |  38 ++--
 src/components/exam/editExam.vue           |  18 +-
 src/components/exam/examList.vue           |  22 ++-
 src/components/question/edit/essay.vue     |  39 ++--
 src/components/question/edit/judgment.vue  |  32 +++-
 src/components/question/edit/mmultiple.vue | 202 +++++++++++++++++----
 src/components/question/edit/single.vue    |  29 ++-
 src/components/question/questionList.vue   |  53 ++++--
 src/components/showExam.vue                |  32 +++-
 9 files changed, 350 insertions(+), 115 deletions(-)

diff --git a/src/components/Show.vue b/src/components/Show.vue
index 195929e..b450404 100644
--- a/src/components/Show.vue
+++ b/src/components/Show.vue
@@ -10,30 +10,36 @@
             <span v-html="item.content" class="q-item-content"></span>
             <span></span>
           </div>
-          <el-form-item label="详细解答">
-          <el-form-item v-html="question.detail"></el-form-item>
-          </el-form-item>
+          <br>
+          <div>详细解答
+            <br>
+          <div v-html="question.detail"></div>
+          </div>
       </div>
     </div>
     <div v-else-if="qType==2" v-loading="qLoading">
-      <div class="q-title" v-html="question.title"/>
+      <div class="q-title" v-html="question.questionName"/>
       <div class="q-content">
-          <span :key="item.id" v-for="item in question.items" class="q-item-contain">
+          <div :key="item.id" v-for="item in question.items" class="q-item-contain">
             <span class="q-item-prefix">{{item.prefix}}</span>
             <span>&nbsp;&nbsp;</span>
             <span v-html="item.content" class="q-item-content"></span>
-          </span>
-          <el-form-item label="详细解答">
-          <el-form-item v-html="question.detail"></el-form-item>
-          </el-form-item>
+          </div>
+          <br>
+          <div>详细解答
+            <br>
+          <div v-html="question.detail"></div>
+          </div>
       </div>
     </div>
     <div v-else-if="qType==3" v-loading="qLoading">
       <div class="q-title" v-html="question.questionName" style="display: inline;margin-right: 10px"/>
       <span>（&nbsp;&nbsp;）</span>
-      <el-form-item label="详细解答">
-          <el-form-item v-html="question.detail"></el-form-item>
-          </el-form-item>
+      <br>
+          <div>详细解答
+            <br>
+          <div v-html="question.detail"></div>
+          </div>
     </div>
 <!-- zjx -->
     <div v-else-if="qType==4" v-loading="qLoading">
@@ -41,9 +47,11 @@
       <i class="el-icon-check"></i>
       &nbsp;
       <i class="el-icon-close"></i>
-      <el-form-item label="详细解答">
-          <el-form-item v-html="question.detail"></el-form-item>
-          </el-form-item>
+      <br>
+          <div>详细解答
+            <br>
+          <div v-html="question.detail"></div>
+          </div>
     </div>
     
     <div v-else-if="qType==5" v-loading="qLoading">
diff --git a/src/components/exam/editExam.vue b/src/components/exam/editExam.vue
index 3efb59f..8d229b9 100644
--- a/src/components/exam/editExam.vue
+++ b/src/components/exam/editExam.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
-      <el-form-item label="试卷编号:"  prop="paperId" required>
+      <el-form-item label="试卷编号:"  prop="paperId">
           <el-input v-model="form.id" />
         </el-form-item>
       <el-form-item label="年级：" prop="grade" required>
@@ -84,7 +84,21 @@
         <el-table-column prop="questionId" label="Id" width="60px"/>
         <el-table-column prop="type" label="题型"  show-overflow-tooltip/>
         <el-table-column prop="questionName" label="题干" width="70px" />
-        <el-table-column prop="answer" label="答案" width="70px"/>
+        <el-table-column prop="answer" label="答案" width="100px">
+        <!-- <el-table-column prop="answerVos" label="答案" width="100px"> -->
+        <template slot-scope="scope">
+          <div v-if="scope.row.type != 2" >
+              <span style="color:rgb(205, 2, 9)">
+                {{scope.row.answer}}
+              </span>
+            </div>
+            <div v-if="scope.row.type == 2" >
+              <span style="color:rgb(205, 2, 9)" v-for="item in scope.row.answerVos">
+                {{item.prefix}}
+              </span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="score" label="分数" width="70px"/>
         <el-table-column label="操作" align="center" width="220px">
         <template slot-scope="{row}">
diff --git a/src/components/exam/examList.vue b/src/components/exam/examList.vue
index 01ce07a..8b5cbaf 100644
--- a/src/components/exam/examList.vue
+++ b/src/components/exam/examList.vue
@@ -30,12 +30,13 @@
       <el-table-column prop="two" label="判断题数量"  width="100px"/>
       <el-table-column prop="three" label="问答题数量"  width="100px"/>
       <el-table-column prop="paperName" label="试卷名" show-overflow-tooltip/>
-      <el-table-column prop="grade" label="年级"  width="70px"/>
+      <el-table-column prop="grade" label="年级"  width="50px"/>
       <el-table-column prop="score" label="分数" width="60px"/>
       <el-table-column prop="time" label="创建时间" width="160px"/>
-      <el-table-column label="操作" align="center" width="220px">
+      <el-table-column label="操作" align="center" width="300px">
         <template slot-scope="{row}">
           <el-button size="mini"   @click="showPaper(row)">预览</el-button>
+          <el-button size="mini"   @click="submitPaper(row)">发布</el-button>
           <el-button size="mini"  @click="editPaper(row)">编辑</el-button>
           <el-button size="mini"  type="danger" @click="deletePaper(row)" class="link-left">删除</el-button>
         </template>
@@ -222,7 +223,24 @@ export default {
         console.log(re.data.titleItems)
          })
     },
+    submitPaper(row){
+      if(row.status == 1){
+        this.$message.error("您已经发布过来，请不要再次操作")
+        return false
+      }
+      this.$http.post("commit/paper?paperId="+row.paperId).then(re => {
+        if (re.data != null) {
+          this.$message.success("发布成功")
+        } else {
+          this.$message.error("发布失败")
+        }
+      })
+    },
     editPaper (row) {
+      if(row.status == 1){
+        this.$message.error("该试卷已经发布，请勿修改")
+        return false
+      }
         this.$router.push({ path: 'updateExam' ,query: { id: row.paperId }})
     },
     deletePaper (row) {
diff --git a/src/components/question/edit/essay.vue b/src/components/question/edit/essay.vue
index d200375..39a8003 100644
--- a/src/components/question/edit/essay.vue
+++ b/src/components/question/edit/essay.vue
@@ -6,9 +6,9 @@
           <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学科：" prop="courseId" required>
-        <el-select v-model="form.courseId" placeholder="学科" >
-          <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value" ></el-option>
+      <el-form-item label="学科：">
+        <el-select v-model="form.courseId" placeholder="学科" clearable> 
+          <el-option v-for="item in subjectFilter" :key="item.courseId" :value="item.courseId" :label="item.courseName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="题干：" prop="questionName" required>
@@ -119,27 +119,27 @@ export default {
     
     let _this = this
     if (id && parseInt(id) !== 0) {
-      //_this.formLoading = false
-
-
-
-      
     this.$http.post("question/id/?id="+id).then(
          re=>{
              const res = re
              this.form=res.data
-            // _this.currentTitleItem.questionItems.push(res.data)
              }
      );  
     this.form.id=id
-      // questionApi.select(id).then(re => {
-      //   _this.form = re.response
-      //   _this.formLoading = false
-      // })
     }
   },
+  mounted() {
+    this.getcourseId();
+  },
   methods: {
     //zjx
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
+      },
     async updateForm(){
       const { data: res } = await this.$http.post("/question/update",this.form);
       if(res != null){
@@ -151,7 +151,6 @@ export default {
     async submitForm () {
         // alert('点击了提交按钮')
             // 调用post请求
-      this.form.courseId =1   //这里需要增加一些id的转换
             const { data: res } = await this.$http.post("/question/edit",this.form);
             if(res != null){
         this.$message.success("添加成功")
@@ -195,14 +194,14 @@ export default {
       let lastId = this.form.id
       this.$refs['form'].resetFields()
       this.form = {
-        id: null,
-        questionType: 1,
+        questionId: null,
+        questionType: 3,
         gradeLevel: null,
-        subjectId: null,
+        courseId: null,
         title: '',
         items: '',
-        analyze: '',
-        correct: '',
+        questionId: '',
+        answer: '',
         score: '',
         difficult: 0
       }
@@ -214,7 +213,7 @@ export default {
     },
     showQuestion () {
       this.questionShow.dialog = true
-      this.questionShow.qType = this.form.questionType
+      this.questionShow.qType = this.form.type
       this.questionShow.question = this.form
     },
    // ...mapActions('exam', { initSubject: 'initSubject' }),
diff --git a/src/components/question/edit/judgment.vue b/src/components/question/edit/judgment.vue
index 99fb129..ec3f771 100644
--- a/src/components/question/edit/judgment.vue
+++ b/src/components/question/edit/judgment.vue
@@ -6,9 +6,9 @@
           <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学科：" prop="courseId" required>
-        <el-select v-model="form.courseId" placeholder="学科" >
-          <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value" ></el-option>
+      <el-form-item label="学科：">
+        <el-select v-model="form.courseId" placeholder="学科" clearable> 
+          <el-option v-for="item in subjectFilter" :key="item.courseId" :value="item.courseId" :label="item.courseName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="题干：" prop="questionName" required>
@@ -151,7 +151,20 @@ export default {
       // })
     }
   },
+  mounted() {
+    this.getcourseId();
+  },
   methods: {
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
+      },
+    //   selectsubjectId(value){
+    //   this.form.courseId = value 
+    // },
         //zjx
         async updateForm(){
       const { data: res } = await this.$http.post("/question/update",this.form);
@@ -164,7 +177,6 @@ export default {
     async submitForm () {
         // alert('点击了提交按钮')
             // 调用post请求
-      this.form.courseId =1   //这里需要增加一些id的转换
             const { data: res } = await this.$http.post("/question/edit",this.form);
             if(res != null){
         this.$message.success("添加成功")
@@ -215,17 +227,17 @@ export default {
       let lastId = this.form.id
       this.$refs['form'].resetFields()
       this.form = {
-        id: null,
-        questionType: 4,
+        questionId: null,
+        type: 4,
         gradeLevel: null,
-        subjectId: null,
+        courseId: null,
         title: '',
         items: [
           { prefix: 'A', content: '' },
           { prefix: 'B', content: '' },
         ],
-        analyze: '',
-        correct: '',
+        detail: '',
+        answer: '',
         score: '',
         difficult: 0
       }
@@ -237,7 +249,7 @@ export default {
     },
     showQuestion () {
       this.questionShow.dialog = true
-      this.questionShow.qType = this.form.questionType
+      this.questionShow.qType = this.form.type
       this.questionShow.question = this.form
     },
    // ...mapActions('exam', { initSubject: 'initSubject' }),
diff --git a/src/components/question/edit/mmultiple.vue b/src/components/question/edit/mmultiple.vue
index d40ae4f..94a04da 100644
--- a/src/components/question/edit/mmultiple.vue
+++ b/src/components/question/edit/mmultiple.vue
@@ -1,28 +1,28 @@
 <template>
   <div class="app-container">
-    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading"  :rules="rules">
+    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
       <el-form-item label="年级：" prop="gradeLevel" required>
-        <el-select v-model="form.gradeLevel" placeholder="年级"  @change="levelChange">
+        <el-select v-model="form.gradeLevel" placeholder="年级"  @change="levelChange" clearable>
           <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学科：" prop="subjectId" required>
-         <el-select v-model="form.subjectId" placeholder="学科" >
-          <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value" ></el-option>
+      <el-form-item label="学科：">
+        <el-select v-model="form.courseId" placeholder="学科" clearable> 
+          <el-option v-for="item in subjectFilter" :key="item.courseId" :value="item.courseId" :label="item.courseName"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="题干：" prop="title" required>
-        <el-input v-model="form.title"   @focus="inputClick(form,'title')" />
+      <el-form-item label="题干：" prop="questionName" required>
+        <el-input v-model="form.questionName"   @focus="inputClick(form,'questionName')" />
       </el-form-item>
       <el-form-item label="选项：" required>
         <el-form-item :label="item.prefix" :key="item.prefix"  v-for="(item,index) in form.items"  label-width="50px" class="question-item-label">
           <el-input v-model="item.prefix"  style="width:50px;" />
           <el-input v-model="item.content"   @focus="inputClick(item,'content')"  class="question-item-content-input"/>
-          <el-button type="danger" size="mini" class="question-item-remove" icon="el-icon-delete" @click="questionItemRemove(index)"></el-button>
+           <el-button type="danger" size="mini" class="question-item-remove" icon="el-icon-delete" @click="questionItemRemove(index)"></el-button>
         </el-form-item>
       </el-form-item>
-      <el-form-item label="解析：" prop="analyze" required>
-        <el-input v-model="form.analyze"  @focus="inputClick(form,'analyze')" />
+      <el-form-item label="解析：" prop="detaile" required>
+        <el-input v-model="form.detail"  @focus="inputClick(form,'detail')" />
       </el-form-item>
       <el-form-item label="分数：" prop="score" required>
         <el-input-number v-model="form.score" :precision="1" :step="1" :max="100"></el-input-number>
@@ -30,25 +30,30 @@
       <el-form-item label="难度：" required>
         <el-rate v-model="form.difficult" class="question-item-rate"></el-rate>
       </el-form-item>
-      <el-form-item label="正确答案：" prop="correctArray" required>
-        <el-checkbox-group v-model="form.correctArray">
-          <el-checkbox v-for="item in form.items" :label="item.prefix" :key="item.prefix">{{item.prefix}}</el-checkbox>
+      <el-form-item label="正确答案：" prop="answer" required>
+        <el-checkbox-group v-model="form.answerVos" >
+          <el-checkbox  v-for="item in form.items" :label="item.prefix" true-label :key="item.prefix">{{item.prefix}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">提交</el-button>
+        <el-button type="success" @click="updateForm">修改</el-button>
         <el-button @click="resetForm">重置</el-button>
         <el-button type="success" @click="questionItemAdd">添加选项</el-button>
         <el-button type="success" @click="showQuestion">预览</el-button>
       </el-form-item>
     </el-form>
-    <el-dialog  :visible.sync="richEditor.dialogVisible"  append-to-body :close-on-click-modal="false" style="width: 100%;height: 100%"   :show-close="false" center>
+    <!-- <el-input v-model="form.answerVos[1].prefix"></el-input>
+    <span v-for="item in form.answerVos" >
+                {{item.prefix}}
+              </span> -->
+    <!-- <el-dialog  :visible.sync="richEditor.dialogVisible"  append-to-body :close-on-click-modal="false" style="width: 100%;height: 100%"   :show-close="false" center>
       <Ueditor @ready="editorReady"/>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="editorConfirm">确 定</el-button>
         <el-button @click="richEditor.dialogVisible = false">取 消</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
     <el-dialog :visible.sync="questionShow.dialog" style="width: 100%;height: 100%">
       <QuestionShow :qType="questionShow.qType" :question="questionShow.question" :qLoading="questionShow.loading"/>
     </el-dialog>
@@ -56,9 +61,8 @@
 </template>
 
 <script>
-import QuestionShow from '@/components/Show.vue'
-import Ueditor from '@/components/Ueditor.vue'
-
+import QuestionShow from '@/components/Show'
+import Ueditor from '@/components/Ueditor'
 
 export default {
   components: {
@@ -66,25 +70,28 @@ export default {
   },
   data () {
     return {
+      answerVos:[
+
+      ],
       form: {
-        id: null,
-        questionType: 2,
+        questionId: null,
+        type: 2,
         gradeLevel: null,
-        subjectId: null,
-        title: '',
+        courseId: null,
+        questionName: '',
         items: [
-          { id: null, prefix: 'A', content: '' },
-          { id: null, prefix: 'B', content: '' },
-          { id: null, prefix: 'C', content: '' },
-          { id: null, prefix: 'D', content: '' }
+          { prefix: 'A', content: '' },
+          { prefix: 'B', content: '' },
+          { prefix: 'C', content: '' },
+          { prefix: 'D', content: '' }
+        ],
+        detail: '',
+        answerVos: [
         ],
-        analyze: '',
-        correct: '',
-        correctArray: [],
         score: '',
         difficult: 0
       },
-             levelEnum:[
+          levelEnum:[
        { key :'1',value:'一年级'},
       { key :'2',value:'二年级'},
       { key :'3',value:'三年级'},
@@ -101,22 +108,22 @@ export default {
       formLoading: false,
       rules: {
         gradeLevel: [
-          { required: true, message: '请选择年级', trigger: 'change' }
+          { required: false, message: '请选择年级', trigger: 'change' }
         ],
         subjectId: [
-          { required: true, message: '请选择学科', trigger: 'change' }
+          { required: false, message: '请选择学科', trigger: 'change' }
         ],
         title: [
-          { required: true, message: '请输入题干', trigger: 'blur' }
+          { required: false, message: '请输入题干', trigger: 'blur' }
         ],
         analyze: [
-          { required: true, message: '请输入解析', trigger: 'blur' }
+          { required: false, message: '请输入解析', trigger: 'blur' }
         ],
         score: [
-          { required: true, message: '请输入分数', trigger: 'blur' }
+          { required: false, message: '请输入分数', trigger: 'blur' }
         ],
-        correctArray: [
-          { required: true, message: '请选择正确答案', trigger: 'change' }
+        correct: [
+          { required: false, message: '请选择正确答案', trigger: 'change' }
         ]
       },
       richEditor: {
@@ -133,6 +140,127 @@ export default {
       }
     }
   },
+  created () {
+    let id = this.$route.query.id
+    let _this = this
+    if (id && parseInt(id) !== 0) {
+    this.$http.post("question/id/?id="+id).then(
+         re=>{
+             const res = re
+             this.form=res.data    
+             //输入多选框
+             for(let i=0;i<res.data.answerVos.length;i++){
+                // alert(res.data.answerVos[i].prefix)
+                this.form.answerVos.push(res.data.answerVos[i].prefix)
+              }
+             }
+     );  
+    this.form.id=id
+    }
+  },
+  mounted() {
+    this.getcourseId();
+  },
+  methods: {
+    // checkanswer(item){
+    //   console.log(item.prefix)
+    //   for(let i=0;i<this.form.answerVos.length;i++){
+    //     console.log(form.answerVos[i])
+    //     if(this.item.prefix == form.answerVos[i])
+    //   {
+    //      checked = true
+    //   }
+    //   }
+    // },
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
+      },
+        async updateForm(){
+          //直接更新问题很多(1)多选框的值更改,取消选择，如何处理已经获取的值
+            const { data: res } = await this.$http.post("/question/update",this.form);
 
+      if(res != null ){
+        this.$message.success("修改成功")
+      }else{
+        this.$message.error("修改失败")
+      }
+    },
+    async submitForm () {
+        // alert('点击了提交按钮')
+            // 调用post请求
+            const { data: res } = await this.$http.post("/question/edit",this.form);
+            if(res != null){
+        this.$message.success("添加成功")
+      }else{
+        this.$message.error("添加失败")
+      }
+    },
+    editorReady (instance) {
+      this.richEditor.instance = instance
+      let currentContent = this.richEditor.object[this.richEditor.parameterName]
+      this.richEditor.instance.setContent(currentContent)
+      // 光标定位到Ueditor
+      this.richEditor.instance.focus(true)
+    },
+    inputClick (object, parameterName) {
+      this.richEditor.object = object
+      this.richEditor.parameterName = parameterName
+      this.richEditor.dialogVisible = true
+    },
+    editorConfirm () {
+      let content = this.richEditor.instance.getContent()
+      this.richEditor.object[this.richEditor.parameterName] = content
+      this.richEditor.dialogVisible = false
+    },
+    questionItemRemove (index) {
+      this.form.items.splice(index, 1)
+    },
+    questionItemAdd () {
+      let items = this.form.items
+      let newLastPrefix
+      if (items.length > 0) {
+        let last = items[items.length - 1]
+        newLastPrefix = String.fromCharCode(last.prefix.charCodeAt() + 1)
+      } else {
+        newLastPrefix = 'A'
+      }
+      items.push({ id: null, prefix: newLastPrefix, content: '' })
+    },
+    resetForm () {
+      let lastId = this.form.id
+      this.$refs['form'].resetFields()
+      this.form = {
+        questionId: null,
+        type: 1,
+        gradeLevel: null,
+        courseId: null,
+        title: '',
+        items: [
+          { prefix: 'A', content: '' },
+          { prefix: 'B', content: '' },
+          { prefix: 'C', content: '' },
+          { prefix: 'D', content: '' }
+        ],
+        detail: '',
+        answer: '',
+        score: '',
+        difficult: 0
+      }
+      this.form.id = lastId
+    },
+    levelChange () {
+      this.form.subjectId = null
+      this.subjectFilter = this.subjects.filter(data => data.level === this.form.gradeLevel)
+    },
+    showQuestion () {
+      this.questionShow.dialog = true
+      this.questionShow.qType = this.form.type
+      this.questionShow.question = this.form
+    },
+  },
 }
 </script>
diff --git a/src/components/question/edit/single.vue b/src/components/question/edit/single.vue
index b25ee39..21f8892 100644
--- a/src/components/question/edit/single.vue
+++ b/src/components/question/edit/single.vue
@@ -6,9 +6,9 @@
           <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学科：" prop="courseId" required>
-        <el-select v-model="form.courseId" placeholder="学科" >
-          <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value" ></el-option>
+      <el-form-item label="学科：">
+        <el-select v-model="form.courseId" placeholder="学科" clearable> 
+          <el-option v-for="item in subjectFilter" :key="item.courseId" :value="item.courseId" :label="item.courseName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="题干：" prop="questionName" required>
@@ -152,7 +152,17 @@ export default {
       // })
     }
   },
+  mounted() {
+    this.getcourseId();
+  },
   methods: {
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
+      },
         //zjx
         async updateForm(){
       const { data: res } = await this.$http.post("/question/update",this.form);
@@ -165,7 +175,6 @@ export default {
     async submitForm () {
         // alert('点击了提交按钮')
             // 调用post请求
-      this.form.courseId =1   //这里需要增加一些id的转换
             const { data: res } = await this.$http.post("/question/edit",this.form);
             if(res != null){
         this.$message.success("添加成功")
@@ -242,10 +251,10 @@ export default {
       let lastId = this.form.id
       this.$refs['form'].resetFields()
       this.form = {
-        id: null,
-        questionType: 1,
+        questionId: null,
+        type: 1,
         gradeLevel: null,
-        subjectId: null,
+        courseId: null,
         title: '',
         items: [
           { prefix: 'A', content: '' },
@@ -253,8 +262,8 @@ export default {
           { prefix: 'C', content: '' },
           { prefix: 'D', content: '' }
         ],
-        analyze: '',
-        correct: '',
+        detail: '',
+        answer: '',
         score: '',
         difficult: 0
       }
@@ -266,7 +275,7 @@ export default {
     },
     showQuestion () {
       this.questionShow.dialog = true
-      this.questionShow.qType = this.form.questionType
+      this.questionShow.qType = this.form.type
       this.questionShow.question = this.form
     },
    // ...mapActions('exam', { initSubject: 'initSubject' }),
diff --git a/src/components/question/questionList.vue b/src/components/question/questionList.vue
index 6959448..1e2c5c4 100644
--- a/src/components/question/questionList.vue
+++ b/src/components/question/questionList.vue
@@ -3,7 +3,6 @@
     <el-form :model="queryParam" ref="queryForm" :inline="true">
       <el-form-item label="题目ID：" >       
           <el-input v-model="queryParam.id" ref="questionId" width="30px" placeholder="请输入试题Id" clearable></el-input>
-        <!-- zjx -->       
       </el-form-item>
       <el-button type="primary" @click="selectquestionId">查询</el-button>
       &nbsp;
@@ -40,7 +39,22 @@
       <el-table-column prop="type" label="题型"  width="70px"/>
       <el-table-column prop="questionName" label="题干" show-overflow-tooltip/>
       <el-table-column prop="score" label="分数" width="60px"/>
-      <el-table-column prop="answer" label="答案" width="60px"/>
+      <el-table-column label="答案" width="100px">
+        <!-- <el-table-column prop="answerVos" label="答案" width="100px"> -->
+        <template slot-scope="scope">
+          <div v-if="scope.row.type != 2" >
+              <span style="color:rgb(205, 2, 9)">
+                {{scope.row.answer}}
+              </span>
+            </div>
+            <div v-if="scope.row.type == 2" >
+              <span style="color:rgb(205, 2, 9)" v-for="item in scope.row.answerVos">
+                {{item.prefix}}
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+      <!-- <el-table-column v-if="answer != null"  prop="answer" label="答案" width="60px"/>  -->
       <el-table-column prop="time" label="创建时间" width="160px"/>
       <el-table-column label="操作" align="center" width="220px">
         <template slot-scope="{row}">
@@ -78,9 +92,15 @@ import QuestionShow from '@/components/Show'
 
 export default {
   components: { Pagination, QuestionShow },
+  props:['tableData'],
   data () {
     return {
-
+      // answer :{
+      //   prefix:''
+      // },
+      // param:{
+      //   typee:'',
+      // },
       editUrlEnum :[
         {key :'1',
         name:'单选题',
@@ -174,6 +194,7 @@ export default {
       this.$http.get("question/id?id="+questionId).then(
         re=>{
            const res = re;
+           console.log(res.data.answerVos[0].prefix)
            if(res.data.questionId!==undefined){
             //输入不存在id传进来的是未定义，不是未空
           this.tableData.push(res.data);//eleui表格是用数组来排序，如果是数据是对象，要将对象转为数组
@@ -182,6 +203,7 @@ export default {
              this.$message.error("试题不存在")
              console.log("加载数据失败")
            }
+          //  alert(this.$refs.type.value)
     })
   },
       //zjx 2023/5/7
@@ -191,7 +213,6 @@ export default {
          re=>{
            const res = re;
            if(res!==null){
-
           this.tableData =res.data;
                   console.log(res.list instanceof Array)
           console.log("加载数据成功")
@@ -209,7 +230,7 @@ export default {
            if(res!==null){
 
           this.tableData =res.data
-                  console.log(res.list instanceof Array)
+                  console.log(res.data.list)
           console.log("加载数据成功")
            }else{
              console.log("加载数据失败")
@@ -217,26 +238,23 @@ export default {
     })
   },
     submitForm () {
-      this.queryParam.pageIndex = 1
+      // this.queryParam.pageIndex = 1
       this.search()
     },
     search () {
-
       this.listLoading = true
-          
          this.$http.get("question/get").then(
          re=>{
            const res = re
            if(res!==null){
-
+          // this.tableData =res.data
           this.tableData =res.data
-                  console.log(res.list instanceof Array)
-                  console.log(res.data.list)
+                  // console.log(res.list instanceof Array)
+                  // console.log(res.data.list)
           console.log("加载数据成功")
            }else{
              console.log("加载数据失败")
            }
-          
              }
      );  
 
@@ -338,7 +356,16 @@ export default {
   //   ...mapGetters('exam', ['subjectEnumFormat']),
   //   ...mapState('exam', { subjects: state => state.subjects })
   // }
-  }
+  },
+  watch:{
+      tableData:function(newData,oldData){
+				console.log(newData)  //newData就是orderData
+				this.newOrderData = newData;     
+				//	methods的函数在这里调用可以获取到newOrderData的值	      
+				// this.order();
+			}
+    }
 
 }
+
 </script>
diff --git a/src/components/showExam.vue b/src/components/showExam.vue
index aece811..aa1de1d 100644
--- a/src/components/showExam.vue
+++ b/src/components/showExam.vue
@@ -12,14 +12,34 @@
       <div >
           <div v-for="item1 in paper.titleItems">
             <span >{{item1.questionName}}</span>
-            <div v-for="item2 in item1.questionItems" class="q-item-contain">
-              <!-- {{ item2 }} -->
+          <div v-if="item1.type == 1 || item1.type == 2">
+            <div v-for="(item2,index) in item1.questionItems" class="q-item-contain">
+              <span >{{index+1}}、{{item2.questionName}}</span>
               <div v-for="item3 in item2.items" class="q-item-contain">
-            <span class="q-item-prefix">{{item3.prefix}}</span>
-            <span>&nbsp;&nbsp;</span>
-            <span v-html="item3.content" class="q-item-content"></span>
+                <span class="q-item-prefix">{{item3.prefix}}</span>
+                <span>&nbsp;&nbsp;</span>
+                <span v-html="item3.content" class="q-item-content"></span>
+              </div>
+                <br>
+            </div>
           </div>
-          <br>
+          <div v-if="item1.type == 4">
+            <div v-for="(item2,index) in item1.questionItems" class="q-item-contain">
+              <span >{{index+2}}、{{item2.questionName}}</span>
+                <br>
+                <i class="el-icon-check"></i>
+                &nbsp;
+                <i class="el-icon-close"></i>
+                <br>
+            </div>
+            <br>
+          </div>
+          <div v-if="item1.type == 3">
+            <div v-for="(item2,index) in item1.questionItems" class="q-item-contain">
+              <span >{{index+3}}、{{item2.questionName}}</span>
+              <br>
+              <span>答：</span>
+            </div>
           </div>
           </div>
       </div>
-- 
Gitee