From d3acdae5fc6cd819f41fb5f7bab3fa26a14d5f25 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 29 Nov 2024 14:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=88=A0=E9=99=A4=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=81=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?meta=E6=B8=85=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 3 +++ src/views/research/ResearchAdd.vue | 26 ++++++++++++------- .../research/components/ResearchAddAsk.vue | 5 +++- .../research/components/ResearchAddPin.vue | 5 +++- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/public/index.html b/public/index.html index 823faeac..14df207b 100644 --- a/public/index.html +++ b/public/index.html @@ -12,6 +12,9 @@ + + + 京东方大学堂 diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 4837e2a3..2423e2bb 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -87,7 +87,7 @@ const canSubmit = computed(() => { data.value.scoringQuestionVoList ]; - return lists.some(list => Array.isArray(list) && list.length > 0); + return lists.some(list => Array.isArray(list) && list?.filter(item=>!item.deleted).length > 0); }); // const orderList = computed(()=>[...data.value.singleStemVoList.filter(t=>!t.deleted),...data.value.multipleStemVoList.filter(t=>!t.deleted),...data.value.essayQuestionVoList.filter(t=>!t.deleted),...data.value.scoringQuestionVoList.filter(t=>!t.deleted)].sort((a,b)=>a.orderNumber-b.orderNumber)) const orderList = computed(() => { @@ -103,7 +103,13 @@ const orderList = computed(() => { .sort((a, b) => a.orderNumber - b.orderNumber); }); watch(()=>orderList.value.length,()=> orderList.value.forEach((t,i)=>t.orderNumber = i + 1)) -watchEffect(() => id && request(ASSESSMENT_DETAIL(id), {}).then((res) => data.value = res.data)); +watchEffect(() => id && request(ASSESSMENT_DETAIL(id), {}).then((res) =>{ + res.data.singleStemVoList = res.data.singleStemVoList || [] + res.data.multipleStemVoList = res.data.multipleStemVoList || [] + res.data.essayQuestionVoList = res.data.essayQuestionVoList || [] + res.data.scoringQuestionVoList = res.data.scoringQuestionVoList || [] + data.value = res.data +})); const handleSave = () => { console.log(data); loading.value = true; @@ -112,12 +118,12 @@ const handleSave = () => { loading.value = false; return false; } - const listsss = data.value.scoringQuestionVoList.map((item) => ({ - minimumEvaluation: item.minimumEvaluation || '非常不满意', - highestEvaluation: item.highestEvaluation || '非常满意', - orderNumber: item.orderNumber, - assessmentId: id, - })); + // const listsss = data.value.scoringQuestionVoList.map((item) => ({ + // minimumEvaluation: item.minimumEvaluation || '非常不满意', + // highestEvaluation: item.highestEvaluation || '非常满意', + // orderNumber: item.orderNumber, + // assessmentId: id, + // })); // // 如果 assessmentId 有值调用 // if(id){ // request('/activitySubmit/editAssessmentScore post',listsss).then((res)=>{ @@ -238,11 +244,11 @@ const checkVal = () => { return false; } // 评分 - if (data.value.scoringQuestionVoList.length && data.value.scoringQuestionVoList?.some((item) => !item.deleted && (!item.assessmentScTitle))) { + if (data.value.scoringQuestionVoList?.length && data.value.scoringQuestionVoList?.some((item) => !item.deleted && (!item.assessmentScTitle))) { message.error("评分题干为必填 请确认!"); return false; } - if (data.value.scoringQuestionVoList.length && data.value.scoringQuestionVoList.reduce((pre, cur) => pre + parseInt(cur.weightScale), 0) !== 100) { + if (data.value.scoringQuestionVoList?.filter(item=>!item.deleted)?.length && data.value.scoringQuestionVoList?.filter(item=>!item.deleted)?.reduce((pre, cur) => pre + parseInt(cur.weightScale), 0) !== 100) { message.error("当前权重设置是百分制 请重新配置"); return false; } diff --git a/src/views/research/components/ResearchAddAsk.vue b/src/views/research/components/ResearchAddAsk.vue index cd55f218..d1007afe 100644 --- a/src/views/research/components/ResearchAddAsk.vue +++ b/src/views/research/components/ResearchAddAsk.vue @@ -43,7 +43,10 @@