Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
27c0aab2 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 61a281d4 46e7e7fb
Inline Side-by-side
Showing 4 changed files with 32 additions and 19 deletions
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
48 active_color: item.expand, 48 active_color: item.expand,
49 }" 49 }"
50 > 50 >
51 <span v-if="item.qszt=='0'" style="color:red">(临)</span>
52 <span v-if="item.qszt=='1'" style="color:green">(正)</span>
53 <span v-if="item.qszt=='2'" style="color:blue">(现)</span>
51 {{ item.mc }} 54 {{ item.mc }}
52 </div> 55 </div>
53 </div> 56 </div>
......
...@@ -10,51 +10,51 @@ ...@@ -10,51 +10,51 @@
10 <div> 10 <div>
11 <table border="1"> 11 <table border="1">
12 <tr> 12 <tr>
13 <td>层建筑面积</td> 13 <td>层建筑面积(㎡)</td>
14 <td> 14 <td>
15 <input type="text" v-model="qlcData.cjzmj" class="inputtitle"/> 15 <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input>
16 </td> 16 </td>
17 <td> 17 <td>
18 层套内建筑面积 18 层套内建筑面积(㎡)
19 </td> 19 </td>
20 <td> 20 <td>
21 <input text="text" v-model="qlcData.ctnjzmj" class="inputtitle"/> 21 <el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input>
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr> 24 <tr>
25 <td>层阳台面积</td> 25 <td>层阳台面积(㎡)</td>
26 <td> 26 <td>
27 <input type="text" v-model="qlcData.cytmj" class="inputtitle"/> 27 <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input>
28 </td> 28 </td>
29 <td> 29 <td>
30 层半墙面积 30 层半墙面积(㎡)
31 </td> 31 </td>
32 <td> 32 <td>
33 <input text="text" v-model="qlcData.cbqmj" class="inputtitle"/> 33 <el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input>
34 </td> 34 </td>
35 </tr> 35 </tr>
36 <tr> 36 <tr>
37 <td>层共有建筑面积(㎡)</td> 37 <td>层共有建筑面积(㎡)</td>
38 <td> 38 <td>
39 <input type="text" v-model="qlcData.cgyjzmj" class="inputtitle"/> 39 <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input>
40 </td> 40 </td>
41 <td> 41 <td>
42 层分摊建筑面积(㎡) 42 层分摊建筑面积(㎡)
43 </td> 43 </td>
44 <td> 44 <td>
45 <input text="text" v-model="qlcData.cftjzmj" class="inputtitle"/> 45 <el-input v-model="qlcData.cftjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层分摊建筑面积(㎡)"></el-input>
46 </td> 46 </td>
47 </tr> 47 </tr>
48 <tr> 48 <tr>
49 <td>层高</td> 49 <td>层高(m)</td>
50 <td> 50 <td>
51 <input type="text" v-model="qlcData.cg" class="inputtitle"/> 51 <el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input>
52 </td> 52 </td>
53 <td> 53 <td>
54 水平投影面积(㎡) 54 水平投影面积(㎡)
55 </td> 55 </td>
56 <td> 56 <td>
57 <input text="text" v-model="qlcData.sptymj" class="inputtitle"/> 57 <el-input v-model="qlcData.sptymj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="水平投影面积(㎡)"></el-input>
58 </td> 58 </td>
59 </tr> 59 </tr>
60 </table> 60 </table>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 <table border="1"> 12 <table border="1">
13 <tr> 13 <tr>
14 <td>室号前缀</td> 14 <td>室号前缀</td>
15 <td>单元号</td> 15 <td>幢单元号</td>
16 <td>分割符A</td> 16 <td>分割符A</td>
17 <td>层号前自动补0</td> 17 <td>层号前自动补0</td>
18 <td>层</td> 18 <td>层</td>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" > 9 <div class="ljz-zdy" :style="{'min-height':ljzzdyHeight+40+'px'}" ref="ljzzdy" v-show="ljzs.zdys.length>0" v-for="(zdys,zdyIndex) in ljzs.zdys" :key="zdyIndex" >
10 <!-- 循环幢单元下的层户 --> 10 <!-- 循环幢单元下的层户 -->
11 <!-- <div class="chTable-wrap"> --> 11 <!-- <div class="chTable-wrap"> -->
12 <table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0"> 12 <table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex"> 13 <tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
14 <!-- 显示层数 --> 14 <!-- 显示层数 -->
15 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td> 15 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </div> 25 </div>
26 <!-- 循环逻辑幢下的层户 --> 26 <!-- 循环逻辑幢下的层户 -->
27 <div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0"> 27 <div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0">
28 <table class="chTable" border="1" cellspacing="0" cellpadding="0"> 28 <table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)<0? 0:(ljzzdyHeight+40-1-ljzs.cs.length*65) +'px'}" border="1" cellspacing="0" cellpadding="0">
29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm"> 29 <tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
30 <!-- 显示层数 --> 30 <!-- 显示层数 -->
31 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td> 31 <td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
...@@ -199,9 +199,11 @@ export default { ...@@ -199,9 +199,11 @@ export default {
199 //计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度 199 //计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
200 higher = highest > this.$refs.ch.offsetHeight ? true : false; 200 higher = highest > this.$refs.ch.offsetHeight ? true : false;
201 this.zdyHeight = higher ? highest : this.$refs.ch.offsetHeight; 201 this.zdyHeight = higher ? highest : this.$refs.ch.offsetHeight;
202 highest = 0;
202 this.zdyWidth += this.$refs.ch.offsetWidth; 203 this.zdyWidth += this.$refs.ch.offsetWidth;
203 } else { 204 } else {
204 this.zdyHeight = highest; 205 this.zdyHeight = highest;
206 highest = 0;
205 } 207 }
206 } else { 208 } else {
207 // this.zdyWidth = 124; 209 // this.zdyWidth = 124;
...@@ -224,13 +226,21 @@ export default { ...@@ -224,13 +226,21 @@ export default {
224 if (this.$refs.ljzch != undefined) { 226 if (this.$refs.ljzch != undefined) {
225 //计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度 227 //计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
226 higher = highest > this.$refs.ljzch.offsetHeight ? true : false; 228 higher = highest > this.$refs.ljzch.offsetHeight ? true : false;
227 this.ljzzdyHeight = higher ? highest : this.$refs.ljzch.offsetHeight; 229 this.$nextTick(()=>{
230 this.ljzzdyHeight = higher ? highest : this.$refs.ljzch.offsetHeight;
231 highest = 0;
232 })
228 } else { 233 } else {
229 this.ljzzdyHeight = highest; 234 this.$nextTick(()=>{
235 this.ljzzdyHeight = highest;
236 highest = 0;
237 })
230 } 238 }
231 } else { 239 } else {
232 // this.zdyWidth = 124; 240 // this.zdyWidth = 124;
233 } 241 }
242
243
234 }, 244 },
235 //户单击事件 245 //户单击事件
236 handleTdClick(e, bsm) { 246 handleTdClick(e, bsm) {
...@@ -497,7 +507,7 @@ export default { ...@@ -497,7 +507,7 @@ export default {
497 background-color: blanchedalmond; 507 background-color: blanchedalmond;
498 } 508 }
499 td { 509 td {
500 width: 124px; 510 min-width: 124px;
501 height: 64px; 511 height: 64px;
502 line-height: 64px; 512 line-height: 64px;
503 text-align: center; 513 text-align: center;
......