diff --git a/src/views/system/addQuestionnaire/index.vue b/src/views/system/addQuestionnaire/index.vue
index c5a2cc1..7e9d08d 100644
--- a/src/views/system/addQuestionnaire/index.vue
+++ b/src/views/system/addQuestionnaire/index.vue
@@ -19,7 +19,8 @@
                     <div class="typetitle">
                         组合题型
                     </div>
-                    <div class="texts" v-for="item in combinationQuestiontypes" :key="item.id" @click="addquestion(item)">
+                    <div class="texts" v-for="item in combinationQuestiontypes" :key="item.id"
+                        @click="addquestion(item)">
                         <img :src="item.src" alt="">
                         <div>{{ item.name }}</div>
                     </div>
@@ -36,11 +37,11 @@
                         <div class="questionnaire-title">
                             问卷标题:
                         </div>
-                        <input type="text" class="title-input">
+                        <input type="text" class="title-input" v-model="list.questionnaireName">
                         <div class="questionnaire-title" style="margin-top:30px">
                             问卷说明:
                         </div>
-                        <editor :min-height="160" class="editor" />
+                        <editor :min-height="160" class="editor" v-model="list.questionnaireDescription" />
                     </div>
                     <div class="addArea" v-if="questionlist.length == 0">
                         <div class="addtext">
@@ -51,25 +52,25 @@
                         <draggable v-model="questionlist">
                             <transition-group>
                                 <div class="questionitem" v-for="(item, index) in questionlist" :key="item.id">
-                                    <div v-if="item.questionname == '单选题'" class="item"
+                                    <div v-if="item.questionType == 'MULTIPLE_CHOICE'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options">
                                             <span>选项： </span>
                                             <div>
-                                                <div v-for="(uitem, uindex) in item.options" :key="uindex"
-                                                    style="display:flex">
-                                                    <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
+                                                <div v-for="(uitem, uindex) in item.questionSubjectOptionList"
+                                                    :key="uindex" style="display:flex;margin-bottom:10px">
+                                                    <el-input placeholder="请输入内容" v-model="uitem.optionName" clearable>
                                                     </el-input>
                                                     <el-button icon="el-icon-close" type="text"
                                                         style="color:red;margin-left:10px"
@@ -82,25 +83,25 @@
                                                 @click.stop="addoption(item)">添加选项</el-button>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '多选题'" class="item"
+                                    <div v-if="item.questionType == 'MULTIPLE_CHOICE_QUESTIONS'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options">
                                             <span>选项： </span>
                                             <div>
-                                                <div v-for="(uitem, uindex) in item.options" :key="uindex"
-                                                    style="display:flex">
-                                                    <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
+                                                <div v-for="(uitem, uindex) in item.questionSubjectOptionList"
+                                                    :key="uindex" style="display:flex;margin-bottom:10px">
+                                                    <el-input placeholder="请输入内容" v-model="uitem.optionName" clearable>
                                                     </el-input>
                                                     <el-button icon="el-icon-close" type="text"
                                                         style="color:red;margin-left:10px"
@@ -113,38 +114,38 @@
                                                 @click.stop="addoption(item)">添加选项</el-button>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '填空题'" class="item"
+                                    <div v-if="item.questionType == 'FILL_IN_THE_BLANKS'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options" style="align-items:center">
                                             <span>回答： </span>
-                                            <el-input style="margin:0;width:300px" v-model="item.option" disabled
+                                            <el-input style="margin:0;width:300px" disabled
                                                 placeholder="填写问卷时,用户需要在此输入答案" />
                                         </div>
                                         <div class="more">
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '打分题'" class="item"
+                                    <div v-if="item.questionType == 'SCORING_QUESTIONS'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options">
@@ -160,42 +161,85 @@
                                         </div>
                                         <div class="more">
                                             <el-radio-group>
-                                                <el-radio :label="1" disabled v-if="optionNumber > 0">1</el-radio>
-                                                <el-radio :label="2" disabled v-if="optionNumber > 1">2</el-radio>
-                                                <el-radio :label="3" disabled v-if="optionNumber > 2">3</el-radio>
-                                                <el-radio :label="4" disabled v-if="optionNumber > 3">4</el-radio>
-                                                <el-radio :label="5" disabled v-if="optionNumber > 4">5</el-radio>
+                                                <el-radio :label="1" disabled v-if="item.optionNumber > 0">1</el-radio>
+                                                <el-radio :label="2" disabled v-if="item.optionNumber > 1">2</el-radio>
+                                                <el-radio :label="3" disabled v-if="item.optionNumber > 2">3</el-radio>
+                                                <el-radio :label="4" disabled v-if="item.optionNumber > 3">4</el-radio>
+                                                <el-radio :label="5" disabled v-if="item.optionNumber > 4">5</el-radio>
                                             </el-radio-group>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '组合单选题'" class="item">
