From 103604c653242d8523965803b75b2f3dbf433c5f Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Thu, 24 Nov 2022 19:32:18 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E6=9D=A1=E6=83=85=E5=86=B5=E5=B7=B2?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=88=90=E5=8A=9F=EF=BC=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2=E8=8E=B7=E5=8F=96=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=20=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=88=90=E5=8A=9F=E4=BD=86=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 2 +- src/components/drawers/AddCase.vue | 51 +++++++++++------ src/components/drawers/AddEval.vue | 65 ++++++++++++++++++++- src/components/drawers/EvList.vue | 2 - src/components/drawers/FaceManage.vue | 13 +++-- src/components/drawers/TestManage.vue | 42 ++++++-------- src/components/drawers/TimeManage.vue | 17 +++--- src/components/drawers/WorkManage.vue | 13 +++-- src/views/learningpath/LevelAddDetail.vue | 69 +++++------------------ 9 files changed, 154 insertions(+), 120 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index c045783a..c348cf6d 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -32,7 +32,7 @@ http.interceptors.request.use( // 此处测试默认配置token config.headers.token = "123456"; - // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962"; + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyODg3MzIsImV4cCI6MTY2OTI5NTkzMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.af724ca2f4c530868cf923daa2e1a4a3733ee97430b830039ace513d628dfb42"; } return config; }, diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index a61dff5b..b0cf6f14 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -199,20 +199,39 @@ export default { const getTableDate = (tableData) => { let data = tableData; let array = []; - data.map((value, index) => { - let obj = { - key: index, - authorId:value.authorId, - authorName:value.authorName, - companyId:value.companyId, - coverUrl:value.coverUrl, - caseid:value.id, - title:value.title, - }; - array.push(obj); - }); - state.tableData = array; - console.log('get下来的数据',state.tableData); + if(state.inputV1 == ""){ + data.map((value, index) => { + let obj = { + key: index, + authorId:value.authorId, + authorName:value.authorName, + companyId:value.companyId, + coverUrl:value.coverUrl, + id:value.id, + title:value.title, + }; + array.push(obj); + }); + state.tableData = array; + console.log('get下来获取全部的的数据',state.tableData); + } else { + data.map((value, index) => { + let obj = { + key: index, + authorId:value.authorId, + authorName:value.authorName, + companyId:value.companyId, + coverUrl:value.coverUrl, + id:value.id, + title:value.title, + }; + if(obj.title == state.inputV1){ + array.push(obj); + } + }); + state.tableData = array; + console.log('get下来搜索的的数据',state.tableData); + } }; //获取全部案例信息接口 const getAllCaseText = () => { @@ -227,7 +246,7 @@ export default { }) .then((res) => { if (res.status === 200) { - getTableDate(res.data.data); + getTableDate(res.data.data); } }) .catch(() => { @@ -238,7 +257,7 @@ export default { for(let i = 0;i < state.apiTaskList.length;i++){ RouterEditTask({ chapterId: props.isactive, - courseId: state.apiTaskList[i].caseid, + courseId: state.apiTaskList[i].id, name: state.apiTaskList[i].caseName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 128063da..e955613c 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -91,7 +91,7 @@
- +
{ state.EvalListVisible = true; }; + //向关卡或阶段渲染 const updateTask = (value) => { if (props.isLevel == 1) { RouterEditTask({ @@ -223,9 +228,11 @@ export default { type: 10, }) .then(( ) => { + message.destroy() message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); }) .catch(( ) => { + message.destroy() message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { @@ -255,6 +262,60 @@ export default { message.error("获取测量平信息失败"); }); } + const creoredit = ()=> { + if(props.edit){ + editInvistText + }else{ + createEvalText + } + } + const editInvistText = ()=> { + if (!state.inputV1) { + message.destroy(); + return message.info("请输入测评名称"); + } + if (!state.evaluationTypeId) { + message.destroy(); + return message.info("请选择测评"); + } + let objei = { + // "createTime": "", + // "createUser": 0, + // "evaluationEndTime": "", + // "evaluationFlag": "", + // "evaluationId": "", + // "evaluationName": "", + // "evaluationPictureAddress": "", + // "evaluationStartTime": "", + // "evaluationTag": "", + // "evaluationTypeId": 0, + // "evaluationTypeName": "", + // "updateTime": "", + // "updateUser": 0 + evaluationName: state.inputV1, + evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), + evaluationId: props.edit ? props.evaluationId : 0, + evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, + evaluationFlag: "", + evaluationPictureAddress: "", + evaluationTag: "", + updateTime: "", + } + api + .updateEvaluation(objei) + .then((res) => { + updateTask(res.data.data); + console.log('编辑后的测评信息 编辑后的测评id还和之前一样么?',res.data.data); + message.success("编辑测评信息成功"); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error("编辑测评信息创建失败"); + }); + } //创建测评信息 const createEvalText = () => { if (!state.inputV1) { @@ -296,8 +357,10 @@ export default { checkFinish, closeDrawer, //增改 + creoredit, createEvalText, queryInvistById, + editInvistText, showEvalDrawer, updateTask, }; diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 929bfa48..5576bb79 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -29,7 +29,6 @@ /> -
@@ -42,7 +41,6 @@
-
{ let obj = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; api .taskStudentList(obj) @@ -425,12 +426,12 @@ export default { //搜索任务列表 const searchTaskList = () => { let objser = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; if (state.name !== "" || state.projectName !== "") { api diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 1ac8904c..67271f97 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -126,6 +126,8 @@
+ + @@ -133,8 +135,12 @@ import { toRefs, reactive } from "vue"; import { message } from 'ant-design-vue'; import * as api from "../../api/index"; +import CQue from './CheckQue.vue' export default { - name: "TestManage", + name: "TestManage", + components: { + CQue, + }, props: { TMvisible: { type: Boolean, @@ -158,6 +164,7 @@ export default { const state = reactive({ name: null, open: false, + CQvisible:false, //查看答卷抽屉 pageNo: 1, pageSize: 10, currentPage: 1, @@ -180,18 +187,7 @@ export default { label: "已完成", }, ], - tabledata: [ - { - workNum:1, - status:"已完成", - operation:"", - }, - { - workNum:1, - status:"未完成", - operation:"", - } - ], + tabledata: [], selectedRowKeys:[], }); const tableDataFunc = () => { @@ -325,15 +321,12 @@ export default { title: "操作", dataIndex: "operation", key: "operation", - width: 60, + width: 90, align: "center", - className: "h", }, ] return columns; } - - }; //考试管理列表操作 const ListOpera = () => { @@ -354,7 +347,7 @@ export default { class="operation" style="cursor:pointer;margin-right:10px;" onClick={() => { - console.log('123') + state.CQvisible = true }} > 查看 @@ -434,16 +427,17 @@ export default { array.push(obj) }) state.tabledata = array + ListOpera(); } //获取任务管理列表 const getManageList = () => { let obj = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; api .taskStudentList(obj) @@ -461,12 +455,12 @@ export default { //搜索任务列表 const searchTaskList = () => { let objser = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; if (state.name !== "" || state.projectName !== "") { api diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue index c4a18e21..624f16f2 100644 --- a/src/components/drawers/TimeManage.vue +++ b/src/components/drawers/TimeManage.vue @@ -364,36 +364,37 @@ export default { //获取任务管理列表 const getManageList = () => { let obj = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; api .taskStudentList(obj) .then((res) => { state.pageNo = res.data.data.pageNo; state.pageSize = res.data.data.pageSize; - state.pageSize = res.data.data.pageSize; for (let i = 0; i < res.data.data.rows.length; i++) { state.tabledata.push(res.data.data.rows[i].userInfoBo); } + ListOpera(); }) - .catch(() => { + .catch((err) => { + console.log(err,'sss'); }); }; //搜索任务列表 const searchTaskList = () => { let objser = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; if (state.name !== "" || state.projectName !== "") { api diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index 8916b350..7a04624b 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -323,12 +323,12 @@ export default { //获取任务管理列表 const getManageList = () => { let obj = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; api .taskStudentList(obj) @@ -339,6 +339,7 @@ export default { for (let i = 0; i < res.data.data.rows.length; i++) { state.tabledata.push(res.data.data.rows[i].userInfoBo); } + ListOpera(); }) .catch(() => { }); @@ -347,12 +348,12 @@ export default { //搜索任务列表 const searchTaskList = () => { let objser = { - name: "", + // name: "", pageNo: state.pageNo, pageSize: state.pageSize, - projectId: 27, + // projectId: 27, projectTaskId: props.projectTaskId, - status: -1, + status: 0, }; if (state.name !== "" || state.projectName !== "") { api diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 338437fd..fdb9f40a 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1189,51 +1189,9 @@ export default { }, ], //项目抽屉、列表参数 - drawertableData: [ - { - key: 1, - parentId:1, - name: '123', - manager:'afssfa', - children:[ - { - key: 5, - parentId:1, - name: '123', - manager:'afssfa', - }, - ] - }, - { - key: 2, - parentId:2, - name: '123', - manager:'afssfa', - children:[ - { - key: 7, - parentId:1, - name: '123', - manager:'afssfa', - children:[ - { - key: 9, - parentId:1, - name: '123', - manager:'afssfa', - }, - ] - }, - ] - }, - { - key: 3, - parentId:3, - name: '123', - manager:'afssfa', - }, - ], + drawertableData: [], selectedProjRowKeys:[], + projListData:[], currentPage: 1, tableDataTotal: 0, pageSize: 10, @@ -1444,6 +1402,7 @@ export default { state.addevalvisible = true; state.EditEvalId = id; state.routerTaskId = eleId; + console.log('id我编辑的测评id',id); }; //评估抽屉 const showDrawerAddInvist = (id, eleId) => { @@ -1950,13 +1909,8 @@ export default { //项目抽屉用的 const onProjSelectChange = (selectedRowKeys,selectedRows) => { state.selectedProjRowKeys = selectedRowKeys - // if(selectedRowKeys.length>1){ - // return - // } - state.projId = selectedRows[0].projectId - state.projName = selectedRows[0].name - console.log(state.projId,'------------------'); - // console.log(selectedRowKeys,selectedRows); + state.projListData = selectedRows + console.log(selectedRows,state.projListData); } const getTableDate = (data) => { let array = [] @@ -2012,17 +1966,19 @@ export default { }; //添加关卡项目 const updateTask = () => { - RouterEditTask({ + state.projListData.map((value)=>{ + console.log('--------',value); + RouterEditTask({ duration: 0, flag: true, - chapterId: state.isactive, - courseId: Number(state.projId), - name: state.projName, + chapterId: Number(state.isactive), + courseId: Number(value.projectId), + name: value.name, routerId: state.routerId, routerTaskId: state.routerTaskId, type: 13, }) - .then(( ) => { + .then(() => { message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`); // ctx.emit("changeData", false); leaveProjDrawer() @@ -2032,6 +1988,7 @@ export default { message.destroy() message.error("添加关卡任务失败") }); + }) }; //显示切换模式抽屉 From 18904331a23e37b19f7dd42ae8aa8737ec31bbf5 Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Thu, 24 Nov 2022 19:42:36 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 171 ++++------------------ 1 file changed, 31 insertions(+), 140 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index fdb9f40a..cb491f9d 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -481,11 +481,23 @@
- +
项目
+
+ +
@@ -707,44 +719,6 @@ - -
- -
-
-
关联项目
- -
-
- - -
-
- - -
-
- -
@@ -1055,6 +1029,7 @@ import AddInvist from "../../components/drawers/AddInvist.vue"; import AddVote from "../../components/vote/AddVote.vue"; import AddLive from "../../components/drawers/AddLive.vue"; import AddRef from "../../components/drawers/AddRef.vue"; +import AddProject from "../../components/drawers/AddProject.vue"; import AddFaceteach from "../../components/drawers/AddFaceteach.vue"; import * as api from "../../api/indexLevel"; import { GetRouterDetail } from "../../api/indexTask"; @@ -1063,9 +1038,9 @@ import { storage } from "../../api/storage"; import { deleteStudyTask } from "../../api/indexStudy"; import draggable from "vuedraggable"; import { editTask } from "../../api/indexTaskadd"; -import * as apiProj from "../../api/index.js"; -import { RouterEditTask } from "@/api/indexTask"; -import dayjs from "dayjs"; + +// import { RouterEditTask } from "@/api/indexTask"; + import { toDate } from "../../api/method"; import UnlockMode from "../../components/drawers/UnlockMode.vue"; export default { @@ -1087,6 +1062,7 @@ export default { draggable, UnlockMode, AddFaceteach, + AddProject, }, setup() { const state = reactive({ @@ -1225,7 +1201,7 @@ export default { EditVoteId: "", EditFaceId: "", //项目 - EditProjId: "", + EditProjectId: "", routerTaskId: "", chapterId: "", stageId: "", @@ -1270,6 +1246,7 @@ export default { deleteChapterId: null, //删除关卡id unlockModeVisible: false, //切换模式抽屉 + chooseProjectList: null, //选择的阶段下的任务列表 }); const showModal = (element) => { @@ -1444,7 +1421,7 @@ export default { //打开项目抽屉 const showDrawerAddProj = (id, eleId) => { state.addprojvisible = true; - state.EditActiveId = id; + state.EditProjectId = id; state.routerTaskId = eleId; }; //关闭项目抽屉 @@ -1457,6 +1434,11 @@ export default { for (let i = 0; i < state.level.length; i++) { if (state.level[i].chapterId === id) { let array = []; + state.chooseProjectList = JSON.stringify(state.level[i].taskList); + // console.log( + // "goggoo", + // Object.prototype.toString.call(state.chooseProjectList) + // ); state.level[i].taskList.forEach((element) => { let obj = { id: element.routerTaskId, @@ -1516,11 +1498,7 @@ export default { message.error(err); }); }; - const afterProjVisibleChange = (bol) => { - if(bol == true){ - getAllProjText() - } - }; + const showAddStu = () => { state.AddSvisible = true; }; @@ -1542,6 +1520,7 @@ export default { "测评", "评估", "投票", + "项目", ]; return typeRules[index]; }; @@ -1906,90 +1885,6 @@ export default { console.log("阶段改变", value, option); state.removeStageId = option.chapterId; }; - //项目抽屉用的 - const onProjSelectChange = (selectedRowKeys,selectedRows) => { - state.selectedProjRowKeys = selectedRowKeys - state.projListData = selectedRows - console.log(selectedRows,state.projListData); - } - const getTableDate = (data) => { - let array = [] - data.map((value)=>{ - if(value.type == 3){ - let obj = { - key: value.projectId, - parentId:value.parentId, - projectId:value.projectId, - name: value.name, - manager:value.manager, - time: dayjs(value.createTime).format("YYYY-MM-DD"), - } - array.push(obj) - } - else { - let obj = { - key: value.projectId, - parentId:value.parentId, - name: value.name, - manager:value.manager, - time: dayjs(value.createTime).format("YYYY-MM-DD"), - children: value.subList ? getTableDate(value.subList) : [] , - } - array.push(obj) - } - }) - return array - }; - //获取全部项目信息接口 - const getAllProjText = () => { - apiProj - .getProjectList({ - "beginTime": 0, - "createName": "", - "endTime": "", - "manager": "", - "name": "", - "pageNo": 1, - "pageSize": 10, - "status": 0 - }) - .then((res) => { - let arr = res.data.data.rows; - if (res.status === 200) { - state.drawertableData = getTableDate(arr); - } - }) - .catch(() => { - message.destroy() - message.error("获取全部项目信息接口失败") - }); - }; - //添加关卡项目 - const updateTask = () => { - state.projListData.map((value)=>{ - console.log('--------',value); - RouterEditTask({ - duration: 0, - flag: true, - chapterId: Number(state.isactive), - courseId: Number(value.projectId), - name: value.name, - routerId: state.routerId, - routerTaskId: state.routerTaskId, - type: 13, - }) - .then(() => { - message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`); - // ctx.emit("changeData", false); - leaveProjDrawer() - state.addLoading = false; - }) - .catch(() => { - message.destroy() - message.error("添加关卡任务失败") - }); - }) - }; //显示切换模式抽屉 const showModeVisible = () => { @@ -2001,7 +1896,6 @@ export default { tableDataFunc2, showModal, closeModal, - afterProjVisibleChange, showAddStu, showImpStu, // drawercolumns, @@ -2041,10 +1935,7 @@ export default { showChangeModal, closeChangeModal, handleChangeStage, - onProjSelectChange, - getTableDate, - getAllProjText, - updateTask, + showDeleteChapter, closeDeleteChapter, From e9e947b9546bb36656b75596c1d3afd4c3f67d04 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 25 Nov 2022 07:07:41 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 2 +- src/components/drawers/AddCase.vue | 25 ++++++++++++++++++++++++- src/components/drawers/AddDiscuss.vue | 10 +++++++++- src/components/drawers/AddEval.vue | 18 +++++++++++++++++- src/components/drawers/AddFaceteach.vue | 21 ++++++++++++++++++++- src/components/drawers/AddHomework.vue | 18 +++++++++++++++++- src/components/drawers/AddInvist.vue | 18 +++++++++++++++++- src/components/drawers/AddLive.vue | 18 +++++++++++++++++- src/components/drawers/AddOnline.vue | 20 +++++++++++++++++++- src/components/drawers/AddProject.vue | 10 +++++++++- src/components/drawers/AddRef.vue | 18 +++++++++++++++++- src/components/drawers/AddTest.vue | 21 ++++++++++++++++++++- 12 files changed, 187 insertions(+), 12 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 16281b21..0120c1e8 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -385,7 +385,7 @@ export default { courseId: res.data.data.activityId, duration: res.data.data.activityDuration, name: res.data.data.activityName, - projectTemplateId: props.projectTemplateId, + projectTemplateId:props.projectTemplateId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId, type: 9, diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index a61dff5b..e393c6c6 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -281,7 +281,30 @@ export default { }); } } else if (props.isLevel == 3) { - console.log(""); + for(let i = 0;i < state.apiTaskList.length;i++){ + console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId'); + apiTask + .addTask({ + "courseId": state.apiTaskList[i].caseid, + "duration": 0, + "flag": true, + "name": state.apiTaskList[i].caseName, + "projectId": props.projectId, + "projectTemplateId": props.projectTemplateId, + "stageId": props.chooseStageId, + "type": 3, + }) + .then(() => { + message.destroy() + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy() + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); + } } }; //重置案例信息 diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index f2440d46..a1c8a59d 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -201,7 +201,15 @@ export default { type: 8, }); } else if (props.isLevel == 3) { - console.log(""); + apiTask.addTask({ + courseId: res.data.data.discussId, + duration: res.data.data.discussExplain, + name: res.data.data.discussName, + projectId: props.projectId, + projectTaskTemplateId: props.projectTaskTemplateId || 0, + stageId: props.chooseStageId, + type: 8, + }); } }; const updateDiscussInfo = () => { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 128063da..aaf57dbf 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -229,7 +229,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apitaskadd + .addTask({ + duration:0, + flag:true, + courseId: Number(value.evaluationId), + name: value.evaluationName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 10, + }) + .then(( ) => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + }) + .catch(( ) => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //根据id获取测评信息 diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 5bca4104..6d7d2377 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -699,7 +699,26 @@ export default { message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + let editObj = { + courseId: res.data.data.offcoursePlanId, + duration: 0, + name: res.data.data.name, + projectTemplateId: props.projecTempaltetId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 2, + }; + // 新增编辑或新增项目 + ProjectEditTask(editObj) + .then(() => { + message.success( + `${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` + ); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); + }); } }; const closeTag = () => { diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 7a8fa48c..444412c1 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -362,7 +362,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + let editObj = { + courseId: res.data.data.workId, + name: res.data.data.workName, + projectId: props.edit ? props.projectId : 0, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 4, + }; + ProjectEditTask(editObj) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + state.addLoading = false; + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 4c02bc58..e09b56ab 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -247,7 +247,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + courseId: state.assessment.assessmentId, + name: state.assessment.name, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 11, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 5f250ccb..aa50f373 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -557,7 +557,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + courseId: res.data.data.liveId, + duration: res.data.data.duration, + name: res.data.data.liveName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 6, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //创建直播 diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 11377929..c7b3016f 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -328,7 +328,25 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + courseId: state.assessmentId, + name: state.assessmentName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 1, + }) + .then(() => { + message.destroy() + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy() + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //重置在线信息 diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 4622d2c4..9d7bb4b8 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -573,7 +573,15 @@ export default { type: 13, }); } else if (props.isLevel == 3) { - console.log(""); + apiTask.addTask({ + courseId: res.data.data.discussId, + duration: res.data.data.discussExplain, + name: res.data.data.discussName, + projectTemplateId: props.projectTemplatetId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 13, + }); } }; const onSelectChange = (selectedRowKeys, selectRow) => { diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index ab154f9b..35867aff 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -210,7 +210,23 @@ export default { message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + courseId: res.data.data.linkId, + name: res.data.data.linkName, + projectTempalteId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 7, + }) + .then(() => { + message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); + }); } }; //创建外链 diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index f3787e95..74394f5d 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -717,7 +717,26 @@ export default { message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + let editObj = { + courseId: res.data.data.examinationId, + duration: 0, + name: res.data.data.examinationName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 5, + }; + // 新增编辑或新增项目 + ProjectEditTask(editObj) + .then(() => { + message.success( + `${props.EditTestId ? "编辑" : "新增"}阶段任务成功` + ); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); + }); } }; From dd67df4f0b57b1ccda40c1b4dee742ac83bdc65a Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Fri, 25 Nov 2022 07:21:58 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=E6=B8=85=E9=99=A4=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E5=92=8C=E6=B5=8B=E8=AF=84=E7=9A=84=E6=B5=8B=E8=AF=95=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE=E5=92=8C=E5=A4=9A=E4=BD=99consolelo?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 2 +- src/components/drawers/AddCase.vue | 40 +++------ src/components/drawers/AddEval.vue | 44 ++++----- src/components/drawers/AddProject.vue | 104 +--------------------- src/components/drawers/SelectTest.vue | 1 + src/components/drawers/TestManage.vue | 17 ++-- src/components/drawers/WorkManage.vue | 1 - src/views/learningpath/LevelAddDetail.vue | 18 ++-- src/views/projectcenter/TaskAdd.vue | 6 +- 9 files changed, 51 insertions(+), 182 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index c348cf6d..800e7fe8 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -32,7 +32,7 @@ http.interceptors.request.use( // 此处测试默认配置token config.headers.token = "123456"; - // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyODg3MzIsImV4cCI6MTY2OTI5NTkzMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.af724ca2f4c530868cf923daa2e1a4a3733ee97430b830039ace513d628dfb42"; + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzMDA4MDksImV4cCI6MTY2OTMwODAwOSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.bb3e0e031513761003d5c3bfeaf16e364bdf8fe7bc4cf691a05a74dc454afbfb"; } return config; }, diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index b0cf6f14..c5e1c1e4 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -32,7 +32,7 @@
-
+
搜索
@@ -149,6 +149,8 @@ export default { ctx.emit("update:edit", false); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); + state.inputV1="" + state.selectedRowKeys=[] }; const afterVisibleChange = (bol) => { if ( bol == true ) { @@ -189,7 +191,6 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; - console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length); }; const handelChangePage = (page, pageSize) => { state.currentPage = page; @@ -199,7 +200,6 @@ export default { const getTableDate = (tableData) => { let data = tableData; let array = []; - if(state.inputV1 == ""){ data.map((value, index) => { let obj = { key: index, @@ -208,36 +208,18 @@ export default { companyId:value.companyId, coverUrl:value.coverUrl, id:value.id, + casesId:value.casesId, title:value.title, }; array.push(obj); }); state.tableData = array; - console.log('get下来获取全部的的数据',state.tableData); - } else { - data.map((value, index) => { - let obj = { - key: index, - authorId:value.authorId, - authorName:value.authorName, - companyId:value.companyId, - coverUrl:value.coverUrl, - id:value.id, - title:value.title, - }; - if(obj.title == state.inputV1){ - array.push(obj); - } - }); - state.tableData = array; - console.log('get下来搜索的的数据',state.tableData); - } }; //获取全部案例信息接口 const getAllCaseText = () => { api .queryCasesDetailList({ - "keyWord": "", + "keyWord": state.inputV1, "orderAsc": true, "orderField": "", "pageIndex": 0, @@ -257,8 +239,8 @@ export default { for(let i = 0;i < state.apiTaskList.length;i++){ RouterEditTask({ chapterId: props.isactive, - courseId: state.apiTaskList[i].id, - name: state.apiTaskList[i].caseName, + courseId: state.apiTaskList[i].casesId, + name: state.apiTaskList[i].title, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 3, @@ -274,18 +256,16 @@ export default { }); } } else if (props.isLevel == 2) { - console.log("state api task list: %o-length: %o", state.apiTaskList, state.apiTaskList.length ) for(let i = 0;i < state.apiTaskList.length;i++){ - console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId'); apiTask .addTask({ - "courseId": state.apiTaskList[i].caseid, + "courseId": state.apiTaskList[i].casesId, "duration": 0, "flag": true, - "name": state.apiTaskList[i].caseName, + "name": state.apiTaskList[i].title, "projectId": props.projectId, "projectTaskId": props.projectTaskId, - "stageId": props.chooseStageId, + "stageId": Number(props.chooseStageId), "type": 3, }) .then(() => { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index e955613c..df92937e 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -56,6 +56,7 @@ class="tag-style" v-if="evaluationTypeName != ''" :closable="true" + @close="delTag" >{{ evaluationTypeName }} @@ -149,11 +150,6 @@ export default { type: Number, default: null, }, - projectTaskId: { - // 要编辑的projectId - type: Number, - default: null, - }, routerId: { type: Number, default: null, @@ -198,6 +194,11 @@ export default { const showEvalDrawer = () => { state.EvalListVisible = true; }; + //删除标签要清除子组件传过来的参数 + const delTag = ()=> { + state.evaluationTypeId= 0 + state.evaluationTypeName= "" + } //向关卡或阶段渲染 const updateTask = (value) => { if (props.isLevel == 1) { @@ -257,16 +258,17 @@ export default { dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), ]; }) - .catch(() => { + .catch((err) => { message.destroy() message.error("获取测量平信息失败"); + console.log(err,"erererrerererererer"); }); } const creoredit = ()=> { if(props.edit){ - editInvistText + editInvistText() }else{ - createEvalText + createEvalText() } } const editInvistText = ()=> { @@ -279,22 +281,9 @@ export default { return message.info("请选择测评"); } let objei = { - // "createTime": "", - // "createUser": 0, - // "evaluationEndTime": "", - // "evaluationFlag": "", - // "evaluationId": "", - // "evaluationName": "", - // "evaluationPictureAddress": "", - // "evaluationStartTime": "", - // "evaluationTag": "", - // "evaluationTypeId": 0, - // "evaluationTypeName": "", - // "updateTime": "", - // "updateUser": 0 evaluationName: state.inputV1, evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), - evaluationId: props.edit ? props.evaluationId : 0, + evaluationId: props.edit ? Number(props.EditEvalId) : 0, evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, @@ -307,13 +296,11 @@ export default { .updateEvaluation(objei) .then((res) => { updateTask(res.data.data); - console.log('编辑后的测评信息 编辑后的测评id还和之前一样么?',res.data.data); - message.success("编辑测评信息成功"); closeDrawer(); ctx.emit("changeData", false); }) - .catch(() => { - message.error("编辑测评信息创建失败"); + .catch((err) => { + console.log(err,'errrrrrrrrrrrrrrrrrrrrr'); }); } //创建测评信息 @@ -329,7 +316,7 @@ export default { let obj = { evaluationName: state.inputV1, evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), - evaluationId: props.edit ? props.evaluationId : 0, + evaluationId: props.evaluationId , evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, @@ -342,12 +329,10 @@ export default { .createEvaluation(obj) .then((res) => { updateTask(res.data.data); - message.success("创建成功"); closeDrawer(); ctx.emit("changeData", false); }) .catch(() => { - message.error("创建失败"); }); }; @@ -356,6 +341,7 @@ export default { afterVisibleChange, checkFinish, closeDrawer, + delTag, //增改 creoredit, createEvalText, diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 4622d2c4..28494493 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -213,8 +213,6 @@