diff --git a/src/components/exam/publishExam.vue b/src/components/exam/publishExam.vue
new file mode 100644
index 0000000000000000000000000000000000000000..41ed82c28126f45832f8a55b69599dbf91ec59a7
--- /dev/null
+++ b/src/components/exam/publishExam.vue
@@ -0,0 +1,309 @@
+<template>
+  <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="50px"/>
+      <el-table-column prop="score" label="分数" width="60px"/>
+      <el-table-column prop="time" label="创建时间" width="160px"/>
+      <el-table-column label="操作" align="center" width="300px">
+        <template slot-scope="{row}">
+          <el-button size="mini"   @click="showPaper(row)">预览</el-button>
+          <el-button size="mini"   @click="publish(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>
+
+
+    <!-- 创建新用户对话框 -->
+    <el-dialog title="添加用户" :visible.sync="publishDialogVisible" width="50%"
+               @close="addDialogClosed">
+      <!-- 内容主体区域 -->
+      <el-form :model="addForm" :rules="addFormRules"
+               ref="addFormRef" label-width="70px">
+        <!-- 用户名 -->
+        <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 label="时间" prop="testTime">
+          <el-input v-model="addForm.testTime"></el-input>
+        </el-form-item>
+
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="publishDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="publishExam">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapState, mapActions } from 'vuex'
+import Pagination from '@/components/Pagination'
+import PaperShow from '@/components/showExam'
+
+
+export default {
+  components: { Pagination, PaperShow },
+  data () {
+    return {
+      publishDialogVisible: false ,// 对话框显示
+
+      addForm: {
+        gradeId:'1',
+        courseId:'1',
+        testTime:'30',
+        paperId:''
+
+      },
+      // 控制修改用户对话框显示/隐藏
+      editDialogVisible:false,
+      // 修改用户信息
+      editForm:{},
+      // 验证规则
+      addFormRules:{
+
+      },
+
+
+
+
+      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
+      },
+      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: {
+
+    addDialogClosed(){
+      this.$refs.addFormRef.resetFields();// 重置表单项
+    },
+
+    //每页条数改变时触发 选择一页显示多少行
+    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("加载数据失败")
+            }
+          })
+    },
+
+
+    selectsubjectId(value){
+      console.log('课程的value：'+value)
+      this.addForm.courseId = value;
+    },
+    levelChange (key) {
+      console.log('年级的key：'+key)
+      // var grade = this.queryParam.level
+      this.addForm.gradeId = key;
+
+    },
+    submitForm () {
+      this.queryParam.pageIndex = 1
+      this.search()
+    },
+    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("加载数据失败")
+            }
+          }
+      );
+    },
+
+    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)
+          })
+    },
+    publish(row){
+      this.publishDialogVisible= true;
+      this.addForm.paperId= row.paperId;
+      console.log('试卷的id是'+row.paperId);
+    },
+    publishExam(row){
+      this.publishDialogVisible= true;
+      //弹出发布框  选择时间  班级  科目
+
+      this.$http.post("publish/paper",this.addForm).then(re => {
+        if (re.data == 1) {
+          this.$message.success("发布成功")
+        } else {
+          this.$message.error("发布失败")
+        }
+      })
+    },
+    editPaper (row) {
+      if(row.status == 1){
+        this.$message.error("该试卷已经发布，请勿修改")
+        return false
+      }
+      this.$router.push({ path: 'updateExam' ,query: { id: row.paperId }})
+    },
+    deletePaper (row) {
+      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.search()
+    },
+    questionTypeFormatter (row, column, cellValue, index) {
+      return this.enumFormat(this.questionType, cellValue)
+    },
+    subjectFormatter (row, column, cellValue, index) {
+      return this.subjectEnumFormat(cellValue)
+    },
+  }
+
+}
+</script>
diff --git a/src/components/question/questionListCopy.vue b/src/components/question/questionListCopy.vue
new file mode 100644
index 0000000000000000000000000000000000000000..16d8cf602fdbebbb61a3568fdec1c56a9c182f02
--- /dev/null
+++ b/src/components/question/questionListCopy.vue
@@ -0,0 +1,226 @@
+<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>
+      <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>
+        </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>
+      </el-form-item>
+      <el-form-item>
+        <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-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 label="操作" align="center" width="220px">
+        <template slot-scope="{row}">
+          <el-button size="mini"   @click="showQuestion(row)">预览</el-button>
+          <el-button size="mini"  @click="editQuestion(row)">编辑</el-button>
+          <el-button size="mini"  type="danger" @click="deleteQuestion(row)" class="link-left">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <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>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapState, mapActions } from 'vuex'
+import Pagination from '@/components/Pagination'
+import QuestionShow from '@/components/Show'
+
+
+export default {
+  components: { Pagination, QuestionShow },
+  data () {
+    return {
+
+      editUrlEnum :[
+        {key :'1',
+        name:'单选题',
+        value:'question/edit/single'} ,
+         {key :'2',
+        name:'多选题',
+        value:'question/edit/mmultiple'},
+      ],
+
+      levelEnum:[
+       { 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++'},
+       ] ,
+      queryParam: {
+        id: 99,
+        level: 0,
+        subjectId: null,
+        pageIndex: 1,
+        pageSize: 10
+      },
+          questionType: [
+       { key :'1',value:'单选题'},
+      { key :'2',value:'多选题'},
+      { key :'3',value:'简答题'},
+      { key :'4',value:'作文'},
+ 
+       ] ,
+
+      listLoading: true,
+      tableData: [
+
+
+      ],
+      total: 0,
+      questionShow: {
+        qType: 1,
+        dialog: false,
+        question: null,
+        loading: false
+      }
+    }
+  },
+    created () {
+   // this.initSubject()
+   // this.search()
+  },
+  methods: {
+    submitForm () {
+      this.queryParam.pageIndex = 1
+      this.search()
+    },
+    search () {
+      this.listLoading = true
+         this.$http.get("question/get").then(
+         re=>{
+           const res = re
+           if(res!==null){
+
+          this.tableData =res.data
+                  console.log(res.list instanceof Array)
+                  console.log(res.data.list)
+          console.log("加载数据成功")
+           }else{
+             console.log("加载数据失败")
+           }
+          
+             }
+     );  
+
+
+      // questionApi.pageList(this.queryParam).then(data => {
+      //   const re = data.response
+      //   this.tableData = re.list
+      //   this.total = re.total
+      //   this.queryParam.pageIndex = re.pageNum
+      //   this.listLoading = false
+      // })
+    },
+    levelChange () {
+      this.queryParam.subjectId = null
+     // this.subjectFilter = this.subjects.filter(data => data.level === this.queryParam.level)
+    },
+    addQuestion () {
+      this.$router.push('/exam/question/edit/singleChoice')
+    },
+    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)
+         })
+
+      // questionApi.select(row.id).then(re => {
+      //   _this.questionShow.qType = re.response.questionType
+      //   _this.questionShow.question = re.response
+      //   _this.questionShow.loading = false
+      // })
+    },
+    editQuestion (row) {
+
+      let url ='singleProblem'
+      this.$router.push({ path: url ,query: { id: row.questionId }})
+
+     // 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)
+        } else {
+          _this.$message.error(re.message)
+        }
+      })
+    },
+  //     enumFormat: (state) => (arrary, key) => {
+  //   return format(arrary, key)
+  // },
+    questionTypeFormatter (row, column, cellValue, index) {
+      return this.enumFormat(this.questionType, cellValue)
+    },
+    subjectFormatter (row, column, cellValue, index) {
+      return this.subjectEnumFormat(cellValue)
+    },
+  //     computed: {
+  //   ...mapGetters('enumItem', ['enumFormat']),
+  //   ...mapState('enumItem', {
+  //     questionType: state => state.exam.question.typeEnum,
+  //     editUrlEnum: state => state.exam.question.editUrlEnum,
+  //     levelEnum: state => state.user.levelEnum
+  //   }),
+  //   ...mapGetters('exam', ['subjectEnumFormat']),
+  //   ...mapState('exam', { subjects: state => state.subjects })
+  // }
+  }
+
+}
+</script>