diff --git a/src/components/Show.vue b/src/components/Show.vue
index 79b8208db49d465aac8fde3c253519e53e6abc97..81b3b7e196060de5fb8c579b420631ee36fc6077 100644
--- a/src/components/Show.vue
+++ b/src/components/Show.vue
@@ -1,14 +1,15 @@
 <template>
   <div style="line-height:1.8">
+    <div>题目预览</div>
     <div v-if="qType==1" v-loading="qLoading">
-      <div class="q-title" v-html="question.title"/>
+      <div class="q-title" v-html="question.questionName"/>
       <div class="q-content">
-          <span :key="item.id" v-for="item in question.items" class="q-item-contain">
+          <div :key="item.id" v-for="item in question.items" class="q-item-contain">
             <span class="q-item-prefix">{{item.prefix}}</span>
             <span>---</span>
             <span v-html="item.content" class="q-item-content"></span>
             <span></span>
-          </span>
+          </div>
       </div>
     </div>
     <div v-else-if="qType==2" v-loading="qLoading">
@@ -22,7 +23,7 @@
       </div>
     </div>
     <div v-else-if="qType==3" v-loading="qLoading">
-      <div class="q-title" v-html="question.title" style="display: inline;margin-right: 10px"/>
+      <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>
@@ -31,10 +32,10 @@
       <span>）</span>
     </div>
     <div v-else-if="qType==4" v-loading="qLoading">
-      <div class="q-title" v-html="question.title"/>
+      <div class="q-title" v-html="question.questionName"/>
     </div>
     <div v-else-if="qType==5" v-loading="qLoading">
-      <div class="q-title" v-html="question.title"/>
+      <div class="q-title" v-html="question.questionName"/>
     </div>
     <div v-else>
     </div>
diff --git a/src/components/exam/editExam.vue b/src/components/exam/editExam.vue
index b10699c20ff7548d5e034f36924fb202e2cc4f91..1a7e453e2ffd65d42e04915b3444c6b9b23c6b6f 100644
--- a/src/components/exam/editExam.vue
+++ b/src/components/exam/editExam.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
-      <el-form-item label="年级：" prop="level" required>
-        <el-select v-model="form.level" placeholder="年级"  @change="levelChange">
+      <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="subjectId" required>
-        <el-select v-model="form.subjectId" placeholder="学科">
+      <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-select>
@@ -22,11 +22,11 @@
                         range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item> -->
-      <el-form-item label="试卷名称："  prop="name" required>
-        <el-input v-model="form.name"/>
+      <el-form-item label="试卷名称："  prop="paperName" required>
+        <el-input v-model="form.paperName"/>
       </el-form-item>
       <el-form-item :key="index" :label="'标题'+(index+1)+'：'" required v-for="(titleItem,index) in titleItems2">
-        <el-input v-model="titleItem.name" style="width: 80%"/>
+        <el-input v-model="titleItem.questionName" style="width: 80%"/>
         <el-button type="text" class="link-left" style="margin-left: 20px" size="mini" @click="addQuestion(titleItem)">
           添加题目
         </el-button>
@@ -35,9 +35,9 @@
           <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> -->
+                      <!-- <el-input ></el-input>  questionItems-->
               <el-col :span="23">
-                <QuestionShow :qType="questionItem.questionType" :question="questionItem"/>
+                <QuestionShow :qType="questionItem.type" :question="questionItem"/>
               </el-col>
               <el-col :span="1">
                 <el-button type="text" size="mini" @click="titleItem.questionItems.splice(questionIndex,1)">删除
@@ -62,7 +62,7 @@
           <el-input v-model="questionPage.queryParam.id"  clearable></el-input>
         </el-form-item>
         <el-form-item label="题型：">
-          <el-select v-model="questionPage.queryParam.questionType" clearable>
+          <el-select v-model="questionPage.queryParam.type" clearable>
             <el-option v-for="item in questionTypeEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
           </el-select>
         </el-form-item>
@@ -75,9 +75,9 @@
       <el-table :data="questionPage.tableData"
                 @selection-change="handleSelectionChange" border fit highlight-current-row style="width: 100%">
         <el-table-column type="selection" width="35"></el-table-column>
