06678ebc by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 86c4657a 8e005190
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-25 13:49:56
* @LastEditTime: 2023-10-25 13:55:42
-->
<template>
<div>
......@@ -311,9 +311,9 @@
}
} else {
if (i > 0) {
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (24 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (27 * (i - 1)));
} else {
context.fillText(lines[i] ? lines[i] : '', 129, 500 + (24 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
}
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-25 13:50:43
* @LastEditTime: 2023-10-25 13:57:14
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -224,7 +224,7 @@
arr.push(currentLine);
if (i > 0) {
arr.forEach((line, index) => {
context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 15)); // 调整行高
})
} else {
arr.forEach((line, index) => {
......@@ -233,9 +233,9 @@
}
} else {
if (i > 0) {
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (24 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (27 * (i - 1)));
} else {
context.fillText(lines[i] ? lines[i] : '', 129, 500 + (24 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
}
}
}
......