+                                    <div v-if="item.questionType == 'COMBINATION_RADIO_SUBJECT'" class="item">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title" style="width:85%">
                                             <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
                                             </el-input>
                                         </div>
                                         <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
                                             @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
                                             </div>
                                             <div class="title">
                                                 <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
                                                 </el-input>
                                             </div>
                                             <div class="options">
                                                 <span>选项： </span>
                                                 <div>
-                                                    <div v-for="(uitem, uindex) in aitem.options" :key="uindex"
-                                                        style="display:flex">
-                                                        <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
+                                                    <div v-for="(uitem, uindex) in aitem.questionSubjectOptionList"
+                                                        :key="uindex" style="display:flex">
+                                                        <el-input placeholder="请输入内容" v-model="uitem.optionName"
+                                                            clearable>
+                                                        </el-input>
+                                                        <el-button icon="el-icon-close" type="text"
+                                                            style="color:red;margin:10px 0 0 10px"
+                                                            @click.stop="deloption(aitem, uitem, aindex, uindex)"></el-button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="more">
+                                                <el-button size="medium" icon="el-icon-plus" type="text"
+                                                    @click.stop="addoption(aitem)">添加选项</el-button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div v-if="item.questionType == 'COMBINATION_MULTIPLE_SUBJECT'" class="item">
+                                        <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
+                                        <img src="@/assets/system/gb.png" alt="" class="delicon"
+                                            @click.stop="delquestion(item, index)">
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
+                                        </div>
+                                        <div class="title" style="width:85%">
+                                            <span>标题： </span>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
+                                            </el-input>
+                                        </div>
+                                        <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
+                                            @click.stop="selectquestion(aitem, index, item, aindex)">
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
+                                            </div>
+                                            <div class="title">
+                                                <span>题目： </span>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
+                                                </el-input>
+                                            </div>
+                                            <div class="options">
+                                                <span>选项： </span>
+                                                <div>
+                                                    <div v-for="(uitem, uindex) in aitem.questionSubjectOptionList"
+                                                        :key="uindex" style="display:flex">
+                                                        <el-input placeholder="请输入内容" v-model="uitem.optionName"
+                                                            clearable>
                                                         </el-input>
                                                         <el-button icon="el-icon-close" type="text"
                                                             style="color:red;margin-left:10px"
@@ -209,67 +253,26 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '组合多选题'" class="item">
+                                    <div v-if="item.questionType == 'COMBINATION_BLANKS_SUBJECT'" class="item">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title" style="width:85%">
                                             <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
                                             </el-input>
                                         </div>
                                         <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
                                             @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
                                             </div>
                                             <div class="title">
                                                 <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
-                                                </el-input>
-                                            </div>
-                                            <div class="options">
-                                                <span>选项： </span>
-                                                <div>
-                                                    <div v-for="(uitem, uindex) in aitem.options" :key="uindex"
-                                                        style="display:flex">
-                                                        <el-input placeholder="请输入内容" v-model="uitem.optionname" clearable>
-                                                        </el-input>
-                                                        <el-button icon="el-icon-close" type="text"
-                                                            style="color:red;margin-left:10px"
-                                                            @click.stop="deloption(aitem, uitem, aindex, uindex)"></el-button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="more">
-                                                <el-button size="medium" icon="el-icon-plus" type="text"
-                                                    @click.stop="addoption(aitem)">添加选项</el-button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div v-if="item.questionname == '组合填空题'" class="item">
-                                        <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
-                                        <img src="@/assets/system/gb.png" alt="" class="delicon"
-                                            @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
-                                        </div>
-                                        <div class="title" style="width:85%">
-                                            <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
-                                            </el-input>
-                                        </div>
-                                        <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
-                                            @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
-                                            </div>
-                                            <div class="title">
-                                                <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
                                                 </el-input>
                                             </div>
                                             <div class="options" style="align-items:center">
@@ -283,26 +286,26 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '组合打分题'" class="item">
+                                    <div v-if="item.questionType == 'COMBINATION_SCORING_SUBJECT'" class="item">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title" style="width:85%">
                                             <span>标题： </span>
-                                            <el-input placeholder="请输入标题" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入标题" v-model="item.questionDescription" clearable>
                                             </el-input>
                                         </div>
                                         <div v-for="(aitem, aindex) in item.list" :key="aitem.id" class="combination"
                                             @click.stop="selectquestion(aitem, index, item, aindex)">
-                                            <div class="questionname" style="padding-top:0">
-                                                {{ aindex + 1 }}. {{ aitem.questionname }}
+                                            <div class="questionName" style="padding-top:0">
+                                                {{ aindex + 1 }}. {{ aitem.title }}
                                             </div>
                                             <div class="title">
                                                 <span>题目： </span>
