diff --git a/src/api/Teaching.js b/src/api/Teaching.js index 5b9b278f..dca1895f 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -1,9 +1,10 @@ import http from "./config"; //列表查询内部讲师授课记录 -export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj) +// http://127.0.0.1:30001/admin/teacher/getTeacherCourseList +// export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj) //内部讲师授课记录详情 -export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeacherCourseList?id=${obj}`) -// export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj) +// export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeacherCourseList?id=${obj}`) +export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj) //授课记录导出 export const getexport = (obj) => http.post('/lesson_records/export', obj) //授课记录导入 diff --git a/src/components/project/Editor.vue b/src/components/project/Editor.vue index c31742b4..98137076 100644 --- a/src/components/project/Editor.vue +++ b/src/components/project/Editor.vue @@ -17,15 +17,28 @@ // 富文本编辑器文档链接: https://www.wangeditor.com/v5/getting-started.html // 引入富文本编辑器CSS import '@wangeditor/editor/dist/css/style.css'; - import { onBeforeUnmount, ref, shallowRef } from 'vue'; + import { onBeforeUnmount, ref, shallowRef,watch,defineProps, defineEmits } from 'vue'; // 导入富文本编辑器的组件 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'; - + const props = defineProps({ + value: { + type: String, + default: ()=>'', + }, + }); // 编辑器实例,必须用 shallowRef const editorRef = shallowRef(); - + const emit = defineEmits(['update:value']) // 内容 HTML const valueHtml = ref(''); + watch(()=>valueHtml.value,(val)=>{ + emit('update:value',val) + + }) + watch(()=>props.value,(val)=>{ + valueHtml.value = val + console.log(val,'222222222222222'); + }) const toolbarConfig = { excludeKeys: [ 'insertLink', // 排除菜单组,写菜单组 key 的值即可 diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 9ce2ae73..58305d51 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -124,9 +124,9 @@ - - + + @@ -556,13 +556,14 @@ export default { teacherIntrofuce: null, description:null, remark: null, - id:null + id:null, + supplier:null, } console.log(state.formParam); } const rules = { name: [{ required: true, message: '讲师不能为空' }], - + supplier:[{ required: true, message: '供应商不能为空' }], } //表格内查看数据操作 const handleLook = (record) => { diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index b7b94fba..bf772493 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -2,7 +2,7 @@