diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 0ef747a5..d80b9d2f 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -18,4 +18,4 @@ export const REFRESH_TOKEN_API = "/userbasic/refreshToken"; export const COURSE_AUDIT = "/systemapi/xboe/m/course/manage/audit post formData"; export const OTHER_AUDIT = "/systemapi/xboe/m/course/audit/appoint post formData"; -export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`; \ No newline at end of file +export const ONLINE_COURSE_DEL = (id, courseId,studentId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}&studentId=${studentId} post`; \ No newline at end of file diff --git a/src/api/configPublic.js b/src/api/configPublic.js index d5345e8e..672b89f3 100644 --- a/src/api/configPublic.js +++ b/src/api/configPublic.js @@ -7,7 +7,7 @@ import Cookies from 'vue-cookies' axios.defaults.withCredentials = true; const http = axios.create({ timeout: 1000 * 15, - headers: { "Content-Type": "application/json", }, + headers: { "Content-Type":"application/json", }, }); http.interceptors.request.use( diff --git a/src/api/examineApi.js b/src/api/examineApi.js new file mode 100644 index 00000000..a5fb8a92 --- /dev/null +++ b/src/api/examineApi.js @@ -0,0 +1,165 @@ +import { data } from "jquery"; +import http from "./configPublic"; +//认证审批项目列表 +export const getexamineList = (data) => { + return http({ + url: "/activityApi/examine/list", + method: "post", + data: data + }) + +} +export const getexamine = (data) => { + return http({ + url: "/activityApi/teacher/list", + method: "post", + data: data + }) + +} +//创建认证 +export const CreateAuthentication = (data)=>{ + return http({ + url:'/activityApi/examine/launchOrUpdate', + method: "post", + data: data + }) +} +//删除认证 +export const delExamine = (data)=>{ + return http({ + url:'/activityApi/examine/deleteExamine', + method: "post", + data: data + }) +} +//讲师列表 +export const getTeacherList = (data)=>{ + return http({ + url:'/activityApi/teacher/list', + method: "post", + data: data + }) +} +//删除教师 +export const deleTeTeacher = (data)=>{ + return http({ + url:'/activityApi//teacher/deleTeTeacher', + method: "post", + data: data + }) +} +//发起评审列表 +export const getReview = (data) =>{ + return http({ + url:'/activityApi/review/list', + method: "post", + data: data + }) +} +//删除评审 +export const delreview=(data) =>{ + return http({ + url:'/activityApi/review/delete', + method: "post", + data: data + }) +} +//查看评审 +export const reviewdetail =(data)=>{ + return http({ + url:'/activityApi/review/detail', + method: "post", + data: data + }) +} +//发起评审 +export const reviewSave = (data) =>{ + return http({ + url:'/activityApi/review/save', + method: "post", + data: data + }) +} +//添加教师 +export const addTeacher= (data)=>{ + return http({ + url:'/activityApi/review/selectTeacher', + method: "post", + data: data + }) +} +//结束评审并通知结果 +export const endreview = (data) =>{ + return http({ + url:'/activityApi/review/endReview', + method: "post", + data: data + }) +} +//编辑评审 +export const editreview = (data) =>{ + return http({ + url:'/activityApi/review/edit', + method: "post", + data: data + }) +} +//添加导师 +export const addTutor = (data) =>{ + return http({ + url:'/activityApi/teacher/saveTeacher', + method: "post", + data: data + }) +} +//线上学习课列表 +export const getOnlineLearningList = (data) => http.post('/activityApi/examine/getOnlineLearningList',data) +//删除线上学习课 +export const deleteCourse = (data) => http.post('/activityApi/examine/deleteCourse',data) +//新增线上学习课 +export const addCourse = (data) => http.post('/activityApi/examine/addCourse',data) +//保存导入的教师信息 +export const saveTeacher = (data) => http.post('/activityApi/teacher/saveTeacher',data) +//退回初稿或终稿 +export const backDraft = (data) => http.post('/activityApi/examine/rejected',data) +//获取教师详情 +export const getDataById = (data) => http.post('/activityApi/teacher/getDataById',data) +//获取认证状态 +export const getCertificationProcess = (data) => http.post('/activityApi/teacher/getCertificationProcess',data) +//编辑认证 +export const updateExamine = (data) => http.post('/activityApi/examine/updateExamine',data) +//添加权限 0: 查看 2: 管理 +export const addPermission = (data) => http.post('/activityApi/examinePermission/addPermission',data) + +//权限列表 +export const removePermission = (data)=>{ + return http({ + url:'/activityApi/examinePermission/list', + method: "post", + data:data + }) +} +//转移归属权 +export const transferPermission =(data)=>{ + return http({ + url:'/activityApi/examinePermission/transferPermission', + method: "post", + data:data + }) +} +//删除权限 +export const deletedPermission = (data) => http.get('/activityApi/examinePermission/deletedPermission',{params:data}) +//添加权限 +// export const addPermission = (data)=>{ +// return http({ +// url:'/activityApi/permission/addPermission', +// method: "post", +// data:data +// }) +// } + +//依旧id查找教师 +export const getTeacherId = (data) => http.get('/activityApi/teacher/getTeacherId',{params:data}) +//更改状态 +export const updateStatus = (data) => http.post('/activityApi/examine/updateStatus',data) \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index f3f684d2..733c29b2 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -80,3 +80,5 @@ export const getProjectCount = (projectId) => http.get('/admin/project/projectCo export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj) export const userInfo = () => http.get('/admin/CheckUser/userInfo') +//修改备注 +export const editStudent = (obj) => http.post('/admin/student/editStudent', obj) \ No newline at end of file diff --git a/src/api/indexProject.js b/src/api/indexProject.js index 7807ef11..571eacfb 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -19,4 +19,6 @@ export const dataStatisticsSelectV1= (obj) => http.post('/data/statistics/select //柱状体右侧获取数据接口 export const dataStatisticsSelectV2= (obj) => http.post('/data/statistics/select/v2', obj ) // 图表2 学习情况数据接口 -export const boeuStudyDataGetStudyStaisticsList= (obj) => http.post('/boeu/studyData/getStudyStatisticsList', obj ) \ No newline at end of file +export const boeuStudyDataGetStudyStaisticsList= (obj) => http.post('/boeu/studyData/getStudyStatisticsList', obj ) +//查看用户有无权限 +export const reportOrgs = (obj) => https.get('/orgHrbp/reportOrgs', {params:obj} ) \ No newline at end of file diff --git a/src/assets/2.png b/src/assets/2.png new file mode 100644 index 00000000..a86d0f5e Binary files /dev/null and b/src/assets/2.png differ diff --git a/src/assets/27.png b/src/assets/27.png new file mode 100644 index 00000000..0090938a Binary files /dev/null and b/src/assets/27.png differ diff --git a/src/assets/30.png b/src/assets/30.png new file mode 100644 index 00000000..6e89c1a7 Binary files /dev/null and b/src/assets/30.png differ diff --git a/src/assets/33.png b/src/assets/33.png new file mode 100644 index 00000000..1f80977f Binary files /dev/null and b/src/assets/33.png differ diff --git a/src/assets/39.png b/src/assets/39.png new file mode 100644 index 00000000..3464fa0b Binary files /dev/null and b/src/assets/39.png differ diff --git a/src/assets/44.png b/src/assets/44.png new file mode 100644 index 00000000..08b11400 Binary files /dev/null and b/src/assets/44.png differ diff --git a/src/assets/46.png b/src/assets/46.png new file mode 100644 index 00000000..8b58d573 Binary files /dev/null and b/src/assets/46.png differ diff --git a/src/assets/47.png b/src/assets/47.png new file mode 100644 index 00000000..a2585bcd Binary files /dev/null and b/src/assets/47.png differ diff --git a/src/assets/49.png b/src/assets/49.png new file mode 100644 index 00000000..d34fcb94 Binary files /dev/null and b/src/assets/49.png differ diff --git a/src/assets/50.png b/src/assets/50.png new file mode 100644 index 00000000..1a435940 Binary files /dev/null and b/src/assets/50.png differ diff --git a/src/assets/8.png b/src/assets/8.png new file mode 100644 index 00000000..86e4b31c Binary files /dev/null and b/src/assets/8.png differ diff --git a/src/assets/images/gratefulteacher/Avatarman.png b/src/assets/images/gratefulteacher/Avatarman.png new file mode 100644 index 00000000..4f4f5c5e Binary files /dev/null and b/src/assets/images/gratefulteacher/Avatarman.png differ diff --git a/src/assets/images/gratefulteacher/AvatarmanNew.png b/src/assets/images/gratefulteacher/AvatarmanNew.png new file mode 100644 index 00000000..19162db7 Binary files /dev/null and b/src/assets/images/gratefulteacher/AvatarmanNew.png differ diff --git a/src/assets/images/gratefulteacher/Avatarwoman.png b/src/assets/images/gratefulteacher/Avatarwoman.png new file mode 100644 index 00000000..20b57972 Binary files /dev/null and b/src/assets/images/gratefulteacher/Avatarwoman.png differ diff --git a/src/assets/images/gratefulteacher/AvatarwomanNew.png b/src/assets/images/gratefulteacher/AvatarwomanNew.png new file mode 100644 index 00000000..930495f1 Binary files /dev/null and b/src/assets/images/gratefulteacher/AvatarwomanNew.png differ diff --git a/src/assets/images/gratefulteacher/e1.png b/src/assets/images/gratefulteacher/e1.png new file mode 100644 index 00000000..0b685401 Binary files /dev/null and b/src/assets/images/gratefulteacher/e1.png differ diff --git a/src/assets/images/gratefulteacher/e2.png b/src/assets/images/gratefulteacher/e2.png new file mode 100644 index 00000000..7e76f076 Binary files /dev/null and b/src/assets/images/gratefulteacher/e2.png differ diff --git a/src/assets/images/gratefulteacher/e3.png b/src/assets/images/gratefulteacher/e3.png new file mode 100644 index 00000000..355b0f12 Binary files /dev/null and b/src/assets/images/gratefulteacher/e3.png differ diff --git a/src/assets/images/gratefulteacher/j1.png b/src/assets/images/gratefulteacher/j1.png new file mode 100644 index 00000000..5fe3b64a Binary files /dev/null and b/src/assets/images/gratefulteacher/j1.png differ diff --git a/src/assets/images/gratefulteacher/j2.png b/src/assets/images/gratefulteacher/j2.png new file mode 100644 index 00000000..dc1016d3 Binary files /dev/null and b/src/assets/images/gratefulteacher/j2.png differ diff --git a/src/assets/images/gratefulteacher/ppt.png b/src/assets/images/gratefulteacher/ppt.png new file mode 100644 index 00000000..8507377b Binary files /dev/null and b/src/assets/images/gratefulteacher/ppt.png differ diff --git a/src/assets/images/gratefulteacher/s1.png b/src/assets/images/gratefulteacher/s1.png new file mode 100644 index 00000000..cf0492b9 Binary files /dev/null and b/src/assets/images/gratefulteacher/s1.png differ diff --git a/src/assets/images/gratefulteacher/s2.png b/src/assets/images/gratefulteacher/s2.png new file mode 100644 index 00000000..ebc70bdc Binary files /dev/null and b/src/assets/images/gratefulteacher/s2.png differ diff --git a/src/assets/images/gratefulteacher/s3.png b/src/assets/images/gratefulteacher/s3.png new file mode 100644 index 00000000..3487153c Binary files /dev/null and b/src/assets/images/gratefulteacher/s3.png differ diff --git a/src/assets/images/gratefulteacher/s4.png b/src/assets/images/gratefulteacher/s4.png new file mode 100644 index 00000000..399c7fa3 Binary files /dev/null and b/src/assets/images/gratefulteacher/s4.png differ diff --git a/src/assets/images/gratefulteacher/s5.png b/src/assets/images/gratefulteacher/s5.png new file mode 100644 index 00000000..d1ed1027 Binary files /dev/null and b/src/assets/images/gratefulteacher/s5.png differ diff --git a/src/assets/images/gratefulteacher/su1.png b/src/assets/images/gratefulteacher/su1.png new file mode 100644 index 00000000..86e4b31c Binary files /dev/null and b/src/assets/images/gratefulteacher/su1.png differ diff --git a/src/assets/images/gratefulteacher/su2.png b/src/assets/images/gratefulteacher/su2.png new file mode 100644 index 00000000..660ac6dc Binary files /dev/null and b/src/assets/images/gratefulteacher/su2.png differ diff --git a/src/assets/images/gratefulteacher/su3.png b/src/assets/images/gratefulteacher/su3.png new file mode 100644 index 00000000..744305a8 Binary files /dev/null and b/src/assets/images/gratefulteacher/su3.png differ diff --git a/src/assets/images/gratefulteacher/su4.png b/src/assets/images/gratefulteacher/su4.png new file mode 100644 index 00000000..e90a2def Binary files /dev/null and b/src/assets/images/gratefulteacher/su4.png differ diff --git a/src/assets/images/gratefulteacher/su5.png b/src/assets/images/gratefulteacher/su5.png new file mode 100644 index 00000000..73504d3e Binary files /dev/null and b/src/assets/images/gratefulteacher/su5.png differ diff --git a/src/assets/images/gratefulteacher/success.png b/src/assets/images/gratefulteacher/success.png new file mode 100644 index 00000000..cfff7760 Binary files /dev/null and b/src/assets/images/gratefulteacher/success.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/27.png b/src/assets/教师认证封面图/教师认证封面图/27.png new file mode 100644 index 00000000..0090938a Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/27.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/30.png b/src/assets/教师认证封面图/教师认证封面图/30.png new file mode 100644 index 00000000..6e89c1a7 Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/30.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/33.png b/src/assets/教师认证封面图/教师认证封面图/33.png new file mode 100644 index 00000000..1f80977f Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/33.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/39.png b/src/assets/教师认证封面图/教师认证封面图/39.png new file mode 100644 index 00000000..3464fa0b Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/39.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/44.png b/src/assets/教师认证封面图/教师认证封面图/44.png new file mode 100644 index 00000000..08b11400 Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/44.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/46.png b/src/assets/教师认证封面图/教师认证封面图/46.png new file mode 100644 index 00000000..8b58d573 Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/46.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/47.png b/src/assets/教师认证封面图/教师认证封面图/47.png new file mode 100644 index 00000000..a2585bcd Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/47.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/49.png b/src/assets/教师认证封面图/教师认证封面图/49.png new file mode 100644 index 00000000..d34fcb94 Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/49.png differ diff --git a/src/assets/教师认证封面图/教师认证封面图/50.png b/src/assets/教师认证封面图/教师认证封面图/50.png new file mode 100644 index 00000000..1a435940 Binary files /dev/null and b/src/assets/教师认证封面图/教师认证封面图/50.png differ diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 4f84ee0b..89a8cff9 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -495,6 +495,30 @@ } ]; } + if ( + n.indexOf("/InstructorCertification") !== -1 || + n.indexOf("/instructorcertification") !== -1 + ) { + state.list = [ + { + name: "教师专区", + }, { + name:'讲师认证' + } + ]; + } + if ( + n.indexOf("/LecturerManagement") !== -1 || + n.indexOf("/lecturermanagement") !== -1 + ) { + state.list = [ + { + name: "教师专区", + }, { + name:'讲师认证' + } + ]; + } if ( n.indexOf("/tooldown") !== -1 || n.indexOf("/ToolDown") !== -1 @@ -594,6 +618,16 @@ } ]; } + if (n.indexOf("/trainingnewmanager") !== -1 || n.indexOf("/TrainingNewManager") !== -1) { + state.list = [ + { + name: "报表中心", + }, + { + name:'新任管理者培训数据' + }, + ]; + } if (n.indexOf("/learningpathmap") !== -1 || n.indexOf("/LearningPathMap") !== -1) { state.list = [ { diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 2dd78605..d957ca22 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -339,7 +339,7 @@ - + + + + + diff --git a/src/views/gratefulteacher/AddLevelImportTec.vue b/src/views/gratefulteacher/AddLevelImportTec.vue new file mode 100644 index 00000000..f0eb3c1f --- /dev/null +++ b/src/views/gratefulteacher/AddLevelImportTec.vue @@ -0,0 +1,642 @@ + + + + + diff --git a/src/views/gratefulteacher/CommonTeacher.vue b/src/views/gratefulteacher/CommonTeacher.vue new file mode 100644 index 00000000..52d7411e --- /dev/null +++ b/src/views/gratefulteacher/CommonTeacher.vue @@ -0,0 +1,950 @@ + + + + + + \ No newline at end of file diff --git a/src/views/gratefulteacher/EvaluationForm.vue b/src/views/gratefulteacher/EvaluationForm.vue new file mode 100644 index 00000000..36f069d8 --- /dev/null +++ b/src/views/gratefulteacher/EvaluationForm.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/gratefulteacher/InitiateReview.vue b/src/views/gratefulteacher/InitiateReview.vue new file mode 100644 index 00000000..f15d7611 --- /dev/null +++ b/src/views/gratefulteacher/InitiateReview.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/views/gratefulteacher/InitiateReviewTable.vue b/src/views/gratefulteacher/InitiateReviewTable.vue new file mode 100644 index 00000000..32fd7995 --- /dev/null +++ b/src/views/gratefulteacher/InitiateReviewTable.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue new file mode 100644 index 00000000..ba9592d3 --- /dev/null +++ b/src/views/gratefulteacher/InstructorCertification.vue @@ -0,0 +1,725 @@ + + + + + diff --git a/src/views/gratefulteacher/LeadInstructor.vue b/src/views/gratefulteacher/LeadInstructor.vue new file mode 100644 index 00000000..57e01304 --- /dev/null +++ b/src/views/gratefulteacher/LeadInstructor.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue new file mode 100644 index 00000000..dfb74582 --- /dev/null +++ b/src/views/gratefulteacher/LecturerManagement.vue @@ -0,0 +1,1752 @@ + + + + + diff --git a/src/views/gratefulteacher/QrCode.vue b/src/views/gratefulteacher/QrCode.vue new file mode 100644 index 00000000..f2ca46bf --- /dev/null +++ b/src/views/gratefulteacher/QrCode.vue @@ -0,0 +1,295 @@ + + + + \ No newline at end of file diff --git a/src/views/gratefulteacher/ViewInstructor.vue b/src/views/gratefulteacher/ViewInstructor.vue new file mode 100644 index 00000000..eea3f825 --- /dev/null +++ b/src/views/gratefulteacher/ViewInstructor.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/views/gratefulteacher/ViewReview.vue b/src/views/gratefulteacher/ViewReview.vue new file mode 100644 index 00000000..f2c14800 --- /dev/null +++ b/src/views/gratefulteacher/ViewReview.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/views/gratefulteacher/tablemodel.vue b/src/views/gratefulteacher/tablemodel.vue new file mode 100644 index 00000000..c6502971 --- /dev/null +++ b/src/views/gratefulteacher/tablemodel.vue @@ -0,0 +1,740 @@ + + + \ No newline at end of file diff --git a/src/views/gratefulteacher/teaAdd.vue b/src/views/gratefulteacher/teaAdd.vue new file mode 100644 index 00000000..3ce81978 --- /dev/null +++ b/src/views/gratefulteacher/teaAdd.vue @@ -0,0 +1,958 @@ + + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 5a2f0e9c..94c3ab1c 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -163,6 +163,10 @@ 任务列表
+
+ {{switchList?'自由学习模式':'顺序学习模式'}} + +
移动任务到关卡
@@ -547,7 +551,7 @@ function deleteTask(element, index) { }, }); } - +const switchList = ref(false) const showChangeModal = () => { if (routerInfo.value?.chapterList?.length <= 1) { message.warning("请添加关卡!"); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index bf7da452..5a3fe2b9 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -119,6 +119,10 @@
任务列表
+
+ {{switchList ?'自由学习模式':'顺序学习模式'}} + +
@@ -418,7 +422,7 @@ import {TASK_TYPE} from "@/utils/const"; import {request} from "@/api/request"; import {PROJECT_DETAIL_MODIFY, PROJECT_RELEASE} from "@/api/apis"; import dialog from "@/utils/dialog"; - +import { editProjectModel } from "@/api/indexLearningPath"; const route = useRoute(); const courseRef = ref({}) const visiblene = ref(false); @@ -454,12 +458,14 @@ watch(() => projectInfo.value.stageList, () => { function changeStageIndex(index) { activeIndex.value = index + projectInfo.value?.stageList[activeIndex.value]?.studyModel == 1 ? switchList.value = false : switchList.value = true } //获取任务列表 const getTask = async () => { await api.getDraftTask({projectId: route.query.projectId}).then((res) => { projectInfo.value = res.data.data + projectInfo.value?.stageList[activeIndex.value]?.studyModel == 1 ? switchList.value = false : switchList.value = true console.log("获取任务列表:" + JSON.stringify(projectInfo.value) ) }); }; @@ -467,7 +473,11 @@ const getTask = async () => { const editTaskForType = (ele, index) => { courseRef.value['el' + ele.type].openDrawer(index, ele) }; - +const switchList = ref(false) +watch(()=>switchList.value,(newVal)=>{ + newVal ? projectInfo.value.stageList[activeIndex.value].studyModel = 0 : projectInfo.value.stageList[activeIndex.value].studyModel = 1 + request(PROJECT_DETAIL_MODIFY, projectInfo.value) +}) const showChangeModal = () => { if (projectInfo.value?.stageList?.length <= 1) { message.warning("请添加阶段!"); @@ -550,6 +560,7 @@ function editStage() { stage.value = false return } + formValue.value.studyModel = 0 //替换 默认阶段 if (projectInfo.value.stageList.length === 1 && projectInfo.value.stageList[0].id === '0') { formValue.value.taskDraftDtoList = [...projectInfo.value.stageList[0].taskDraftDtoList] @@ -1420,6 +1431,21 @@ const openCourse = (ele) => { color: #000000; margin-top: 10px; } + .taskmain_switch{ + position: absolute; + top: 0; + right: 268px; + width: 150px; + height: 40px; + border-radius: 8px; + cursor: pointer; + text-align: center; + line-height: 40px; + + .taskmain_switch_text{ + margin-right: 10px; + } + } .btn { position: absolute; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index a4c0ed38..6a33af3f 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -827,6 +827,7 @@ :stage="stage" :visable="tabFlag" :groupList="groupList" + :remarksTrue="remarksTrue" > @@ -2347,6 +2353,43 @@ + + +
+
+
+
+
修改备注
+
+
+
+
+ +
+ +
+
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 681d0857..402835f1 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -91,8 +91,8 @@ const handleSave = () => { return false; } const listsss = data.value.scoringQuestionVoList.map((item) => ({ - minimumEvaluation: item.minimumEvaluation || '非常满意', - highestEvaluation: item.highestEvaluation || '非常不满意', + minimumEvaluation: item.minimumEvaluation || '非常不满意', + highestEvaluation: item.highestEvaluation || '非常满意', orderNumber: item.orderNumber, assessmentId: id, })); @@ -192,8 +192,8 @@ function addScoringQuestionItem() { questionType: 4, assessmentScTitle: "", assessmentMaxScore: 10, - minimumEvaluation: '非常满意', - highestEvaluation: '非常不满意', + minimumEvaluation: '非常不满意', + highestEvaluation: '非常满意', assessmentMinScore: 1, weightScale: 100, orderNumber: orderList.value?.length + 1,