{{ item.raw.name }}
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 7d1954f..9287e78 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -117,10 +117,28 @@ export default {
this.callback(param)
})
this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
-
+
},
mounted() {
},
+ activated() {
+ if (this.uploadData.textbookId !== null) {
+ this.isLoading = true
+ getSmarttalkPage({
+ ...this.uploadData,
+ orderByColumn: 'uploadTime',
+ isAsc: 'desc',
+ pageSize: 500
+ })
+ .then(async (res) => {
+ this.currentFileList = [...res.rows]
+ this.isLoading = false
+ })
+ .catch(() => {
+ this.isLoading = false
+ })
+ }
+ },
methods: {
createFile() {
creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
@@ -252,9 +270,9 @@ export default {
},
// 打开外部链接
handleOutLink(key){
- // key 对应的 linkConfig.js 外部链接配置
+ // key 对应的 linkConfig.js 外部链接配置
let configObj = outLink[key]
- // 通知主进程
+ // 通知主进程
ipcRenderer.send('openWindow', {
fullPath: configObj.fullPath,
cookieData: {...(configObj.data)}
diff --git a/src/renderer/src/views/resource/store.js b/src/renderer/src/views/resource/store.js
index 3f2342e..76e474a 100644
--- a/src/renderer/src/views/resource/store.js
+++ b/src/renderer/src/views/resource/store.js
@@ -76,7 +76,6 @@ export default defineStore('resource', {
if (data.fileSuffix == -1) {
data.fileSuffix = ''
}
- console.log(data, 200)
getSmarttalkPage(data).then((res) => {
this.result.total = res.total
this.result.list = res.rows
From 0a641fee06ba3c272518d166bede3fa17bb7a7b9 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 25 Jul 2024 10:09:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E8=B7=AF?=
=?UTF-8?q?=E7=94=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/layout/components/Header.vue | 4 ++--
src/renderer/src/router/index.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index e4642b3..8c96268 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -60,11 +60,11 @@ const menus = ref([
name: '备课',
path: '/prepare'
},
- {
+ /*{
icon: 'icon-jiangke1 icon-teach',
name: '授课',
path: '/teach'
- }
+ }*/
])
// 监听当前路由
diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index 7692dc2..c02b728 100644
--- a/src/renderer/src/router/index.js
+++ b/src/renderer/src/router/index.js
@@ -18,7 +18,7 @@ export const constantRoutes = [
path: '/resource',
component: () => import('@/views/resource/index.vue'),
name: 'resource',
- meta: {title: '资源',keepAlive:true}
+ meta: {title: '资源'}
},
{
path: '/prepare',
From 9f9a611f89150949572ef14f70c9c51c0b0d9568 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 26 Jul 2024 09:11:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9ABUG=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/file.js | 2 +-
src/renderer/src/utils/resourceDict.js | 6 ++++-
src/renderer/src/views/prepare/index.vue | 33 ++++++++++++------------
3 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/main/file.js b/src/main/file.js
index 5637a23..d10cb59 100644
--- a/src/main/file.js
+++ b/src/main/file.js
@@ -238,7 +238,7 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
//下载文件
ipcMain.on('download-file-default', (e, { url, fileName }) => {
createFolder('selfFile').then(async () => {
- const browserWindow = BrowserWindow.fromId(e.sender.id)
+ const browserWindow = BrowserWindow.getFocusedWindow()
const id = await manager.download({
window: browserWindow,
url: url,
diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js
index eb9275c..a1a1a61 100644
--- a/src/renderer/src/utils/resourceDict.js
+++ b/src/renderer/src/utils/resourceDict.js
@@ -20,6 +20,10 @@ export const resourceFormat = [
label: 'ppt',
value: 'ppt'
},
+ {
+ label: 'pptx',
+ value: 'pptx'
+ },
{
label: 'mp3',
value: 'mp3'
@@ -62,4 +66,4 @@ export const resourceType = [
label: '教案',
value: '教案'
}
-]
\ No newline at end of file
+]
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 9287e78..a485a49 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -14,6 +14,7 @@
@@ -123,20 +124,7 @@ export default {
},
activated() {
if (this.uploadData.textbookId !== null) {
- this.isLoading = true
- getSmarttalkPage({
- ...this.uploadData,
- orderByColumn: 'uploadTime',
- isAsc: 'desc',
- pageSize: 500
- })
- .then(async (res) => {
- this.currentFileList = [...res.rows]
- this.isLoading = false
- })
- .catch(() => {
- this.isLoading = false
- })
+ this.asyncAllFile()
}
},
methods: {
@@ -331,8 +319,16 @@ export default {
height: 150px;
align-items: center;
justify-content: center;
- background: linear-gradient(#97c4ed, #7aa8e5);
- padding-right: 20px;
+ position: relative;
+ background: linear-gradient(#b0d1ef, #3e7bcb);
+ .top-zoom-style{
+ position: absolute;
+ width: 90%;
+ height: 30px;
+ background: linear-gradient(#b0d1ef, #5283c4);
+ bottom: 0;
+ clip-path: polygon(3% 0%, 97% 0%, 100% 100%, 0% 100%);
+ }
.textbook-img{
height: 120px;
background-color: #ffffff;
@@ -340,11 +336,13 @@ export default {
border-radius: 6px;
overflow: hidden;
margin-right: 20px;
+ z-index: 1;
}
.top-item{
width: 230px;
-
+ position: relative;
flex-wrap: wrap;
+ z-index: 1;
.btn{
width: 102px;
background: none;
@@ -368,6 +366,7 @@ export default {
height: 80px;
margin-left: 25px;
font-size: 18px;
+ z-index: 1;
.icon-lingdang{
margin-right: 5px;
color: #ffffff;
From 53e34dc515ac4b8b3a4be846e61da4e8e5cd7384 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 26 Jul 2024 15:22:58 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9ABUG=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/views/classManage/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue
index 8deb68d..45648eb 100644
--- a/src/renderer/src/views/classManage/index.vue
+++ b/src/renderer/src/views/classManage/index.vue
@@ -110,7 +110,7 @@
//学科列表
const courseList = ref([])
//班级id
- const classId = ref('')
+ const classId = ref(null)
//当前页面
const currentIndex = ref(0)
//年级