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 @@