Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-07 08:47:38
+ * @LastEditTime: 2023-11-08 13:27:03
 -->
 <template>
   <div>
@@ -572,18 +572,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
               } else {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
               }
             }
           }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-07 08:46:45
+ * @LastEditTime: 2023-11-08 13:25:20
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -497,18 +497,18 @@
               arr.push(currentLine);
               if (i > 0) {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + 5 * num + (index * 22)); // 调整行高
                 })
               } else {
                 arr.forEach((line, index) => {
-                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 15)); // 调整行高
+                  context.fillText(line, 770, 610 + (25 * (i - 1)) + (index * 22)); // 调整行高
                 })
               }
             } else {
               if (i > 0) {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + 5 * num + (24 * (i - 1)));
               } else {
-                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (23 * (i - 1)));
+                context.fillText(lines1[i] ? lines1[i] : '', 770, 610 + (24 * (i - 1)));
               }
             }
           }

@@ -166,14 +166,14 @@
               that.$message.error('本书必须大于0，请检查印刷序列号');
               return
             }
-            store.dispatch("user/refreshPage", true);
+            store.dispatch("user/refreshPage", false);
             zsrk(this.ruleForm).then(res => {
               if (res.code == 200) {
                 that.$message.success('保存成功')
                 that.$popupCacel()
                 that.$refs['ruleForm'].resetFields()
                 that.resetTableFields()
-                store.dispatch("user/refreshPage", false);
+                store.dispatch("user/refreshPage", true);
               } else {
                 that.$message.error(res.message);
               }