merge conflic

src/components/LevelTypeSelect.vue

@@ -1,57 +0,0 @@
-<template>
-  <el-select
-    v-model="selected"
-    class="size-select"
-    placeholder="请选择"
-    :style="styles"
-    clearable
-    @change="select"
-  >
-    <el-option
-      v-for="item in optionList"
-      :key="item.code"
-      :label="item.name"
-      :value="item.code"
-    >
-      <span>{{ item.name }}</span>
-    </el-option>
-  </el-select>
-</template>
-
-<script>
-import { LEVEL_TYPE_SELECT } from "@/constants/constants";
-export default {
-  name: "LevelTypeSelect",
-  props: {
-    value: {
-      type: String,
-      default: "",
-    },
-    options: { type: Array, default: () => null },
-    styles: { type: String, default: "" },
-  },
-  data() {
-    return {
-      optionList: this.options || LEVEL_TYPE_SELECT,
-      selected: "",
-    };
-  },
-  watch: {
-    value: {
-      immediate: true,
-      handler(val) {
-        this.selected = val;
-      },
-    },
-  },
-  async created() {},
-  methods: {
-    select() {
-      this.$emit("input", this.selected);
-      this.$emit("change", this.selected);
-    },
-  },
-};
-</script>
-
-<style></style>

src/modules/questions/views/CourseProperty.vue

@@ -179,6 +179,7 @@
           <el-input
             v-model="coursePropertyForm.name"
             class="dialog-input-width"
+            maxlength="100"
             placeholder="请输入"
           ></el-input>
         </el-form-item>

src/modules/questions/views/data_previllege_add_course.vue

@@ -22,7 +22,14 @@
         <el-input v-model="form.name" placeholder="请输入课程名称" />
       </el-form-item>
       <el-form-item label="课程层次">
-        <LevelTypeSelect v-model="form.levelType"></LevelTypeSelect>
+        <el-select v-model="form.level" placeholder="请选择" clearable>
+          <el-option
+            v-for="item in levelList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="danger" @click="search"> 查询 </el-button>
@@ -74,6 +81,7 @@
 
 <script>
 import { QUESTION_API } from "@/constants/constants";
+import { LEVEL_TYPE } from "../constants/constants.js";
 export default {
   name: "DataPrevillegeAddCourseDialog",
   props: {
@@ -85,8 +93,9 @@ export default {
       visible: false,
       form: {
         name: "",
-        levelType: "",
+        level: "",
       },
+      levelList: LEVEL_TYPE,
       rules: {},
       loading: false,
       paginationShow: false,