Compare commits
No commits in common. "bbe22817813bd62c9ee544b1b2cf849d8bf890a5" and "66881b0025cd176db243cb9fe3634ee82057787b" have entirely different histories.
bbe2281781
...
66881b0025
|
@ -112,14 +112,16 @@
|
|||
/>
|
||||
</Modal>
|
||||
|
||||
|
||||
<el-dialog v-model="classWorkTaskVisible" append-to-body :show-close="false" width="70%">
|
||||
<Modal
|
||||
v-model:visible="classWorkTaskVisible"
|
||||
:width="1080"
|
||||
>
|
||||
<QuestToPPTist
|
||||
class="class-work-task-modal"
|
||||
@close="classWorkTaskVisible = false"
|
||||
@update="data => { onhtml2canvas(data); classWorkTaskVisible = false }"
|
||||
/>
|
||||
</el-dialog>
|
||||
</Modal>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
@ -361,7 +363,7 @@ const toggleNotesPanel = () => {
|
|||
}
|
||||
}
|
||||
.class-work-task-modal{
|
||||
height: 70vh;
|
||||
height: 80vh;
|
||||
}
|
||||
|
||||
@media screen and (width <= 1200px) {
|
||||
|
|
|
@ -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 + '%',
|
||||
}
|
||||
})
|
||||
|
@ -230,7 +228,6 @@ 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
|
||||
|
@ -478,7 +475,7 @@ const scaleClipRange = (e: MouseEvent, type: OperateResizeHandlers) => {
|
|||
isMouseDown = false
|
||||
document.onmousemove = null
|
||||
document.onmouseup = null
|
||||
console.log('----------------------------------')
|
||||
|
||||
updateRange()
|
||||
|
||||
setTimeout(() => isSettingClipRange.value = false, 0)
|
||||
|
|
|
@ -68,6 +68,7 @@ defineExpose({
|
|||
|
||||
.page-resource {
|
||||
user-select: none;
|
||||
// height: calc(100% - 55px);
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
Loading…
Reference in New Issue