diff --git a/src/App.vue b/src/App.vue index 85df1c49..24fde76b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -59,6 +59,8 @@ function init() { initDict("project_pic"); //项目封面 initDict("router_pic"); //路径图封面 initDict("course_pic"); //课程封面 + initDict("job_type"); //岗位 + initDict("band"); //band } function unloadHandler() { diff --git a/src/api/apis.js b/src/api/apis.js index 1f6ff030..578edf33 100644 --- a/src/api/apis.js +++ b/src/api/apis.js @@ -1,7 +1,7 @@ -export const STUDENT_LIST = '/admin/student/getStudent' -export const ONLINE_COURSE_PAGE = '/onlineClasses/queryOnlineList' -export const ASSESSMENT_PAGE = '/assessment/queryAssessmentDetailList post' -export const PROJECT_AUDIT_PAGE = '/admin/project/auditedlist post' -export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post' -export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post' -export const PROJECT_RELEASE = '/admin/project/realease post' \ No newline at end of file +export const STUDENT_LIST = '/admin/student/getStudent'; +export const ONLINE_COURSE_PAGE = '/onlineClasses/queryOnlineList'; +export const ASSESSMENT_PAGE = '/assessment/queryAssessmentDetailList post'; +export const PROJECT_AUDIT_PAGE = '/admin/project/auditedlist post'; +export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post'; +export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post'; +export const PROJECT_RELEASE = '/admin/project/realease'; \ No newline at end of file diff --git a/src/api/indexCourse.js b/src/api/indexCourse.js index 15fd7983..f2200d74 100644 --- a/src/api/indexCourse.js +++ b/src/api/indexCourse.js @@ -32,6 +32,7 @@ export const edit = (obj) => http.post("/admin/offcourse/edit", obj); //7新建或编辑面授课开课 export const editPlan = (obj) => http.post("/admin/offcourse/editPlan", obj); export const copyCoursePlan = (params) => http.get("/admin/offcourse/copyCoursePlan", {params}); +export const copyCourse = (params) => http.get("/admin/offcourse/copyCourse", {params}); //8课程导出 export const exportP = (obj) => http.post("/admin/offcourse/export", obj); //9操作面授课(发布,撤回,删除，审核，停用) diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 04ed82be..8af1e4ed 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -24,7 +24,7 @@ ～ {{ datasource && datasource.endTime ? datasource.endTime : "-" }} - +
签到时间：{{beginTime}}
@@ -407,24 +407,25 @@ export default { // 计算签到时间 const isSignClick = () => { + debugger console.log("计算签到时间", props.datasource); let beginTime = new Date(props.datasource.startTime).getTime(); - let endTime = !props.datasource.afterStart + let endTime = !props.datasource.info.afterSignIn ? new Date(props.datasource.endTime).getTime() : new Date(props.datasource.startTime).getTime(); - if (props.datasource.beforeStart && props.datasource.afterStart) { + if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { //有开始前有开始后 - beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; - endTime = endTime + props.datasource.afterStart * 60 * 1000; + beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; + endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; console.log("1111", beginTime, endTime); - } else if (props.datasource.beforeStart && !props.datasource.afterStart) { + } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) { //只有开始前无开始后 - beginTime = beginTime - props.datasource.beforeStart * 60 * 1000; + beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000; console.log("11112222", beginTime); - } else if (!props.datasource.beforeStart && props.datasource.afterStart) { + } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) { //无开始前有开始后 - endTime = endTime + props.datasource.afterStart * 60 * 1000; + endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000; console.log("1111333", endTime); } @@ -443,6 +444,7 @@ export default { }; const getTableData = () => { + debugger console.log('当前是项目还是路径图 1 路径图 2 项目', props.types) if ( props.datasource.type == 6 && props.types==1 || props.datasource.type == 9 && props.types==1) { // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可 @@ -452,8 +454,8 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, - taskType: props.datasource.type, + taskId: props.datasource.id, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, signStatus: state.projectName2 @@ -465,7 +467,7 @@ export default { currentStageId: props.datasource.chapterId, type: 2, // 1项目 2 路径 pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -497,8 +499,8 @@ export default { currentStageId: props.datasource.stageId, type: 1, pid: props.datasource.projectId, - taskId: props.datasource.projectTaskId, - taskType: props.datasource.type, + taskId: props.datasource.projectTaskId, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, signStatus: state.projectName2 @@ -510,7 +512,7 @@ export default { currentStageId: props.datasource.stageId, type: 1, // 1项目 2 路径 pid: props.datasource.projectId, - taskId: props.datasource.projectTaskId, + taskId: props.datasource.projectTaskId, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -735,12 +737,13 @@ export default { customRender: (value) => { return (
-
{ console.log("点击签到", value); + // 获取当前时间 {/* showsingleqdModal(); */} {/* AttendanceSign */} - + let obj = { courseId: Number(props.datasource.courseId), routerId: Number(props.datasource.routerId), @@ -779,7 +782,7 @@ export default { }
签到
-
{ console.log("点击请假", value); {/* showsingleqjModal(); */} @@ -901,6 +904,8 @@ export default { // 导出数据 function exportTaskStu() { + debugger + console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource); console.log("props.datasource", props.datasource); if(props.types==1){ window.open( @@ -908,7 +913,7 @@ export default { process.env.VUE_APP_BASE_API }/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId - }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}` + }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}` ); }else{ window.open( @@ -919,7 +924,7 @@ export default { }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}` ); } - + // api // .exportTaskStudent({ // pageNo: state.currentPage, diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 1cd5585f..3a8ba62c 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -188,10 +188,12 @@ 回放设置：
- +
-
+
回放链接： @@ -325,6 +327,9 @@ const removePG = () => { formData.value.assessmentId = '' formData.value.assessmentName = '' }; +const getchange=(mess)=> { + console.log(mess); //输出true或者false +}; const props = defineProps({ type: Number, taskList: [] @@ -493,11 +498,14 @@ const beforeUpload = (file) => { formDatas.append("file", file); fileUp(formDatas).then((res) => { if (res.data.code === 200) { - console.log(res) - imageUrl.value = res.data - formData.value.liveCover = res.data + console.log(res.data.data,45); + imageUrl.value = process.env.VUE_APP_FILE_PATH +res.data.data + formData.value.liveCover =process.env.VUE_APP_FILE_PATH + res.data.data + + + // state.hasImgName = file.name; - // emit("src", { id: curItem.value.id, src: res.data.data }); + // emit("src", { id: '', src: res.data.data }); } }); return false; diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 4a8e1238..80c2465b 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -11,79 +11,28 @@ >
-
编辑在线
-
添加在线
- +
{{ taskIndex === -1 ? "编辑" : "添加" }}任务
+
-
-
-
-
-
-
- -
- -
-
-
-
-
课程分类：
-
- -
-
-
-
-
-
-
搜索
-
-
-
-
重置
-
-
-
-
-
-
- -
-
+
+
+ + {{ + taskIndex === -1 ? '选择/新建课程' : '重新选择' + }} + +
+
+ +
@@ -92,10 +41,9 @@ \ No newline at end of file diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 01cb0be4..7f8462d8 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -17,7 +17,7 @@
+ placeholder="请输入测评名称"/>
@@ -117,11 +117,18 @@ const taskIndex = ref(-1); const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, { init: false, - result: res => res.result.data, + result: res => { + let newArr = [] + for(let i=0;i res.result.total_page_num, total: res => res.result.count }) - +console.log(data,222) watch(taskIndex, () => { if (taskIndex.value >= 0) { rowSelectKeys.value = [props.taskList[taskIndex.value].courseId] @@ -182,24 +189,31 @@ const closeDrawer = () => { function confirm() { if (!selectsData.value.length || !rowSelectKeys.value.length) { - message.warning("请选择案例！"); + message.warning("请选择测评！"); return } if (taskIndex.value === -1) { - const list = props.taskList - list.push({ + let list = props.taskList + console.log(props,222,list); + if(list!=undefined){ + list.push({ name: selectsData.value[0].title, type: 3, courseId: selectsData.value[0].id, info: selectsData.value[0] }) + } + } else { const data = props.taskList[taskIndex.value] data.name = selectsData.value[0].title data.courseId = selectsData.value[0].id data.info = selectsData.value[0] } - emit('update:taskList', [...props.taskList]) + if(props.taskList!=undefined){ + emit('update:taskList', [...props.taskList]) + } + closeDrawer() } diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue index fbd15382..0f1ba90a 100644 --- a/src/components/drawers/ImportStu.vue +++ b/src/components/drawers/ImportStu.vue @@ -24,12 +24,28 @@
上传：
-
+
+ +

+ +

+

点击或将文件拖拽到此处上传

+

支持扩展名：.xls/.xlsx

+ +
+ + + +
+
+
+
+
+
+
{{ fileName }}
+
正在上传
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
{{ fileName }}
+
上传失败
+
+ + +
+ +
+ +
+ 下载失败数据 +
+ +
+
+
+ {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败 +
+
+
+
+ +
+
+
+
+
+
{{ fileName }}
+
上传成功
+
+ + +
+
+ +
+ 删除 +
+
+
+
+
+ 下载失败数据 +
+
+
+
+ +
+ {{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败 +
+
- - + +
@@ -111,6 +249,9 @@ - + - - \ No newline at end of file + diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index f9ba9b36..879d30a9 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -190,15 +190,15 @@ export default { tablecolumns: [ { title: "工号", - dataIndex: "studentUserNo", - key: "studentUserNo", + dataIndex: "studentCode", + key: "studentCode", width: 120, align: "center", className: "h head", customRender: (text) => { return (
- {text.record.studentUserNo?text.record.studentUserNo:"-"} + {text.record.studentCode?text.record.studentCode:"-"}
); }, @@ -395,22 +395,21 @@ export default { // 获取数据 function getData() { - api.AssessmentManagementMessage({ + api.ExamManagementMessage({ + studentName: state.name, pageNo: state.currentPage, pageSize: state.pageSize, - currentStageId: props.datasource.chapterId, - type: 2, - pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, - taskType: props.datasource.type, - status: state.projectName, - studentName: state.name, + chapterId: props.datasource.chapterId, + type: 1, + taskId: props.datasource.courseId, + targetId: props.datasource.routerId }).then(res=>{ - state.tabledata = res.data.data.records; + state.tabledata = res.data.data.managementDtoList; state.tableDataTotal = res.data.data.total; state.loadingData = false; }) } + // 搜索 function searchTableData() { state.currentPage = 1; @@ -436,7 +435,7 @@ export default { {/* 导出数据 */} function exportData() { // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`) {/* api.ExportExam({ "chapterId": props.datasource.chapterId, diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 4c102d35..c5919dc5 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -567,7 +567,7 @@ export default { }/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${ - props.datasource.routerTaskId + props.datasource.id }` ); // api diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue index fd5d03c8..05d058b9 100644 --- a/src/components/drawers/router/RouterVoteManage.vue +++ b/src/components/drawers/router/RouterVoteManage.vue @@ -23,7 +23,7 @@ v-if="datasource.type !== 6 && datasource.type !== 9" class="endtime" > - +
@@ -48,7 +48,7 @@ placeholder="请选择" :options="projectNameList" @change="selectProjectName" - + >
@@ -112,13 +112,13 @@
-->
- - + - + - \ No newline at end of file diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 015cda24..47fc06d2 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -33,7 +33,7 @@ /> \ No newline at end of file + diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index 4d04e2fb..4cf3fbf5 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -74,7 +74,7 @@ 创建投票题干：
- + diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index ae70ecc5..5100cc14 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -71,28 +71,58 @@ + \ No newline at end of file diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 89a439a6..e9a345cf 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -11,7 +11,7 @@ height: 40px; border-radius: 8px; margin-right: 14px; - " placeholder="请输入模板名称" /> + " placeholder="请输入模板名称"/>