From e0e134004c0b4538d0b78d17f4934cef33b6ba36 Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Fri, 25 Nov 2022 22:37:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E9=BD=90=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 2 +- src/components/drawers/AddEval.vue | 12 +++++++----- src/components/drawers/EvList.vue | 22 ++++++++-------------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index 3562efbb..a20b0f8b 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -34,7 +34,7 @@ http.interceptors.request.use( // 此处测试默认配置token config.headers.token = "123456"; - // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzMDA4MDksImV4cCI6MTY2OTMwODAwOSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.bb3e0e031513761003d5c3bfeaf16e364bdf8fe7bc4cf691a05a74dc454afbfb"; + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzODQ5MTgsImV4cCI6MTY2OTM5MjExOCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.7c3af587cbacf68180e86681442e06ffd33c65a78fc835aaac34d0c773752d99"; } return config; }, diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 26953fd6..b8c15ac0 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -173,8 +173,10 @@ export default { // addLoading:false, }); const checkFinish = (value)=> { + console.log('父亲'); state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null state.evaluationTypeName = value.title ? value.title : "" + console.log(value,state.evaluationTypeName ,'state.evaluationTypeName state.evaluationTypeName '); } const closeDrawer = () => { ctx.emit("update:addevalVisible", false); @@ -182,9 +184,9 @@ export default { state.inputV1 = ""; state.time = undefined; state.description = ""; - (state.evaluationTypeId = 0), - (state.evaluationTypeName = ""), - localStorage.setItem("stageId", props.chooseStageId); + state.evaluationTypeId = 0, + state.evaluationTypeName = "", + localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bool) => { @@ -232,9 +234,11 @@ export default { type: 10, }) .then(() => { + message.destroy() message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); }) .catch(() => { + message.destroy() message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { @@ -347,12 +351,10 @@ export default { .createEvaluation(obj) .then((res) => { updateTask(res.data.data); - message.success("创建成功"); closeDrawer(); ctx.emit("changeData", false); }) .catch(() => { - message.error("创建失败"); }); }; diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index c08d98d3..9d71243c 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -148,16 +148,12 @@ import { reactive, toRefs } from "vue"; }, ] }); - // const onSelect = (record)=> { - // state.evaluationTypeName = record.title - // state.evaluationTypeId = record.quiz_code - // }; const onSelectChange = (selectedRowKeys,selectedRows)=> { - if(state.selectedRowKeys.length>1){ + if(selectedRowKeys.length>1){ return } state.selectedRowKeys = selectedRowKeys - state.evListData = selectedRows[0] ? selectedRows[0] : [] + state.evListData = selectedRows[0] ? selectedRows[0] : {} } const closeDrawer = () => { ctx.emit("update:EvalListVisible", false); @@ -171,11 +167,8 @@ import { reactive, toRefs } from "vue"; } }; const checkFinish =() =>{ - let EvListDate = { - Id : state.evaluationTypeId, - Name : state.evaluationTypeName, - } - ctx.emit("getEvListDate", EvListDate); + ctx.emit("getEvListData", state.evListData); + console.log('儿子',state.evListData); closeDrawer(); } const changePagination = (page) => { @@ -230,6 +223,7 @@ import { reactive, toRefs } from "vue"; key:index+1, status:value.status, quiz_code:value.quiz_code, + quiz_kid:value.quiz_kid, title:value.title, theme_desc:value.theme_desc, quiz_price:value.quiz_price, @@ -245,17 +239,17 @@ import { reactive, toRefs } from "vue"; const getAllEvalText = ()=> { let objael = { "keyword": "", - "user_id": 965341999643234304, + "user_id": "965341999643234304", } api - .choiceEvaluation(objael) + .choiceEvaluation(objael) .then((res) => { getTableDataList(res.data.data) }) .catch(()=>{ }) } - // + //搜索测评列表 const searchList = ()=> { state.searching = true getAllEvalText()