diff --git a/src/api/apis.js b/src/api/apis.js index 72d5416e..ae74b11e 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 PROJECT_AUDIT_PAGE = '/admin/project/auditedlistV2 post'; export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post'; export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post'; export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post'; diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index 185ef73b..27282fde 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -826,7 +826,7 @@ export default { name: props.datasource?.name, url: process.env.VUE_APP_BASE_API + - `/admin/student/studentSign?taskId=${props.datasource.routerTaskId + `/admin/student/studentSign?taskId=${props.datasource.id }&taskType=${props.datasource.type}&type=${2}`, }; console.log("codeInfo", state.codeInfo); @@ -855,7 +855,6 @@ export default { // 导出数据 function exportTaskStu() { - debugger {/* debugger */ } console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource); console.log("props.datasource", props.datasource); diff --git a/src/components/drawers/CheckWork.vue b/src/components/drawers/CheckWork.vue index 83cd35d8..00200b2d 100644 --- a/src/components/drawers/CheckWork.vue +++ b/src/components/drawers/CheckWork.vue @@ -183,7 +183,7 @@ export default { }; //获取作业详情 const getWorkDetail = () => { - debugger + // debugger console.log("props.workId, props.stuId", props.workId, props.stuId); getWorkSubmitInfo(props.workId, props.stuId) .then((res) => { diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index b3ee5147..eadbe8d2 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -24,7 +24,7 @@ @change="handleChange" :showUploadList="false" :data="{ type: type, taskId: Number(id), - workId: datesource.info.id, + workId: datesource.info?datesource.info.id:id, targetId: Number(id), }">

diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index e93999f4..55f11b95 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -118,7 +118,7 @@ preserveSelectedRowKeys: true, }" /> - +

