Merge branch 'dev'

@@ -465,20 +465,20 @@ class data extends filter {
           label: "分摊土地面积(m²)",
           label: "分摊土地面积(m²)",
         },
         },
         {
         {
-          prop: "tdsyqzsj",
-          label: "土地使用期限",
+          prop: "tdxzmc",
+          label: "土地性质",
         },
         },
         {
         {
-          prop: "syqqzsj",
+          prop: "tdsyqzsj",
           label: "使用权起止时间",
           label: "使用权起止时间",
-        },
+        },        
         {
         {
           prop: "qdjgmc",
           prop: "qdjgmc",
           label: "房地产交易价格",
           label: "房地产交易价格",
         },
         },
         {
         {
           prop: "ytmc",
           prop: "ytmc",
-          label: "规划用途",
+          label: "房屋用途",
         },
         },
         {
         {
           prop: "fwxzmc",
           prop: "fwxzmc",

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 10:37:13
+ * @LastEditTime: 2023-08-16 10:56:33
 -->
 -->
 <template>
 <template>
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
   <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -124,7 +124,7 @@
         const image = new Image();
         const image = new Image();
         image.onload = () => {
         image.onload = () => {
           context.drawImage(image, 0, 0);
           context.drawImage(image, 0, 0);
-          context.font = '14px 楷体';
+          context.font = '16px 楷体';
           context.fillStyle = '#000000';
           context.fillStyle = '#000000';
           context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56);
           context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56);
           context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56);
           context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56);
@@ -133,18 +133,17 @@
           context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 129, 97);
           context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 129, 97);
           context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 129, 136);
           context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 129, 136);
 
 
-
-          // context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 129, 170);
-
+          let arr = this.bdcqz.bdcdyh.split('F')
+          this.bdcqz.bdcdyh = arr[0].slice(0, 6) + ' ' + arr[0].slice(6, 12) + ' ' + arr[0].slice(12, arr[0].length) + ' F' + arr[1]
+          context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 129, 223);
 
 
 
 
 
 
-          context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 129, 223);
           context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 129, 263);
           context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 129, 263);
           context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 129, 303);
           context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 129, 303);
           context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 129, 346);
           context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 129, 346);
           context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
           context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
-          context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
+          // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
           // qlqtzk
           // qlqtzk
           const maxWidth = 280; // 最大宽度限制
           const maxWidth = 280; // 最大宽度限制
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
           let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
@@ -187,6 +186,26 @@
               context.fillText(line, 580, y + (index * 20)); // 调整行高
               context.fillText(line, 580, y + (index * 20)); // 调整行高
             })
             })
           })
           })
+          let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
+          lines3.forEach((line, index) => {
+            const y = 423 + (index * 20); // 每行文本的垂直位置
+            let currentLine = '';
+            let arr = [];
+            for (let word of line) {
+              const testLine = currentLine + word;
+              const lineWidth = context.measureText(testLine).width;
+              if (lineWidth <= 315) {
+                currentLine = testLine;
+              } else {
+                arr.push(currentLine);
+                currentLine = word;
+              }
+            }
+            arr.push(currentLine);
+            arr.forEach((line, index) => {
+              context.fillText(line, 129, y + (index * 20)); // 调整行高
+            })
+          })
 
 
 
 
 
 
@@ -231,10 +250,7 @@
                 context.fillText(line, 129, y + (index * 20)); // 调整行高
                 context.fillText(line, 129, y + (index * 20)); // 调整行高
               })
               })
             })
             })
-
           }
           }
-
-
         }
         }
         image.src = this.imgSrc
         image.src = this.imgSrc
       },
       },