From 9803c09c434b805c4b688799f1cafde9d4378697 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Wed, 4 Dec 2024 17:04:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?s=E7=94=9F=E6=88=90PPT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/container/ai-pptistV2.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/renderer/src/views/prepare/container/ai-pptistV2.vue b/src/renderer/src/views/prepare/container/ai-pptistV2.vue index 674c65a..f92eca6 100644 --- a/src/renderer/src/views/prepare/container/ai-pptistV2.vue +++ b/src/renderer/src/views/prepare/container/ai-pptistV2.vue @@ -158,7 +158,7 @@ const outlineCreatePPT = () => { const checkProgress = () => { getProgressV2(res.sid).then(response => { - percentage.value = Math.round(response?.donePages/response?.totalPages)*100; + percentage.value = Math.round(response?.donePages*100/response?.totalPages); if (response.pptStatus === "done") { emit('addSuccess',{...res,url:response.pptUrl}) ElMessage.success("生成成功"); @@ -267,7 +267,6 @@ function webSocketSend(ws, data) { function result1(resultData) { let jsonData = JSON.parse(resultData); - console.log(jsonData) outputText.value += jsonData.payload.choices.text[0].content; const div = document.querySelector('.paragraphs'); if (div) { From 65670af54fdf67b75db01fc2e994f111b16f8e3a Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Fri, 6 Dec 2024 14:21:05 +0800 Subject: [PATCH 2/5] =?UTF-8?q?s=E7=94=9F=E6=88=90PPT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/AixPPTist/src/App.vue | 5 ++++- src/renderer/src/views/model/index.vue | 2 +- src/renderer/src/views/teachingDesign/container/right.vue | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/AixPPTist/src/App.vue b/src/renderer/src/AixPPTist/src/App.vue index 5214d9b..7cb504f 100644 --- a/src/renderer/src/AixPPTist/src/App.vue +++ b/src/renderer/src/AixPPTist/src/App.vue @@ -81,5 +81,8 @@ const initLoad: Function = () => { \ No newline at end of file + diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue index 6085346..95f3c39 100644 --- a/src/renderer/src/views/model/index.vue +++ b/src/renderer/src/views/model/index.vue @@ -10,7 +10,7 @@ 作业管理 教材研读 教学框架设计 - 打开PPTist + 考试分析 测试 文生图片 diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue index 6fae50c..289b39b 100644 --- a/src/renderer/src/views/teachingDesign/container/right.vue +++ b/src/renderer/src/views/teachingDesign/container/right.vue @@ -114,6 +114,7 @@ const params = reactive( const addAiPPT = async(res) => { let node = courseObj.node + pptDialog.value = false; if (!node) return msgUtils.msgWarning('请选择章节?') //TODO res中有PPT地址 const params = { evalid: node.id, edituserid: userStore.id, pageSize: 1 } From 8e72b50c68310b840efd8261f11f975081c745ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Mon, 9 Dec 2024 10:16:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ppts=EF=BC=9A=E5=9B=BE=E7=89=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20=E8=A3=81=E5=89=AA=E9=80=BB=E8=BE=91=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/element/ImageElement/ImageClipHandler.vue | 7 +++---- .../src/views/components/element/ImageElement/index.vue | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/ImageClipHandler.vue b/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/ImageClipHandler.vue index 14065e6..09370da 100644 --- a/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/ImageClipHandler.vue +++ b/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/ImageClipHandler.vue @@ -154,15 +154,13 @@ const topImgWrapperPositionStyle = computed(() => { const topImgPositionStyle = computed(() => { const bottomWidth = imgPosition.value.width const bottomHeight = imgPosition.value.height - console.log("底层图片位置大小（遮罩区域图片）", imgPosition.value) const { top, left, width, height } = topImgWrapperPosition.value - console.log("width", ((bottomWidth / width * 100) - (left * (100 / width))) + '%') - console.log("height", bottomHeight / height * 100 + '%') + return { left: -left * (100 / width) + '%', top: -top * (100 / height) + '%', - width: ((bottomWidth / width * 100) - (left * (100 / width))) + '%' , + width: bottomWidth / width * 100 + '%' , height: bottomHeight / height * 100 + '%', } }) @@ -540,6 +538,7 @@ const edgePoints = [ img { position: absolute; + max-width: none !important; } } } diff --git a/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/index.vue b/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/index.vue index 670f486..f785359 100644 --- a/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/index.vue +++ b/src/renderer/src/AixPPTist/src/views/components/element/ImageElement/index.vue @@ -183,6 +183,7 @@ const handleClip = (data: ImageClipedEmitData | null) => { } img { position: absolute; + max-width: none !important; // 防止图片被压缩 } } .color-mask { From e0a56b37efcbd42b4ac64dd9f49b2b281ff5294e Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Mon, 9 Dec 2024 10:51:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=94=B9=E5=90=8DAIPPT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/file-image/index.vue | 2 +- src/renderer/src/layout/components/Aside.vue | 18 ++- src/renderer/src/views/model/index.vue | 6 +- .../views/prepare/container/class-start.vue | 2 +- .../views/prepare/container/kj-list-item.vue | 2 +- src/renderer/src/views/prepare/index.vue | 122 ++++++++++++++++-- .../views/teachingDesign/container/right.vue | 6 +- 7 files changed, 135 insertions(+), 23 deletions(-) diff --git a/src/renderer/src/components/file-image/index.vue b/src/renderer/src/components/file-image/index.vue index 3c6bd18..c68ee78 100644 --- a/src/renderer/src/components/file-image/index.vue +++ b/src/renderer/src/components/file-image/index.vue @@ -35,7 +35,7 @@ const getFileTypeIcon = () => { txt: 'icon-txt', rar: 'icon-rar', apt: 'icon-A', - aptist: 'icon-A', + aippt: 'icon-A', } if (iconObj[name]) { return '#' + iconObj[name] diff --git a/src/renderer/src/layout/components/Aside.vue b/src/renderer/src/layout/components/Aside.vue index f58795b..e046925 100644 --- a/src/renderer/src/layout/components/Aside.vue +++ b/src/renderer/src/layout/components/Aside.vue @@ -48,7 +48,7 @@
V{{ version }}
- + @@ -87,6 +87,12 @@ const headerMenus = [ icon: 'icon-gongzuotai', path: '/desktop' }, + { + name: '教学实践', + id: 4, + icon: 'icon-jiaoxueshijian', + path: '/prepare' + }, { name: '资源中心', id: 3, @@ -126,12 +132,12 @@ const computedregistertype = computed(() => { if(type==3 && userStore.DeptInfo.register.auditStatus==0){ return 2 } - + // 创建学校 待审核 if(type==4 && userStore.DeptInfo.register.auditStatus==0){ return 3 } - + }) const clickMenu = ({ id, disabled, path }) => { if (disabled) return @@ -193,7 +199,7 @@ onMounted(() => { } .popoverStyle .head-aside{ width: 100%; - display: flex; + display: flex; justify-content: center; flex-direction: column; align-items: center; @@ -246,7 +252,7 @@ onMounted(() => { align-items: center; font-size: 12px; .user-img{ - width: 56px; + width: 56px; height: 56px; border-radius: 50%; cursor: pointer; @@ -312,4 +318,4 @@ onMounted(() => { font-size: 18px; font-weight: 800; } - \ No newline at end of file + diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue index 95f3c39..ef727b5 100644 --- a/src/renderer/src/views/model/index.vue +++ b/src/renderer/src/views/model/index.vue @@ -230,7 +230,7 @@ const HTTP_SERVER_API = (type, params = {}) => { ppttype: 'file', title: enpt.coursetitle, fileurl: '', - filetype: 'aptist', + filetype: 'aippt', datacontent: '', filekey: '', filetag: '', @@ -287,7 +287,7 @@ const handleAll = async(type, row) =>{ break; } case 'open': { // 打开资源-pptist - if (row.filetype != 'aptist') return msgUtils.msgWarning('暂不支持该类型文件操作!') + if (row.filetype != 'aippt') return msgUtils.msgWarning('暂不支持该类型文件操作!') sessionStore.set('curr.resource', row) // 缓存当前资源信息 createWindow('open-win', { url: '/pptist', // 窗口关闭时，清除缓存 @@ -312,7 +312,7 @@ const handleAll = async(type, row) =>{ // icons 处理 type 代表传递svg const getIcon = (o, type) => { let icon = typeof o == 'string' ? o : o?.filetype - if (['aptist'].includes(o?.filetype)) icon = 'pptx' + if (['aippt'].includes(o?.filetype)) icon = 'pptx' if (!!type) { // 其他格式icon switch(type) { case 'svg': // 返回svg格式 diff --git a/src/renderer/src/views/prepare/container/class-start.vue b/src/renderer/src/views/prepare/container/class-start.vue index 3829064..3fa408b 100644 --- a/src/renderer/src/views/prepare/container/class-start.vue +++ b/src/renderer/src/views/prepare/container/class-start.vue @@ -262,7 +262,7 @@ const createClasscourse = async () => { // getClasscourseList('update') // 更新列表 ElMessage.success('创建课程-成功') // 新版-pptList 打开公屏 - if (myClassActive.value.filetype == 'aptist') { + if (myClassActive.value.filetype == 'aippt') { const msgEl = ElMessage.warning({message:'正在打开公屏，请稍后...',duration: 0}) setTimeout(() => { msgEl.close() diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue index fc1cc6d..b874549 100644 --- a/src/renderer/src/views/prepare/container/kj-list-item.vue +++ b/src/renderer/src/views/prepare/container/kj-list-item.vue @@ -341,7 +341,7 @@ export default { cookieData: { ...configObj.data } }) return - } else if(items.fileFlag === 'aptist') { // aptist 被点击 打开PPT-List 课件 + } else if(items.fileFlag === 'aippt') { // aippt 被点击 打开PPT-List 课件 return this.$emit('change', 'click', items) } if (!items||!items.fileSuffix) return; diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index ca44ba8..43ff14a 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -2,8 +2,20 @@
+ + + 新建 + + + - +
@@ -145,7 +157,7 @@