5e2e7f8f by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 266f7dde 4af02c93
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:36:24 4 * @LastEditTime: 2023-08-25 09:21:38
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -126,7 +126,12 @@ ...@@ -126,7 +126,12 @@
126 context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 138, 97); 126 context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 138, 97);
127 context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 138, 138); 127 context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 138, 138);
128 context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 138, 180); 128 context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 138, 180);
129 context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 138, 223); 129 // 不动产单元号
130 this.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
131 this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length)
132 context.fillText(this.bdcdyh ? this.bdcdyh : '', 138, 223);
133
134
130 context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 138, 263); 135 context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 138, 263);
131 context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 138, 303); 136 context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 138, 303);
132 context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346); 137 context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346);
...@@ -158,7 +163,7 @@ ...@@ -158,7 +163,7 @@
158 } 163 }
159 164
160 // qlqtzk 165 // qlqtzk
161 const maxWidth = 280; // 最大宽度限制 166 const maxWidth = 305; // 最大宽度限制
162 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 167 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
163 lines.forEach((line, index) => { 168 lines.forEach((line, index) => {
164 const y = 469 + (index * 37); // 每行文本的垂直位置 169 const y = 469 + (index * 37); // 每行文本的垂直位置
......