Merge branch 'dev'

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-22 17:12:09
+ * @LastEditTime: 2024-01-23 10:59:37
  */
  */
 import request from '@/utils/request'
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))

@@ -690,18 +690,18 @@
               arr.push(currentLine);
               arr.push(currentLine);
               if (i > 0) {
               if (i > 0) {
                 arr.forEach((line, index) => {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
+                  context.fillText(line, 770, 605 + (24 * (i - 1)) + 5 * num + (index * 17)); // 调整行高
                 })
                 })
               } else {
               } else {
                 arr.forEach((line, index) => {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
+                  context.fillText(line, 770, 605 + (24 * (i - 1)) + (index * 17)); // 调整行高
                 })
                 })
               }
               }
             } else {
             } else {
               if (i > 0) {
               if (i > 0) {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 616 + 6 * num + (25 * (i - 1)));
               } else {
               } else {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 616 + (25 * (i - 1)));
               }
               }
             }
             }
           }
           }

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 11:25:39
+ * @LastEditTime: 2024-01-23 11:07:58
 -->
 -->
 <template>
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
@@ -616,18 +616,18 @@
               arr.push(currentLine);
               arr.push(currentLine);
               if (i > 0) {
               if (i > 0) {
                 arr.forEach((line, index) => {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
+                  context.fillText(line, 770, 605 + (24 * (i - 1)) + 5 * num + (index * 17)); // 调整行高
                 })
                 })
               } else {
               } else {
                 arr.forEach((line, index) => {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
+                  context.fillText(line, 770, 605 + (24 * (i - 1)) + (index * 17)); // 调整行高
                 })
                 })
               }
               }
             } else {
             } else {
               if (i > 0) {
               if (i > 0) {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 616 + 6 * num + (25 * (i - 1)));
               } else {
               } else {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 616 + (25 * (i - 1)));
               }
               }
             }
             }
           }
           }