\ No newline at end of file + diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue index dd4d65f6..bb299b2e 100644 --- a/src/components/drawers/ProjPowerList.vue +++ b/src/components/drawers/ProjPowerList.vue @@ -1,18 +1,18 @@ diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index e1b08b74..1b500710 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -593,9 +593,9 @@ export default defineComponent({ selectBandName: [], selectBandId: [], //资源归属 - sourceBelongId: [], - sourceBelongName: [], - sourceBelongFullName: [], + sourceBelongId: null, + sourceBelongName: null, + sourceBelongFullName: null, }); const store = useStore(); console.log(store, 666); @@ -606,7 +606,12 @@ export default defineComponent({ const jobType = computed(() => store.state.job_type); //获取band const bandList = computed(() => store.state.band); + const userInfo = computed(() => store.state.userInfo); console.log("jobTypebandList", jobType, bandList); + if (userInfo.value.departId && userInfo.value.departName) { + state.sourceBelongName = userInfo.value.departName; + state.sourceBelongId = userInfo.value.departId; + } watch( () => state.fen_lei, () => { @@ -718,9 +723,9 @@ export default defineComponent({ state.selectBandName = []; state.selectBandId = []; //资源归属 - state.sourceBelongId = []; - state.sourceBelongName = []; - state.sourceBelongFullName = []; + state.sourceBelongId = null; + state.sourceBelongName = null; + state.sourceBelongFullName = null; // valueHtml.value = ""; console.log("清空"); }; @@ -754,7 +759,15 @@ export default defineComponent({ fileUp(formData).then((res) => { if (res.data.code === 200) { // 最后插入图片 url alt href - insertFn(res.data.data, file.name, res.data.data); + console.log( + "上传图片结果", + process.env.VUE_APP_FILE_PATH + res.data.data + ); + insertFn( + process.env.VUE_APP_FILE_PATH + res.data.data, + file.name, + res.data.data + ); } }); }, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 7273571e..0e6add9e 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -10,13 +10,13 @@
创建时间:{{ cretime }}
- +
任务大纲
- + - +
@@ -1387,7 +1387,7 @@ import RouterHomeworkManage from "../../components/drawers/router/RouterHomework import RouterCommonManage from "../../components/drawers/router/RouterCommonManage"; import RouterVoteManage from "../../components/drawers/router/RouterVoteManage"; import RouterProjectManage from "../../components/drawers/router/RouterProjectManage"; -import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue"; +// import ImpoterGroupLeader from "@/components/drawers/project/ImpoterGroupLeader.vue"; import TaskImpStu from "../../components/drawers/TaskFaceIn"; import { checkPer } from "@/utils/utils"; @@ -1395,7 +1395,7 @@ import { checkPer } from "@/utils/utils"; export default { name: "LevelAdd", components: { - ImpoterGroupLeader, + // ImpoterGroupLeader, ProjCheckShip, ImpStu, CheckStu, @@ -2759,7 +2759,10 @@ export default { let obj = { title: "[学习路径]二维码", name: state.styTitle, - // url: codeUrl, + url: window.location.protocol + + process.env.VUE_APP_H5 + + "/pathdetails?routerId=" + + state.routerId, }; state.codeInfo = obj; }; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index ab2a13b2..4dbf10dd 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -261,7 +261,7 @@ size="small" active-color="red"/>
必修
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 392a4b8b..0b3ac2f4 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -160,13 +160,8 @@ type="link" >撤回发布 - 管理 - + 管理 + { await api.getDraftTask({projectId: route.query.projectId}).then((res) => { projectInfo.value = res.data.data + console.log("获取任务列表:" + JSON.stringify(projectInfo.value) ) }); }; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 3703d254..412382cb 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -14,7 +14,7 @@
- + action == -2 + " + >
阶段名称:
-
管理者进阶-腾飞班1第一阶段
+
{{ choosedStageName }}
@@ -459,14 +459,14 @@
任务大纲
- - + --> 查看 - {{ record.topFlag ? "取消优秀" : "优秀学员" }} - 换组 @@ -909,7 +914,7 @@ @@ -1069,7 +1074,7 @@
-
+
+添加证书
", @@ -3101,6 +3108,7 @@ export default { state.stugroup = false; state.groupInfo = {}; state.groupMemberCountContrast = null; + getGroup(); }; //点击确定创建小组 const createG = () => { @@ -3934,9 +3942,9 @@ export default { const createGroup = async () => { console.log("state.groupPageList" + state.groupPageList); const id = state.groupInfo.id; - const d = state.groupPageList.filter(item => item.id !== id).filter( - (item) => item.leaderId === state.groupInfo.leaderId - ); + const d = state.groupPageList + .filter((item) => item.id !== id) + .filter((item) => item.leaderId === state.groupInfo.leaderId); if (state.isEdit) { if (d.length > 0 && d[0].id !== id) { return message.warn(d[0].leaderName + "已是小组长,请重新选择"); @@ -3947,11 +3955,10 @@ export default { } } else { if (d.length > 0) { - return message.warn(d[0].leaderName + "已是小组长,请重新选择"); + return message.warn(d[0].leaderName + "已是小组长,请重新选择"); } } - state.isEdit = false; await editGroup({ ...state.groupInfo, projectId: state.projectId }); message.success(id ? "小组编辑成功" : "小组创建成功"); @@ -4662,7 +4669,11 @@ export default { let obj = { title: "[项目]二维码", name: state.name, - // url: codeUrl, + url: + window.location.protocol + + process.env.VUE_APP_H5 + + "/projectdetails?projectId=" + + state.projectId, }; state.codeInfo = obj; }; @@ -4679,6 +4690,7 @@ export default { url && window.open(url); }; function stageChange(item, index) { + state.choosedStageName = item.name; state.choosedStageId = item.stageId; state.choosedStageIndex = index; } diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index 4cf30df3..9cfd488f 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -281,7 +281,7 @@
- 确定 + 确定11 取消
@@ -541,7 +541,16 @@ const cancelModal = ref(false); const deleteStageModal = ref(false); const templateLoading = ref(false); const cancleLoading = ref(false); -const projectInfo = ref({stageList: [{taskTemplateList: [{}]}], projectTemplateInfo: {}}); +const projectInfo = ref({ + stageList: [{ + "id":"0", + taskTemplateList: [{ + }] + }], + projectTemplateInfo: { + + } +}); const activeIndex = ref(0); const moveChapterIndex = ref(0); const deleteIndex = ref(0); @@ -576,6 +585,13 @@ function changeStageIndex(index) { const getTask = async () => { await api.templateEditDetail(route.query.projectId).then((res) => { projectInfo.value = res.data.data + if(projectInfo.value.stageList.length == 0){ + projectInfo.value.stageList = [{ + "id":"0", + taskTemplateList: [] + }] + } + console.log("获取任务列表信息:" + JSON.stringify(projectInfo.value)); }); }; @@ -721,7 +737,7 @@ const closeDeAll = () => { const submitStorage = async () => { templateLoading.value = true await request(PROJECT_TEMPLATE_DETAIL_MODIFY, projectInfo.value) - await getTask() + // await getTask() message.success("保存成功"); templateLoading.value = false }; diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index d376df65..21574111 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -17,17 +17,17 @@
模板名称
@@ -95,68 +95,68 @@
-
项目时间
项目经理
资源归属
项目级别
@@ -167,8 +167,8 @@
培训体系
@@ -179,8 +179,8 @@
是否BOEU实施
@@ -195,34 +195,30 @@
同步学习记录
-
+
- 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
-
+
- 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
@@ -232,11 +228,11 @@
@@ -245,18 +241,48 @@ + + +
+
+
封面图
+
+
+ +
+ +
+
+
+ + +
+
+