From 3fdf500366279dc96aafb9a3f2f9a47e0356f2d0 Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Thu, 12 Sep 2024 09:30:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=AC=AC=E4=B8=89=E6=96=B9=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=90=8D=E7=A7=B0=E4=B8=8D=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/components/choose-textbook/third/index.vue | 4 +++- src/renderer/src/views/classManage/aside.vue | 1 - src/renderer/src/views/classManage/index.vue | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/components/choose-textbook/third/index.vue b/src/renderer/src/components/choose-textbook/third/index.vue index 2b7a6a2..dc5fd9e 100644 --- a/src/renderer/src/components/choose-textbook/third/index.vue +++ b/src/renderer/src/components/choose-textbook/third/index.vue @@ -41,7 +41,9 @@ const getSubject = (value) => { gradeName:gradeList[currentIndex].label } }) - const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject) + //判断是否有名称或者包括名称就对应哪个学科 + const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject || item.subjectName.includes(useStore.user.edusubject)) + if(nameIndex === -1) return; getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName}) if(textbookVersionId.value === 0){ getTagId(subjectList.value[0]) diff --git a/src/renderer/src/views/classManage/aside.vue b/src/renderer/src/views/classManage/aside.vue index 32bb0d2..f7ee23f 100644 --- a/src/renderer/src/views/classManage/aside.vue +++ b/src/renderer/src/views/classManage/aside.vue @@ -34,7 +34,6 @@ const emits = defineEmits(['handleSelect']) //点击跳转路由 const handleSelect = (itemDom,pathKey) => { - console.log(itemDom,pathKey) const parts = pathKey[1].split("-") const result = parts.slice(0, 2).join("-") const index = props.menuItems.findIndex(item=>item.index===result) diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue index 4fd66be..8ef42c2 100644 --- a/src/renderer/src/views/classManage/index.vue +++ b/src/renderer/src/views/classManage/index.vue @@ -2,8 +2,8 @@
- -
+ +
From bc0579fa3297b8bc543b5ef0dbdb6452c254c1b9 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Thu, 12 Sep 2024 09:47:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/main/index.js | 4 ++-- src/renderer/src/components/choose-textbook/index.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index b43d760..80f69fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win", - "version": "1.2.0", + "version": "1.2.2", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/main/index.js b/src/main/index.js index e4559b2..a4875ac 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -53,7 +53,7 @@ function createLoginWindow() { updateInit(loginWindow) } - // loginWindow.webContents.openDevTools() + loginWindow.webContents.openDevTools() loginWindow.once('ready-to-show', () => { loginWindow.show() }) @@ -297,4 +297,4 @@ function appWatchError() { app.on('child-process-gone', async (event, details) => { console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`) }) -} \ No newline at end of file +} diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 007f9a0..94b9e2b 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -264,7 +264,7 @@ const transData = (data) => { //获取教材 const getSubject = async () => { - const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000 }) + const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', }) // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject) subjectList.value = rows From 6a33ea8023574608044f16fc1af9c285f6e9708e Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Thu, 12 Sep 2024 09:47:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=8F=90=E7=A4=BA=E6=95=99=E6=9D=90?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=E9=80=89=E6=8B=A9=E6=95=99=E6=9D=90?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/container/reserv.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue index ed2ee39..c76c36f 100644 --- a/src/renderer/src/views/prepare/container/reserv.vue +++ b/src/renderer/src/views/prepare/container/reserv.vue @@ -270,6 +270,11 @@ const updateClassReserv = (formData) => { } const addClassReserv = (formData) => { let ids = formData.resource.join(',') + // 判断是否添加教材 + if(!props.bookId){ + ElMessage.warning('请选择教材') + return + } let param = { className: formData.name, classType: formData.type,