From e3199b43debbc56bf6f6214e4a77725d1348d468 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: Fri, 6 Dec 2024 15:26:22 +0800
Subject: [PATCH] 1

---
 .../AixPPTist/src/views/Editor/CanvasTool/index.vue    | 10 ++++------
 .../element/ImageElement/ImageClipHandler.vue          |  9 ++++++---
 .../newClassTaskAssign/questToPPTist/index.vue         |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
index a0d73aa..12d9df4 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -112,16 +112,14 @@
       />
     </Modal>
 
-    <Modal
-      v-model:visible="classWorkTaskVisible" 
-      :width="880"
-    >
+    
+    <el-dialog v-model="classWorkTaskVisible" append-to-body :show-close="false" width="70%">
       <QuestToPPTist 
         class="class-work-task-modal"
         @close="classWorkTaskVisible = false"
         @update="data => { onhtml2canvas(data); classWorkTaskVisible = false }"
       />
-    </Modal>
+    </el-dialog>
 
   </div>
 </template>
@@ -363,7 +361,7 @@ const toggleNotesPanel = () => {
   }
 }
 .class-work-task-modal{
-  height: 80vh;
+  height: 70vh;
 }
 
 @media screen and (width <= 1200px) {
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 5d96bce..14065e6 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,13 +154,15 @@ 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 + '%',
+    width: ((bottomWidth / width * 100) - (left * (100 / width))) + '%' ,
     height: bottomHeight / height * 100 + '%',
   }
 })
@@ -228,6 +230,7 @@ const updateRange = () => {
     width: parseInt(topImgPositionStyle.value.width),
     height: parseInt(topImgPositionStyle.value.height),
   }
+  console.log('retPosition', retPosition)
 
   const widthScale = 100 / retPosition.width
   const heightScale = 100 / retPosition.height
@@ -475,7 +478,7 @@ const scaleClipRange = (e: MouseEvent, type: OperateResizeHandlers) => {
     isMouseDown = false
     document.onmousemove = null
     document.onmouseup = null
-
+console.log('----------------------------------')
     updateRange()
 
     setTimeout(() => isSettingClipRange.value = false, 0)
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questToPPTist/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questToPPTist/index.vue
index 26be2e9..2d7e448 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questToPPTist/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questToPPTist/index.vue
@@ -68,7 +68,7 @@ defineExpose({
   
   .page-resource {
     user-select: none;
-    height: calc(100% - 55px);
+    height: 100%;
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
-- 
2.44.0.windows.1