From 8c57ca276f0e1052f4d2feab29b2d15390e5bb58 Mon Sep 17 00:00:00 2001
From: zjxxxxxx02 <z1040874720@163.com>
Date: Mon, 8 May 2023 16:33:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E8=AF=95=E9=A2=98?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BAShow.vue=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=AF=95=E9=A2=98=E4=BF=AE=E6=94=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=95=E9=A2=98=E5=86=85=E5=AE=B9=EF=BC=8C=E4=B9=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=A6=E7=BB=86=E8=A7=A3=E7=AD=94=E3=80=82?=
 =?UTF-8?q?=20=E8=AF=95=E9=A2=98=E6=9F=A5=E8=AF=A2=E6=9D=BF=E5=9D=97?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E5=B7=A5=EF=BC=8C=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=90=84=E7=A7=8D=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C=E5=AF=B9=E4=BA=8E=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=A1=E6=81=AF=E7=9A=84=E6=98=BE=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Show.vue                  |  21 +--
 src/components/question/questionList.vue | 164 ++++++++++++++++++-----
 2 files changed, 144 insertions(+), 41 deletions(-)

diff --git a/src/components/Show.vue b/src/components/Show.vue
index 5c4c83e..a46cec9 100644
--- a/src/components/Show.vue
+++ b/src/components/Show.vue
@@ -6,10 +6,12 @@
       <div class="q-content">
           <div :key="item.id" v-for="item in question.items" class="q-item-contain">
             <span class="q-item-prefix">{{item.prefix}}</span>
-            <span>---</span>
+            <span>&nbsp;&nbsp;</span>
             <span v-html="item.content" class="q-item-content"></span>
             <span></span>
           </div>
+          <h1>详细解答</h1>
+          <h1 v-html="question.detail"></h1>
       </div>
     </div>
     <div v-else-if="qType==2" v-loading="qLoading">
@@ -17,26 +19,29 @@
       <div class="q-content">
           <span :key="item.id" v-for="item in question.items" class="q-item-contain">
             <span class="q-item-prefix">{{item.prefix}}</span>
-            <span>---</span>
+            <span>&nbsp;&nbsp;</span>
             <span v-html="item.content" class="q-item-content"></span>
           </span>
+          <h1>详细解答</h1>
+          <h1 v-html="question.detail"></h1>
       </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>（</span>
-      <span :key="item.id" v-for="item in question.items">
-          <span></span>
-        <span v-html="item.content" class="q-item-content"></span>
-       </span>
-      <span>）</span>
+      <span>（&nbsp;&nbsp;）</span>
+      <h1>详细解答</h1>
+          <h1 v-html="question.detail"></h1>
     </div>
 <!-- zjx -->
     <div v-else-if="qType==4" v-loading="qLoading">
       <div class="q-title" v-html="question.questionName"/>
       <i class="el-icon-check"></i>
+      &nbsp;
       <i class="el-icon-close"></i>
+      <h1>详细解答</h1>
+          <h1 v-html="question.detail"></h1>
     </div>
+    
     <div v-else-if="qType==5" v-loading="qLoading">
       <div class="q-title" v-html="question.questionName"/>
     </div>
diff --git a/src/components/question/questionList.vue b/src/components/question/questionList.vue
index af6f464..e8a90c0 100644
--- a/src/components/question/questionList.vue
+++ b/src/components/question/questionList.vue
@@ -1,41 +1,47 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParam" ref="queryForm" :inline="true">
-      <el-form-item label="题目ID：">
-        <el-input v-model="queryParam.id" clearable></el-input>
+      <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;
       <el-form-item label="年级：">
         <el-select v-model="queryParam.level" 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="学科：">
-        <el-select v-model="queryParam.subjectId" clearable>
-          <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value"
-                     :label="item.value"></el-option>
+        <!-- zjx 2023/5/7 添加事件selectsubjectId -->
+        <el-select v-model="queryParam.subjectId" placeholder="学科" @change="selectsubjectId" clearable> 
+                   <!-- zjx  -->
+          <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="题型：">
-        <el-select v-model="queryParam.questionType" clearable>
-          <el-option v-for="item in questionType" :key="item.key" :value="item.value" :label="item.value"></el-option>
+        <el-select v-model="queryParam.questionType" @change="selectType" clearable>
+         <!-- zjx  -->
+          <el-option v-for="item in questionType" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm">查询</el-button>
-                <el-button type="primary" @click="search">刷新数据</el-button>
+        <el-button type="primary" @click="submitForm">查询所有题目</el-button>
+                <!-- <el-button type="primary" @click="search">刷新数据</el-button> -->
         <el-popover placement="bottom" trigger="click">
         
         </el-popover>
       </el-form-item>
     </el-form>
-    <el-table :data="tableData" border fit highlight-current-row style="width: 100%">
+    <!-- <el-table :data="tableData" border fit highlight-current-row style="width: 100%"> -->
+      <el-table :data="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)" border fit highlight-current-row style="width: 100%">
       <el-table-column prop="questionId" label="Id" width="90px"/>
       <el-table-column prop="courseId" label="学科" width="120px"/>
       <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="difficult" label="难度" width="60px"/>
-      <el-table-column prop="createTime" label="创建时间" width="160px"/>
+      <el-table-column 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}">
           <el-button size="mini"   @click="showQuestion(row)">预览</el-button>
@@ -44,8 +50,20 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParam.pageIndex" :limit.sync="queryParam.pageSize"
-                @pagination="search"/>
+    <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange" 
+            :current-page="currentPage" 
+            :page-sizes="[2,5,10,20]" 
+            :page-size="pageSize" 
+            layout="total, sizes, prev, pager, next, jumper" 
+            :total="tableData.length">
+            </el-pagination>
+    <!-- <pagination 
+    v-show="total>0" 
+    :total="total" 
+    :page.sync="queryParam.pageIndex" 
+    :limit.sync="queryParam.pageSize"
+    @pagination="search"
+    /> -->
     <el-dialog :visible.sync="questionShow.dialog" style="width: 100%;height: 100%">
       <QuestionShow :qType="questionShow.qType" :question="questionShow.question" :qLoading="questionShow.loading"/>
     </el-dialog>