-                                                <el-input placeholder="请输入题目" v-model="aitem.title" clearable>
+                                                <el-input placeholder="请输入题目" v-model="aitem.questionName" clearable>
                                                 </el-input>
                                             </div>
                                             <div class="options">
@@ -318,47 +321,52 @@
                                             </div>
                                             <div class="more">
                                                 <el-radio-group>
-                                                    <el-radio :label="1" disabled v-if="aitem.optionNumber > 0">1</el-radio>
-                                                    <el-radio :label="2" disabled v-if="aitem.optionNumber > 1">2</el-radio>
-                                                    <el-radio :label="3" disabled v-if="aitem.optionNumber > 2">3</el-radio>
-                                                    <el-radio :label="4" disabled v-if="aitem.optionNumber > 3">4</el-radio>
-                                                    <el-radio :label="5" disabled v-if="aitem.optionNumber > 4">5</el-radio>
+                                                    <el-radio :label="1" disabled
+                                                        v-if="aitem.optionNumber > 0">1</el-radio>
+                                                    <el-radio :label="2" disabled
+                                                        v-if="aitem.optionNumber > 1">2</el-radio>
+                                                    <el-radio :label="3" disabled
+                                                        v-if="aitem.optionNumber > 2">3</el-radio>
+                                                    <el-radio :label="4" disabled
+                                                        v-if="aitem.optionNumber > 3">4</el-radio>
+                                                    <el-radio :label="5" disabled
+                                                        v-if="aitem.optionNumber > 4">5</el-radio>
                                                 </el-radio-group>
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '日期填空题'" class="item"
+                                    <div v-if="item.questionType == 'DATE_BLANKS_SUBJECT'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options" style="align-items:center">
                                             <span>回答： </span>
-                                            <el-input style="" v-model="item.option" disabled prefix-icon="el-icon-date"
+                                            <el-input style="" disabled prefix-icon="el-icon-date"
                                                 placeholder="填写问卷时,用户在此选择日期" />
                                         </div>
                                         <div class="more">
                                         </div>
                                     </div>
-                                    <div v-if="item.questionname == '时间填空题'" class="item"
+                                    <div v-if="item.questionType == 'TIME_BLANKS_SUBJECT'" class="item"
                                         @click.stop="selectquestion(item, index)">
                                         <img src="@/assets/system/yidong.png" alt="" class="delicon yidong">
                                         <img src="@/assets/system/gb.png" alt="" class="delicon"
                                             @click.stop="delquestion(item, index)">
-                                        <div class="questionname">
-                                            {{ index + 1 }}. {{ item.questionname }}
+                                        <div class="questionName">
+                                            {{ index + 1 }}. {{ item.title }}
                                         </div>
                                         <div class="title">
                                             <span>题目： </span>
-                                            <el-input placeholder="请输入题目" v-model="item.title" clearable>
+                                            <el-input placeholder="请输入题目" v-model="item.questionName" clearable>
                                             </el-input>
                                         </div>
                                         <div class="options" style="align-items:center">
@@ -381,7 +389,7 @@
                     <div class="totalscore-title" style="font-size:14px">
                         Q{{ questionitem.index + 1 }}
                         <span
-                            v-if="questionitem.type == 'danxuans' || questionitem.type == 'duoxuans' || questionitem.type == 'tiankongs' || questionitem.type == 'duoxuans' || questionitem.type == 'dafens'">
+                            v-if="questionitem.questionType == 'COMBINATION_RADIO_SUBJECT' || questionitem.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || questionitem.questionType == 'COMBINATION_BLANKS_SUBJECT' || questionitem.questionType == 'COMBINATION_SCORING_SUBJECT'">
                             - {{ questionitem.aindex + 1 }}
                         </span>: 整题分值设置
                     </div>
@@ -392,8 +400,8 @@
                     </div>
                     <div class="text" style="border:none">计分方式</div>
                     <div class="introduce">
-                        <el-select v-model="questionitem.scoringMethod" placeholder="请选择计分方式" clearable style="width:200px"
-                            disabled>
+                        <el-select v-model="questionitem.scoringMethod" placeholder="请选择计分方式" clearable
+                            style="width:200px" disabled>
                             <el-option v-for="dict in dict.type.scoring_method" :key="dict.value" :label="dict.label"
                                 :value="dict.value" />
                         </el-select>
@@ -401,9 +409,10 @@
                     <div v-if="questionitem.scoringMethod == 'NOT_UNIQUE_ANSWER' && questionitem.whetherScore">
                         <div class="text" style="border:none">各选项分值
                         </div>
