diff --git a/src/components/Panel/index.vue b/src/components/Panel/index.vue index 97e9981..cae3302 100644 --- a/src/components/Panel/index.vue +++ b/src/components/Panel/index.vue @@ -496,16 +496,19 @@ const submit = async () => { let score = 0; // 给判分列表添加分数和运行结果 - taskList.value.map((e) => { - const item = retMap?.scoreInfo.find((n) => n.lcId === e.judgmentId); - if (item) { - e.examScore = item.questionScore; - e.finishedResult = item.calculate; // 1:正确,2:错误 - score += item.questionScore; // 计算总分 - } else { - e.examScore = 0; - } - }); + taskList.value.map((e) => { + const item = retMap?.scoreInfo.find((n) => n.lcId === e.judgmentId); + console.log('🚀 ~ taskList.value.map ~ item:', item); + try { + if (item) { + e.examScore = item.questionScore; + e.finishedResult = item.calculate; // 1:正确,2:错误 + score += item.questionScore; // 计算总分 + } else { + e.examScore = 0; + } + } catch (e) {} + }); grade.value = score < 10 ? '0' + score : score; reportId.value = retMap.reportId; Cookies.set('sand-reportId', retMap.reportId); diff --git a/src/views/Home.vue b/src/views/Home.vue index 7eec587..87d8d57 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -145,6 +145,8 @@ onMounted(() => { --line6: 840px; --line7: 1000px; --line8: 1160px; + --line9: 1320px; + --line10: 1480px; @apply absolute w-[218px] h-[120px] text-white bg-[url('@/assets/images/level/8.png')] bg-[length:100%_100%] bg-no-repeat cursor-pointer; &:before, &:after { @@ -355,11 +357,41 @@ onMounted(() => { @include verticalLine; } } - &:last-child { + &:nth-child(41) { + @apply top-[var(--line9)]; &:before { display: none; } } + &:nth-child(42) { + @apply top-[var(--line10)] left-[160px]; + } + &:nth-child(43) { + @apply top-[var(--line9)] left-[var(--w)]; + } + &:nth-child(44) { + @apply top-[var(--line10)] left-[510px]; + } + &:nth-child(45) { + @apply top-[var(--line9)] left-[calc(var(--w)*2)]; + } + &:nth-child(46) { + @apply top-[var(--line10)] left-[820px]; + } + &:nth-child(47) { + @apply top-[var(--line9)] left-[calc(var(--w)*3)]; + } + &:nth-child(48) { + @apply top-[var(--line10)] left-[1170px]; + } + &:nth-child(49) { + @apply top-[var(--line9)] left-[calc(var(--w)*4)]; + } + // &:last-child { + // &:before { + // display: none; + // } + // } } .arrow { @apply fixed bg-[length:100%_100%] bg-no-repeat animate-bounce cursor-pointer; diff --git a/src/views/config/level/Index.vue b/src/views/config/level/Index.vue index f7f0078..d8af7e8 100644 --- a/src/views/config/level/Index.vue +++ b/src/views/config/level/Index.vue @@ -212,26 +212,30 @@ watch([params, () => route.query], getList); const save = async () => { if (saveLoading.value) return false; saveLoading.value = true; - // 编辑 - const param = list.value - .filter((e) => e.checkpointId) - .map((e, i) => { - e.serialNumber = i + 1; - return { - checkpointId: e.checkpointId, - customsPassName: e.customsPassName, - isEnable: e.isEnable, - serialNumber: e.serialNumber, - }; - }); - await updatePass(param); - // 新增 - const addList = list.value.filter((e) => !e.checkpointId && e.customsPassName); - await savePass(addList); - getList(); - ElMessage.success('保存成功!'); - saveLoading.value = false; - hadChange.value = 0; + try { + // 编辑 + const param = list.value + .filter((e) => e.checkpointId) + .map((e, i) => { + e.serialNumber = i + 1; + return { + checkpointId: e.checkpointId, + customsPassName: e.customsPassName, + isEnable: e.isEnable, + serialNumber: e.serialNumber, + }; + }); + await updatePass(param); + // 新增 + const addList = list.value.filter((e) => !e.checkpointId && e.customsPassName); + await savePass(addList); + getList(); + ElMessage.success('保存成功!'); + saveLoading.value = false; + hadChange.value = 0; + } catch (e) { + saveLoading.value = false; + } }; // 输入序号排序 const submitSerial = (row: Record, oldIndex: number, newIndex: number) => { @@ -277,15 +281,17 @@ const cancel = async (row: Record) => { }; // 删除 const handleDelete = async (id: number[]) => { - const param = id.map((e) => { - return { - checkpointId: e, - isDel: 1, - }; - }); - await updatePass(param); - getList(); - ElMessage.success('删除成功!'); + try { + const param = id.map((e) => { + return { + checkpointId: e, + isDel: 1, + }; + }); + await updatePass(param); + getList(); + ElMessage.success('删除成功!'); + } catch (e) {} }; // 批量删除 const delAll = async () => { diff --git a/src/views/product/bank/Info.vue b/src/views/product/bank/Info.vue index 70253f3..4e13050 100644 --- a/src/views/product/bank/Info.vue +++ b/src/views/product/bank/Info.vue @@ -10,7 +10,7 @@ {{ info.opinionDescription }}

审查日期:{{ info.approvalTime }}

-

审查员:公瑾

+

审查员:{{ userName }}

一、产品定义
@@ -123,6 +123,7 @@