235f528b by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 8e1fff14 b3717622
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-25 13:55:42
* @LastEditTime: 2023-11-02 16:22:48
-->
<template>
<div>
......@@ -302,16 +302,16 @@
arr.push(currentLine);
if (i > 0) {
arr.forEach((line, index) => {
context.fillText(line, 129, 485 + (26 * (i - 1)) + 5 * num + (index * 15)); // 调整行高
context.fillText(line, 129, 490 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
})
} else {
arr.forEach((line, index) => {
context.fillText(line, 129, 495 + (26 * (i - 1)) + (index * 13)); // 调整行高
context.fillText(line, 129, 488 + (26 * (i - 1)) + (index * 14)); // 调整行高
})
}
} else {
if (i > 0) {
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (27 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (29 * (i - 1)));
} else {
context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-25 13:57:14
* @LastEditTime: 2023-11-02 16:21:04
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -207,7 +207,7 @@
// 权利其他状态
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
for (let i = 0; i < lines.length; i++) {
let num = Math.ceil(getByteLen(lines[i]) / 37)
let num = Math.ceil(getByteLen(lines[i]) / 38)
if (getByteLen(lines[i]) > 37) {
let currentLine = '';
let arr = [];
......@@ -224,16 +224,16 @@
arr.push(currentLine);
if (i > 0) {
arr.forEach((line, index) => {
context.fillText(line, 129, 485 + (24 * (i - 1)) + 4 * num + (index * 15)); // 调整行高
context.fillText(line, 129, 490 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
})
} else {
arr.forEach((line, index) => {
context.fillText(line, 129, 495 + (26 * (i - 1)) + (index * 14)); // 调整行高
context.fillText(line, 129, 488 + (26 * (i - 1)) + (index * 14)); // 调整行高
})
}
} else {
if (i > 0) {
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (27 * (i - 1)));
context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (29 * (i - 1)));
} else {
context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
}
......