-
-
@@ -72,10 +72,12 @@ import { homeworklist } from '@/api/teaching/classwork'
import { getSmarttalkPage, getPrepareById } from '@/api/file'
import SetHomework from '@/views/prepare/container/set-homework.vue'
import FileImage from '@/components/file-image/index.vue'
+import { useGetHomework } from '@/hooks/useGetHomework'
import { ipcMsgSend } from '@/utils/tool'
import { useToolState } from '@/store/modules/tool'
import { asyncLocalFile } from '@/utils/talkFile'
import Lesson from './lesson.vue';
+import { parseCataByNode } from '@/utils/talkFile'
const { ipcRenderer } = window.electron || {}
const route = useRoute();
@@ -108,13 +110,28 @@ const closeHomework = () => {
setDialog.value = false
}
+
+const changeChapter = async (data)=>{
+ const res = await useGetHomework(data)
+ dataList.value = res
+ let cata = parseCataByNode(data)
+
+ toolStore.curSubjectNode.querySearch.levelFirstId = cata[0]
+ toolStore.curSubjectNode.querySearch.levelSecondId = cata[1]
+ lesson.value = data.label
+ showLeft.value = !showLeft.value
+ getResource()
+}
+
// 获取资源数据
const getResource = () => {
- let data = toRaw(toolStore.curSubjectNode)
- data.orderByColumn = 'uploadTime'
- data.isAsc = 'desc'
- data.pageSize = 500
- getSmarttalkPage(data).then(res => {
+ let querySearch = toRaw(toolStore.curSubjectNode).querySearch
+
+ querySearch.orderByColumn = 'uploadTime'
+ querySearch.isAsc = 'desc'
+ querySearch.pageSize = 500
+
+ getSmarttalkPage(querySearch).then(res => {
resourceList.value = res.rows
})
@@ -210,9 +227,9 @@ onMounted(() => {
entpcourseid.value = route.query.entpcourseid
lesson.value = route.query.label
getHomework()
- setTimeout(() => {
+ setTimeout(()=>{
getResource()
- }, 5000)
+ },5000)
})
@@ -224,8 +241,9 @@ onMounted(() => {
.homework {
width: 100%;
+ height: 100%;
position: absolute;
-
+ flex-direction: column;
}
.homework-content {
@@ -317,6 +335,8 @@ onMounted(() => {
.unit-top-center{
margin: 0 auto;
}
-
+}
+.unit-content{
+ height: calc(100% - 50px);
}
\ No newline at end of file
diff --git a/src/renderer/src/views/tool/components/lesson.vue b/src/renderer/src/views/tool/components/lesson.vue
index 87f65f1..7ed1658 100644
--- a/src/renderer/src/views/tool/components/lesson.vue
+++ b/src/renderer/src/views/tool/components/lesson.vue
@@ -1,5 +1,6 @@
-
+
+
@@ -7,14 +8,16 @@
{{ node.label }}
-
+
+
\ No newline at end of file
From e89ffd4416e6c3e1bf7522be871764e408859a16 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Mon, 12 Aug 2024 16:51:10 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 5cf82e3..5c5797a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "aix-win",
- "version": "1.0.6",
+ "version": "1.0.7",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "example.com",
From c4c4bca54ae662918d41f3782b64dd65559b9136 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Mon, 12 Aug 2024 16:52:41 +0800
Subject: [PATCH 12/20] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=94=B9?=
=?UTF-8?q?=E7=A7=91=E7=9B=AE=E4=B8=BB=E9=A1=B5=E8=AF=BE=E7=A8=8B=E4=B8=8D?=
=?UTF-8?q?=E8=83=BD=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/choose-textbook/index.vue | 48 +++++++------------
.../src/components/move-file/index.vue | 17 ++-----
src/renderer/src/router/index.js | 2 +-
src/renderer/src/views/prepare/index.vue | 15 +++---
src/renderer/src/views/profile/userInfo.vue | 15 +++++-
5 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 9693126..bdd14b9 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -42,7 +42,7 @@
From 1f9788498ac0aab3f7075121e0e7b0f19fc00d3c Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Tue, 13 Aug 2024 15:12:55 +0800
Subject: [PATCH 19/20] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89defineProps,?=
=?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=A4=87=E8=AF=BE-?=
=?UTF-8?q?=E8=AF=BE=E6=A0=87=E7=A0=94=E8=AF=BB=EF=BC=8C=E9=AB=98=E8=80=83?=
=?UTF-8?q?=E7=A0=94=E8=AF=BB=EF=BC=8C=E6=95=99=E5=AD=A6=E5=A4=A7=E6=A8=A1?=
=?UTF-8?q?=E5=9E=8B=E9=93=BE=E6=8E=A5=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84bug;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/classManage/select/index.vue | 2 +-
src/renderer/src/plugins/shareStore.js | 19 +++++++++++++++++--
.../src/views/classManage/basicGroup.vue | 2 +-
.../src/views/classManage/classInfo.vue | 2 +-
.../src/views/classManage/studentList.vue | 2 +-
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/renderer/src/components/classManage/select/index.vue b/src/renderer/src/components/classManage/select/index.vue
index b8959c3..6a11142 100644
--- a/src/renderer/src/components/classManage/select/index.vue
+++ b/src/renderer/src/components/classManage/select/index.vue
@@ -5,7 +5,7 @@
diff --git a/src/renderer/src/components/pdf/index.vue b/src/renderer/src/components/pdf/index.vue
index 2ab4c39..e588373 100644
--- a/src/renderer/src/components/pdf/index.vue
+++ b/src/renderer/src/components/pdf/index.vue
@@ -73,11 +73,6 @@ const renderPage = async (canvasobj) => {
canvasContext: canvasobj.context,
viewport: viewport
}
- // console.log(renderContext,22222222222222222222)
- // const textContent = await page.getTextContent();
- // console.log(textContent);
- // const annotations = await page.getAnnotations();
- // console.log(annotations);
page.render(renderContext).promise.then((res) => {
const img = document.createElement('img')
img.src = canvasobj.canvas.toDataURL('image/png')
@@ -90,7 +85,6 @@ const renderPage = async (canvasobj) => {
if (canvasobj.index == 0) {
canvasFabricVue.value.canvas.setWidth(screenWidth)
canvasFabricVue.value.canvas.setHeight(screenHeight)
- // updateCanvasBackgroundImage(canvasFabricVue,img)
displayData(canvasFabricVue, canvsStore, canvasobj, fabric, img)
} else {
canvas1FabricVue.value.canvas.setWidth(screenWidth)
@@ -198,10 +192,7 @@ const initPdf = async (type = 'default') => {
})
}
// 保存数据
- // savecanvsStore(imgarr, canvsStore)
-
if (props.pdfObj.numberOfPdf == 1) {
- // imgarr.value[0]
canvasFabricVue.value.history.clean()
} else {
canvasFabricVue.value.history.clean()
@@ -380,7 +371,10 @@ defineExpose({
savaDataStore
})
watchEffect(() => {
- console.log(toolState,'监听')
+ setTimeout(() => {
+ console.log(toolState,'监听')
+
+ }, 300)
if(toolState.isPdfWin){
// if(toolState.isToolWin){
// ispointer.value=false
diff --git a/src/renderer/src/views/classBegins/index.vue b/src/renderer/src/views/classBegins/index.vue
index 3d7e874..5876c9c 100644
--- a/src/renderer/src/views/classBegins/index.vue
+++ b/src/renderer/src/views/classBegins/index.vue
@@ -41,6 +41,7 @@ const { ipcRenderer } = require('electron')
import { getBookMarkById } from '@/api/eTextbook/index'
import {useToolState} from '@/store/modules/tool'
pdfjsLib.GlobalWorkerOptions.workerSrc = getStaticUrl('/lib/build/pdf.worker.mjs')
+
const toolState = useToolState();
const route = useRoute();
const isOnLoadShow = ref(false) //加载完毕显示
@@ -70,14 +71,9 @@ const navtopage = (type) => {
if (pdfObj.numPages > numPagesTotal.value) return
pdfCanvaslist.value.initPdf('rest')
}
-// 最小化窗口
+// 关闭窗口
const minimize = async () => {
await pdfCanvaslist.value.savaDataStore()
- // toolState.isPdfWin=false
- // toolState.showBoardAll=true //恢复默认值
- // console.log(toolState.showBoardAll,"关闭")
- // // ipcRenderer.send('tool-sphere:reset') //重置tool状态
- // ipcRenderer.send('open-PDF:minimize')
}
const handleUpdate = (data) => {
numPagesTotal.value = data
@@ -104,11 +100,12 @@ const switchPageMode = () => {
}
}
onMounted(async () => {
- toolState.isPdfWin=true
+ toolState.isPdfWin=true //设置打开pdf窗口
// pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上
pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
textbookId.value = route.query.textbookId
pdfObj.bookId=textbookId.value
+ //初始化获取接口数据
getBookMarkById(textbookId.value).then(res=>{
pdfObj.allPageData=getUniqueArrayByLastOccurrence(res.data)
isOnLoadShow.value=true