diff --git a/src/api/config.js b/src/api/config.js index 8e180c47..ec213068 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-13 15:30:27 + * @LastEditTime: 2022-12-14 09:04:31 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); + // window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 2a3ee083..ddb7666f 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -21,21 +21,17 @@
- + v-model:assessmentVisible="assessmentVisible" + v-model:assessmentId="assessmentId" + v-model:assessmentName="assessmentName" + />
-
-
- - -
+ + + @@ -119,16 +115,16 @@ export default { assessmentName: "", assessment: null, assessment1: null, - assessmentVisible:false, + assessmentVisible: false, titleTag: false, }); - // const getCheckedAss = (ass) => { - // state.assessmentId = ass.assessmentId; - // state.assessment = ass; - // console.log("state.assessment1",state.assessment); - // - // }; - + // const getCheckedAss = (ass) => { + // state.assessmentId = ass.assessmentId; + // state.assessment = ass; + // console.log("state.assessment1",state.assessment); + // + // }; + const closeDrawer = () => { ctx.emit("update:addinvistVisible", false); ctx.emit("update:edit", false); @@ -138,43 +134,45 @@ export default { // ctx.emit("changeData", false); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); - }; const checkAssDrawer = () => { state.assessmentVisible = true; }; const afterVisibleChange = (bool) => { - if(bool && props.EditInvistId >0){ + if (bool && props.EditInvistId > 0) { state.assessmentVisible = true; state.assessmentId = props.EditInvistId; - }else{ - state.assessmentId =null; - state.assessmentName =null; + } else { + state.assessmentId = null; + state.assessmentName = null; } - }; - + const updateTask = () => { - console.log("state.assessmentId ",state.assessmentId ,state.assessmentName ); + console.log( + "state.assessmentId ", + state.assessmentId, + state.assessmentName + ); if (!state.assessmentId) { return message.warning("请选择评估"); } let l_data_id = []; - l_data_id.push(Number(state.assessmentId)) - console.log("state.assessment",state.assessment,state.assessmentId); + l_data_id.push(Number(state.assessmentId)); + console.log("state.assessment", state.assessment, state.assessmentId); if (props.isLevel == 1) { - if(!props.isactive){ + if (!props.isactive) { message.destroy(); return message.warning("请先选中关卡"); } IsExistence({ chapterId: Number(props.isactive), - courseTaskId:l_data_id, + courseTaskId: l_data_id, routerId: props.routerId, type: 11, }) .then((res) => { - console.log('shifouchongfu',res) + console.log("shifouchongfu", res); console.log("路径图中是否包含此评估了", res); if (res.data.data.length) { let strdata = res.data.data; @@ -200,7 +198,9 @@ export default { }) .then(() => { message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + message.success( + `${props.edit ? "编辑" : "新增"}关卡任务成功` + ); ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; @@ -210,20 +210,20 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); } - }).catch(err=>{ - console.log(err) }) - - + .catch((err) => { + console.log(err); + }); } else if (props.isLevel == 2) { IsExistenceProject({ courseTaskId: l_data_id, projectId: props.projectId, stageId: props.chooseStageId || 0, type: 11, - }).then(res=>{ - console.log(res) - console.log("项目中是否包含此评估了", res); + }) + .then((res) => { + console.log(res); + console.log("项目中是否包含此评估了", res); if (res.data.data.length) { let strdata = res.data.data; let tipStr = ""; @@ -239,71 +239,70 @@ export default { return; } else { apiTask - .addTask({ - courseId: state.assessmentId, - name: state.assessmentName, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId || 0, - type: 11, - }) - .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - }) - .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}任务失败`); - }); + .addTask({ + courseId: state.assessmentId, + name: state.assessmentName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0, + type: 11, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + }); } - }).catch(err=>{ - console.log(err) - }) - + }) + .catch((err) => { + console.log(err); + }); } else if (props.isLevel == 3) { IsExistenceProjectTemplate({ courseTaskId: l_data_id, projectTemplateId: props.projectTemplateId, stageId: props.chooseStageId || 0, type: 11, - }).then((res)=>{ - console.log(res) + }).then((res) => { + console.log(res); console.log("项目中是否包含此评估了", res); - if (res.data.data.length) { - let strdata = res.data.data; - let tipStr = ""; - for (let i = 0; i < strdata.length; i++) { - if (i == strdata.length - 1) { - tipStr += strdata[i].courseName; - } else { - tipStr += strdata[i].courseName + "/"; - } + if (res.data.data.length) { + let strdata = res.data.data; + let tipStr = ""; + for (let i = 0; i < strdata.length; i++) { + if (i == strdata.length - 1) { + tipStr += strdata[i].courseName; + } else { + tipStr += strdata[i].courseName + "/"; } - message.destroy(); - message.warning("评估(" + tipStr + ")重复添加"); - return; - }else{ - addTempTask({ - courseId: state.assessmentId, - name: state.assessmentName, - projectTemplateId: props.projectTemplateId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId || 0, - type: 11, - }) - .then(() => { - message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - }) - .catch(() => { - message.destroy(); - message.error(`${props.edit ? "编辑" : "新增"}任务失败`); - }); } + message.destroy(); + message.warning("评估(" + tipStr + ")重复添加"); + return; + } else { + addTempTask({ + courseId: state.assessmentId, + name: state.assessmentName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0, + type: 11, + }) + .then(() => { + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + }); + } }); - } }; @@ -313,7 +312,6 @@ export default { closeDrawer, updateTask, checkAssDrawer, - }; }, }; @@ -339,7 +337,6 @@ export default { } } .contentMain { - .main { width: 100%; .main_left { @@ -348,7 +345,7 @@ export default { .main_item { display: flex; align-items: center; - + .fi_input { margin-right: 20px; } @@ -410,7 +407,7 @@ export default { display: flex; justify-content: space-between; align-items: center; - margin-bottom:3px; + margin-bottom: 3px; height: 40px; background-color: #e9f6fe; .mntc_left { @@ -439,11 +436,11 @@ export default { } } } - + .main_btns { height: 72px; width: 100%; - + bottom: 0; left: 0; display: flex; diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index 016926f9..ae06897b 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -1,59 +1,54 @@