@@ -79,22 +97,22 @@ export default {
       ],
 
       levelEnum:[
-       { key :'1',value:'一年级'},
+      { key :'1',value:'一年级'},
       { key :'2',value:'二年级'},
       { key :'3',value:'三年级'},
       { key :'4',value:'四年级'},
       { key :'5',value:'大学年级'},
        ] ,
              subjectFilter: [ 
-       { key :'1',value:'语文'},
-      { key :'2',value:'数学'},
-      { key :'3',value:'英语'},
-      { key :'4',value:'java'},
-      { key :'5',value:'c++'},
+      // { key :'1',value:'数学'},
+      // { key :'2',value:'语文'},
+      // { key :'3',value:'英语'},
+      // { key :'4',value:'java'},
+      // { key :'5',value:'c++'},
        ] ,
       queryParam: {
-        id: 99,
-        level: 0,
+        id: null,
+        level: null,
         subjectId: null,
         pageIndex: 1,
         pageSize: 10
@@ -104,16 +122,15 @@ export default {
       { key :'2',value:'多选题'},
       { key :'3',value:'简答题'},
       { key :'4',value:'判断题'},
-      // { key :'4',value:'作文'},//zjx
- 
        ] ,
 
       listLoading: true,
       tableData: [
-
-
       ],
-      total: 0,
+      currentPage: 1, // 当前页码
+      total: null, // 总条数
+      pageSize: 2 // 每页的数据条数
+      ,
       questionShow: {
         qType: 1,
         dialog: false,
@@ -126,13 +143,86 @@ export default {
    // this.initSubject()
    // this.search()
   },
+    mounted(){
+      this.getcourseId();
+      this.search();
+    },
   methods: {
+    //每页条数改变时触发 选择一页显示多少行
+    handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    this.currentPage = 1;
+                    this.pageSize = val;
+                },
+                //当前页改变时触发 跳转其他页
+                handleCurrentChange(val) {
+                    console.log(`当前页: ${val}`);
+                    this.currentPage = val;
+                },
+    //获取所有课程信息
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
+      },
+    //zjx 2023/5/7 
+    selectquestionId(){
+      var questionId = this.$refs.questionId.value;
+      this.$http.get("question/id?id="+questionId).then(
+        re=>{
+           const res = re;
+           if(res.data.questionId!==undefined){
+            //输入不存在id传进来的是未定义，不是未空
+          this.tableData.push(res.data);//eleui表格是用数组来排序，如果是数据是对象，要将对象转为数组
+          console.log("加载数据成功")
+           }else{
+             this.$message.error("试题不存在")
+             console.log("加载数据失败")
+           }
+    })
+  },
+      //zjx 2023/5/7
+    selectsubjectId(value){
+      var courseId = value;
+      this.$http.get("question/courseId?courseId="+courseId).then(
+         re=>{
+           const res = re;
+           if(res!==null){
+
+          this.tableData =res.data;
+                  console.log(res.list instanceof Array)
+          console.log("加载数据成功")
+           }else{
+             console.log("加载数据失败")
+           }
+    })
+  },
+  //zjx 2023/5/7
+  selectType(value){
+    var type = value;
+      this.$http.get("question/type?type="+type).then(
+         re=>{
+           const res = re
+           if(res!==null){
+
+          this.tableData =res.data
+                  console.log(res.list instanceof Array)
+          console.log("加载数据成功")
+           }else{
+             console.log("加载数据失败")
+           }
+    })
+  },
     submitForm () {
       this.queryParam.pageIndex = 1
       this.search()
     },
     search () {
+
       this.listLoading = true
+          
          this.$http.get("question/get").then(
          re=>{
            const res = re
@@ -210,15 +300,23 @@ export default {
      // this.$router.push({ path: url, query: { id: row.id } })
     },
     deleteQuestion (row) {
-      let _this = this
-      questionApi.deleteQuestion(row.id).then(re => {
-        if (re.code === 1) {
-          _this.search()
-          _this.$message.success(re.message)
+      //zjx
+      this.$http.get("question/delete/"+row.questionId).then(re => {
+        if (re.data != null) {
+          this.$message.success(re.message)
         } else {
-          _this.$message.error(re.message)
+          this.$message.error(re.message)
         }
       })
+      // let _this = this
+      // questionApi.deleteQuestion(row.id).then(re => {
+      //   if (re.code === 1) {
+      //     _this.search()
+      //     _this.$message.success(re.message)
+      //   } else {
+      //     _this.$message.error(re.message)
+      //   }
+      // })
     },
   //     enumFormat: (state) => (arrary, key) => {
   //   return format(arrary, key)
-- 
Gitee


From 5f55b5c0caec124db312ff52f9c3748e8daa2c11 Mon Sep 17 00:00:00 2001
From: zjxxxxxx02 <z1040874720@163.com>
Date: Tue, 9 May 2023 20:51:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E8=AF=95?=
 =?UTF-8?q?=E5=8D=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B1=95=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E3=80=82=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E4=BA=86=E8=AF=95=E5=8D=B7=E5=88=9B=E5=BB=BA=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BA=8C=E7=BA=A7=E6=9F=A5=E8=AF=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=95=E9=A2=98=EF=BC=8C=E5=AE=8C=E6=88=90=E4=BA=86?=
 =?UTF-8?q?=E8=AF=95=E9=A2=98=E7=9A=84=E6=9B=B4=E6=96=B0=E3=80=82=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=A4=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Show.vue                   |  20 +-
 src/components/exam/editExam.vue          | 633 +++++++++++++++-------
 src/components/exam/examList.vue          | 520 ++++++++----------
 src/components/exam/updateExam.vue        | 506 +++++++++++++++++
 src/components/question/edit/essay.vue    |  15 +
 src/components/question/edit/judgment.vue |  23 +-
 src/components/question/edit/single.vue   |  65 ++-
 src/components/question/questionList.vue  |   1 +
 src/components/showExam.vue               |  48 ++
 src/router/index.js                       |   4 +-
 src/store/modules/enumItem.js             |   2 +-
 11 files changed, 1297 insertions(+), 540 deletions(-)
 create mode 100644 src/components/exam/updateExam.vue
 create mode 100644 src/components/showExam.vue

diff --git a/src/components/Show.vue b/src/components/Show.vue
index a46cec9..195929e 100644
--- a/src/components/Show.vue
+++ b/src/components/Show.vue
@@ -10,8 +10,9 @@
             <span v-html="item.content" class="q-item-content"></span>
             <span></span>
           </div>
-          <h1>详细解答</h1>
-          <h1 v-html="question.detail"></h1>
+          <el-form-item label="详细解答">
+          <el-form-item v-html="question.detail"></el-form-item>
+          </el-form-item>
       </div>
     </div>
     <div v-else-if="qType==2" v-loading="qLoading">
@@ -22,15 +23,17 @@
             <span>&nbsp;&nbsp;</span>
             <span v-html="item.content" class="q-item-content"></span>
           </span>
-          <h1>详细解答</h1>
-          <h1 v-html="question.detail"></h1>
+          <el-form-item label="详细解答">
+          <el-form-item v-html="question.detail"></el-form-item>
+          </el-form-item>
       </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>
-      <h1>详细解答</h1>
-          <h1 v-html="question.detail"></h1>
+      <el-form-item label="详细解答">
+          <el-form-item v-html="question.detail"></el-form-item>
+          </el-form-item>
     </div>
 <!-- zjx -->
     <div v-else-if="qType==4" v-loading="qLoading">
@@ -38,8 +41,9 @@
       <i class="el-icon-check"></i>
       &nbsp;
       <i class="el-icon-close"></i>
-      <h1>详细解答</h1>
-          <h1 v-html="question.detail"></h1>
+      <el-form-item label="详细解答">
+          <el-form-item v-html="question.detail"></el-form-item>
+          </el-form-item>
     </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 1a7e453..3efb59f 100644
--- a/src/components/exam/editExam.vue
+++ b/src/components/exam/editExam.vue
@@ -1,15 +1,17 @@
 <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-input v-model="form.id" />
+        </el-form-item>
       <el-form-item label="年级：" prop="grade" required>
         <el-select v-model="form.grade" placeholder="年级"  @change="levelChange">
           <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="course" required>
-        <el-select v-model="form.course" placeholder="学科">
-          <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value"
-                    ></el-option>
+      <el-form-item label="学科：" prop="courseId" required>
+        <el-select v-model="form.course" @change="selectsubjectId" placeholder="学科">
+          <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="paperType" required>
@@ -17,20 +19,20 @@
           <el-option v-for="item in paperTypeEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="时间限制：" required v-show="form.paperType===4">
-        <el-date-picker v-model="form.limitDateTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
-                        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item> -->
-      <el-form-item label="试卷名称："  prop="paperName" required>
-        <el-input v-model="form.paperName"/>
+
+      <el-form-item label="试卷名称:"  prop="paperName" required>
+        <el-input v-model="form.paperName" placeholder="请输入试卷名称"/>
       </el-form-item>
-      <el-form-item :key="index" :label="'标题'+(index+1)+'：'" required v-for="(titleItem,index) in titleItems2">
-        <el-input v-model="titleItem.questionName" style="width: 80%"/>
+      <el-form-item :key="index" :label="'大题'+(index+1)+'：'" required v-for="(titleItem,index) in titleItems2">
+        <el-input v-model="titleItem.questionName" style="width: 80%" placeholder="请输入大题名"/>
+        <!-- <el-select v-model="titleItem.questionName" @change="selectsubjectId" placeholder="大题选择">
+          <el-option v-for="item in titleItemName" :key="item.ket" :value="item.key" :label="item.value"></el-option>
+        </el-select> -->
         <el-button type="text" class="link-left" style="margin-left: 20px" size="mini" @click="addQuestion(titleItem)">
-          添加题目
+          添加试题
         </el-button>
-        <el-button type="text" class="link-left" size="mini" @click="form.titleItems.splice(index,1)">删除</el-button>
+        <!-- 修改了大题不能删除的bug -->
+        <el-button type="text" class="link-left" size="mini" @click="titleItems2.splice(index,1)">删除</el-button>
         <el-card class="exampaper-item-box" v-if="titleItem.questionItems.length!==0">
           <el-form-item :key="questionIndex" :label="'题目'+(questionIndex+1)+'：'"
                         v-for="(questionItem,questionIndex) in titleItem.questionItems" style="margin-bottom: 15px">
@@ -47,45 +49,100 @@
           </el-form-item>
         </el-card>
       </el-form-item>
-      <el-form-item label="建议时长：" prop="suggestTime" required>
+      <!-- <el-form-item label="建议时长：" prop="suggestTime" required>
         <el-input v-model="form.suggestTime" placeholder="分钟"/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="submitForm">提交</el-button>
         <el-button @click="resetForm">重置</el-button>
-        <el-button type="success" @click="addTitle">添加标题</el-button>
+        <el-button type="success" @click="addTitle">添加大题</el-button>
+        <el-button type="info" @click="addDialogVisible = true">自动组卷</el-button>
       </el-form-item>
     </el-form>
+
     <el-dialog :visible.sync="questionPage.showDialog"  width="70%">
-      <el-form :model="questionPage.queryParam" ref="queryForm" :inline="true">
+      <el-form :model="questionPage.queryParam" :inline="true">
         <el-form-item label="ID：">
-          <el-input v-model="questionPage.queryParam.id"  clearable></el-input>
+          <el-input v-model="questionPage.queryParam.id" ref ="questionId" clearable></el-input>
         </el-form-item>
+        <el-button type="primary" @click="queryForm">查询</el-button>
+        &nbsp;
         <el-form-item label="题型：">
-          <el-select v-model="questionPage.queryParam.type" clearable>
+          <el-select v-model="questionPage.queryParam.type" @change="selecttype" clearable>
             <el-option v-for="item in questionTypeEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="queryForm">查询</el-button>
                     <el-button type="primary" @click="RamdomSelectQuestion">随机出题</el-button>
 
         </el-form-item>
       </el-form>
-      <el-table :data="questionPage.tableData"
+      <el-table :data="questionPage.tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
                 @selection-change="handleSelectionChange" border fit highlight-current-row style="width: 100%">
-        <el-table-column type="selection" width="35"></el-table-column>
+                <!-- 宽度不够显示有... -->
+        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="questionId" label="Id" width="60px"/>
-        <el-table-column prop="type" label="题型"  width="70px"/>
-        <el-table-column prop="questionName" label="题干" />
+        <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="score" label="分数" width="70px"/>
+        <el-table-column label="操作" align="center" width="220px">
+        <template slot-scope="{row}">
+          <el-button size="mini"   @click="showQuestion(row)">预览</el-button>
+        </template>
+      </el-table-column>
       </el-table>
-      <pagination v-show="questionPage.total>0" :total="questionPage.total"
+      <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange" 
+            :current-page="currentPage" 
+            :page-sizes="[2,5,10,20]" 
+            :page-size="pageSize" 
+            layout="total, sizes, prev, pager, next, jumper" 
+            :total="questionPage.tableData.length">
+            </el-pagination>
+      <!-- <pagination v-show="questionPage.total>0" :total="questionPage.total"
                   :page.sync="questionPage.queryParam.pageIndex" :limit.sync="questionPage.queryParam.pageSize"
-                  @pagination="search"/>
+                  @pagination="search"/> -->
       <span slot="footer" class="dialog-footer">
           <el-button @click="questionPage.showDialog = false">取 消</el-button>
           <el-button type="primary" @click="confirmQuestionSelect">确定</el-button>
      </span>
+    </el-dialog>
+
+            <!-- 自动组卷对话框 -->
+    <el-dialog title="自动组卷" :visible.sync="addDialogVisible" width="50%" @close="addDialogClosed">
+      <el-form :model="addForm" :rules="addFormRules"
+        ref="addFormRef" label-width="70px">
+        <el-form-item label="试卷名" prop="paperName">
+          <el-input v-model="addForm.paperName" placeholder="请输入试卷名" ></el-input>
+        </el-form-item>
+        <el-form-item label="学科" prop="courseId">
+          <el-select v-model="addForm.courseId" placeholder="学科" @change="selectsubjectId" 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="grade">
+          <el-select v-model="addForm.grade" 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="one">
+          <el-input v-model="addForm.one" placeholder="请输入选择题数量" ></el-input>
+        </el-form-item>
+        <el-form-item label="判断题" prop="two">
+          <el-input v-model="addForm.two" placeholder="请输入判断题数量" ></el-input>
+        </el-form-item>
+        <el-form-item label="问答题" prop="three">
+          <el-input v-model="addForm.three" placeholder="请输入问答题数量" ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addPaperAut">确 定</el-button>
+      </span>
+    </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>
   </div>
 </template>
@@ -97,6 +154,8 @@ import Pagination from '@/components/Pagination'
 import QuestionShow from '@/components/Show'
 import examPaperApi from '@/api/examPaper'
 import questionApi from '@/api/question'
+import { onMounted } from 'vue'
+import { form } from '@/Utils/request copy'
 
 export default {
   components: { Pagination, QuestionShow },
@@ -104,105 +163,132 @@ export default {
     return {
       idList:[],
             questionItems: [
-                       {
-                        "id": 7,   //题目id
-                        "type": 5,  //题目类型
-                        "subjectId": 1,  //学科
-                        "title": "这是简单题", //题干
-                        "gradeLevel": 1, //年级
-                        "items": [], //题目选项
-                        "analyze": "咏鹅可以带拼音",  //解析
-                        "correctArray": null,  //标答数组
-                        "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
-                        "score": "10",  //题目分数
-                        "difficult": 3,  //难度
-                        "itemOrder": 1  //题序
-                    },
+                    //    {
+                    //     "id": 7,   //题目id
+                    //     "type": 5,  //题目类型
+                    //     "subjectId": 1,  //学科
+                    //     "title": "这是简单题", //题干
+                    //     "gradeLevel": 1, //年级
+                    //     "items": [], //题目选项
+                    //     "analyze": "咏鹅可以带拼音",  //解析
+                    //     "correctArray": null,  //标答数组
+                    //     "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+                    //     "score": "10",  //题目分数
+                    //     "difficult": 3,  //难度
+                    //     "itemOrder": 1  //题序
+                    // },
                 ],
-        res:   {
-                        "id": 9,      //题目id
-                        "questionType": 5,  //题型
-                        "subjectId": 1,  //学科
-                        "title": "默写weqwe咏鹅",  //标题
-                        "gradeLevel": 1,  //年级
-                        "items": [],  //选项
-                        "analyze": "咏鹅可以带拼音",  //解析
-                        "correctArray": null,  //标答
-                        "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
-                        "score": "10", //分数
-                        "difficult": 3,  //难度
-                        "itemOrder": 1  //顺序
-                    },
+        // res:   {
+        //                 "id": 9,      //题目id
+        //                 "questionType": 5,  //题型
+        //                 "subjectId": 1,  //学科
+        //                 "title": "默写weqwe咏鹅",  //标题
+        //                 "gradeLevel": 1,  //年级
+        //                 "items": [],  //选项
+        //                 "analyze": "咏鹅可以带拼音",  //解析
+        //                 "correctArray": null,  //标答
+        //                 "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+        //                 "score": "10", //分数
+        //                 "difficult": 3,  //难度
+        //                 "itemOrder": 1  //顺序
+        //             },
+    addDialogVisible: false ,// 对话框显示
      titleItems2:[],
-    
+     addForm:[],
+     addFormRules:[],
+     addForm:{
+        id: null,
+        grade:null,
+        courseId: [],
+        paperType: 1,
+       // limitDateTime: [],
+        paperName:null,
+        suggestTime: null,
+         titleItems: [ ],
+     },
+     questionPagetableData: [
+      ],
+      currentPage: 1, // 当前页码
+      total: null, // 总条数
+      pageSize: 2 // 每页的数据条数
+      ,
+      questionShow: {
+        qType: 1,
+        dialog: false,
+        question: null,
+        loading: false
+      },
       form: {
-         id: null,
+        id: null,
         level: null,
         courseId: null,
         paperType: 1,
        // limitDateTime: [],
-        name:'构造的试卷名称',
+        name:null,
         suggestTime: null,
          titleItems: 
          [
-                  {
-                "questionName": "一、选择题",  //试卷标题
-                "questionItems": [
-                       {
-                        "id": 7,   //题目id
-                        "questionType": 1,  //题目类型
-                        "subjectId": 1,  //学科
-                        "title": ",.,.,默fsdfs写hghgh咏鹅", //题干
-                        "gradeLevel": 1, //年级
-                        "items": [
-                                {
-                                    "prefix": "A",
-                                    "content": "ererwe",
-                                    "score": null,
-                                    "itemUuid": null
-                                    }, 
-                                    {
-                                    "prefix": "",
-                                    "content": "ererwe",
-                                    "score": null,
-                                    "itemUuid": null
-                                    }, 
-
-
-                        ], //题目选项
-                        "analyze": "咏鹅可以带拼音",  //解析
-                        "correctArray": null,  //标答数组
-                        "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
-                        "score": "10",  //题目分数
-                        "difficult": 3,  //难度
-                        "itemOrder": 1  //题序
-                    },
-                         {
-                        "id": 7,   //题目id
-                        "questionType": 5,  //题目类型
-                        "subjectId": 1,  //学科
-                        "title": "默fsdfs写hghgh咏鹅", //题干
-                        "gradeLevel": 1, //年级
-                        "items": [], //题目选项
-                        "analyze": "咏鹅可以带拼音",  //解析
-                        "correctArray": null,  //标答数组
-                        "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
-                        "score": "10",  //题目分数
-                        "difficult": 3,  //难度
-                        "itemOrder": 1  //题序
-                    },
-                ]
-            },
+
+            //       {
+            //     "questionName": "一、选择题",  //试卷标题
+            //     "questionItems": [
+            //            {
+            //             "id": 7,   //题目id
+            //             "questionType": 1,  //题目类型
+            //             "subjectId": 1,  //学科
+            //             "title": ",.,.,默fsdfs写hghgh咏鹅", //题干
+            //             "gradeLevel": 1, //年级
+            //             "items": [
+            //                     {
+            //                         "prefix": "A",
+            //                         "content": "ererwe",
+            //                         "score": null,
+            //                         "itemUuid": null
+            //                         }, 
+            //                         {
+            //                         "prefix": "",
+            //                         "content": "ererwe",
+            //                         "score": null,
+            //                         "itemUuid": null
+            //                         }, 
+
+
+            //             ], //题目选项
+            //             "analyze": "咏鹅可以带拼音",  //解析
+            //             "correctArray": null,  //标答数组
+            //             "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+            //             "score": "10",  //题目分数
+            //             "difficult": 3,  //难度
+            //             "itemOrder": 1  //题序
+            //         },
+            //              {
+            //             "id": 7,   //题目id
+            //             "questionType": 5,  //题目类型
+            //             "subjectId": 1,  //学科
+            //             "title": "默fsdfs写hghgh咏鹅", //题干
+            //             "gradeLevel": 1, //年级
+            //             "items": [], //题目选项
+            //             "analyze": "咏鹅可以带拼音",  //解析
+            //             "correctArray": null,  //标答数组
+            //             "correct": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+            //             "score": "10",  //题目分数
+            //             "difficult": 3,  //难度
+            //             "itemOrder": 1  //题序
+            //         },
+            //     ]
+            // },
             
 
         ]
       },
       
-      subjectFilter: [       { key :'1',value:'语文'},
-      { key :'2',value:'数学'},
-      { key :'3',value:'英语'},
-      { key :'4',value:'java'},
-      { key :'5',value:'c++'},],
+      subjectFilter: [       
+      //   { key :'1',value:'语文'},
+      // { key :'2',value:'数学'},
+      // { key :'3',value:'英语'},
+      // { key :'4',value:'java'},
+      // { key :'5',value:'c++'},
+    ],
       formLoading: false,
       levelEnum:[   
     {
@@ -212,7 +298,14 @@ export default {
       { key :'4',value:'四年级'},
       { key :'5',value:'大学年级'},
       ],
-      paperTypeEnum:[      { key :'1',value:'语文'},
+    //   titleItemName:[
+    //   { key :'1',value:'单选题'},
+    //   { key :'2',value:'多选题'},
+    //   { key :'3',value:'判断题'},
+    //   { key :'4',value:'问答题'},
+    //  ],
+      paperTypeEnum:[      
+        { key :'1',value:'语文'},
       { key :'2',value:'数学'},
       { key :'3',value:'英语'},
       { key :'4',value:'java'},
@@ -257,18 +350,13 @@ export default {
       { key :'4',value:'java'},
       { key :'5',value:'c++'},
        ],
-          subjectId: 1,
+          type: null,
+          courseId: '',
           pageIndex: 1,
           pageSize: 5
         },
         listLoading: true,
-        tableData: [
-            {
-            questionName:'构造的titlle',
-            id:'9',
-            type:'1'
-            },
-            ],
+        tableData: [ ],
         total: 0
       },
       currentTitleItem:[
@@ -277,131 +365,255 @@ export default {
     }
   },
   created () {
-    
 if(typeof this.$route.query.id !== 'undefined'){
       let id = this.$route.query.id
     console.log('当前的titleItems'+this.form.titleItems)
     console.log('传进来的id :' +id)
-    this.$http.post("paper/getPaperById?id="+id).then(
+    this.$http.post("/get/paper?id="+id).then(
     re=>{
              this.form=re.data
              console.log('当前的re data'+re.data.titleItems)
-
+             this.titleItems2 = re.data.titleItems
        }
      );  
-        this.$http.post("paper/getTitleItems?id="+id).then(
-    res=>{
-             this.titleItems2=res.data
-            //  console.log('当前的titleItems'+this.form.titleItems)
-              console.log('当前的res.data.titleItems :'+res)
+    //     this.$http.post("paper/getTitleItems?id="+id).then(
+    // res=>{
+    //          this.titleItems2=res.data
+    //         //  console.log('当前的titleItems'+this.form.titleItems)
+    //           console.log('当前的res.data.titleItems :'+res)
 
-       }
-     ); 
+    //    }
+    //  ); 
    
 }
+  },
+  mounted(){
+      this.getcourseId();
+    },
+  methods: {
+        //每页条数改变时触发 选择一页显示多少行
+        handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    this.currentPage = 1;
+                    this.pageSize = val;
+                },
+                //当前页改变时触发 跳转其他页
+                handleCurrentChange(val) {
+                    console.log(`当前页: ${val}`);
+                    this.currentPage = val;
+                },
+                //将选择中的课程id赋值给form中的courseId
+    selectsubjectId(value){
+      this.form.courseId = value 
+      // alert(value)
+      // alert(this.form.courseId)
+    },
+    showQuestion (row) {
+      let _this = this
+      this.questionShow.dialog = true
+      this.questionShow.loading = true
 
+      this.$http.get("question/id?id="+row.questionId).then(
+        re=>{
+        
+        _this.questionShow.qType = re.data.type
 
+        _this.questionShow.question = re.data
+        _this.questionShow.loading = false
+            console.log("question :"+_this.questionShow.question.items)
+            console.log("type :"+re.data.questionType)
 
-  },
-  methods: {
+            console.log("type :"+_this.questionShow.qType)
+        })
+},
+    async selecttype(value){//异常请求才能显示
+      this.questionPage.tableData = [];
+      var type = value
+      var courseId = this.form.courseId
+     const {data:res} =await this.$http.get("question/courseIdortype?courseId="+courseId+"&type="+type); 
 
- async search () {
-      this.questionPage.queryParam.courseId = this.form.courseId
+    this.questionPage.listLoading = false
+      if(res!=null){
+        //  alert ("调用的结果"+res)
+            this.questionPage.tableData = res
+      }
+      },
+    async  submitForm () {
+        let _this = this
+        this.$refs.form.validate(async(valid) => {
+          if (valid) {
+        this.form.titleItems=this.titleItems2
+  
+      const {data:re} =await  this.$http.post("edit/paper",this.form);  
+       if(re!=null){
+          this.$message.success("创建成功")
+        }else{
+          this.$message.error("创建失败")
+        }
+        } else {
+          return false
+        }
+      })
+      
+    },
+  async search () {
+      // this.questionPage.queryParam.courseId = this.form.courseId
       //this.questionPage.listLoading = 
    // this.questionPage.tableData = questionPage.tableData
-    const {data:res} =await this.$http.get("question/questionList");  
+   var courseId = this.form.courseId
+    // const {data:res} =await this.$http.get("question/courseIdortype?courseId="+courseId+"&type="+type);  
+    const {data:res} =await this.$http.get("question/courseId?courseId="+courseId); 
 
    this.questionPage.listLoading = false
-    if(res!=null){
+    if(courseId!=undefined){
       //  alert ("调用的结果"+res)
            this.questionPage.tableData = res
+    }else{
+      this.$message.error("您还没有选择考试科目")
     }
     },
-     queryForm () {
-      this.questionPage.queryParam.pageIndex = 1
-      this.search()
+    async queryForm () {
+      this.questionPage.tableData = [];
+      var questionId = this.$refs.questionId.value
+      if(questionId == null){
+      this.$message.error("您还没有输入试题编号")
+      }
+      const {data:res} = await this.$http.get("question/id?id="+questionId); 
+      this.questionPage.listLoading = false
+    if(res.questionName != null){
+      //  alert ("调用的结果"+res)
+           this.questionPage.tableData.push(res)
+    }else if(res.questionId == null && questionId != null){
+      this.$message.error("该试题不存在！！请重新输入")
+    }
     },
-  async  submitForm () {
-      let _this = this
-        // const { data: res } =await this.$http.post("product?methods=allProduct1" );
-        // alert("fsdfdsf"+res)
-        //alert("看看表格"+this.form.paperType  +"年级"+this.form.level)
-      this.$refs.form.validate(async(valid) => {
-        if (valid) {
-        //   this.formLoading = true
+//   async  submitForm () {
+//       let _this = this
+//         // const { data: res } =await this.$http.post("product?methods=allProduct1" );88888888888
+//         // alert("fsdfdsf"+res)
+//         //alert("看看表格"+this.form.paperType  +"年级"+this.form.level)
+//       this.$refs.form.validate(async(valid) => {
+//         if (valid) {
+//         //   this.formLoading = true
         
-     //   this.formLoading = true
-     //alert(examPaperApi)
-      this.form.titleItems=this.titleItems2
+//      //   this.formLoading = true
+//      //alert(examPaperApi)
+//       this.form.titleItems=this.titleItems2
   
-//--------------------------------
-      const {data:re} =await  this.$http.post("edit/paper",this.form);  
-        // alert(re)
-       // alert("api调用成功")
-        if(re!=null){
-            
-        }
-            // if (re.code === 1) {
+// //--------------------------------
+//       const {data:re} =await  this.$http.post("edit/paper",this.form);  
+//         // alert(re)
+//        // alert("api调用成功")
+//        if(re!=null){
+//           this.$message.success(re.message)
+//         }else{
+//           this.$message.error(re.message)
+//         }
+//             // if (re.code === 1) {
                    
-            //   _this.$message.success(re.message)
-            //   _this.delCurrentView(_this).then(() => {
-            //     _this.$router.push('/exam/paper/list')
-            //   })
-            // } else {
-            //   //  alert("api调用失败")
-            //   _this.$message.error(re.message)
-            //   this.formLoading = false
-            // }
+//             //   _this.$message.success(re.message)
+//             //   _this.delCurrentView(_this).then(() => {
+//             //     _this.$router.push('/exam/paper/list')
+//             //   })
+//             // } else {
+//             //   //  alert("api调用失败")
+//             //   _this.$message.error(re.message)
+//             //   this.formLoading = false
+//             // }
        
-        } else {
-          return false
+//         } else {
+//           return false
+//         }
+//       })
+//     },
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
+      },
+    //zjx 2023/5/8
+    addPaperAut(){
+        this.$refs.addFormRef.validate(async valid =>{
+        console.log(valid);
+        if( !valid ) return;
+        // 发起请求
+        const {data:res} = await this.$http.post("/addPaperAut",this.addForm);
+       //res后台返回值
+        if(res == "创建成功"){
+            this.$message.success(res);
+        }else{
+          this.$message.error(res);
         }
+      
+        //隐藏
+        this.addDialogVisible = false;
+        // this.search();
       })
     },
+    addDialogClosed(){
+      this.$refs.addFormRef.resetFields();// 重置表单项
+    },
     addTitle () {
+      
       this.titleItems2.push({
-        questionName: '构造的questionName',
-
+        questionName: '',
         // questionItems: []  //这是原来的
-       questionItems:[{
+       questionItems:[
+                    // {
+                    //     "questionId": null,      //题目id
+                    //     "type": 3,  //题型
+                    //     "courseId": 1,  //学科
+                    //     "questionName": "这是简答题",  //标题
+                    //     // "gradeLevel": 1,  //年级
+                    //     "items": [],  //选项
+                    //     "detail": "这是解答",  //解析
+                    //     "correctArray": null,  //标答
+                    //     "answer": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+                    //     "score": "10", //分数
+                    //     "difficult": 3,  //难度
+                    //     "itemOrder": 1  //顺序
+                    // },
+                    // {
                         
-                        "questionId": 9,      //题目id
-                        "type": 5,  //题型
-                        "courseId": 1,  //学科
-                        "questionName": "这是简答题",  //标题
-                        // "gradeLevel": 1,  //年级
-                        "items": [],  //选项
-                        "detail": "咏鹅可以带拼音",  //解析
-                        "correctArray": null,  //标答
-                        "answer": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
-                        "score": "10", //分数
-                        "difficult": 3,  //难度
-                        "itemOrder": 1  //顺序
-                    },
-                    {
-                        
-                        "questionId": 9,      //题目id
-                        "type": 1,  //题型
-                        "courseId": 1,  //学科
-                        "questionName": "这是单选或多选",  //标题
-                        // "gradeLevel": 1,  //年级
-                        "items": [
-                          {"prefix": 'A',
-                            "content":'这是选项\n'},
-                            {"prefix": 'B',
-                            "content":'这是选项\n'},
-                            {"prefix": 'C',
-                            "content":'这是选项'},
-                            {"prefix": 'D',
-                            "content":'这是选项'}
-                        ],  //选项
-                        "detail": "咏鹅可以带拼音",  //解析
-                        "correctArray": null,  //标答
-                        "answer": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
-                        "score": "10", //分数
-                        "difficult": 3,  //难度
-                        "itemOrder": 1  //顺序
-                    },]
+                    //     "questionId": null,      //题目id
+                    //     "type": 1,  //题型
+                    //     "courseId": 1,  //学科
+                    //     "questionName": "这是单选或多选",  //标题
+                    //     // "gradeLevel": 1,  //年级
+                    //     "items": [
+                    //       {"prefix": 'A',
+                    //         "content":'这是选项\n'},
+                    //         {"prefix": 'B',
+                    //         "content":'这是选项\n'},
+                    //         {"prefix": 'C',
+                    //         "content":'这是选项'},
+                    //         {"prefix": 'D',
+                    //         "content":'这是选项'}
+                    //     ],  //选项
+                    //     "detail": "这是解答",  //解析
+                    //     "correctArray": null,  //标答
+                    //     "answer": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+                    //     "score": "10", //分数
+                    //     "difficult": 3,  //难度
+                    //     "itemOrder": 1  //顺序
+                    // },
+                    // {
+                    //     "questionId": null,      //题目id
+                    //     "type": 4,  //题型
+                    //     "courseId": 1,  //学科
+                    //     "questionName": "这是判断题",  //标题
+                    //     // "gradeLevel": 1,  //年级
+                    //     "items": [],  //选项
+                    //     "detail": "这是解答",  //解析
+                    //     "correctArray": null,  //标答
+                    //     "answer": "鹅鹅鹅， 曲项向天歌。 白毛浮绿水， 红掌拨清波。",  //标答
+                    //     "score": "10", //分数
+                    //     "difficult": 3,  //难度
+                    //     "itemOrder": 1  //顺序
+                    // },
+                  ]
       })
     },
     addQuestion (titleItem) {
@@ -499,6 +711,7 @@ if(typeof this.$route.query.id !== 'undefined'){
       }
       this.form.id = lastId
     },
+
     ...mapActions('exam', { initSubject: 'initSubject' }),
     ...mapActions('tagsView', { delCurrentView: 'delCurrentView' })
   },
diff --git a/src/components/exam/examList.vue b/src/components/exam/examList.vue
index fa0bfa5..01ce07a 100644
--- a/src/components/exam/examList.vue
+++ b/src/components/exam/examList.vue
@@ -1,321 +1,247 @@
 <template>
-  <div>
-    <!-- 面包屑导航  这个应该写成一个模板的 --> 
-    <navigation-bar></navigation-bar>
-    <el-card>
-      <el-row :gutter="25">
-        <el-col :span="10">
-          <!-- 搜索添加 -->
-          <el-input placeholder="请输入搜索内容" v-model="queryInfo.query" clearable @clear="getUserList">
-            <el-button slot="append" icon="el-icon-search" @click="getUserList"></el-button>
-          </el-input>
-        </el-col>
-
-        <el-col :span="4">
-          <el-button type="primary" @click="addDialogVisible = true">查询试卷</el-button>
-        </el-col>
-      </el-row>
-      <!-- 用户列表 -->
-      <el-table :data="productList" border stripe>
-        <!-- <el-table-column type="index"></el-table-column> -->
-        <el-table-column label="id" prop="id"></el-table-column>
-        <el-table-column label="学科" prop="productName"></el-table-column>
-        <el-table-column label="试卷名称" prop="price"></el-table-column>
-        <el-table-column label="班级" prop="productDate"></el-table-column>
-  
-
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <!-- 修改 -->
-            <el-button type="primary" icon="el-icon-edit" size="mini" @click="$router.push({path:'/createExam',query:{id:scope.row.id}})"></el-button>
-            <!-- 删除 -->
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteUser(scope.row.id)"></el-button>
-            <!-- 权限 -->
-            <el-tooltip effect="dark" content="分配权限" placement="top-start" :enterable="false">
-              <el-button type="warning" icon="el-icon-setting" size="mini"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 分页 -->
-      <el-pagination
-         @size-change="handleSizeChange" 
-        @current-change="handleCurrentChange"
-        :current-page="queryInfo.pageNum"
-        :page-sizes="[1, 2, 5, 100]"
-        :page-size="queryInfo.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
-    </el-card>
-
-    <!-- 创建新用户对话框 -->
-    <el-dialog title="添加试卷" :visible.sync="addDialogVisible" width="50%"
-    @close="addDialogClosed">
-      <!-- 内容主体区域 -->
-      <el-form :model="addForm" :rules="addFormRules"
-        ref="addFormRef" label-width="70px">
-        <!-- 用户名 -->
-        <el-form-item label="试卷名称" prop="productName">
-          <el-input v-model="addForm.productName"></el-input>
-        </el-form-item>
-        <!-- 密码 -->
-        <el-form-item label="班级" prop="price">
-          <el-input v-model="addForm.price"></el-input>
-        </el-form-item>
-         <el-form-item label="id" prop="info">
-          <el-input v-model="addForm.info"></el-input>
-        </el-form-item>
-         <el-form-item label="创建日期" prop="productDate">
-          <el-input v-model="addForm.productDate"></el-input>
-        </el-form-item>
-      
-   
-      </el-form>
-      <!-- 内容底部区域 -->
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="addDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addProduct">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 修改用户对话框 -->
-    <el-dialog title="修改用户信息" :visible.sync="editDialogVisible" width="50%" @colse="editDialogClosed">
-       <el-form :model="editForm" :rules="editFormRules" ref="editFormRef" label-width="70px">
-       <el-form-item label="试卷名称" prop="productName">
-          <el-input v-model="editForm.productName"></el-input>
-        </el-form-item>
-        <!-- 密码 -->
-        <el-form-item label="班级" prop="price">
-          <el-input v-model="editForm.price"></el-input>
-        </el-form-item>
-         <el-form-item label="学科" prop="info">
-          <el-input v-model="editForm.info"></el-input>
-        </el-form-item>
-         <el-form-item label="日期" prop="productDate">
-          <el-input v-model="editForm.productDate"></el-input>
-        </el-form-item>
-        <el-form-item label="货号" prop="id">
-          <el-input v-model="editForm.id"></el-input>
-        </el-form-item>
-         <el-form-item label="发布状态" prop="state">
-          <el-input v-model="editForm.state"></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="editDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="editUserInfo">确 定</el-button>
-      </span>
+  <div class="app-container">
+    <el-form :model="queryParam" ref="queryForm" :inline="true">
+      <el-form-item label="试卷ID：" >       
+          <el-input v-model="queryParam.id" ref="paperId" width="30px" placeholder="请输入试卷Id" clearable></el-input>    
+      </el-form-item>
+      <el-button type="primary" @click="selectpaperId">查询</el-button>
+      &nbsp;
+      <el-form-item label="年级：">
+        <el-select v-model="queryParam.level" 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="学科：">
+        <el-select v-model="queryParam.subjectId" placeholder="学科" @change="selectsubjectId" 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>
+        <el-button type="primary" @click="submitForm">查询所有试卷</el-button>
+        <el-popover placement="bottom" trigger="click">
+        
+        </el-popover>
+      </el-form-item>
+    </el-form>
+      <el-table :data="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)" border fit highlight-current-row style="width: 100%">
+      <el-table-column prop="paperId" label="Id" width="90px"/>
+      <el-table-column prop="courseId" label="学科" width="120px"/>
+      <el-table-column prop="one" label="选择题数量"  width="100px"/>
+      <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="score" label="分数" width="60px"/>
+      <el-table-column prop="time" label="创建时间" width="160px"/>
+      <el-table-column label="操作" align="center" width="220px">
+        <template slot-scope="{row}">
+          <el-button size="mini"   @click="showPaper(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>
+      </el-table-column>
+    </el-table>
+    <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange" 
+            :current-page="currentPage" 
+            :page-sizes="[2,5,10,20]" 
+            :page-size="pageSize" 
+            layout="total, sizes, prev, pager, next, jumper" 
+            :total="tableData.length">
+            </el-pagination>
+    <el-dialog :visible.sync="paperShow.dialog" style="width: 100%;height: 100%">
+      <PaperShow :paper="paperShow.paper" :qLoading="paperShow.loading"/>
     </el-dialog>
   </div>
 </template>
+
 <script>
-import NavigationBar from '../views/NavigationBar.vue';
+import { mapGetters, mapState, mapActions } from 'vuex'
+import Pagination from '@/components/Pagination'
+import PaperShow from '@/components/showExam'
+
+
 export default {
-  components: { NavigationBar },
-   
-  data() {
+  components: { Pagination, PaperShow },
+  data () {
     return {
-      // 请求数据
-      queryInfo: {
-        methods: "",
-        pageNum: 1,
-        pageSize: 5
-      },
-      productList: [],// 用户列表
-     
-      total: 0, // 最大数据记录
-      addDialogVisible: false ,// 对话框显示
-      // 添加用户表单项
-      addForm: {
-        productName:'',
-        info:'',
-        id:'',
-        price:'',
-        state:'',
-        productDate:''
-    
-      }, 
-      // 控制修改用户对话框显示/隐藏
-      editDialogVisible:false,
-      // 修改用户信息
-      editForm:{
-        // productName:'',
-        // info:'',
-        // id:'',
-        // price:'',
-        // state:'',
-        // productDate:''
-      },
-      // 验证规则
-      addFormRules:{
-        productName:[
-           { required: true, message: "请输入用户名", trigger: "blur" },
-          { min: 0, max: 8, message: "长度在 5 到 8 个字符", trigger: "blur" }
-        ],
-        info:[
-           { required: true, message: "请输入密码", trigger: "blur" },
-          { min: 0, max: 8, message: "长度在 6 到 8 个字符", trigger: "blur" }
-        ],
-        id:[
-           { required: true, message: "请输入邮箱", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
-         price:[
-           { required: true, message: "请输入价格", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
-         state:[
-           { required: true, message: "请输入邮箱", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
-         productDate:[
-           { required: true, message: "请输入邮箱", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
+
+      editUrlEnum :[
+        {key :'1',
+        name:'单选题',
+        value:'question/edit/single'} ,
+         {key :'2',
+        name:'多选题',
+        value:'question/edit/mmultiple'},
+        {key :'3',
+        name:'问答题',
+        value:'question/edit/essay'},              
+        {key :'4',
+        name:'判断题',
+        value:'question/edit/judgment'},
+      ],
+
+      levelEnum:[
+      { key :'1',value:'一年级'},
+      { key :'2',value:'二年级'},
+      { key :'3',value:'三年级'},
+      { key :'4',value:'四年级'},
+      { key :'5',value:'大学年级'},
+       ] ,
+             subjectFilter: [ 
+       ] ,
+      queryParam: {
+        id: null,
+        level: null,
+        subjectId: null,
+        pageIndex: 1,
+        pageSize: 10
       },
-      // 修改用户表单验证规则
-      editFormRules:{
-          productName:[
-        { required: true, message: "请输入用户名", trigger: "blur" },
-          { min: 0, max: 15, message: "长度在 5 到 8 个字符", trigger: "blur" }
-        ],
-        info:[
-           { required: true, message: "请输入密码", trigger: "blur" },
-          { min: 0, max: 15, message: "长度在 6 到 8 个字符", trigger: "blur" }
-        ],
-        id:[
-           { required: true, message: "请输入邮箱", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
-         price:[
-           { required: true, message: "请输入价格", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
-         state:[
-           { required: true, message: "请输入邮箱", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        ],
-         productDate:[
-           { required: true, message: "请输入邮箱", trigger: "blur" },
-          { min: 0, max: 15, message: "请输入正确邮箱地址", trigger: "blur" }
-        
-          ],
+          questionType: [
+       { key :'1',value:'单选题'},
+      { key :'2',value:'多选题'},
+      { key :'3',value:'简答题'},
+      { key :'4',value:'判断题'},
+       ] ,
+
+      listLoading: true,
+      tableData: [
+      ],
+      currentPage: 1, // 当前页码
+      total: null, // 总条数
+      pageSize: 2 // 每页的数据条数
+      ,
+      paperShow: {
+        dialog: false,
+        paper: null,
+        loading: false
+      }
+    }
+  },
+    created () {
+  },
+    mounted(){
+      this.getcourseId();
+      this.search();
+    },
+  methods: {
+    //每页条数改变时触发 选择一页显示多少行
+    handleSizeChange(val) {
+                    console.log(`每页 ${val} 条`);
+                    this.currentPage = 1;
+                    this.pageSize = val;
+                },
+                //当前页改变时触发 跳转其他页
+                handleCurrentChange(val) {
+                    console.log(`当前页: ${val}`);
+                    this.currentPage = val;
+                },
+    //获取所有课程信息
+    getcourseId(){
+        this.$http.get("course/get").then(res =>{
+          console.log("加载数据成功")
+          this.subjectFilter=res.data;
+          console.log(this.subjectFilter[1].courseId)
+        })
       },
-    };
+    selectpaperId(){
+      this.tableData = [];//清空当前页数据，不如查询数会push进当前页面数据
+      var paperId = this.$refs.paperId.value;
+      //在请求执行成功后执行回调函数中的内容，回调函数处于其它函数的内部this不会与任何对象绑定，为undefined
+      this.$http.get("get/paper?id="+paperId).then(
+        re=>{
+           const res = re.data;//大题问题，查询试卷1无定义
+           if(re.data.paperId != undefined){
+            //输入不存在id传进来的是未定义，不是未空
+          this.tableData.push(res);//eleui表格是用数组来排序，如果是数据是对象，要将对象转为数组
+          console.log("加载数据成功")
+           }else{
+             this.$message.error("试卷不存在")
+             console.log("加载数据失败")
+           }
+    })
   },
-  created() {
+    selectsubjectId(value){
+      var courseId = value;
+      this.$http.get("paper/courseId?courseId="+courseId).then(
+         re=>{
+           const res = re;
+           if(res!==null){
 
-    this.getUserList();
+          this.tableData =res.data;
+                  console.log(res.list instanceof Array)
+          console.log("加载数据成功")
+           }else{
+             console.log("加载数据失败")
+           }
+    })
   },
-  methods: {
-    async getUserList() {
-      // 调用post请求
-      this.queryInfo.methods='allProduct'
-      const { data: res } = await this.$http.get("product", {
-        params: this.queryInfo
-      });
-      this.productList = res.data; // 将返回数据赋值
-      this.total = res.numbers; // 总个数
+    submitForm () {
+      this.queryParam.pageIndex = 1
+      this.search()
     },
-    // 监听pageSize改变的事件
-    handleSizeChange(newSize) {
-      this.queryInfo.pageSize = newSize;
-      this.getUserList(); // 数据发生改变重新申请数据
+    search () {
+      this.listLoading = true
+         this.$http.get("paper/get").then(
+         re=>{
+           const res = re
+           if(res!==null){
+          this.tableData =res.data
+          console.log("加载数据成功")
+           }else{
+             console.log("加载数据失败")
+           }
+         }
+     );  
     },
-    // 监听pageNum改变的事件
-    handleCurrentChange(newPage) {
-      this.queryInfo.pageNum = newPage;
-      this.getUserList(); // 数据发生改变重新申请数据
+    levelChange () {
+      var grade = this.queryParam.level
+      this.$http.get("paper/grade?grade="+grade).then(
+         re=>{
+           const res = re
+           if(res!==null){
+          this.tableData =res.data
+          console.log("加载数据成功")
+           }else{
+             console.log("加载数据失败")
+           }
+         }
+     );  
     },
-    // 修改用户状态
-    async userStateChanged(userinfo) {
-      const { data: res } = await this.$http.get(   `product?methods=updateState&id=${userinfo.id}&state=${userinfo.state}`);
-      if (res != "success") {
-        userinfo.state = !userinfo.state;
-        return this.$message.error("操作失败！！！");
-      }
-      this.$message.success("操作成功！！！");
+    addQuestion () {
+      this.$router.push('/exam/question/edit/singleChoice')
+    },
+    showPaper (row) {
+      let _this = this
+      this.paperShow.dialog = true
+      this.paperShow.loading = true
+   
+ this.$http.get("get/paper?id="+row.paperId).then(
+         re=>{
+        _this.paperShow.paper = re.data
+        _this.paperShow.loading = false
+        console.log(re.data.titleItems)
+         })
     },
-    // 监听添加用户
-    addDialogClosed(){
-      this.$refs.addFormRef.resetFields();// 重置表单项
+    editPaper (row) {
+        this.$router.push({ path: 'updateExam' ,query: { id: row.paperId }})
     },
-    // 添加用户
-    addProduct(){
-        this.$refs.addFormRef.validate(async valid =>{
-        console.log(valid);
-        if( !valid ) return;
-        if(this.addForm==null){
-            return this.$message.error("kong！");
-        }
-        // 发起请求
-        const {data:res} = await this.$http.post("product?methods=addProduct",this.addForm);
-        if (res != "success") {
-        // userinfo.state = !userinfo.state;
-        return this.$message.error("操作失败！！！");
+    deletePaper (row) {
+      this.$http.get("paper/delete/"+row.paperId).then(re => {
+        if (re.data != null) {
+          this.$message.success(re.message)
+        } else {
+          this.$message.error(re.message)
         }
-        this.$message.success("操作成功！！！");
-        //隐藏
-        this.addDialogVisible = false;
-        this.getUserList();
       })
+      this.search()
     },
-    // 展示修改框
-    // async showEditDialog(id){
-       
-
-    // //   this.$router.push('/createExam')
-
-    // //     const {data:res} = await this.$http.get("product?methods=getUpdateProduct&id="+id);
-    // //     // if (res != "success") {
-    // //     // userinfo.state = !userinfo.state;
-    // //     // return this.$message.error("操作失败！！！");
-    // //     // }
-    // //     // this.$message.success("操作成功！！！");
-
-    // //     // this.editForm = res;
-    // //     // this.editDialogVisible = true;
-    // // },
-    // // 关闭窗口
-    // // editDialogClosed(){
-    // //   this.$refs.editFormRef.resetFields();
-    // },
-    // 确认修改
-    editUserInfo(){
-      this.$refs.editFormRef.validate(async valid =>{
-        console.log(valid);
-        if( !valid ) return;
-        // 发起请求
-        const {data:res} = await this.$http.post("product?methods=editProduct",this.editForm);
-        console.log(res);
-         if (res != "success") return this.$message.error("操作失败！！！");
-        this.$message.success("操作成功！！！");
-        //隐藏
-        this.editDialogVisible = false;
-        this.getUserList();
-      });
+    questionTypeFormatter (row, column, cellValue, index) {
+      return this.enumFormat(this.questionType, cellValue)
     },
-    // 删除按钮
-    async deleteUser(id){
-      // 弹框
-      const confirmResult = await this.$confirm('此操作将永久删除该用户, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).catch(err => err)
-      // 成功删除为confirm 取消为 cancel
-      if(confirmResult!='confirm'){
-        return this.$message.info("已取消删除");
-      }
-      const {data:res} = await this.$http.get("product?methods=deleteProduct&id="+id);
-      if (res != "success") {
-        return this.$message.error("操作失败！！！");
-      }
-      this.$message.success("操作成功！！！");
-      this.getUserList();
+    subjectFormatter (row, column, cellValue, index) {
+      return this.subjectEnumFormat(cellValue)
     },
   }
-};
+
+}
 </script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
diff --git a/src/components/exam/updateExam.vue b/src/components/exam/updateExam.vue
new file mode 100644
index 0000000..c6efb70
--- /dev/null
+++ b/src/components/exam/updateExam.vue
@@ -0,0 +1,506 @@
+<template>
+    <div class="app-container">
+      <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
+        <el-form-item label="试卷Id:"  prop="paperId" required>
+          <el-input v-model="form.paperId" />
+        </el-form-item>
+        <el-form-item label="试卷名称:"  prop="paperName" required>
+          <el-input v-model="form.paperName" placeholder="请输入试卷名称"/>
+        </el-form-item>
+        <el-form-item :key="index" :label="'大题'+(index+1)+'：'" required v-for="(titleItem,index) in titleItems2">
+          <el-input v-model="titleItem.questionName" style="width: 80%" placeholder="请输入大题名"/>
+          <!-- <el-select v-model="titleItem.questionName" @change="selectsubjectId" placeholder="大题选择">
+            <el-option v-for="item in titleItemName" :key="item.ket" :value="item.key" :label="item.value"></el-option>
+          </el-select> -->
+          <el-button type="text" class="link-left" style="margin-left: 20px" size="mini" @click="addQuestion(titleItem)">
+            添加试题
+          </el-button>
+          <!-- 修改了大题不能删除的bug -->
+          <el-button type="text" class="link-left" size="mini" @click="titleItems2.splice(index,1)">删除</el-button>
+          <el-card class="exampaper-item-box" v-if="titleItem.questionItems.length!==0">
+            <el-form-item :key="questionIndex" :label="'题目'+(questionIndex+1)+'：'"
+                          v-for="(questionItem,questionIndex) in titleItem.questionItems" style="margin-bottom: 15px">
+              <el-row>
+                        <!-- <el-input ></el-input>  questionItems-->
+                <el-col :span="23">
+                  <QuestionShow :qType="questionItem.type" :question="questionItem"/>
+                </el-col>
+                <el-col :span="1">
+                  <el-button type="text" size="mini" @click="titleItem.questionItems.splice(questionIndex,1)">删除
+                  </el-button>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-card>
+        </el-form-item>
+        <!-- <el-form-item label="建议时长：" prop="suggestTime" required>
+          <el-input v-model="form.suggestTime" placeholder="分钟"/>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="submitForm">修改</el-button>
+          <el-button type="success" @click="addTitle">添加大题</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-dialog :visible.sync="questionPage.showDialog"  width="70%">
+        <el-form :model="questionPage.queryParam" :inline="true">
+          <el-form-item label="ID：">
+            <el-input v-model="questionPage.queryParam.id" ref ="questionId" clearable></el-input>
+          </el-form-item>
+          <el-button type="primary" @click="queryForm">查询</el-button>
+          &nbsp;
+          <el-form-item label="题型：">
+            <el-select v-model="questionPage.queryParam.type" @change="selecttype" clearable>
+              <el-option v-for="item in questionTypeEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+                      <el-button type="primary" @click="RamdomSelectQuestion">随机出题</el-button>
+  
+          </el-form-item>
+        </el-form>
+        <el-table :data="questionPage.tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
+                  @selection-change="handleSelectionChange" border fit highlight-current-row style="width: 100%">
+                  <!-- 宽度不够显示有... -->
+          <el-table-column type="selection" width="55"></el-table-column>
+          <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="score" label="分数" width="70px"/>
+          <el-table-column label="操作" align="center" width="220px">
+          <template slot-scope="{row}">
+            <el-button size="mini"   @click="showQuestion(row)">预览</el-button>
+          </template>
+        </el-table-column>
+        </el-table>
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange" 
+              :current-page="currentPage" 
+              :page-sizes="[2,5,10,20]" 
+              :page-size="pageSize" 
+              layout="total, sizes, prev, pager, next, jumper" 
+              :total="questionPage.tableData.length">
+              </el-pagination>
+        <!-- <pagination v-show="questionPage.total>0" :total="questionPage.total"
+                    :page.sync="questionPage.queryParam.pageIndex" :limit.sync="questionPage.queryParam.pageSize"
+                    @pagination="search"/> -->
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="questionPage.showDialog = false">取 消</el-button>
+            <el-button type="primary" @click="confirmQuestionSelect">确定</el-button>
+       </span>
+      </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>
+    </div>
+  </template>
+  
+  <script>
+  
+  import { mapGetters, mapState, mapActions } from 'vuex'
+  import Pagination from '@/components/Pagination'
+  import QuestionShow from '@/components/Show'
+  import examPaperApi from '@/api/examPaper'
+  import questionApi from '@/api/question'
+  import { onMounted } from 'vue'
+  import { form } from '@/Utils/request copy'
+  
+  export default {
+    components: { Pagination, QuestionShow },
+    data () {
+      return {
+        idList:[],
+              questionItems: [ ],
+      addDialogVisible: false ,// 对话框显示
+       titleItems2:[],
+       addForm:[],
+       addFormRules:[],
+       addForm:{
+          id: null,
+          grade:null,
+          courseId: [],
+          paperType: 1,
+         // limitDateTime: [],
+          paperName:null,
+          suggestTime: null,
+           titleItems: [ ],
+       },
+       questionPagetableData: [
+        ],
+        currentPage: 1, // 当前页码
+        total: null, // 总条数
+        pageSize: 2 // 每页的数据条数
+        ,
+        questionShow: {
+          qType: 1,
+          dialog: false,
+          question: null,
+          loading: false
+        },
+        form: {
+          id: null,
+          level: null,
+          courseId: null,
+          paperType: 1,
+         // limitDateTime: [],
+          name:null,
+          suggestTime: null,
+           titleItems: 
+           [
+              
+  
+          ]
+        },
+        
+        subjectFilter: [       
+        //   { key :'1',value:'语文'},
+        // { key :'2',value:'数学'},
+        // { key :'3',value:'英语'},
+        // { key :'4',value:'java'},
+        // { key :'5',value:'c++'},
+      ],
+        formLoading: false,
+        levelEnum:[   
+      {
+          key :'1',value:'一年级'},
+        { key :'2',value:'二年级'},
+        { key :'3',value:'三年级'},
+        { key :'4',value:'四年级'},
+        { key :'5',value:'大学年级'},
+        ],
+      //   titleItemName:[
+      //   { key :'1',value:'单选题'},
+      //   { key :'2',value:'多选题'},
+      //   { key :'3',value:'判断题'},
+      //   { key :'4',value:'问答题'},
+      //  ],
+        paperTypeEnum:[      
+          { key :'1',value:'语文'},
+        { key :'2',value:'数学'},
+        { key :'3',value:'英语'},
+        { key :'4',value:'java'},
+        { key :'5',value:'c++'},],
+     
+        rules: {
+          level: [
+            { required: false, message: '请选择年级', trigger: 'change' }
+          ],
+          courseId: [
+            { required: false, message: '请选择学科', trigger: 'change' }
+          ],
+          paperType: [
+            { required: false, message: '请选择试卷类型', trigger: 'change' }
+          ],
+          name: [
+            { required: false, message: '请输入试卷名称', trigger: 'blur' }
+          ],
+          suggestTime: [
+            { required: false, message: '请输入建议时长', trigger: 'blur' }
+          ]
+        },
+  
+        questionPage: {
+          //        this.questionPage.tableData = re.list
+          // this.questionPage.total = re.total
+          // this.questionPage.queryParam.pageIndex = re.pageNum
+          // this.questionPage.listLoading = false
+  
+  
+  
+          multipleSelection: [
+  
+          ],
+          showDialog: false,
+          queryParam: {
+            id: null,
+            questionType: [ 
+         { key :'1',value:'语文'},
+        { key :'2',value:'数学'},
+        { key :'3',value:'英语'},
+        { key :'4',value:'java'},
+        { key :'5',value:'c++'},
+         ],
+            type: null,
+            courseId: '',
+            pageIndex: 1,
+            pageSize: 5
+          },
+          listLoading: true,
+          tableData: [ ],
+          total: 0
+        },
+        currentTitleItem:[
+  
+        ]
+      }
+    },
+    created () {
+  if(typeof this.$route.query.id !== 'undefined'){
+        let id = this.$route.query.id
+      console.log('当前的titleItems'+this.form.titleItems)
+      console.log('传进来的id :' +id)
+      this.$http.post("/get/paper?id="+id).then(
+      re=>{
+               this.form=re.data
+               console.log('当前的re data'+re.data.titleItems)
+               this.titleItems2 = re.data.titleItems
+         }
+       );  
+      //     this.$http.post("paper/getTitleItems?id="+id).then(
+      // res=>{
+      //          this.titleItems2=res.data
+      //         //  console.log('当前的titleItems'+this.form.titleItems)
+      //           console.log('当前的res.data.titleItems :'+res)
+  
+      //    }
+      //  ); 
+     
+  }
+    },
+    mounted(){
+        this.getcourseId();
+      },
+    methods: {
+          //每页条数改变时触发 选择一页显示多少行
+          handleSizeChange(val) {
+                      console.log(`每页 ${val} 条`);
+                      this.currentPage = 1;
+                      this.pageSize = val;
+                  },
+                  //当前页改变时触发 跳转其他页
+                  handleCurrentChange(val) {
+                      console.log(`当前页: ${val}`);
+                      this.currentPage = val;
+                  },
+                  //将选择中的课程id赋值给form中的courseId
+      selectsubjectId(value){
+        this.form.courseId = value 
+        // alert(value)
+        // alert(this.form.courseId)
+      },
+      showQuestion (row) {
+        let _this = this
+        this.questionShow.dialog = true
+        this.questionShow.loading = true
+  
+        this.$http.get("question/id?id="+row.questionId).then(
+          re=>{
+          
+          _this.questionShow.qType = re.data.type
+  
+          _this.questionShow.question = re.data
+          _this.questionShow.loading = false
+              console.log("question :"+_this.questionShow.question.items)
+              console.log("type :"+re.data.questionType)
+  
+              console.log("type :"+_this.questionShow.qType)
+          })
+  },
+      async selecttype(value){//异常请求才能显示
+        this.questionPage.tableData = [];
+        var type = value
+        var courseId = this.form.courseId
+       const {data:res} =await this.$http.get("question/courseIdortype?courseId="+courseId+"&type="+type); 
+  
+      this.questionPage.listLoading = false
+        if(res!=null){
+          //  alert ("调用的结果"+res)
+              this.questionPage.tableData = res
+        }
+        },
+      async  submitForm () {
+        this.$http.get("paper/delete/"+this.form.paperId).then(re => {
+        // if (re.data != null) {
+        //   this.$message.success(re.message)
+        // } else {
+        //   this.$message.error(re.message)
+        // }
+      })
+          let _this = this
+          this.$refs.form.validate(async(valid) => {
+            if (valid) {
+          this.form.titleItems=this.titleItems2
+    
+        const {data:re} =await  this.$http.post("edit/paper",this.form);  
+         if(re!=null){
+            this.$message.success("修改成功")
+          }else{
+            this.$message.error("修改失败")
+          }
+          } else {
+            return false
+          }
+        })
+        
+      },
+    async search () {
+        // this.questionPage.queryParam.courseId = this.form.courseId
+        //this.questionPage.listLoading = 
+     // this.questionPage.tableData = questionPage.tableData
+     var courseId = this.form.courseId
+      // const {data:res} =await this.$http.get("question/courseIdortype?courseId="+courseId+"&type="+type);  
+      const {data:res} =await this.$http.get("question/courseId?courseId="+courseId); 
+  
+     this.questionPage.listLoading = false
+      if(courseId!=undefined){
+        //  alert ("调用的结果"+res)
+             this.questionPage.tableData = res
+      }else{
+        this.$message.error("您还没有选择考试科目")
+      }
+      },
+      async queryForm () {
+        this.questionPage.tableData = [];
+        var questionId = this.$refs.questionId.value
+        if(questionId == null){
+        this.$message.error("您还没有输入试题编号")
+        }
+        const {data:res} = await this.$http.get("question/id?id="+questionId); 
+        this.questionPage.listLoading = false
+      if(res.questionName != null){
+        //  alert ("调用的结果"+res)
+             this.questionPage.tableData.push(res)
+      }else if(res.questionId == null && questionId != null){
+        this.$message.error("该试题不存在！！请重新输入")
+      }
+      },
+      getcourseId(){
+          this.$http.get("course/get").then(res =>{
+            console.log("加载数据成功")
+            this.subjectFilter=res.data;
+            console.log(this.subjectFilter[1].courseId)
+          })
+        },
+      addDialogClosed(){
+        this.$refs.addFormRef.resetFields();// 重置表单项
+      },
+      addTitle () {
+        
+        this.titleItems2.push({
+          questionName: '',
+          // questionItems: []  //这是原来的
+         questionItems:[
+                    ]
+        })
+      },
+      addQuestion (titleItem) {
+        this.currentTitleItem = titleItem
+        this.questionPage.showDialog = true
+        this.search()
+        // this.
+      },
+      removeTitleItem (titleItem) {
+        this.titleItems.remove(titleItem)
+      },
+      removeQuestion (titleItem, questionItem) {
+        titleItem.questionItems.remove(questionItem)
+      },
+      async RamdomSelectQuestion(){
+           await this.$http.post("question/getQuestionIdList").then(
+      re=>{
+               this.idList=re.data
+         }
+     
+  
+       );  
+  
+       //mock一下数据好了  
+   console.log('当前的re idList :'+this.idList.length)
+          this.idList.forEach(id=>{
+                      console.log("遍历")
+            //以id为参数 遍历id   根据id查询到对应·的题目 然后放入questionItems当中 
+       this.$http.post("question/getQuestionItems?id="+id).then(
+           re=>{
+               const res = re
+               this.currentTitleItem.questionItems.push(res.data)
+               }
+       );  
+  
+          // if(re!=null){
+          //    _this.currentTitleItem.questionItems.push(re)
+          //  //  _this.form.titleItems.questionItems.push(re)
+          // }
+          })
+             // alert(关闭窗口)
+        this.questionPage.showDialog = false
+      },
+      confirmQuestionSelect () {
+        let _this = this
+         this.questionPage.multipleSelection.forEach (  q => {
+            console.log("遍历")
+            //以id为参数 遍历id   根据id查询到对应·的题目 然后放入questionItems当中 
+       this.$http.post("question/id/?id="+q.questionId).then(
+           re=>{
+               const res = re
+               _this.currentTitleItem.questionItems.push(res.data)
+               }
+       );  
+  
+          // if(re!=null){
+          //    _this.currentTitleItem.questionItems.push(re)
+          //  //  _this.form.titleItems.questionItems.push(re)
+          // }
+        
+      
+        })
+  
+     // alert(关闭窗口)
+        this.questionPage.showDialog = false
+     
+      },
+      levelChange () {
+        this.form.courseId = null
+        this.subjectFilter = this.subjects.filter(data => data.level === this.form.level)
+      },
+  
+      handleSelectionChange (val) {
+        this.questionPage.multipleSelection = val
+        console.log('val'+val)
+      },
+      questionTypeFormatter (row, column, cellValue, index) {
+        return this.enumFormat(this.questionTypeEnum, cellValue)
+      },
+      subjectFormatter (row, column, cellValue, index) {
+        return this.subjectEnumFormat(cellValue)
+      },
+      resetForm () {
+        let lastId = this.form.id
+        this.$refs['form'].resetFields()
+        this.form = {
+          id: null,
+          level: null,
+          courseId: null,
+          paperType: 1,
+          limitDateTime: [],
+          name: '',
+          suggestTime: null,
+          titleItems: []
+        }
+        this.form.id = lastId
+      },
+  
+      ...mapActions('exam', { initSubject: 'initSubject' }),
+      ...mapActions('tagsView', { delCurrentView: 'delCurrentView' })
+    },
+    computed: {
+      ...mapGetters('enumItem', ['enumFormat']),
+      ...mapState('enumItem', {
+        questionTypeEnum: state => state.exam.question.typeEnum,
+        paperTypeEnum: state => state.exam.examPaper.paperTypeEnum,
+        levelEnum: state => state.user.levelEnum
+      }),
+      ...mapState('exam', { subjects: state => state.subjects })
+    }
+  }
+  </script>
+  
+  <style lang="less">
+    .exampaper-item-box {
+      .q-title {
+        margin: 0px 5px 0px 5px;
+      }
+     
+    }
+  </style>
\ No newline at end of file
diff --git a/src/components/question/edit/essay.vue b/src/components/question/edit/essay.vue
index d3e9bbc..d200375 100644
--- a/src/components/question/edit/essay.vue
+++ b/src/components/question/edit/essay.vue
@@ -28,6 +28,7 @@
       </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>
@@ -138,11 +139,25 @@ export default {
     }
   },
   methods: {
+    //zjx
+    async updateForm(){
+      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请求
       this.form.courseId =1   //这里需要增加一些id的转换
             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
diff --git a/src/components/question/edit/judgment.vue b/src/components/question/edit/judgment.vue
index 7427a11..99fb129 100644
--- a/src/components/question/edit/judgment.vue
+++ b/src/components/question/edit/judgment.vue
@@ -38,6 +38,7 @@
       </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>
@@ -151,13 +152,33 @@ export default {
     }
   },
   methods: {
+        //zjx
+        async updateForm(){
+      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请求
       this.form.courseId =1   //这里需要增加一些id的转换
             const { data: res } = await this.$http.post("/question/edit",this.form);
-
+            if(res != null){
+        this.$message.success("添加成功")
+      }else{
+        this.$message.error("添加失败")
+      }
     },
+    // async submitForm () {
+    //     // alert('点击了提交按钮')
+    //         // 调用post请求
+    //   this.form.courseId =1   //这里需要增加一些id的转换
+    //         const { data: res } = await this.$http.post("/question/edit",this.form);
+
+    // },
     editorReady (instance) {
       this.richEditor.instance = instance
       let currentContent = this.richEditor.object[this.richEditor.parameterName]
diff --git a/src/components/question/edit/single.vue b/src/components/question/edit/single.vue
index b4856e7..b25ee39 100644
--- a/src/components/question/edit/single.vue
+++ b/src/components/question/edit/single.vue
@@ -37,6 +37,7 @@
       </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>
@@ -152,39 +153,59 @@ export default {
     }
   },
   methods: {
+        //zjx
+        async updateForm(){
+      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请求
       this.form.courseId =1   //这里需要增加一些id的转换
             const { data: res } = await this.$http.post("/question/edit",this.form);
+            if(res != null){
+        this.$message.success("添加成功")
+      }else{
+        this.$message.error("添加失败")
+      }
+    },
+    // async submitForm () {
+    //     // alert('点击了提交按钮')
+    //         // 调用post请求
+    //   this.form.courseId =1   //这里需要增加一些id的转换
+    //         const { data: res } = await this.$http.post("/question/edit",this.form);
       
 
 
-      // this.$refs.form.validate( async (valid) => {
-      //   if (valid) {
-      //    // this.formLoading = true
-      // const {data:re} =await  this.$http.post("question/edit",this.form);  
-      //     // questionApi.edit(this.form).then(re => {
-      //     //   if (re.code === 1) {
-      //     //     _this.$message.success(re.message)
+    //   // this.$refs.form.validate( async (valid) => {
+    //   //   if (valid) {
+    //   //    // this.formLoading = true
+    //   // const {data:re} =await  this.$http.post("question/edit",this.form);  
+    //   //     // questionApi.edit(this.form).then(re => {
+    //   //     //   if (re.code === 1) {
+    //   //     //     _this.$message.success(re.message)
 
 
 
-      //     //     _this.delCurrentView(_this).then(() => {
-      //     //       _this.$router.push('/exam/question/list')
-      //     //     })
-      //     //   } else {
-      //     //     _this.$message.error(re.message)
-      //     //     this.formLoading = false
-      //     //   }
-      //     // }).catch(e => {
-      //     //   this.formLoading = false
-      //     // })
-      //   } else {
-      //     return false
-      //   }
-      // })
-    },
+    //   //     //     _this.delCurrentView(_this).then(() => {
+    //   //     //       _this.$router.push('/exam/question/list')
+    //   //     //     })
+    //   //     //   } else {
+    //   //     //     _this.$message.error(re.message)
+    //   //     //     this.formLoading = false
+    //   //     //   }
+    //   //     // }).catch(e => {
+    //   //     //   this.formLoading = false
+    //   //     // })
+    //   //   } else {
+    //   //     return false
+    //   //   }
+    //   // })
+    // },
     editorReady (instance) {
       this.richEditor.instance = instance
       let currentContent = this.richEditor.object[this.richEditor.parameterName]
diff --git a/src/components/question/questionList.vue b/src/components/question/questionList.vue
index e8a90c0..6959448 100644
--- a/src/components/question/questionList.vue
+++ b/src/components/question/questionList.vue
@@ -169,6 +169,7 @@ export default {
       },
     //zjx 2023/5/7 
     selectquestionId(){
+      this.tableData = [];//清空当前页数据，不如查询数会push进当前页面数据
       var questionId = this.$refs.questionId.value;
       this.$http.get("question/id?id="+questionId).then(
         re=>{
diff --git a/src/components/showExam.vue b/src/components/showExam.vue
new file mode 100644
index 0000000..aece811
--- /dev/null
+++ b/src/components/showExam.vue
@@ -0,0 +1,48 @@
+<template>
+    <div style="line-height:1.8">
+    <div>试卷预览</div>
+    <el-row style="text-align: center">
+      <el-form :inline="true">
+       <el-form-item  v-html="paper.paperName"></el-form-item>
+       <el-form-item  v-html='paper.score'></el-form-item>分
+      </el-form>
+      </el-row>
+
+
+      <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-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>
+          </div>
+          <br>
+          </div>
+          </div>
+      </div>
+  </div>
+
+  </template>
+  
+  <script>
+  export default {
+    name: 'PaperShow',
+    props: {
+      paper: {
+        type: Object,
+        default: function () {
+          return {}
+        }
+      },
+      qLoading: {
+        type: Boolean,
+        default: false
+      },
+    },
+    methods: {}
+  }
+  </script>
+  
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index d6881fc..1fed762 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,6 +17,7 @@ import multipleProblem from '../components/question/edit/mmultiple.vue'
 import file from'../components/File.vue'
 import essayProblem from'../components/question/edit/essay.vue'
 import judgmentProblem from'../components/question/edit/judgment.vue'
+import updateExam from'../components/exam/updateExam.vue'
 //后期还需要配置一些页面  404 之类的  还有不同权限的分配等等
 Vue.use(VueRouter)
 
@@ -47,7 +48,8 @@ const routes = [
       { path:'/readed', component: readed},
       { path:'/file', component: file},
       { path:'/essayProblem', component: essayProblem},
-      { path:'/judgmentProblem', component: judgmentProblem}
+      { path:'/judgmentProblem', component: judgmentProblem},
+      { path:'/updateExam', component: updateExam}
     ],
   }
 
diff --git a/src/store/modules/enumItem.js b/src/store/modules/enumItem.js
index 74048e4..aa14c4c 100644
--- a/src/store/modules/enumItem.js
+++ b/src/store/modules/enumItem.js
@@ -15,7 +15,7 @@ const state = {
       paperTypeEnum: [{ key: 1, value: '固定试卷' }, { key: 4, value: '时段试卷' }, { key: 6, value: '任务试卷' }]
     },
     question: {
-      typeEnum: [{ key: 1, value: '单选题' }, { key: 2, value: '多选题' }, { key: 3, value: '判断题' }, { key: 4, value: '填空题' }, { key: 5, value: '简答题' }],
+      typeEnum: [{ key: 1, value: '单选题' }, { key: 2, value: '多选题' }, { key: 3, value: '填空题' }, { key: 4, value: '判断题' }, { key: 5, value: '简答题' }],
       editUrlEnum: [{ key: 1, value: '/exam/question/edit/singleChoice', name: '单选题' },
         { key: 2, value: '/exam/question/edit/multipleChoice', name: '多选题' },
         { key: 3, value: '/exam/question/edit/trueFalse', name: '判断题' },
-- 
Gitee