-                        <div v-for="item in questionitem.options" :key="item.optionid" class="optionitem">
-                            <div class="optionname">
-                                {{ item.optionname }}
+                        <div v-for="item in questionitem.questionSubjectOptionList" :key="item.optionid"
+                            class="optionitem">
+                            <div class="optionName">
+                                {{ item.optionName }}
                             </div>
                             <el-input-number v-model="item.optionScore" :min="0" :max="100"
                                 :controls="false"></el-input-number>
@@ -415,9 +424,10 @@
                     <div v-if="questionitem.scoringMethod == 'UNIQUE_ANSWER' && questionitem.whetherScore">
                         <div class="text" style="border:none">本题答案及答案分值
                         </div>
-                        <div v-for="item in questionitem.options" :key="item.optionid" class="optionitem">
-                            <div class="optionname">
-                                <el-checkbox v-model="item.checked" :label="item.optionname"></el-checkbox>
+                        <div v-for="item in questionitem.questionSubjectOptionList" :key="item.optionid"
+                            class="optionitem">
+                            <div class="optionName">
+                                <el-checkbox v-model="item.checked" :label="item.optionName"></el-checkbox>
                             </div>
                             <el-input-number v-model="item.optionScore" :min="0" :max="100" :controls="false"
                                 :disabled="!item.checked"></el-input-number>
@@ -431,7 +441,9 @@
         </div>
     </div>
 </template>
+
 <script>
