diff --git a/src/api/config.js b/src/api/config.js index e51593fd..a8899f02 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.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njg4NjI2MTAsImV4cCI6MTY2ODg2OTgxMCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.defa91ecb2b61d9b20d858db0c2c8d7d80dea4613cb2559a22569b7df36b3f6b"; + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962"; } return config; }, diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 22c806dc..a61dff5b 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -49,7 +49,7 @@ :row-class-name=" (_record, index) => (index % 2 === 1 ? 'table-striped' : null) " - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect }" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="tableDataFunc()" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" @@ -189,11 +189,8 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; + console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length); }; - const onSelect = ( record ) => { - state.caseId = record.caseid; - state.caseName = record.title; - } const handelChangePage = (page, pageSize) => { state.currentPage = page; state.pageSize = pageSize; @@ -215,6 +212,7 @@ export default { array.push(obj); }); state.tableData = array; + console.log('get下来的数据',state.tableData); }; //获取全部案例信息接口 const getAllCaseText = () => { @@ -237,29 +235,32 @@ export default { }; const updateTask = () => { if (props.isLevel == 1) { - RouterEditTask({ - chapterId: props.isactive, - courseId: state.caseId, - name: state.caseName, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, - type: 3, - }) - .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - state.addLoading = false; + for(let i = 0;i < state.apiTaskList.length;i++){ + RouterEditTask({ + chapterId: props.isactive, + courseId: state.apiTaskList[i].caseid, + name: state.apiTaskList[i].caseName, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 3, }) - .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); - }); + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + state.addLoading = false; + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + }); + } } else if (props.isLevel == 2) { - if(state.apiTaskList.length > 1){ - for(let i = 0;i <= state.apiTaskList.length;i++){ + 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].caseid, "duration": 0, "flag": true, "name": state.apiTaskList[i].caseName, @@ -279,27 +280,6 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } - } else { - apiTask - .addTask({ - "courseId": state.caseId, - "duration": 0, - "flag": true, - "name": state.caseName, - "projectId": props.projectId, - "projectTaskId": props.projectTaskId, - "stageId": props.chooseStageId, - "type": 3, - }) - .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - }) - .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); - }); - } } else if (props.isLevel == 3) { console.log(""); } @@ -315,7 +295,6 @@ export default { closeDrawer, tableDataFunc, onSelectChange, - onSelect, handelChangePage, getTableDate, updateTask, diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 2f3ece39..128063da 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -51,6 +51,14 @@ + + {{ evaluationTypeName }} +
@@ -88,11 +96,8 @@
- - @@ -161,106 +166,105 @@ export default { setup(props, ctx) { const state = reactive({ inputV1: "", - inputV2: "", time: undefined, EvalId: null, //子传回来的参数 - evaluationTypeId: null, + evaluationTypeId: 0, evaluationTypeName: "", description: "", EvalListVisible: false, // addLoading:false, }); - const checkFinish = (EvListDate)=> { - state.evaluationTypeId = EvListDate.Id - state.evaluationTypeName = EvListDate.Name + const checkFinish = (value)=> { + state.evaluationTypeId = value.quiz_kid + state.evaluationTypeName = value.title } const closeDrawer = () => { ctx.emit("update:addevalVisible", false); ctx.emit("update:edit", false); state.inputV1 = ""; - state.inputV2 = ""; localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bool) => { if (props.edit && bool) { - queryEval(); + queryInvistById() } }; const showEvalDrawer = () => { state.EvalListVisible = true; }; - const queryEval = () => { - api - .queryEvaluationDetailById({ evaluationId: props.evaluationId }) - .then((res) => { - state.inputV1 = res.data.data.evaluationName; - state.time = [ - dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), - dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), - ]; - state.evaluationTypeId = res.data.data.evaluationTypeId; - state.evaluationTypeName = res.data.data.evaluationTypeName; - }) - .catch(() => { - }); - }; - const updateTask = (res) => { + const updateTask = (value) => { if (props.isLevel == 1) { - apitaskadd - .addTask({ - courseId: res.data.data.evaluationId, - name: res.data.data.evaluationName, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, - evaluationTypeId: state.evaluationTypeId, - evaluationTypeName: state.evaluationTypeName, - type: 10, - }) - .then(( ) => { - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); - }) - .catch(( ) => { - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); - }); - } else if (props.isLevel == 2) { RouterEditTask({ chapterId: props.isactive, - courseId: res.data.data.evaluationId, - name: res.data.data.evaluationName, + courseId: Number(value.evaluationId), + name: value.evaluationName, routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, - evaluationTypeId: state.evaluationTypeId, - evaluationTypeName: state.evaluationTypeName, + routerTaskId: props.routerTaskId || 0, type: 10, }) .then(( ) => { - message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); + message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`); }) .catch(( ) => { - message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); + message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`); + }); + } else if (props.isLevel == 2) { + apitaskadd + .addTask({ + duration: 0, + flag: true, + courseId: Number(value.evaluationId), + name: value.evaluationName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 10, + }) + .then(( ) => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + }) + .catch(( ) => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { console.log(""); } }; - //创建或编辑测评信息 + //根据id获取测评信息 + const queryInvistById = ()=> { + let objqi = { + evaluationId : props.EditEvalId + } + api + .queryEvaluationDetailById(objqi) + .then((res) => { + message.destroy() + message.success("获取测评信息成功"); + state.inputV1 = res.data.data.evaluationName + state.evaluationTypeName = res.data.data.evaluationTypeName + state.evaluationTypeId = res.data.data.evaluationTypeId; + state.time = [ + dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), + dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), + ]; + }) + .catch(() => { + message.destroy() + message.error("获取测量平信息失败"); + }); + } + //创建测评信息 const createEvalText = () => { if (!state.inputV1) { message.destroy(); return message.info("请输入测评名称"); } - if (!state.inputV2) { + if (!state.evaluationTypeId) { message.destroy(); return message.info("请选择测评"); } - if (!state.time) { - message.destroy(); - return message.warning("请输入直播时间"); - } - let obj = { evaluationName: state.inputV1, evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), @@ -268,12 +272,15 @@ export default { evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, + evaluationFlag: "", + evaluationPictureAddress: "", + evaluationTag: "", + updateTime: "", }; - if (props.edit !== true) { api .createEvaluation(obj) .then((res) => { - updateTask(res); + updateTask(res.data.data); message.success("创建成功"); closeDrawer(); ctx.emit("changeData", false); @@ -281,19 +288,6 @@ export default { .catch(() => { message.error("创建失败"); }); - } else { - api - .updateEvaluation(obj) - .then((res) => { - updateTask(res); - message.success("编辑成功"); - closeDrawer(); - ctx.emit("changeData", false); - }) - .catch(( ) => { - message.error("编辑失败"); - }); - } }; return { @@ -303,6 +297,7 @@ export default { closeDrawer, //增改 createEvalText, + queryInvistById, showEvalDrawer, updateTask, }; @@ -366,6 +361,10 @@ export default { margin-left: 15px; color: #fff; } + .tag-style { + color: rgb(113, 113, 237); + background-color: #d7d1f7; + } } } .main_item2 { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index e16ef4d4..f3787e95 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -759,7 +759,7 @@ export default { }; const getData = (value)=> { state.paperId = value.paperId; - state.paperName = value.paperName; + state.paperName = value.testName; } return { formState, diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 257dbd95..929bfa48 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -77,7 +77,7 @@