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

src/modules/question/components/QuestionsChidren.vue

 <template>
   <div>
-    <el-form :rules="rules" :disabled="!!($route.query.type === 'view')" :model="data" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+    <el-form
+      :rules="rules"
+      :disabled="!!($route.query.type === 'view')"
+      :model="data"
+      ref="ruleForm"
+      label-width="100px"
+      class="demo-ruleForm"
+    >
       <div v-for="(ruleForm, index) in chidrenList" :key="index">
         <el-divider content-position="center" class="divider">子题目{{ index + 1 }}</el-divider>
-        <el-form-item style="text-align: right;" v-if="!!!($route.query.type === 'view')">
-          <el-button type="primary" v-if="!!!($route.query.type === 'edit')" @click="$emit('cacheChidren')">保存子题目</el-button>
+        <el-form-item style="text-align: right" v-if="!!!($route.query.type === 'view')">
+          <el-button type="primary" v-if="!!!($route.query.type === 'edit')" @click="$emit('cacheChidren')"
+            >保存子题目</el-button
+          >
           <el-button type="primary" @click="removeChidren(index)">删除子题目</el-button>
         </el-form-item>
         <el-form-item label="子题目类型" prop="child_question_type">
           <el-select v-model="ruleForm.child_question_type" disabled placeholder="请选择活动区域">
-            <el-option label="单选题" :value='1'></el-option>
-            <el-option label="多选题" :value='2'></el-option>
-            <el-option label="判断题" :value='6'></el-option>
-            <el-option label="问答题" :value='3'></el-option>
+            <el-option label="单选题" :value="1"></el-option>
+            <el-option label="多选题" :value="2"></el-option>
+            <el-option label="判断题" :value="6"></el-option>
+            <el-option label="问答题" :value="3"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="子题目标题" prop="question_title">
@@ -25,14 +34,22 @@
           <!-- 单选题 -->
           <radio ref="options" :option="ruleForm.question_options" v-if="ruleForm.child_question_type == 1"></radio>
           <!-- 多选题 -->
-          <checkbox ref="options" :option="ruleForm.question_options" v-if="ruleForm.child_question_type == 2"></checkbox>
+          <checkbox
+            ref="options"
+            :option="ruleForm.question_options"
+            v-if="ruleForm.child_question_type == 2"
+          ></checkbox>
           <!-- 判断题 -->
-          <judgment ref="options" :option="ruleForm.question_options" v-if="ruleForm.child_question_type == 6"></judgment>
+          <judgment
+            ref="options"
+            :option="ruleForm.question_options"
+            v-if="ruleForm.child_question_type == 6"
+          ></judgment>
         </el-form-item>
         <el-form-item label="子题目解析" prop="question_analysis">
           <v-editor :disabled="!!($route.query.type === 'view')" v-model="ruleForm.question_analysis"></v-editor>
         </el-form-item>
-        <el-form-item style="text-align: center;" v-if="index + 1 == chidrenList.length">
+        <el-form-item style="text-align: center" v-if="index + 1 == chidrenList.length">
           <el-button v-if="!!!($route.query.type === 'view')" type="primary" @click="submitForm">保存</el-button>
         </el-form-item>
       </div>
@@ -63,13 +80,12 @@ export default {
         question_difficulty: [{ required: true, message: ' ', trigger: 'blur' }],
         question_title: [{ required: true, message: ' ', trigger: 'blur' }],
         question_content: [{ required: true, message: ' ', trigger: 'blur' }],
-        question_analysis: [{ required: true, message: ' ', trigger: 'blur' }],
+        question_analysis: [{ required: false, message: ' ', trigger: 'blur' }],
         question_options: [{ required: true, message: ' ', trigger: 'blur' }]
       }
     }
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     removeChidren(n) {
       this.chidrenList.splice(n, 1)
@@ -81,5 +97,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/modules/question/views/Classify.vue

@@ -2,7 +2,7 @@
   <app-card>
     <el-button v-if="!treeList.length" type="primary" @click="centerDialogVisible = true">添加分类</el-button>
     <div class="block">
-      <el-tree :data="treeList" node-key="id" default-expand-all :expand-on-click-node="true">
+      <el-tree :data="treeList" node-key="id" default-expand-all :expand-on-click-node="false">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <span>{{ node.label }}</span>
           <span>
@@ -111,6 +111,7 @@ export default {
     // },
     // 点击编辑子项按钮
     edit(data) {
+      this.treeParams.name = data.label
       this.centerDialogVisible = true
       this.treeParams.id = data.id
       this.treeParams.type = 'edit'