diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index e620b460..ab1092f2 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -29,6 +29,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess', //是否优秀学员 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) +export const updateStudent = (obj) => http.post('/admin/student/updateStudent', obj) //项目概览 export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 30d3e251..d0126089 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -264,7 +264,7 @@ export default { workEnclosureAddress: state.attach ? state.attach : "", - workId: props.edit ? props.EditWorkId : 0, + workId: props.EditWorkId >0 ? props.EditWorkId:0 , workName: state.name, workRequirement: state.workRequirement, }; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index ab8d1e95..98ab1fef 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -538,11 +538,13 @@ export default { //TODO缺少paperName字段 state.test.examinationTestName = state.paperName; //考试推送 - state.test.targetId = 0; - state.test.type = 0; - if (props.isLevel == 1) { - state.test.targetId = props.routerId; - state.test.type = 2; + state.test.targetId = 0; + state.test.type = 0; + state.test.chapterId=0; + if(props.isLevel == 1){ + state.test.targetId = props.routerId; + state.test.chapterId = props.isactive; + state.test.type = 2; } else if (props.isLevel == 2) { state.test.targetId = props.projectId; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 67115e24..04fd474a 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -39,7 +39,7 @@
资源归属:
- {{ projectInfo.sourceBelongName }} + {{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index dce4fedc..aced870f 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -15,7 +15,8 @@ @click="closeDrawer" />
-
+ +
@@ -176,6 +177,7 @@ export default { }, setup(props, ctx) { const state = reactive({ + loading:false, userName: null, //用户名 deptName: null, //部门 jobName: null, //岗位 @@ -302,11 +304,13 @@ export default { state.stageList = array; }; const check = () => { + state.loading = true let obj = { - projectId: 37, - studentId: 3, + projectId: props.projectId, + studentId: props.checkStuId, }; studentProcess(obj).then((res) => { + state.loading = false console.log("查看了学员", res.data.data); let result = res.data.data; state.userName = result.userInfoBo.userName; diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index 4cf15db6..73f44421 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -43,9 +43,9 @@ const id = computed(() => { return props.value }) -function change(key, obj) { - console.log(obj[0], key, props.value); +function change(key, obj, {triggerNode: {props: {namePath}}}) { emit('update:name', obj[0]) + emit('update:fullName', namePath) emit('update:value', key) } diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index bbb0270e..bf68e918 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -107,7 +107,7 @@ function change(e, l) { memberParam.value.page = 1 isOpen.value = false Array.isArray(l) && (selectOptions.value = l) - Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName) + Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName) if (Array.isArray(l)) { emit('update:name', l.map(t => t.label).join(',')) emit('update:value', l.map(t => t.value).join(',')) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 80bb4fd5..643be4e9 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -1,328 +1,332 @@ + +
+
+ + + + +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否授予此学员优秀学员称号? +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+
+ + +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否取消此学员优学员称号? +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+
+ + - \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index a40179c7..ee92e8d5 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1,28 +1,29 @@