06678ebc by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 86c4657a 8e005190
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-25 13:49:56 4 * @LastEditTime: 2023-10-25 13:55:42
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -311,9 +311,9 @@ ...@@ -311,9 +311,9 @@
311 } 311 }
312 } else { 312 } else {
313 if (i > 0) { 313 if (i > 0) {
314 context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (24 * (i - 1))); 314 context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (27 * (i - 1)));
315 } else { 315 } else {
316 context.fillText(lines[i] ? lines[i] : '', 129, 500 + (24 * (i - 1))); 316 context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
317 } 317 }
318 } 318 }
319 } 319 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-25 13:50:43 4 * @LastEditTime: 2023-10-25 13:57:14
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
224 arr.push(currentLine); 224 arr.push(currentLine);
225 if (i > 0) { 225 if (i > 0) {
226 arr.forEach((line, index) => { 226 arr.forEach((line, index) => {
227 context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 14)); // 调整行高 227 context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 15)); // 调整行高
228 }) 228 })
229 } else { 229 } else {
230 arr.forEach((line, index) => { 230 arr.forEach((line, index) => {
...@@ -233,9 +233,9 @@ ...@@ -233,9 +233,9 @@
233 } 233 }
234 } else { 234 } else {
235 if (i > 0) { 235 if (i > 0) {
236 context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (24 * (i - 1))); 236 context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (27 * (i - 1)));
237 } else { 237 } else {
238 context.fillText(lines[i] ? lines[i] : '', 129, 500 + (24 * (i - 1))); 238 context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
239 } 239 }
240 } 240 }
241 } 241 }
......