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 dcd6eb0..1334688 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -113,16 +113,14 @@
/>
-
+
+
{ onhtml2canvas(data); classWorkTaskVisible = false }"
/>
-
+
{
}
}
.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;
diff --git a/src/renderer/src/views/teachingDesign/container/progress-dialog.vue b/src/renderer/src/views/teachingDesign/container/progress-dialog.vue
new file mode 100644
index 0000000..5bfe036
--- /dev/null
+++ b/src/renderer/src/views/teachingDesign/container/progress-dialog.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/renderer/src/views/teachingDesign/container/right.vue b/src/renderer/src/views/teachingDesign/container/right.vue
index 6fae50c..8986190 100644
--- a/src/renderer/src/views/teachingDesign/container/right.vue
+++ b/src/renderer/src/views/teachingDesign/container/right.vue
@@ -50,6 +50,7 @@
+