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

src/modules/admin/teacher/views/Add.vue

@@ -42,14 +42,12 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate(valid => {
     if (valid) {
+      console.log(store.getMapValuesByKey('teacher_level'), ruleForm.education, 'add')
       if (ruleForm.education !== '') {
         ruleForm.education = store
           .getMapValuesByKey('teacher_level')
           .filter(item => item.value === ruleForm.education)[0].label
       }
-      // if (ruleForm.avatar === '') {
-      //   ruleForm.avatar = 'https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png'
-      // }
       const params = Object.assign({}, ruleForm)
       createTeacher(params).then(() => {
         ElMessage.success('创建讲师成功')

src/modules/admin/teacher/views/Detail.vue

@@ -10,7 +10,9 @@ const store = useMapStore()
 const router = useRouter()
 const route = useRoute()
 const appList = ref()
-const levelList = store.getMapValuesByKey('teacher_level')
+const levelList = $computed(() => {
+  return store.getMapValuesByKey('teacher_level')
+})
 const imgDefault = $ref('https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png')
 
 const id = route.query.id as string
@@ -69,10 +71,21 @@ const handleUpdate = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate(valid => {
     if (valid) {
+      console.log(store.getMapValuesByKey('teacher_level'), ruleForm.education, ruleForm.education, 'edit')
+      if (ruleForm.education !== '') {
+        ruleForm.education = store
+          .getMapValuesByKey('teacher_level')
+          .filter(item => item.label === ruleForm.education)[0].label
+      } else {
+        ruleForm.education = ''
+      }
+      if (ruleForm.avatar === '') {
+        ruleForm.avatar = imgDefault
+      }
       const params = Object.assign({}, ruleForm)
-      params.education = store
-        .getMapValuesByKey('teacher_level')
-        .filter(item => item.label === ruleForm.education)[0].label
+      console.log(params, 'params.education')
+
+      console.log(params, 'params')
       updateTeacher(params).then(() => {
         ElMessage.success('更新讲师成功')
         router.push('/admin/teacher')
@@ -80,6 +93,9 @@ const handleUpdate = async (formEl: FormInstance | undefined) => {
     }
   })
 }
+const changeEdu = (val: any) => {
+  console.log(val, val)
+}
 
 onMounted(() => {
   // 更新获取讲师信息
@@ -111,6 +127,7 @@ onMounted(() => {
               style="width: 250px"
               placeholder="请选择讲师学历"
               :disabled="isEdit === '1'"
+              @change="changeEdu"
             >
               <el-option v-for="(item, index) in levelList" :key="index" :label="item.label" :value="item.value" />
             </el-select>

src/modules/admin/teacher/views/List.vue

@@ -34,6 +34,9 @@ const listOptions = $computed(() => {
         label: '讲师学历',
         prop: 'education',
         align: 'center'
+        // computed(row: any) {
+        //   return row.row.education
+        // }
       },
       { label: '创建时间', prop: 'created_time', align: 'center' },
       { label: '操作', slots: 'table-operate', width: 230, align: 'center' }