+import { getQuestion } from "@/api/system/question";
 import draggable from 'vuedraggable'
 export default {
     name: "addQuestionnaire",
@@ -445,60 +457,66 @@ export default {
             optionid: 99,
             otherQuestiontypes: [
                 {
-                    id: 'riqi',
+                    id: 'DATE_BLANKS_SUBJECT',
                     name: '日期填空题',
                     src: require('@/assets/system/riqi.png')
                 },
                 {
-                    id: 'shijian',
+                    id: 'TIME_BLANKS_SUBJECT',
                     name: '时间填空题',
                     src: require('@/assets/system/shijian.png')
                 },
             ],
             combinationQuestiontypes: [
                 {
-                    id: 'danxuans',
+                    id: 'COMBINATION_RADIO_SUBJECT',
                     name: '组合单选题',
                     src: require('@/assets/system/danxuans.png')
                 },
                 {
-                    id: 'duoxuans',
+                    id: 'COMBINATION_MULTIPLE_SUBJECT',
                     name: '组合多选题',
                     src: require('@/assets/system/duoxuans.png')
                 },
                 {
-                    id: 'tiankongs',
+                    id: 'COMBINATION_BLANKS_SUBJECT',
                     name: '组合填空题',
                     src: require('@/assets/system/tiankongs.png')
                 },
                 {
-                    id: 'dafens',
+                    id: 'COMBINATION_SCORING_SUBJECT',
                     name: '组合打分题',
                     src: require('@/assets/system/dafens.png')
                 },
             ],
             basicQuestiontypes: [
                 {
-                    id: 'danxuan',
+                    id: 'MULTIPLE_CHOICE',
                     name: '单选题',
                     src: require('@/assets/system/danxuan.png')
                 },
                 {
-                    id: 'duoxuan',
+                    id: 'MULTIPLE_CHOICE_QUESTIONS',
                     name: '多选题',
                     src: require('@/assets/system/duoxuan.png')
                 },
                 {
-                    id: 'tiankong',
+                    id: 'FILL_IN_THE_BLANKS',
                     name: '填空题',
                     src: require('@/assets/system/tiankong.png')
                 },
                 {
-                    id: 'dafen',
+                    id: 'SCORING_QUESTIONS',
                     name: '打分题',
                     src: require('@/assets/system/dafen.png')
                 },
             ],
+            list: {
+                questionnaireName: undefined,
+                questionnaireDescription: undefined,
+                questionnaireTotalScore: undefined,  //总分
+                questionSubjectList: [],
+            },
             //题目arr
             questionlist: [],
             //打分题选项
@@ -527,28 +545,74 @@ export default {
     watch: {
     },
     created() {
+        if(this.$route.query.id){
+            this.info();
+        }
     },
     methods: {
         addquestion(item) {
             this.id++
             if (this.questionlist.length > 0) {
-                if (this.questionlist[this.questionlist.length - 1].title == '') {
+                if (this.questionlist[this.questionlist.length - 1].questionName == '') {
                     return this.$message.error('请填写完在继续添加');
                 }
             }
-            if (item.id == 'danxuan') {
+            if (item.id == 'MULTIPLE_CHOICE') {
                 this.questionlist.push({
-                    type: 'danxuan',
-                    id: this.id,
-                    questionname: '单选题',
-                    title: '',
-                    options: [{
+                    questionType: 'MULTIPLE_CHOICE',
+                    id: this.id++,
+                    title: '单选题',
+                    questionName: '',
+                    questionNumber: '',
+                    //是否计分
+                    whetherScore: false,
+                    disabled: false,
+                    //计分方式
+                    scoringMethod: '',
+                    optionCount: 0, //选项个数
+                    questionSubjectOptionList: [{
                         optionid: ++this.optionid,
-                        optionname: '',
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
                         optionScore: 0,
                     }, {
                         optionid: ++this.optionid,
-                        optionname: '',
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
+                        optionScore: 0,
+                    }],
+                })
+            } else if (item.id == 'MULTIPLE_CHOICE_QUESTIONS') {
+                this.questionlist.push({
+                    questionType: 'MULTIPLE_CHOICE_QUESTIONS',
+                    id: this.id++,
+                    questionName: '',
+                    title: '多选题',
+                    questionSubjectOptionList: [{
+                        optionid: ++this.optionid,
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
+                        optionScore: 0,
+                    }, {
+                        optionid: ++this.optionid,
+                        optionName: '',
+                        optionAnswer: '',
+                        //题目名称
+                        questionName: '',
+                        //题目序号
+                        questionNumber: '',
                         optionScore: 0,
                     }],
                     //是否计分
@@ -557,74 +621,132 @@ export default {
                     //计分方式
                     scoringMethod: '',
                 })
-            } else if (item.id == 'duoxuan') {
+            } else if (item.id == 'FILL_IN_THE_BLANKS') {
                 this.questionlist.push({
-                    type: 'duoxuan',
-                    id: this.id,
-                    questionname: '多选题',
-                    title: '',
-                    options: [{
-                        optionid: ++this.optionid,
-                        optionname: '',
-                        optionScore: 0,
-                        checked: false,
-                    }, {
-                        optionid: ++this.optionid,
-                        optionScore: 0,
-                        optionname: '',
-                        checked: false,
-                    }],
-                    //是否计分
-                    whetherScore: false,
-                    disabled: false,
-                    //计分方式
-                    scoringMethod: '',
-                })
-            } else if (item.id == 'tiankong') {
-                this.questionlist.push({
-                    type: 'tiankong',
-                    id: this.id,
-                    questionname: '填空题',
-                    title: '',
-                    option: '',
+                    questionType: 'FILL_IN_THE_BLANKS',
+                    id: this.id++,
+                    questionName: '',
+                    title: '填空题',
                     //是否计分
                     whetherScore: false,
                     disabled: true,
                 })
-            } else if (item.id == 'dafen') {
+            } else if (item.id == 'SCORING_QUESTIONS') {
                 this.questionlist.push({
-                    type: 'dafen',
-                    optionNumber: undefined,
+                    questionType: 'SCORING_QUESTIONS',
                     id: this.id,
-                    questionname: '打分题',
-                    title: '',
+                    questionName: '',
+                    title: '打分题',
                     //是否计分
                     whetherScore: false,
                     disabled: false,
                     //计分方式
                     scoringMethod: '',
-                    options: [],
+                    questionSubjectOptionList: [],
                 })
-            } else if (item.id == 'danxuans') {
+            } else if (item.id == 'COMBINATION_RADIO_SUBJECT') {
                 this.questionlist.push({
-                    title: '',
-                    questionname: '组合单选题',
-                    type: 'danxuans',
+                    title: '组合单选题',
+                    questionType: 'COMBINATION_RADIO_SUBJECT',
                     id: this.id++,
+                    questionDescription: '',
                     list: [
                         {
-                            type: 'danxuans',
+                            questionType: 'COMBINATION_RADIO_SUBJECT',
                             id: this.id++,
-                            questionname: '单选题',
-                            title: '',
-                            options: [{
+                            questionName: '',
+                            title: '单选题',
+                            //是否计分
+                            whetherScore: false,
+                            disabled: false,
+                            //计分方式
+                            scoringMethod: '',
+                            questionDescription: '',
+                            questionSubjectOptionList: [{
                                 optionid: ++this.optionid,
-                                optionname: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                                optionAnswer: '',
+                                optionName: '',
                                 optionScore: 0,
                             }, {
                                 optionid: ++this.optionid,
-                                optionname: '',
+                                optionName: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                                 optionScore: 0,
+                                optionAnswer: '',
+                            }],
+                        }, {
+                            questionType: 'COMBINATION_RADIO_SUBJECT',
+                            id: this.id++,
+                            questionName: '',
+                            title: '单选题',
+                            //是否计分
+                            whetherScore: false,
+                            disabled: false,
+                            //计分方式
+                            scoringMethod: '',
+                            questionDescription: '',
+                            questionSubjectOptionList: [{
+                                optionid: ++this.optionid,
+                                optionName: '',
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                                optionScore: 0,
+                            }, {
+                                optionid: ++this.optionid,
+                                optionName: '',
+                                optionScore: 0,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                            }],
+                        },
+                    ],
+                })
+            } else if (item.id == 'COMBINATION_MULTIPLE_SUBJECT') {
+                this.questionlist.push({
+                    title: '组合多选题',
+                    questionDescription: '',
+                    questionType: 'COMBINATION_MULTIPLE_SUBJECT',
+                    id: this.id++,
+                    list: [
+                        {
+                            questionType: 'COMBINATION_MULTIPLE_SUBJECT',
+                            id: this.id++,
+                            questionName: '',
+                            questionDescription: '',
+                            title: '多选题',
+                            questionSubjectOptionList: [{
+                                optionid: ++this.optionid,
+                                optionName: '',
+                                optionScore: 0,
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
+                            }, {
+                                optionid: ++this.optionid,
+                                optionScore: 0,
+                                optionName: '',
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                             }],
                             //是否计分
                             whetherScore: false,
@@ -632,18 +754,31 @@ export default {
                             //计分方式
                             scoringMethod: '',
                         }, {
-                            type: 'danxuans',
+                            questionType: 'COMBINATION_MULTIPLE_SUBJECT',
                             id: this.id++,
-                            questionname: '单选题',
-                            title: '',
-                            options: [{
+                            questionName: '',
+                            questionDescription: '',
+                            title: '多选题',
+                            questionSubjectOptionList: [{
                                 optionid: ++this.optionid,
-                                optionname: '',
+                                optionName: '',
                                 optionScore: 0,
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                             }, {
                                 optionid: ++this.optionid,
-                                optionname: '',
                                 optionScore: 0,
+                                optionName: '',
+                                checked: false,
+                                optionAnswer: '',
+                                //题目名称
+                                questionName: undefined,
+                                //题目序号
+                                questionNumber: undefined,
                             }],
                             //是否计分
                             whetherScore: false,
@@ -653,139 +788,91 @@ export default {
                         },
                     ],
                 })
-            } else if (item.id == 'duoxuans') {
+            } else if (item.id == 'COMBINATION_BLANKS_SUBJECT') {
                 this.questionlist.push({
-                    title: '',
-                    questionname: '组合多选题',
-                    type: 'duoxuans',
+                    title: '组合填空题',
+                    questionDescription: '',
+                    questionType: 'COMBINATION_BLANKS_SUBJECT',
                     id: this.id++,
                     list: [
                         {
-                            type: 'duoxuans',
+                            questionType: 'COMBINATION_BLANKS_SUBJECT',
                             id: this.id++,
-                            questionname: '多选题',
-                            title: '',
-                            options: [{
-                                optionid: ++this.optionid,
-                                optionname: '',
-                                optionScore: 0,
-                                checked: false,
-                            }, {
-                                optionid: ++this.optionid,
-                                optionScore: 0,
-                                optionname: '',
-                                checked: false,
-                            }],
-                            //是否计分
-                            whetherScore: false,
-                            disabled: false,
-                            //计分方式
-                            scoringMethod: '',
-                        }, {
-                            type: 'duoxuans',
-                            id: this.id++,
-                            questionname: '多选题',
-                            title: '',
-                            options: [{
-                                optionid: ++this.optionid,
-                                optionname: '',
-                                optionScore: 0,
-                                checked: false,
-                            }, {
-                                optionid: ++this.optionid,
-                                optionScore: 0,
-                                optionname: '',
-                                checked: false,
-                            }],
-                            //是否计分
-                            whetherScore: false,
-                            disabled: false,
-                            //计分方式
-                            scoringMethod: '',
-                        },
-                    ],
-                })
-            } else if (item.id == 'tiankongs') {
-                this.questionlist.push({
-                    title: '',
-                    questionname: '组合填空题',
-                    type: 'tiankongs',
-                    id: this.id++,
-                    list: [
-                        {
-                            type: 'tiankongs',
-                            id: this.id++,
-                            questionname: '填空题',
-                            title: '',
-                            option: '',
+                            questionDescription: '',
+                            questionName: '',
+                            title: '填空题',
                             //是否计分
                             whetherScore: false,
                             disabled: true,
                         }, {
-                            type: 'tiankongs',
+                            questionType: 'COMBINATION_BLANKS_SUBJECT',
+                            questionDescription: '',
                             id: this.id++,
-                            questionname: '填空题',
-                            title: '',
-                            option: '',
+                            questionName: '',
+                            title: '填空题',
                             //是否计分
                             whetherScore: false,
                             disabled: true,
                         },
                     ],
                 })
-            } else if (item.id == 'dafens') {
+            } else if (item.id == 'COMBINATION_SCORING_SUBJECT') {
                 this.questionlist.push({
-                    title: '',
-                    questionname: '组合打分题',
-                    type: 'dafens',
+                    title: '组合打分题',
+                    questionName: '',
+                    questionType: 'COMBINATION_SCORING_SUBJECT',
                     id: this.id++,
                     list: [
                         {
-                            type: 'dafens',
+                            questionType: 'COMBINATION_SCORING_SUBJECT',
                             id: this.id++,
-                            questionname: '打分题',
-                            optionNumber: undefined,
-                            title: '',
+                            questionName: '',
+                            questionDescription: '',
+                            optionNumber: '',
+                            title: '打分题',
                             //是否计分
                             whetherScore: false,
                             disabled: false,
                             //计分方式
                             scoringMethod: '',
-                            options: [],
+                            questionSubjectOptionList: [],
                         }, {
-                            type: 'dafens',
+                            questionType: 'COMBINATION_SCORING_SUBJECT',
                             id: this.id++,
-                            optionNumber: undefined,
-                            questionname: '打分题',
-                            title: '',
+                            questionDescription: '',
+                            optionNumber: '',
+                            questionName: '',
+                            title: '打分题',
                             //是否计分
                             whetherScore: false,
                             disabled: false,
                             //计分方式
                             scoringMethod: '',
-                            options: [],
+                            questionSubjectOptionList: [],
                         },
                     ],
                 })
-            } else if (item.id == 'riqi') {
+            } else if (item.id == 'DATE_BLANKS_SUBJECT') {
                 this.questionlist.push({
-                    type: 'riqi',
+                    questionType: 'DATE_BLANKS_SUBJECT',
                     id: this.id++,
-                    questionname: '日期填空题',
-                    title: '',
-                    option: '',
+                    questionName: '',
+                    questionNumber: '',
+                    title: '日期填空题',
                     //是否计分
                     whetherScore: false,
+                    optionCount: 0, //选项个数
                     disabled: true,
                 })
-            } else if (item.id == 'shijian') {
+            } else if (item.id == 'TIME_BLANKS_SUBJECT') {
                 this.questionlist.push({
-                    type: 'shijian',
+                    questionType: 'TIME_BLANKS_SUBJECT',
                     id: this.id++,
-                    questionname: '时间填空题',
-                    title: '',
-                    option: '',
+                    questionNumber: '',
+                    questionName: '',
+                    title: '时间填空题',
                     //是否计分
+                    optionCount: 0, //选项个数
                     whetherScore: false,
                     disabled: true,
                 })
@@ -793,7 +880,7 @@ export default {
             if (this.questionlist.length == 1) {
                 this.questionitem = this.questionlist[0]
                 this.questionitem.index = 0
-                if (item.id == 'danxuans' || item.id == 'duoxuans' || item.id == 'tiankongs' || item.id == 'dafens') {
+                if (item.id == 'COMBINATION_RADIO_SUBJECT' || item.id == 'COMBINATION_MULTIPLE_SUBJECT' || item.id == 'COMBINATION_BLANKS_SUBJECT' || item.id == 'COMBINATION_SCORING_SUBJECT') {
                     this.questionitem = this.questionlist[0].list[0]
                     this.questionitem.index = 0
                     this.questionitem.aindex = 0
@@ -803,54 +890,56 @@ export default {
         selectquestion(item, index, topitem, aindex) {
             this.questionitem = item
             this.questionitem.index = index
-            if (this.questionitem.type == 'danxuans' || this.questionitem.type == 'duoxuans' || this.questionitem.type == 'tiankongs' || this.questionitem.type == 'dafens') {
+            if (this.questionitem.questionType == 'COMBINATION_RADIO_SUBJECT' || this.questionitem.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || this.questionitem.questionType == 'COMBINATION_BLANKS_SUBJECT' || this.questionitem.questionType == 'COMBINATION_SCORING_SUBJECT') {
                 this.questionitem.aindex = aindex
             }
         },
         delquestion(item, index) {
+            console.log(index)
             if (this.questionlist.length == 1) {
                 this.$message.error('请保留一条题目！');
                 return
             }
             if (this.questionitem.id == this.questionlist[index].id) {
                 this.questionlist.splice(index, 1)
-                let index = 0
+                let aindex = 0
                 this.questionlist.forEach(e => {
-                    e.index = index++
+                    e.index = aindex++
                 })
                 this.questionitem = this.questionlist[0]
                 this.questionitem.index = 0
             } else {
                 this.questionlist.splice(index, 1)
-                let index = 0
+                let aindex = 0
                 this.questionlist.forEach(e => {
-                    e.index = index++
+                    e.index = aindex++
                 })
             }
         },
         addoption(item) {
-            if (item.options.length == 6) {
+            if (item.questionSubjectOptionList.length == 6) {
                 return this.$message.error('多选最多为六个选项！');
             }
-            item.options.push({
+            item.questionSubjectOptionList.push({
                 optionid: ++this.optionid,
-                optionname: '',
+                optionName: '',
                 optionScore: 0,
+                optionAnswer: '',
                 checked: false,
             })
         },
         deloption(item, uitem, index, uindex) {
-            if (item.options.length > 2) {
-                item.options.splice(uindex, 1)
+            if (item.questionSubjectOptionList.length > 2) {
+                item.questionSubjectOptionList.splice(uindex, 1)
             } else {
                 this.$message.error('最少保留两条选项！');
             }
         },
         changeswitch(e) {
             if (e) {
-                if (this.questionitem.type == 'danxuan' || this.questionitem.type == 'dafen' || this.questionitem.type == 'dafens' || this.questionitem.type == 'danxuans') {
+                if (this.questionitem.questionType == 'MULTIPLE_CHOICE' || this.questionitem.questionType == 'SCORING_QUESTIONS' || this.questionitem.questionType == 'COMBINATION_SCORING_SUBJECT' || this.questionitem.questionType == 'COMBINATION_RADIO_SUBJECT') {
                     this.questionitem.scoringMethod = 'NOT_UNIQUE_ANSWER'
-                } else if (this.questionitem.type == 'duoxuan' || this.questionitem.type == 'duoxuans') {
+                } else if (this.questionitem.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || this.questionitem.questionType == 'COMBINATION_MULTIPLE_SUBJECT') {
                     this.questionitem.scoringMethod = 'UNIQUE_ANSWER'
                 }
             } else {
@@ -858,23 +947,61 @@ export default {
             }
         },
         selectchange(e, item) {
-            item.options = []
+            item.questionSubjectOptionList = []
             for (var i = 0; i < e; i++) {
-                item.options.push({
+                item.questionSubjectOptionList.push({
                     optionid: ++this.optionid,
-                    optionname: i + 1,
+                    optionName: i + 1,
                     optionScore: 0,
                     checked: false,
+                    optionAnswer: '',
+                    //题目名称
+                    questionName: undefined,
+                    //题目序号
+                    questionNumber: undefined,
                 })
             }
         },
         //保存
         upload() {
-            console.log(this.questionlist)
+            this.list.questionSubjectList = []
+            this.questionlist.forEach((e, eindex) => {
+                e.questionNumber = eindex + 1
+                if (e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_BLANKS_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') {
+                    e.list.forEach((el, elindex) => {
+                        el.questionDescription = e.questionDescription
+                        el.questionNumber = (eindex + 1) + '.' + (elindex + 1)
+                        if (e.questionType != 'COMBINATION_BLANKS_SUBJECT') {
+                            el.questionSubjectOptionList.forEach(ele => {
+                                ele.optionAnswer = ele.optionName
+                                ele.questionName = el.questionName
+                                ele.questionNumber = el.questionNumber
+                            })
+                        }
+                        this.list.questionSubjectList.push(el)
+                    })
+                } else {
+                    if (e.questionType != 'DATE_BLANKS_SUBJECT' && e.questionType != 'TIME_BLANKS_SUBJECT' && e.questionType != 'FILL_IN_THE_BLANKS') {
+                        e.questionSubjectOptionList.forEach(el => {
+                            el.optionAnswer = el.optionName
+                            el.questionName = e.questionName
+                            el.questionNumber = e.questionNumber
+                        })
+                    }
+                    this.list.questionSubjectList.push(e)
+                }
+            })
+            console.log(this.list)
+        },
+        info() {
+            getQuestion(this.$route.query.id).then(res => {
+
+            })
         },
     }
 };
 </script>
+
 <style lang="scss" scoped>
 .app-container {
     padding: 14px 0 0;
@@ -986,7 +1113,7 @@ export default {
                         }
                     }
 
-                    .questionname {
+                    .questionName {
                         padding: 20px 0 0 20px;
                     }
                 }
@@ -1009,7 +1136,7 @@ export default {
                     justify-content: space-between;
                     font-size: 14px;
 
-                    .optionname {
+                    .optionName {
                         width: 50%;
                         white-space: nowrap;
                         text-overflow: ellipsis;
diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue
index 2f4a858..a3aa82f 100644
--- a/src/views/system/question/index.vue
+++ b/src/views/system/question/index.vue
@@ -46,6 +46,7 @@
           </el-table-column>
           <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:question:edit']">编辑</el-button>
@@ -54,8 +55,8 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
   </div>
@@ -156,6 +157,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.$router.push({
+        path: "/question/addQuestionnaire",
+        query: {
+          id: row.id,
+        },
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {