Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e87e646e by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents e31004b5 4fd24016
Expand all
Inline Side-by-side
Showing 25 changed files with 281 additions and 156 deletions
......@@ -44,13 +44,13 @@ export function insertChInfo (data) {
/**
* 查询楼盘表数据
*/
export function getLpb (data) {
export function getLpb (data,lx) {
return request({
url: 'fw/lpb/getLpb',
method: 'get',
params: {
zrzbsm:data,
syclx:0,
syclx:lx,
},
})
}
......
......@@ -156,4 +156,53 @@ ol, ul { list-style:none; }
.contextmenu li:hover {
background: #eee;
}
// end
\ No newline at end of file
// end
//生成按钮样式
.el-button--warning{
color: #FFF;
background-color: #F79700;
border-color: #F79700;
}
.el-button--warning:focus, .el-button--warning:hover{
background-color: rgba(247, 151, 0,.7);
border-color: rgba(247, 151, 0,.7);
}
.percent80{
width: 78%;
float: left;
}
.createBtn{
position: absolute;
width: 50px;
padding: 6px 0px;
right: 6px;
top: 4px;
}
// 增删操作按钮样式
.addMinus{
border-radius:50%;
width: 30px !important;
height: 30px !important;
font-size: 22px!important;
padding: 4px 6px;
}
.outAdd,.outAdd:hover:focus{
background-color: #2FA5FF!important;
border: 1px solid #2FA5FF!important;
color: #fff!important;
}
.inAdd,.inAdd:hover:focus{
border: 1px solid #2FA5FF!important;
background-color: #fff!important;
color: #2FA5FF!important;
}
.outMinus,.outMinus:hover:focus{
background-color: #FA6400!important;
border: 1px solid #FA6400!important;
color: #fff!important;
}
.inMinus,.inMinus:hover:focus{
border: 1px solid #FA6400!important;
background-color: #fff!important;
color: #FA6400!important;
}
\ No newline at end of file
......

878 Bytes | W: | H:

1.34 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -210,13 +210,13 @@
<td rowspan="2" class="btnCol">
<el-button
type="primary"
class="changeBtn"
class="changeBtn outAdd addMinus"
@click="handleClick(item, index, 'add')"
>+</el-button
>
<el-button
type="primary"
class="changeBtn"
class="changeBtn outMinus addMinus"
@click="handleClick(item, index, 'minus')"
>-</el-button
>
......@@ -671,10 +671,6 @@
text-align: center;
cursor: text;
}
.percent78 {
width: 78%;
float: left;
}
.percent68 {
width: 68% !important;
float: left;
......@@ -685,13 +681,6 @@
width: 30% !important;
float: left;
}
.createBtn {
position: absolute;
width: 50px;
padding: 6px 4px;
right: 4px;
top: 4px;
}
.el-input__icon {
line-height: 37px;
}
......
......@@ -15,14 +15,14 @@
<el-button
v-show="childIndex < 1"
type="primary"
class="changeBtn"
class="changeBtn addMinus outAdd"
@click="handleClick(index, 'add')"
>+</el-button
>
<el-button
v-show="childIndex < 1"
type="primary"
class="changeBtn"
class="changeBtn addMinus outMinus"
@click="handleClick(index, 'minus')"
>-</el-button
>
......@@ -41,13 +41,13 @@
<span class="qlxz" v-show="childIndex < 1">权利性质</span><br />
<el-button
type="primary"
class="changeBtn"
class="changeBtn addMinus inAdd"
@click="handleInClick(index, childIndex, 'add')"
>+</el-button
>
<el-button
type="primary"
class="changeBtn"
class="changeBtn addMinus inMinus"
@click="handleInClick(index, childIndex, 'minus')"
>-</el-button
>
......@@ -398,7 +398,7 @@ export default {
.qlxzModule {
height: auto;
position: relative;
border-bottom: 1px solid grey;
border-bottom: 1px solid #E6E6E6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
......
......@@ -289,7 +289,7 @@ export default {
.qlxzModule {
height: auto;
position: relative;
border-bottom: 1px solid grey;
border-bottom: 1px solid #E6E6E6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
......
......@@ -101,12 +101,16 @@
}
},
methods: {
lodding:function(){
this.$emit('lodding')
},
save: function () {
this.qlcData['bsms'] = this.bsms
updatePlc(this.qlcData).then(res => {
console.log(res)
if (res.success) {
Message.success("保存成功")
this.lodding()
this.close()
} else {
Message.error(res.message)
......
......@@ -313,6 +313,9 @@
}
},
methods: {
lodding:function(){
this.$emit('lodding')
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......@@ -367,6 +370,7 @@
console.log(this.form)
batchUpdateQjH(this.form).then((res)=>{
if(res.code===200){
this.lodding()
this.$message.success("保存成功！")
}
})
......
......@@ -25,13 +25,13 @@
<input type="text" class="inputtitle" v-model="plshData.shqz"/>
</td>
<td>
<el-checkbox v-model="plshData.isSelectDyh"></el-checkbox>
<el-checkbox v-model="plshData.selectDyh"></el-checkbox>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fgfA"/>
</td>
<td>
<el-checkbox v-model="plshData.isChqbl"></el-checkbox>
<el-checkbox v-model="plshData.chqbl"></el-checkbox>
</td>
<td>
<el-select v-model="plshData.c">
......@@ -112,9 +112,9 @@
xlVisible: false,
plshData: {
shqz: '',
isSelectDyh: false,
selectDyh: false,
fgfA: '',
isChqbl: false,
chqbl: false,
c: '',
fgfB: '',
shhz: ''
......@@ -133,6 +133,9 @@
}
},
methods: {
lodding:function(){
this.$emit('lodding')
},
xl: function () {
this.xlVisible = true;
},
......@@ -144,9 +147,9 @@
result: function () {
this.plshData = {
shqz: '',
isSelectDyh: false,
selectDyh: false,
fgfA: '',
isChqbl: false,
chqbl: false,
c: '',
fgfB: '',
shhz: ''
......@@ -154,10 +157,11 @@
},
save: function () {
this.plshData['bsms'] = this.bsms
console.log(this.plshData)
updateSh(this.plshData).then(res => {
if (res.success) {
this.lodding();
this.close();
} else {
Message.error(res.message)
}
......@@ -173,7 +177,7 @@
if (this.plshData.shqz != "") {
gz += this.plshData.shqz
}
if (this.plshData.isSelectDyh) {
if (this.plshData.selectDyh) {
gz += "[单元号]"
}
if (this.plshData.fgfA != "") {
......
......@@ -196,10 +196,14 @@
}
},
methods: {
lodding:function(){
this.$emit('lodding')
},
save: function () {
this.plzlData['bsms'] = this.bsms;
updateZl(this.plzlData).then(res => {
if (res.success) {
this.lodding()
this.close();
} else {
Message.error(res.message)
......
......@@ -398,7 +398,7 @@ export default {
color: #006cff;
border-left: 1px solid #EAEAEA;
border-right: 1px solid #EAEAEA;
height: 59px;
height: 58px;
border-bottom: 1px solid #FFF;
}
}
......
......@@ -10,22 +10,22 @@
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<el-input v-model="form.zddm"></el-input>
<input class="formInput" v-model="form.zddm">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
<td colspan="4" class="psr">
<input class="formInput percent80" v-model="form.bdcdyh">
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >项目名称</td>
<td colspan="4" >
<el-input v-model="form.xmmc"></el-input>
<input class="formInput" v-model="form.xmmc">
</td>
<td colspan="2" align="center" >房屋性质</td>
<td colspan="4" >
<el-select v-model="form.fwxzbsm" placeholder="请选择" >
<el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwxzOptions"
:key="item.bsm"
......@@ -39,7 +39,7 @@
<tr height="30">
<td colspan="2" align="center" >房屋类型</td>
<td colspan="4" >
<el-select v-model="form.fwlxbsm" placeholder="请选择" >
<el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwlxList"
:key="item.bsm"
......@@ -61,7 +61,7 @@
<tr height="30">
<td colspan="2" align="center" >产别</td>
<td colspan="4" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -72,7 +72,7 @@
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="4" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -127,26 +127,23 @@
<tr height="30">
<td colspan="2" align="center" >共有土地面积（㎡）</td>
<td colspan="2" >
<el-input v-model="form.zdmj"></el-input>
<input class="formInput" v-model="form.zdmj">
</td>
<td colspan="2" align="center" >分摊土地面积（㎡）</td>
<td colspan="2" >
<el-input v-model="form.fttdsymj"></el-input>
<input class="formInput" v-model="form.fttdsymj">
</td>
<td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
<td colspan="2" >
<el-input v-model="form.dlsytdmj"></el-input>
<input class="formInput" v-model="form.dlsytdmj">
</td>
</tr>
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
<td colspan="12" align="center">
<Qlxz ref="qlxzModule" :formData="form"></Qlxz>
</td>
</tr>
<tr></tr>
<tr></tr>
<tr></tr>
<tr height="30">
......@@ -154,7 +151,7 @@
<span>坐落</span>
</td>
<td colspan="10" >
<el-input v-model="form.zl"></el-input>
<input class="formInput" v-model="form.zl">
</td>
</tr>
......@@ -163,7 +160,7 @@
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<el-input v-model="form.bz" type="textarea"></el-input>
<input class="formInput" v-model="form.bz" type="textarea">
</td>
</tr>
<tr height="30">
......@@ -174,7 +171,7 @@
<span>调查意见</span>
</td>
<td colspan="10" >
<el-input v-model="form.name"></el-input>
<input class="formInput" v-model="form.name">
</td>
</tr>
......@@ -183,7 +180,7 @@
<span>审查员</span>
</td>
<td colspan="2" >
<el-input v-model="form.name"></el-input>
<input class="formInput" v-model="form.name">
</td>
<td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px">
<span>审查日期</span>
......@@ -481,10 +478,6 @@
box-sizing: border-box;
padding: 18px;
padding-bottom: 0;
/deep/.el-input__inner{
width: 100%;
border: 0;
}
/deep/textarea{
width: 100%;
......@@ -503,13 +496,12 @@
}
td{
//bgcolor:#F1F4FC;
bgcolor:#fff;
width:8.33%
height: 36px;
width:8.33%;
}
.el-select{
display:block;
width: 100%;
}
table{
......@@ -518,6 +510,15 @@
.dzTable{
margin-top: 10px;
/deep/.el-input__inner {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
}
}
}
</style>
\ No newline at end of file
......
......@@ -4,7 +4,7 @@
<el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz></cxlz></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -25,6 +25,7 @@ export default {
activeName: "fg",
hbLoad:false, //默认不加载合并tab
fwsxbgLoad:false, //默认不加载范围属性变更tab
cxlzLoad:false, //默认不加载重新落宗tab
};
},
methods: {
......@@ -36,6 +37,9 @@ export default {
if(!this.fwsxbgLoad){
this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
}
if(!this.cxlzLoad){
this.cxlzLoad = tab.name == 'cxlz' ? true : false
}
},
},
created() {},
......
......@@ -106,7 +106,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
this.tableHeight = this.$refs.notice.offsetHeight - 53;
this.tableHeight = this.$refs.notice.offsetHeight - 54;
});
},
methods: {
......@@ -228,13 +228,13 @@ export default {
}
}
}
.el-card__body {
padding: 40px;
/deep/ .el-card__body {
padding: 50px 20px;
}
}
.notice {
padding: 0;
height: calc(100% - 225px);
height: calc(100% - 285px);
@flex();
.news {
float: left;
......
......@@ -22,20 +22,41 @@
</table>
<table border="1">
<tr>
<td @click="addRow" class="cz">+</td>
<td class="cz"><el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+</el-button
></td>
<td class="dzwdm">定着物代码</td>
<td class="syqmj">土地所有权/使用权面积(㎡)</td>
<td class="dytdmj">独有独用土地面积(㎡)</td>
<td class="fttjmj">分摊土地面积(㎡)</td>
</tr>
<tr v-for="(item,i) in mjftData.list" :key="i">
<td @click="delRow(i)" class="cz">-</td>
<td class="dzwdm"><input type="text" class="formInput" v-model="item.dzwdm"/></td>
<td class="syqmj"><input type="number" class="formInput" v-model="item.tdsyqsyqmj" @keydown="oninput"/>
<td class="cz">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="delRow(i)"
>-</el-button
>
</td>
<td class="dytdmj"><input type="number" class="formInput" v-model="item.dydytdmj" @keydown="oninput"/>
<td class="dzwdm">
<el-input v-model="item.dzwdm" placeholder="请输入定着物代码">
</el-input>
</td>
<td class="fttjmj"><input type="number" class="formInput" v-model="item.fttdmj" @keydown="oninput"/>
<td class="syqmj">
<el-input placeholder="请输入使用所有权面积" style="ime-mode:inactive"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
v-model="item.tdsyqsyqmj"
></el-input>
</td>
<td class="dytdmj">
<el-input v-model="item.dydytdmj" style="ime-mode:inactive" placeholder="请输入独有独用土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
<td class="fttjmj">
<el-input v-model="item.fttdmj" style="ime-mode:inactive" placeholder="请输入分摊土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
......@@ -110,9 +131,6 @@
console.log(error)
})
},
oninput(e) {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
},
addRow() {
this.mjftData.list.push({
dydytdmj: '',
......
......@@ -113,10 +113,10 @@
<td colspan="4" class="psr">
<input :disabled="formData.qszt!='0'"
type="text" placeholder="请输入"
class="formInput percent78"
class="formInput percent80"
v-model="formData.zddm"
/>
<el-button type="primary" class="createBtn" @click="generatorCode"
<el-button type="warning" class="createBtn" @click="generatorCode"
>生成
</el-button>
</td>
......@@ -131,10 +131,10 @@
<td colspan="4" class="psr">
<input
type="text" :disabled="formData.qszt!='0'"
class="formInput percent78"
class="formInput percent80"
v-model="formData.bdcdyh"
/>
<el-button type="primary" class="createBtn">生成</el-button>
<el-button type="warning" class="createBtn">生成</el-button>
</td>
</tr>
<tr>
......@@ -708,10 +708,6 @@ export default {
overflow: visible;
text-align: center;
}
.percent78 {
width: 78%;
float: left;
}
.percent68 {
width: 68% !important;
float: left;
......@@ -732,13 +728,6 @@ export default {
width: 30% !important;
float: left;
}
.createBtn {
position: absolute;
width: 50px;
padding: 6px 4px;
right: 4px;
top: 4px;
}
.el-input__icon {
line-height: 37px;
}
......
......@@ -20,9 +20,9 @@
<tr height="30">
<td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
<!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 82%" disabled></el-input>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:17%;margin-left:1%">生成</el-button>
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80" disabled></el-input>
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
<td colspan="2" align="center" >原不动产单元</td>
<td colspan="4" >
......
......@@ -3,7 +3,7 @@
<div class="tab-header">
<el-row class="searchContent">
<el-col :span="8">
<el-radio-group v-model="tabPosition">
<el-radio-group v-model="syclx">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
</el-radio-group>
......@@ -34,28 +34,28 @@
class="radioBtn"
label="3"
border
@click="plhVisible = true"
@click="openPl('h')"
>批量户</el-button
>
<el-button
class="radioBtn"
label="4"
border
@click="plcVisible = true"
@click="openPlC"
>批量层</el-button
>
<el-button
class="radioBtn"
label="5"
border
@click="plShVisible = true"
@click="openPl('sh')"
>批量室号</el-button
>
<el-button
class="radioBtn"
label="6"
border
@click="plzlVisible = true"
@click="openPl('zl')"
>批量坐落</el-button
>
<el-button class="radioBtn" label="7" border @click="addBdcdyh"
......@@ -236,10 +236,10 @@
</div>
</el-dialog>
<!-- 批量操作弹出框 -->
<pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h>
<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose"></pl-zl>
<pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c>
<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh>
<pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h>
<pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
<pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
<pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
<h-cxlz
:h-cxlz-visble="hcxlzVisible"
:bsms="bsms"
......@@ -258,6 +258,7 @@
</template>
<script>
import {Message} from "element-ui"
import HCxlz from "./../../../../components/hCxlz/hCxlz";
import PlC from "./../../../../components/plc/plC";
import PlSh from "./../../../../components/plsh/plSh";
......@@ -289,7 +290,7 @@ export default {
props: {},
data() {
return {
bsms: ["123", "321", "231"],
bsms: [],
hbsm: "",
dialogVisible: false,
plcVisible: false,
......@@ -298,7 +299,7 @@ export default {
plzlVisible: false,
hbjVisible: false,
hcxlzVisible:false,
tabPosition: "1", //1是实测 0是预测
syclx: "1", //1是实测 0是预测
radio1: "",
radio2: "",
createFlag: false,
......@@ -372,6 +373,7 @@ export default {
lpbContentwidth: "",
time: "",
dyztBsmList: {}, //单元状态bsmList
cbsmList:[], // 层bsmlist
};
},
created() {
......@@ -391,6 +393,35 @@ export default {
}, 100);
},
methods: {
openPlC(){
if (this.cbsmList.length <= 0) {
Message.warning("请选择层")
return
}
this.plcVisible=true
},
openPl(val){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
return
}
switch (val) {
case 'h':
this.plhVisible=true;
break;
case 'zl':
this.plzlVisible=true;
break;
case 'sh':
this.plShVisible=true;
break;
default:
break;
}
},
lodding(){
this.getlpbData();
},
hcxlzClose() {
this.hcxlzVisible = false;
},
......@@ -484,6 +515,11 @@ export default {
}
console.log(this.bsms);
},
//获取选中层bsmlist
getCbsm(data){
this.cbsmList = data;
console.log(this.cbsmList);
},
//不动产单元号输入框事件
inputFocus() {
this.inputWidth = 200;
......
......@@ -30,13 +30,13 @@
<el-input v-model="form.ljzmc"></el-input>
</td>
<td colspan="2" align="center">不动产单元号</td>
<td colspan="4">
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" class="percent80"></el-input>
<el-button
@click.prevent=""
size="mini"
type="primary"
style="width:25%;margin-left:3%"
type="warning"
class="createBtn"
>生成</el-button
>
</td>
......
......@@ -9,10 +9,10 @@
<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" :style="{'top':(ljzzdyHeight-1-zdys.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0" v-show="zdys.cs.length>0">
<table class="chTable" 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')">{{cs.sjc}}层</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
</tr>
......@@ -25,10 +25,10 @@
</div>
<!-- 循环逻辑幢下的层户 -->
<div class="ljz-ch" :style="{'min-height':ljzzdyHeight+40+'px'}" v-if="ljzs.cs.length>0">
<table class="chTable" :style="{'top':(ljzzdyHeight+40-1-ljzs.cs.length*65)+'px'}" border="1" cellspacing="0" cellpadding="0">
<table class="chTable" 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')">{{cs.sjc}}层</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
</tr>
......@@ -53,7 +53,7 @@
<table class="chTable" 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')">{{cs.sjc}}层</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
</tr>
......@@ -65,7 +65,7 @@
<table class="chTable" ref="ch" border="1" cellspacing="0" cellpadding="0" v-show="lpbData.cs != null && lpbData.cs.length>0" >
<tr v-for="(cs,csIndex) in lpbData.cs" :key="csIndex">
<!-- 显示层数 -->
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{cs.sjc}}层</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')" @click="handleClickC($event,cs)">{{cs.sjc}}层</td>
<!-- 显示户 -->
<td v-for="(hs,hsIndex) in cs.hs" :data-bsm="hs.bsm" ref="hBsm" :key="hsIndex" :class="(searchNum == hs.shbw || searchNum == hs.bdcdyh) ? 'tdSelect':''" @click="handleTdClick($event,hs.bsm)" @dblclick="dbclick(hs.bsm)" @contextmenu.prevent="openMenu($event, hs,'h')">{{hs.shbw}}</td>
</tr>
......@@ -117,6 +117,7 @@ export default {
ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
loading: true,
hbsmList: [],
cbsmList:[],
time: null, //区分单双击事件的定时器
searchNum: Math.random(),
//接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
......@@ -131,7 +132,7 @@ export default {
},
created() {},
mounted() {
this.getLpb(this.$store.state.zrzbsm);
this.getLpb(this.$store.state.zrzbsm,this.$parent.syclx);
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
......@@ -144,15 +145,15 @@ export default {
},
methods: {
//获取楼盘表数据
getLpb(zrzbsm) {
getLpb(zrzbsm).then((res) => {
getLpb(zrzbsm,syclx) {
getLpb(zrzbsm,syclx).then((res) => {
if (res.code == 200) {
this.loading = false;
this.lpbData = res.result == null ? this.lpbData : res.result;
setTimeout(() => {
this.$nextTick(()=>{
//渲染楼盘表
this.dataChange();
}, 200);
})
} else {
this.$message({
message: res.message,
......@@ -171,12 +172,13 @@ export default {
//自然幢下元素高度宽度计算
dataChange() {
//计算逻辑幢宽度 20为marginRight值
this.ljzWidth -= 9980;
this.ljzWidth = 20;
if (this.$refs.ljz != undefined) {
this.$refs.ljz.forEach((item) => {
this.ljzWidth += item.offsetWidth + 20;
});
} else {
}
//计算独立幢单元和独立层户宽度
//考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
......@@ -185,7 +187,7 @@ export default {
let higher = true;
//记录最高的幢单元高度 默认为第一个幢单元高度
let highest = this.$refs.zdy[0].offsetHeight;
this.zdyWidth -= 980;
this.zdyWidth = 20;
this.$refs.zdy.forEach((item) => {
this.zdyWidth += item.offsetWidth + 21;
this.cHeight =
......@@ -278,6 +280,7 @@ export default {
},
//户右键点击事件
openMenu(e,item,type){
debugger
console.log(e,'e');
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
......@@ -285,6 +288,20 @@ export default {
this.rightClickFlag = type;
this.lpbChVisible = true;
},
// 层选中事件
handleClickC(e,item){
//判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className += " tdSelect"; //加边框
this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList
} else {
//选中→未选中
e.target.className = "floor";
this.deleteArrOption(this.cbsmList,item.bsm);
}
this.$parent.getCbsm(this.cbsmList);
},
//关闭右键菜单
closeMenu(){
this.lpbChVisible = false
......@@ -319,8 +336,14 @@ export default {
legendToggleFlagChange() {
return this.$parent.legendToggleFlag;
},
syclx(){
return this.$parent.syclx
}
},
watch: {
syclx(n){
this.getLpb(this.$store.state.zrzbsm,n)
},
createFlagChange: function(val) {
setTimeout(() => {
this.lpbContentWidth = this.$refs.lpbContent.offsetWidth - 6;
......@@ -485,12 +508,14 @@ export default {
background-image: url("../../../../../assets/tdSelect.png");
background-repeat: no-repeat;
background-position: right top;
background-size: 30px;
}
}
}
.name {
line-height: 40px;
text-align: center;
display: inline-block;
}
// end
}
......
......@@ -13,7 +13,14 @@
</table>
<table border="1">
<tr>
<td @click="addRow">+</td>
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+</el-button
>
</td>
<td>建(构)筑物编号</td>
<td>建(构)筑物数量</td>
<td>建(构)筑物面积(㎡)</td>
......@@ -22,13 +29,20 @@
<td>附记</td>
</tr>
<tr v-for="(item,i) in Data.list" :key="i">
<td @click="delRow(i)">-</td>
<td><input type="text" class="formInput" v-model="item.jgzwbh"/></td>
<td><input type="number" class="formInput" v-model="item.jgzsl" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td>
<td><input type="text" class="formInput" v-model="item.fj"/></td>
<td>
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="delRow(i)"
>-</el-button
>
</td>
<td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td>
<td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td>
<td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td>
<td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td>
<td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td>
<td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td>
</tr>
<!-- <tr>
<td>统计</td>
......@@ -94,9 +108,6 @@
}
})
},
oninput(e) {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
},
addRow() {
this.Data.list.push({
jgzwbh: '', // 建(构)筑物编号
......
......@@ -23,9 +23,9 @@
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
</td>
<td colspan="2" >不动产单元号<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
<el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
<td colspan="4" class="psr">
<input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.bdcdyh">
<el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
......@@ -145,12 +145,12 @@
<tr v-for="(item1,index) in form.fwytList" :key="index">
<td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle">
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
<span>用途<i class="requisite">*</i></span>
<el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;用途<i class="requisite">*</i></span>
</td>
<td colspan="1" style="min-width:120px">
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
<el-button type="info" class="outMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
规划用途
</td>
<td colspan="3" >
......@@ -186,11 +186,12 @@
<tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" >
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
<el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" >
<span @click="deleteFwjgInfo(index)">删除</span>
<el-button type="primary" class="outMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button>
<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
</td>
<td colspan="9" >
<el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" >
......@@ -205,13 +206,10 @@
</tr>
<tr>
<td colspan="12" rowspan="4" align="center">
<td colspan="12" align="center">
<Qlxz ref="qlxzModule" :formData="form"></Qlxz>
</td>
</tr>
<tr></tr>
<tr></tr>
<tr></tr>
<tr>
<td colspan="2" >
......@@ -262,7 +260,7 @@
</el-date-picker>
</td>
</tr>
</table>
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
......@@ -605,10 +603,6 @@
text-align: center;
cursor: text;
}
.percent78 {
width: 78%;
float: left;
}
.percent68 {
width: 68% !important;
float: left;
......@@ -629,13 +623,6 @@
width: 30% !important;
float: left;
}
.createBtn {
position: absolute;
width: 50px;
padding: 6px 4px;
right: 4px;
top: 4px;
}
.el-input__icon {
line-height: 37px;
}
......@@ -644,4 +631,4 @@
}
}
}
</style>
\ No newline at end of file
</style>
......