Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-02 16:22:48
+ * @LastEditTime: 2023-11-07 08:47:38
 -->
 <template>
   <div>
@@ -302,18 +302,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 490 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
+                  context.fillText(line, 129, 495 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 488 + (26 * (i - 1)) + (index * 14)); // 调整行高
+                  context.fillText(line, 129, 493 + (26 * (i - 1)) + (index * 14)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (29 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (29 * (i - 1)));
               } else {
-                context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 505 + (27 * (i - 1)));
               }
             }
           }

-          <!--
+<!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-26 15:54:17
+ * @LastEditTime: 2023-11-07 08:46:12
 -->
 <template>
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-02 16:21:04
+ * @LastEditTime: 2023-11-07 08:46:45
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -224,18 +224,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 490 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
+                  context.fillText(line, 129, 495 + (29 * (i - 1)) + 4 * num + (index * 14)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 129, 488 + (26 * (i - 1)) + (index * 14)); // 调整行高
+                  context.fillText(line, 129, 493 + (26 * (i - 1)) + (index * 14)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines[i] ? lines[i] : '', 129, 495 + 4 * num + (29 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 500 + 4 * num + (29 * (i - 1)));
               } else {
-                context.fillText(lines[i] ? lines[i] : '', 129, 500 + (27 * (i - 1)));
+                context.fillText(lines[i] ? lines[i] : '', 129, 505 + (27 * (i - 1)));
               }
             }
           }