Merge branch 'dev'
Showing
2 changed files
with
9 additions
and
9 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-25 13:55:42 | 4 | * @LastEditTime: 2023-11-02 16:22:48 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div> | 7 | <div> |
... | @@ -302,16 +302,16 @@ | ... | @@ -302,16 +302,16 @@ |
302 | arr.push(currentLine); | 302 | arr.push(currentLine); |
303 | if (i > 0) { | 303 | if (i > 0) { |
304 | arr.forEach((line, index) => { | 304 | arr.forEach((line, index) => { |
305 | context.fillText(line, 129, 485 + (26 * (i - 1)) + 5 * num + (index * 15)); // 调整行高 | 305 | context.fillText(line, 129, 490 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高 |
306 | }) | 306 | }) |
307 | } else { | 307 | } else { |
308 | arr.forEach((line, index) => { | 308 | arr.forEach((line, index) => { |
309 | context.fillText(line, 129, 495 + (26 * (i - 1)) + (index * 13)); // 调整行高 | 309 | context.fillText(line, 129, 488 + (26 * (i - 1)) + (index * 14)); // 调整行高 |
310 | }) | 310 | }) |
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 + (27 * (i - 1))); | 314 | context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (29 * (i - 1))); |
315 | } else { | 315 | } else { |
316 | context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1))); | 316 | context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1))); |
317 | } | 317 | } | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-10-25 13:57:14 | 4 | * @LastEditTime: 2023-11-02 16:21:04 |
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;"> |
... | @@ -207,7 +207,7 @@ | ... | @@ -207,7 +207,7 @@ |
207 | // 权利其他状态 | 207 | // 权利其他状态 |
208 | let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; | 208 | let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; |
209 | for (let i = 0; i < lines.length; i++) { | 209 | for (let i = 0; i < lines.length; i++) { |
210 | let num = Math.ceil(getByteLen(lines[i]) / 37) | 210 | let num = Math.ceil(getByteLen(lines[i]) / 38) |
211 | if (getByteLen(lines[i]) > 37) { | 211 | if (getByteLen(lines[i]) > 37) { |
212 | let currentLine = ''; | 212 | let currentLine = ''; |
213 | let arr = []; | 213 | let arr = []; |
... | @@ -224,16 +224,16 @@ | ... | @@ -224,16 +224,16 @@ |
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 * 15)); // 调整行高 | 227 | context.fillText(line, 129, 490 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高 |
228 | }) | 228 | }) |
229 | } else { | 229 | } else { |
230 | arr.forEach((line, index) => { | 230 | arr.forEach((line, index) => { |
231 | context.fillText(line, 129, 495 + (26 * (i - 1)) + (index * 14)); // 调整行高 | 231 | context.fillText(line, 129, 488 + (26 * (i - 1)) + (index * 14)); // 调整行高 |
232 | }) | 232 | }) |
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 + (27 * (i - 1))); | 236 | context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (29 * (i - 1))); |
237 | } else { | 237 | } else { |
238 | context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1))); | 238 | context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1))); |
239 | } | 239 | } | ... | ... |
-
Please register or sign in to post a comment