From cd5abd864d50a91e9a584c8df8ef3c2f0ff1d17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 11 Oct 2024 16:03:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=80=83=E8=AF=95=E5=88=86=E6=9E=90]=20-=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=9E=E7=BB=91=E5=AE=9A=E8=8F=81=E4=BC=98?= =?UTF-8?q?=E7=BD=91=E7=AB=A0=E8=8A=82=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=AF=95?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/choose-textbook/index.vue | 3 +- src/renderer/src/views/examReport/index.vue | 58 +++++++++++-------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 028cd02..3c4414d 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -49,7 +49,7 @@ import { useGetSubject } from '@/hooks/useGetSubject' const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH // 定义要发送的emit事件 -const emit = defineEmits(['nodeClick']) +const emit = defineEmits(['nodeClick', 'changeBook']) let useSubject = null const subjectList = ref([]) const dialogVisible = ref(false) @@ -164,7 +164,6 @@ const handleNodeClick = (data) => { sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys) sessionStore.set('subject.curNode', nodeData) emit('nodeClick', curData) - } onMounted( async () => { treeLoading.value = true diff --git a/src/renderer/src/views/examReport/index.vue b/src/renderer/src/views/examReport/index.vue index e45fa83..9a4c791 100644 --- a/src/renderer/src/views/examReport/index.vue +++ b/src/renderer/src/views/examReport/index.vue @@ -58,8 +58,8 @@ v-else-if="curTask.viewkey=='考点分析' " /> - @@ -81,6 +81,7 @@ import { JYApiListCT} from "@/utils/examQuestion/jyeoo" import examReview from './container/examReview.vue' import pointAnalysis from './container/pointAnalysis.vue' import examMocks from './container/examMocks.vue' +import { ElMessage } from 'element-plus' const {proxy} = getCurrentInstance(); const sourceStore = useResoureStore(); @@ -106,6 +107,19 @@ const listWorkType = ref([{ value: 0, }]); +const getCourseWorkList = async (params) => { + const res = await listEntpcourseworkNew(params); + if(res.data == null) { + listExamQuestion.value = []; + // queryParams.total = 0 + return; + } + listExamQuestion.value = res.data; + // queryParams.total = res.total; + // 格式化试题 + processList(listExamQuestion.value); +} + /** * @desc: 选中单元章节后的回调, 获取单元章节信息 * @return: {*} @@ -134,6 +148,15 @@ const getData = async (data) => { // const res = await listEntpcoursework(params); // listExamQuestion.value = res.rows; + // 当前不存在对应绑定的菁优网章节id时, 不进行处理 + // 注意: 菁优网章节id绑定需在网页端[/evaluation/bind]中进行绑定 + if (curNode.value.bookId == null || curNode.value.bookId == '' || curNode.value.bookId == '0') { + listExamQuestion.value = []; + loading.value = false; + ElMessage.error("当前单元/章节下无试题"); + return; + } + // 查询本地+菁优网(后端处理) const params = { eid: curNode.value.id, @@ -144,17 +167,7 @@ const getData = async (data) => { edustage: curNode.value.edustage, sectionName: curNode.value.itemtitle, } - const res = await listEntpcourseworkNew(params); - if(res.data == null) { - listExamQuestion.value = []; - // queryParams.total = 0 - loading.value = false; - return; - } - listExamQuestion.value = res.data; - // queryParams.total = res.total; - // 格式化试题 - processList(listExamQuestion.value); + await getCourseWorkList(params); loading.value = false; } @@ -202,6 +215,13 @@ const queryExamQuestionByParams = async () => { // const res = await listEntpcoursework(params); // listExamQuestion.value = res.rows; + if (curNode.value.bookId == null || curNode.value.bookId == '' || curNode.value.bookId == '0') { + listExamQuestion.value = []; + loading.value = false; + ElMessage.error("当前单元/章节下无试题"); + return; + } + // 查询本地+菁优网(后端处理) const params = { eid: curNode.value.id, @@ -212,17 +232,7 @@ const queryExamQuestionByParams = async () => { edustage: curNode.value.edustage, sectionName: curNode.value.itemtitle, } - const res = await listEntpcourseworkNew(params); - if(res.data == null) { - listExamQuestion.value = []; - // queryParams.total = 0 - loading.value = false; - return; - } - listExamQuestion.value = res.data; - // queryParams.total = res.total; - // 格式化试题 - processList(listExamQuestion.value); + await getCourseWorkList(params); loading.value = false; }