-        <el-table-column prop="id" label="Id" width="60px"/>
-        <el-table-column prop="questionType" label="题型"  width="70px"/>
-        <el-table-column prop="shortTitle" label="题干" />
+        <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>
       <pagination v-show="questionPage.total>0" :total="questionPage.total"
                   :page.sync="questionPage.queryParam.pageIndex" :limit.sync="questionPage.queryParam.pageSize"
@@ -106,9 +106,9 @@ export default {
             questionItems: [
                        {
                         "id": 7,   //题目id
-                        "questionType": 5,  //题目类型
+                        "type": 5,  //题目类型
                         "subjectId": 1,  //学科
-                        "title": "默fsdfs写hghgh咏鹅", //题干
+                        "title": "这是简单题", //题干
                         "gradeLevel": 1, //年级
                         "items": [], //题目选项
                         "analyze": "咏鹅可以带拼音",  //解析
@@ -138,61 +138,61 @@ export default {
       form: {
          id: null,
         level: null,
-        subjectId: null,
+        courseId: null,
         paperType: 1,
        // limitDateTime: [],
-        name:'',
+        name:'构造的试卷名称',
         suggestTime: null,
          titleItems: 
          [
-            //       {
-            //     "name": "一、选择题",  //试卷标题
-            //     "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
-            //                         }, 
+                  {
+                "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  //题序
-            //         },
-            //     ]
-            // },
+                        ], //题目选项
+                        "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  //题序
+                    },
+                ]
+            },
             
 
         ]
@@ -217,18 +217,12 @@ export default {
       { key :'3',value:'英语'},
       { key :'4',value:'java'},
       { key :'5',value:'c++'},],
-      questionTypeEnum:[ 
-       { key :'1',value:'语文'},
-      { key :'2',value:'数学'},
-      { key :'3',value:'英语'},
-      { key :'4',value:'java'},
-      { key :'5',value:'c++'},
-       ],
+   
       rules: {
         level: [
           { required: false, message: '请选择年级', trigger: 'change' }
         ],
-        subjectId: [
+        courseId: [
           { required: false, message: '请选择学科', trigger: 'change' }
         ],
         paperType: [
@@ -270,20 +264,10 @@ export default {
         listLoading: true,
         tableData: [
             {
-            shortTitle:'asdasda',
-            id:'suoiuoid',
-            questionType:'dsdasd'
+            questionName:'构造的titlle',
+            id:'9',
+            type:'1'
             },
-            //   {
-            // shortTitle:'asdasda',
-            // id:'sdsdasd',
-            // questionType:'dsdasd'
-            // },
-            //   {
-            // shortTitle:'asdasda',
-            // id:'ssdd',
-            // questionType:'dsdasd'
-            // },
             ],
         total: 0
       },
@@ -322,10 +306,10 @@ if(typeof this.$route.query.id !== 'undefined'){
   methods: {
 
  async search () {
-      this.questionPage.queryParam.subjectId = this.form.subjectId
+      this.questionPage.queryParam.courseId = this.form.courseId
       //this.questionPage.listLoading = 
    // this.questionPage.tableData = questionPage.tableData
-    const {data:res} =await this.$http.get("TextContent/getTableDate");  
+    const {data:res} =await this.$http.get("question/questionList");  
 
    this.questionPage.listLoading = false
     if(res!=null){
@@ -351,7 +335,7 @@ if(typeof this.$route.query.id !== 'undefined'){
       this.form.titleItems=this.titleItems2
   
 //--------------------------------
-      const {data:re} =await  this.$http.post("paper/insertPaper",this.form);  
+      const {data:re} =await  this.$http.post("edit/paper",this.form);  
         // alert(re)
        // alert("api调用成功")
         if(re!=null){
@@ -376,14 +360,55 @@ if(typeof this.$route.query.id !== 'undefined'){
     },
     addTitle () {
       this.titleItems2.push({
-        name: '',
-        questionItems: []
+        questionName: '构造的questionName',
+
+        // questionItems: []  //这是原来的
+       questionItems:[{
+                        
+                        "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  //顺序
+                    },]
       })
     },
     addQuestion (titleItem) {
       this.currentTitleItem = titleItem
       this.questionPage.showDialog = true
       this.search()
+      // this.
     },
     removeTitleItem (titleItem) {
       this.titleItems.remove(titleItem)
@@ -399,6 +424,8 @@ if(typeof this.$route.query.id !== 'undefined'){
    
 
      );  
+
+     //mock一下数据好了  
  console.log('当前的re idList :'+this.idList.length)
         this.idList.forEach(id=>{
                     console.log("遍历")
@@ -423,7 +450,7 @@ if(typeof this.$route.query.id !== 'undefined'){
        this.questionPage.multipleSelection.forEach (  q => {
           console.log("遍历")
           //以id为参数 遍历id   根据id查询到对应·的题目 然后放入questionItems当中 
-     this.$http.post("question/getQuestionItems?id="+q.id).then(
+     this.$http.post("question/id/?id="+q.questionId).then(
          re=>{
              const res = re
              _this.currentTitleItem.questionItems.push(res.data)
@@ -443,7 +470,7 @@ if(typeof this.$route.query.id !== 'undefined'){
    
     },
     levelChange () {
-      this.form.subjectId = null
+      this.form.courseId = null
       this.subjectFilter = this.subjects.filter(data => data.level === this.form.level)
     },
 
@@ -463,7 +490,7 @@ if(typeof this.$route.query.id !== 'undefined'){
       this.form = {
         id: null,
         level: null,
-        subjectId: null,
+        courseId: null,
         paperType: 1,
         limitDateTime: [],
         name: '',
diff --git a/src/components/question/edit/single.vue b/src/components/question/edit/single.vue
index 15255f0341db1f85e71168d67dc1107bf9e43bd7..b4856e7c3bad52b2793fb8f8846d44d5831494a2 100644
--- a/src/components/question/edit/single.vue
+++ b/src/components/question/edit/single.vue
@@ -6,13 +6,13 @@
           <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学科：" prop="subjectId" required>
-        <el-select v-model="form.subjectId" placeholder="学科" >
+      <el-form-item label="学科：" prop="courseId" required>
+        <el-select v-model="form.courseId" placeholder="学科" >
           <el-option v-for="item in subjectFilter" :key="item.key" :value="item.value" ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="题干：" prop="title" required>
-        <el-input v-model="form.title"   @focus="inputClick(form,'title')" />
+      <el-form-item label="题干：" prop="questionName" required>
+        <el-input v-model="form.questionName"   @focus="inputClick(form,'questionName')" />
       </el-form-item>
       <el-form-item label="选项：" required>
         <el-form-item :label="item.prefix" :key="item.prefix"  v-for="(item,index) in form.items"  label-width="50px" class="question-item-label">
@@ -21,8 +21,8 @@
            <el-button type="danger" size="mini" class="question-item-remove" icon="el-icon-delete" @click="questionItemRemove(index)"></el-button>
         </el-form-item>
       </el-form-item>
-      <el-form-item label="解析：" prop="analyze" required>
-        <el-input v-model="form.analyze"  @focus="inputClick(form,'analyze')" />
+      <el-form-item label="解析：" prop="detaile" required>
+        <el-input v-model="form.detail"  @focus="inputClick(form,'detail')" />
       </el-form-item>
       <el-form-item label="分数：" prop="score" required>
         <el-input-number v-model="form.score" :precision="1" :step="1" :max="100"></el-input-number>
@@ -30,8 +30,8 @@
       <el-form-item label="难度：" required>
         <el-rate v-model="form.difficult" class="question-item-rate"></el-rate>
       </el-form-item>
-      <el-form-item label="正确答案：" prop="correct" required>
-        <el-radio-group v-model="form.correct">
+      <el-form-item label="正确答案：" prop="answer" required>
+        <el-radio-group v-model="form.answer">
           <el-radio  v-for="item in form.items"  :key="item.prefix"  :label="item.prefix">{{item.prefix}}</el-radio>
         </el-radio-group>
       </el-form-item>
@@ -62,19 +62,19 @@ export default {
   data () {
     return {
       form: {
-        id: null,
-        questionType: 1,
+        questionId: null,
+        type: 1,
         gradeLevel: null,
-        subjectId: null,
-        title: '',
+        courseId: null,
+        questionName: '',
         items: [
           { prefix: 'A', content: '' },
           { prefix: 'B', content: '' },
           { prefix: 'C', content: '' },
           { prefix: 'D', content: '' }
         ],
-        analyze: '',
-        correct: '',
+        detail: '',
+        answer: '',
         score: '',
         difficult: 0
       },
@@ -129,12 +129,15 @@ export default {
   },
   created () {
     let id = this.$route.query.id
-    //alert(id)
+    
     let _this = this
     if (id && parseInt(id) !== 0) {
       //_this.formLoading = false
 
-    this.$http.post("question/getQuestionItems?id="+id).then(
+
+
+      
+    this.$http.post("question/id/?id="+id).then(
          re=>{
              const res = re
              this.form=res.data
@@ -149,32 +152,38 @@ export default {
     }
   },
   methods: {
-       submitForm () {
-      let _this = this
-      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)
+    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.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
diff --git a/src/components/question/questionList.vue b/src/components/question/questionList.vue
index 1ee7373b978247964ec7b9c890dacfcd54441a2d..16d8cf602fdbebbb61a3568fdec1c56a9c182f02 100644
--- a/src/components/question/questionList.vue
+++ b/src/components/question/questionList.vue
@@ -29,10 +29,10 @@
       </el-form-item>
     </el-form>
     <el-table :data="tableData" border fit highlight-current-row style="width: 100%">
-      <el-table-column prop="id" label="Id" width="90px"/>
-      <el-table-column prop="subjectId" label="学科" width="120px"/>
-      <el-table-column prop="questionType" label="题型"  width="70px"/>
-      <el-table-column prop="title" label="题干" show-overflow-tooltip/>
+      <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"/>
@@ -126,12 +126,12 @@ export default {
     },
     search () {
       this.listLoading = true
-         this.$http.get("question/getQuestionList").then(
+         this.$http.get("question/get").then(
          re=>{
            const res = re
            if(res!==null){
 
-          this.tableData =res.data.list
+          this.tableData =res.data
                   console.log(res.list instanceof Array)
                   console.log(res.data.list)
           console.log("加载数据成功")
@@ -164,10 +164,10 @@ export default {
       this.questionShow.dialog = true
       this.questionShow.loading = true
    
- this.$http.get("TextContent/getContent?id="+row.id).then(
+ this.$http.get("question/id?id="+row.questionId).then(
          re=>{
         
-         _this.questionShow.qType = re.data.questionType
+         _this.questionShow.qType = re.data.type
 
         _this.questionShow.question = re.data
         _this.questionShow.loading = false
@@ -186,7 +186,7 @@ export default {
     editQuestion (row) {
 
       let url ='singleProblem'
-      this.$router.push({ path: url ,query: { id: 1 }})
+      this.$router.push({ path: url ,query: { id: row.questionId }})
 
      // this.$router.push({ path: url, query: { id: row.id } })
     },
diff --git a/src/main.js b/src/main.js
index 4af997cdcfc2d86d8a6fc7324dcb96e70cfde635..cc642ae6628dd81f0083bcefe815beb9d08593e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,7 @@ Vue.prototype.$http=axios
 //axios.defaults.baseURL = 'api'
 //axios.defaults.baseURL="http://localhost:8090/"
 
-axios.defaults.baseURL="http://localhost:9000/"  //设置全局url
+axios.defaults.baseURL="http://localhost:8090/"  //设置全局url
 axios.interceptors.request.use(config => {
   console.log(config);
   // 请求头挂载信息
diff --git a/src/router/index.js b/src/router/index.js
index 7457da2f71601e2e27e3c7f88689a0a8fec8140b..76d2767618ae811a2b06bafcc1a4fd32362eedd4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -44,7 +44,6 @@ const routes = [
       { path:'/correctList', component: correctList},
       { path:'/readed', component: readed},
       { path:'/file', component: file}
-
     ],
   }