diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index ea5bdc95..788346fc 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,4 +1,6 @@ -// export const USER_LIST = '/userbasic/user/list post' +//学员列表带分页 +export const USER_LIST_PAGE = '/userbasic/user/list post' +//学员列表 没有分页数据 只能通过名称检索 速度较快 export const USER_LIST = '/userbasic/user/searchList post' export const ORG_LIST = '/userbasic/org/list post' export const ORG_CHILD_LIST = '/userbasic/org/info post' diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue new file mode 100644 index 00000000..f2847e0b --- /dev/null +++ b/src/components/common/CommonAlert.vue @@ -0,0 +1,184 @@ + + + + \ No newline at end of file diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index cfd25dc2..b40ab272 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -3,7 +3,7 @@ @after-visible-change="afterVisibleChange">
-
【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤1
+
【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤
@@ -393,10 +393,11 @@ export default { }; const getTableData = () => { + debugger // debugger - console.log('当前是项目还是路径图 1 路径图 2 项目', props) - console.log('当前是项目还是路径图 1 路径图 2 项目', props.types) - if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) { + console.log('当前是项目还是路径图 1 项目 2 路径图', props) + console.log('当前是项目还是路径图 1 项目 2 路径图', props.types) + if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, @@ -441,14 +442,14 @@ export default { state.tableDataTotalLoading = false; state.tableData = []; }); - } else if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) { + } else if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 console.log("我是传递的查询参数", { pageNo: state.currentPage, pageSize: state.pageSize, currentStageId: props.datasource.stageId, type: 1, - pid: props.datasource.projectId, + pid: props.datasource.id, taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, @@ -689,15 +690,17 @@ export default {
{ + debugger {/* debugger */ } console.log("点击签到", value); // 获取当前时间 {/* showsingleqdModal(); */ } {/* AttendanceSign */ } - let obj = { + + let obj1 = { courseId: Number(props.datasource.courseId), - routerId: Number(props.datasource.routerId), + routerId: Number(props.datasource.projectId), ids: [value.record.studentId], taskId: Number(props.datasource.id), taskType: Number(props.datasource.type), @@ -706,15 +709,16 @@ export default { let obj2 = { courseId: Number(props.datasource.courseId), - routerId: Number(props.datasource.projectId), + routerId: Number(props.datasource.routerId), ids: [value.record.studentId], taskId: Number(props.datasource.id), taskType: Number(props.datasource.type), type: 2, }; - console.log(obj, obj2) + // 1是项目 2路径图 3开课 + console.log(obj1, obj2) state.tableDataTotalLoading = true; - api.AttendanceSign(props.types == 1 ? obj : obj2).then(res => { + api.AttendanceSign(props.types === '1' ? obj1 : obj2).then(res => { console.log('res----签到是否成功', res) message.destroy() message.info('签到成功') diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 2f38e378..d94cfdd0 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -10,13 +10,23 @@ @click="closeDrawer" />
-
- - +
+
+ +
@@ -44,18 +54,18 @@
选择试卷：
- -
- -
-
{{ formData.examinationTestName }}
+ +
+ +
+
@@ -189,7 +199,7 @@ 考试名称：
-
@@ -201,7 +211,7 @@ 数据来源：
-
@@ -210,7 +220,7 @@ 考试说明：
-
@@ -355,7 +365,7 @@ async function confirm() { }).catch(err => { console.log(err) }) - + emit('update:taskList', [...props.taskList]) closeDrawer() } @@ -374,9 +384,6 @@ const delTag = () => { } function changeOuter(v) { - if (taskIndex.value >= 0) { - return message.warn("编辑状态不允许切换。") - } formData.value.examType = v; } diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue index 0f1ba90a..fc21b270 100644 --- a/src/components/drawers/ImportStu.vue +++ b/src/components/drawers/ImportStu.vue @@ -282,7 +282,7 @@ export default { template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE, }); const closeDrawer = () => { - + ctx.emit("closeDraw", true); ctx.emit("update:TaskFaceImpStuvisible", false); state.fileList = []; @@ -719,4 +719,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 8155c1b3..fe295f68 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -72,10 +72,10 @@
批量删除
- +
导出组员
+
@@ -541,6 +541,15 @@ export default { // }); } ); + + // 导出数据 + function exportGroupMember() { + console.log("props.datasource", props); + window.open( + `${process.env.VUE_APP_BASE_API}/admin/studentGroup/exportGroupMember/${props.projectId}/${props.chooseGroupId}` + ); + } + function submitCall(flag) { flag && getStu(); } @@ -563,6 +572,7 @@ export default { closedeleone, yesdele, submitCall, + exportGroupMember }; }, }; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index fb1a8d15..0f035ae4 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -417,7 +417,7 @@ export default { message.error(`请输入审核意见！`); return; } - + ctx.emit("update:ProjAuditvisible", false); auditView({ createId: props.chooseCreateId, createName: props.chooseCreater, @@ -437,7 +437,8 @@ export default { }); }; const getDictList = async (param) => - api1.getDict({ + api1 + .getDict({ pageNo: 1, pageSize: 20, setCode: param, @@ -648,7 +649,6 @@ export default { background-color: #fafafa; } .reworkCon { - height: 56px; display: flex; align-items: center; border-bottom: 1px solid #f0f6fc; diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue index 581f9ca8..731f17ee 100644 --- a/src/components/drawers/TaskFaceIn.vue +++ b/src/components/drawers/TaskFaceIn.vue @@ -224,7 +224,7 @@ export default { template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE, }); const closeDrawer = () => { - + ctx.emit("closeDraw", true); ctx.emit("update:TaskFaceImpStuvisible", false); state.fileList = []; diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index 4d29d6dc..7bce6344 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -194,7 +194,7 @@ export default { console.log('我是传递过来的参数', props.datasource) console.log('我是传递过来的参数2', props.basicdata) api.QueryAssessmentDetail({ - "assessmentSubmitId": props.datasource.assessmentSubmitId, + "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds, "courseId": props.basicdata.id, "studentId": props.datasource.studentId }).then(res=>{ diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue index 2aa0b3f5..317a3088 100644 --- a/src/components/drawers/project/AddCertificate.vue +++ b/src/components/drawers/project/AddCertificate.vue @@ -462,20 +462,6 @@ export default { function CreateCertificate() { state.CCertificate = true; } - //上传封面 - const handleChange = (info) => { - if (info.file.status === "uploading") { - return; - } - if (info.file.status === "done") { - console.log("上传图片返回的信息 %o", info.file.name); - state.imageUrl = process.env.VUE_APP_FILE_PATH + info.file.name; - state.imageName = process.env.VUE_APP_FILE_PATH + info.file.name; - } - if (info.file.status === "error") { - message.error("upload error"); - } - }; const beforeUpload = (file) => { const isJpgOrPng = @@ -501,19 +487,14 @@ export default { fileUp(formDatas).then((res) => { if (res.data.code === 200) { console.log(file) - state.imageUrl = res.data.data; - state.imageName = file.name; + state.imageUrl = process.env.VUE_APP_FILE_PATH + res.data.data; + state.imageName = process.env.VUE_APP_FILE_PATH + res.data.data; } }); return false; }; - // function beforeUpload(file) { - // if (!state.fileType.includes(file.name.split(".").slice(-1).join(""))) { - // message.error("不支持该格式"); - // return false; - // } - // } + //查看证书 const getcertificate = () => { @@ -528,7 +509,7 @@ export default { if (res.data.code === 200) { let info = res.data.data; state.certificateName = info.name; //证书名称 - state.imageUrl = process.env.VUE_APP_FILE_PATH + info.url; //证书封面 + state.imageUrl = info.url; //证书封面 state.certificateRemark = info.remark; //证书说明 state.condition = info.finishType; //选择条件 state.large = info.finishType == 1 ? info.finishValue : null; //选择项目里的全部任务或必修任务 @@ -634,7 +615,6 @@ export default { closeDrawer, selectCondition, selectlarge, - handleChange, beforeUpload, CreateCertificate, saveupdatecertificate, diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue index 556b6bdd..39dc4180 100644 --- a/src/components/drawers/project/ImpoterGroupLeader.vue +++ b/src/components/drawers/project/ImpoterGroupLeader.vue @@ -19,12 +19,12 @@
-
请下载
-
- 模板 -
-
，按要求填写数据并导入
+
导入小组长
+ + +
+
请先导出小组填写小组长，按要求填写数据并导入
上传：
@@ -66,7 +66,7 @@
- 下载失败数据 + 下载失败数据1
@@ -130,13 +130,13 @@ const closeDrawer = () => { function openDrawer() { visible.value = true } - -function downTemplate() { - window.open(process.env.VUE_APP_BASE_API + props.templateUrl); -} +// +// function downTemplate() { +// window.open(process.env.VUE_APP_BASE_API + props.templateUrl); +// } function downloadErrorData(url) { - window.open(process.env.VUE_APP_BASE_API + url) + window.open(process.env.VUE_APP_FILE_PATH + url) } function handleChange({file}) { @@ -481,4 +481,4 @@ function handleChange({file}) { } } } - \ No newline at end of file + diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue index 51aa1caa..4033a65a 100644 --- a/src/components/project/OrgClassCheck.vue +++ b/src/components/project/OrgClassCheck.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-02-23 14:57:21 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-02-24 09:58:42 + * @LastEditTime: 2023-02-24 22:54:03 * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue index 4d5f770d..ab4fa38f 100644 --- a/src/components/student/ChangeGroupModal.vue +++ b/src/components/student/ChangeGroupModal.vue @@ -48,6 +48,10 @@ const props = defineProps({ type: Boolean, default: false, }, + checkBatch: { + type: Boolean, + default: false, + }, groupList: { type: Array, default: () => [], @@ -56,10 +60,10 @@ const props = defineProps({ type: Number, default: null, }, + }); const option = computed(() => { - debugger console.log("props.groupList", props.groupList); return props.groupList.map((e) => ({ label: e.groupName, @@ -81,13 +85,13 @@ const selectGroup = (e, v) => { }; //确认换组 const changeGroup = (item) => { - // debugger + debugger console.log("换组", selectGroupId.value, item); props.checkgroupStuId.forEach(stu => { let obj = { groupId: selectGroupId.value, groupName: selectGroupName.value, - studentId: stu, + id: stu, }; console.log("换组obj", obj); api diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 128b1483..9b474053 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -85,7 +85,7 @@
+ style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" @click="orgValue"/>