27c0aab2 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents 61a281d4 46e7e7fb
......@@ -48,6 +48,9 @@
active_color: item.expand,
}"
>
<span v-if="item.qszt=='0'" style="color:red">(临)</span>
<span v-if="item.qszt=='1'" style="color:green">(正)</span>
<span v-if="item.qszt=='2'" style="color:blue">(现)</span>
{{ item.mc }}
</div>
</div>
......
......@@ -10,51 +10,51 @@
<div>
<table border="1">
<tr>
<td>层建筑面积</td>
<td>层建筑面积(㎡)</td>
<td>
<input type="text" v-model="qlcData.cjzmj" class="inputtitle"/>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input>
</td>
<td>
层套内建筑面积
层套内建筑面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.ctnjzmj" class="inputtitle"/>
<el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input>
</td>
</tr>
<tr>
<td>层阳台面积</td>
<td>层阳台面积(㎡)</td>
<td>
<input type="text" v-model="qlcData.cytmj" class="inputtitle"/>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input>
</td>
<td>
层半墙面积
层半墙面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.cbqmj" class="inputtitle"/>
<el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input>
</td>
</tr>
<tr>
<td>层共有建筑面积(㎡)</td>
<td>
<input type="text" v-model="qlcData.cgyjzmj" class="inputtitle"/>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input>
</td>
<td>
层分摊建筑面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.cftjzmj" class="inputtitle"/>
<el-input v-model="qlcData.cftjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层分摊建筑面积(㎡)"></el-input>
</td>
</tr>
<tr>
<td>层高</td>
<td>层高(m)</td>
<td>
<input type="text" v-model="qlcData.cg" class="inputtitle"/>
<el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input>
</td>
<td>
水平投影面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.sptymj" class="inputtitle"/>
<el-input v-model="qlcData.sptymj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="水平投影面积(㎡)"></el-input>
</td>
</tr>
</table>
......
......@@ -12,7 +12,7 @@
<table border="1">
<tr>
<td>室号前缀</td>
<td>单元号</td>
<td>单元号</td>
<td>分割符A</td>
<td>层号前自动补0</td>
<td></td>
......
......@@ -9,7 +9,7 @@
<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" >
<!-- 循环幢单元下的层户 -->
<!-- <div class="chTable-wrap"> -->
<table class="chTable" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<table class="chTable" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<tr v-for="(cs,csIndex) in zdys.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}</td>
......@@ -25,7 +25,7 @@
</div>
<!-- 循环逻辑幢下的层户 -->
<div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0">
<table class="chTable" border="1" cellspacing="0" cellpadding="0">
<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">
<tr v-for="(cs) in ljzs.cs" :key="cs.bsm">
<!-- 显示层数 -->
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}</td>
......@@ -199,9 +199,11 @@ export default {
//计算自然幢下的幢单元高度,如果有比层户高的幢单元,则幢单元高度设为最高的幢单元高度,如果没有,则设为层户高度
higher = highest > this.$refs.ch.offsetHeight ? true : false;
this.zdyHeight = higher ? highest : this.$refs.ch.offsetHeight;
highest = 0;
this.zdyWidth += this.$refs.ch.offsetWidth;
} else {
this.zdyHeight = highest;
highest = 0;
}
} else {
// this.zdyWidth = 124;
......@@ -224,13 +226,21 @@ export default {
if (this.$refs.ljzch != undefined) {
//计算自然幢下的幢单元高度,如果有比层户高的幢单元,则幢单元高度设为最高的幢单元高度,如果没有,则设为层户高度
higher = highest > this.$refs.ljzch.offsetHeight ? true : false;
this.$nextTick(()=>{
this.ljzzdyHeight = higher ? highest : this.$refs.ljzch.offsetHeight;
highest = 0;
})
} else {
this.$nextTick(()=>{
this.ljzzdyHeight = highest;
highest = 0;
})
}
} else {
// this.zdyWidth = 124;
}
},
//户单击事件
handleTdClick(e, bsm) {
......@@ -497,7 +507,7 @@ export default {
background-color: blanchedalmond;
}
td {
width: 124px;
min-width: 124px;
height: 64px;
line-height: 64px;
text-align: center;
......