Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/qbs

src/modules/question/components/Detail.vue

@@ -76,6 +76,9 @@
         </template>
       </el-form-item>
     </el-form>
+    <div v-if="$route.query.type === 'view'" style="text-align: center">
+      <el-button type="primary" @click="$router.back()">关闭</el-button>
+    </div>
   </div>
 </template>
 <script>

src/modules/question/components/QTypeJudgment.vue

 <template>
   <div>
-    <el-radio v-model="radio" :label=0 @change="radioChange"><i class="el-icon-check"></i></el-radio>
-    <el-radio v-model="radio" :label=1 @change="radioChange"><i class="el-icon-close"></i></el-radio>
+    <template v-for="(item, index) in option">
+      <div class="opt" :key="index">
+        <el-radio v-model="radio" :label="index" @change="radioChange">
+          <el-input v-model="item.option" style="width: 80px"></el-input>
+        </el-radio>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -32,5 +37,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/modules/question/components/QTypeSituation.vue

@@ -4,13 +4,25 @@
       <el-button type="primary" @click="drawer = true">添加子题目</el-button>
       <el-button type="primary" v-if="!!!($route.query.type === 'edit')" @click="cacheQuestion">保存主题目</el-button>
     </div>
-    <el-form :disabled="!!($route.query.type === 'view')" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+    <el-form
+      :disabled="!!($route.query.type === 'view')"
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="100px"
+      class="demo-ruleForm"
+    >
       <el-form-item label="题库范围" prop="permission">
         <el-radio v-model="ruleForm.permission" label="1">我的题库</el-radio>
         <el-radio v-model="ruleForm.permission" label="2">公共题库</el-radio>
       </el-form-item>
       <el-form-item label="题目类型" prop="question_type">
-        <el-select :disabled="!!($route.query.id)" @change="questionTypeChange" v-model="ruleForm.question_type" placeholder="请选择活题目类型">
+        <el-select
+          :disabled="!!$route.query.id"
+          @change="questionTypeChange"
+          v-model="ruleForm.question_type"
+          placeholder="请选择活题目类型"
+        >
           <el-option v-for="(item, index) in qType" :label="item.label" :value="item.value" :key="index"></el-option>
         </el-select>
       </el-form-item>
@@ -51,6 +63,9 @@
       @submitForm="submitForm"
       @cacheChidren="cacheQuestion"
     ></questions-chidren>
+    <div v-if="$route.query.type === 'view'" style="text-align: center">
+      <el-button type="primary" @click="$router.back()">关闭</el-button>
+    </div>
     <el-drawer size="90%" title="新建试题" :visible.sync="drawer" direction="rtl" :before-close="handleCloseDrawer">
       <add-chidren @haveQuestion="haveQuestion" @questionList="questionList" :dataForm="ruleForm"></add-chidren>
     </el-drawer>