Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 08:20:44
+ * @LastEditTime: 2024-01-18 11:00:00
 -->
 <template>
   <div>
@@ -36,9 +36,9 @@
         </el-form-item>
       </el-form>
       <div class="zs-content">
-        <canvas ref="zs1" width="1000" v-show="this.formData.bdcqzlx==1 && activeTitle=='title1'" height="700"></canvas>
-        <canvas ref="zs" width="1000" v-show="this.formData.bdcqzlx==1 && activeTitle=='title2'" height="700"></canvas>
-        <canvas ref="zm" width="1180" v-show="this.formData.bdcqzlx==2" height="780"></canvas>
+        <canvas ref="zs1" width="1024" v-show="this.formData.bdcqzlx==1 && activeTitle=='title1'" height="739"></canvas>
+        <canvas ref="zs" width="1024" v-show="this.formData.bdcqzlx==1 && activeTitle=='title2'" height="739"></canvas>
+        <canvas ref="zm" width="1169" v-show="this.formData.bdcqzlx==2" height="828"></canvas>
       </div>
     </div>
     <!-- 打印模板需要此模块 -->
@@ -507,13 +507,24 @@
           }
           context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125);
           context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125);
-          context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 750, 125);
+          // context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 750, 125);
+
+          if (getByteLen(this.bdcqz.sxqc) > 14) {
+            const originalFont = context.font;
+            // 设置新的字体大小
+            context.font = '14px 楷体'; // 替换为你想要的字体和大小
+            // 绘制 bdcdyh
+            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125);
+            // 恢复原始字体设置
+            context.font = originalFont;
+          }
+
           context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);
           context.fillText(this.bdcqz.zmqlhsx ? this.bdcqz.zmqlhsx : '', 775, 180);
           // context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 775, 228);
           // 权利人
           let qlrlines = this.bdcqz.qlr ? this.bdcqz.qlr.split(' ') : [];
-          if (getByteLen(this.bdcqz.qlr) > 37) {
+          if (getByteLen(this.bdcqz.qlr) >= 34) {
             qlrlines.forEach((line, index) => {
               let currentLine = '';
               let arr = [];

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-18 10:41:05
+ * @LastEditTime: 2024-01-18 10:59:00
 -->
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
@@ -20,12 +20,12 @@
           <el-tab-pane label="第一页" name="title1"></el-tab-pane>
           <el-tab-pane label="第二页" name="title2"></el-tab-pane>
         </el-tabs>
-        <div style="width:1169px;overflow-x: hidden;height: 833px;margin-top:2px">
+        <div style="width:1169px;overflow-x: hidden;">
           <canvas ref="zs1" width="1024" v-show="activeTitle=='title1'" height="739"></canvas>
           <canvas ref="zs" width="1024" v-show="activeTitle=='title2'" height="739"></canvas>
         </div>
       </div>
-      <div style="width:1169px;overflow-x: hidden;height: 833px;margin-top:2px" v-show="this.bdcqz.bdcqzlx==2">
+      <div style="width:1169px;overflow-x: hidden;" v-show="this.bdcqz.bdcqzlx==2">
         <canvas ref="zm" width="1169" height="828"></canvas>
       </div>
     </div>
@@ -434,13 +434,22 @@
           }
           context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125);
           context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125);
-          context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 750, 125);
+          if (getByteLen(this.bdcqz.sxqc) > 14) {
+            const originalFont = context.font;
+            // 设置新的字体大小
+            context.font = '14px 楷体'; // 替换为你想要的字体和大小
+            // 绘制 bdcdyh
+            context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 725, 125);
+            // 恢复原始字体设置
+            context.font = originalFont;
+          }
+
           context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);
           context.fillText(this.bdcqz.zmqlhsx ? this.bdcqz.zmqlhsx : '', 775, 180);
           // context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 775, 228);
           // 权利人
           let qlrlines = this.bdcqz.qlr ? this.bdcqz.qlr.split(' ') : [];
-          if (getByteLen(this.bdcqz.qlr) > 37) {
+          if (getByteLen(this.bdcqz.qlr) >= 34) {
             qlrlines.forEach((line, index) => {
               let currentLine = '';
               let arr = [];