017d8d44 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents de304aea 262f684b
......@@ -122,3 +122,27 @@ ol, ul { list-style:none; }
.el-tabs__content{
position: unset;
}
// 自定义右键菜单样式
.contextmenu {
margin: 0;
background: #fff;
z-index: 3000;
position: absolute;
list-style-type: none;
padding: 5px 0;
border-radius: 4px;
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
}
.contextmenu li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
.contextmenu li:hover {
background: #eee;
}
// end
\ No newline at end of file
......
<template>
<div class="main">
<el-dialog
title="户重新落宗"
:visible.sync="isVisible"
......@@ -68,7 +67,6 @@
<query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
:isZdClose="true"></query-data>
</el-dialog>
</div>
</template>
<script>
......
......@@ -260,31 +260,7 @@ export default {
};
</script>
<style lang="less" scoped>
// 自定义右键菜单样式 start
.contextmenu {
margin: 0;
background: #fff;
z-index: 3000;
position: absolute;
list-style-type: none;
padding: 5px 0;
border-radius: 4px;
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
}
.contextmenu li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
.contextmenu li:hover {
background: #eee;
}
// end
.content {
height: 100%;
width: 100%;
......
......@@ -626,7 +626,6 @@ export default {
font-size: 16px;
}
td {
width: 60px;
text-align: center;
height: 36px;
}
......
......@@ -12,9 +12,9 @@
<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">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{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)">{{hs.shbw}}</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>
</table>
<!-- </div> -->
......@@ -28,9 +28,9 @@
<table class="chTable" :style="{'top':(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">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{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)">{{hs.shbw}}</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>
</table>
</div>
......@@ -53,9 +53,9 @@
<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">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{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)">{{hs.shbw}}</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>
</table>
</div>
......@@ -65,9 +65,9 @@
<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">{{cs.sjc}}</td>
<td class="floor" @contextmenu.prevent="openMenu($event, cs,'c')">{{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)">{{hs.shbw}}</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>
</table>
</div>
......@@ -81,6 +81,18 @@
>
{{ lpbData.xmmc }}
</div>
<ul
v-show="lpbChVisible"
:style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
class="contextmenu"
>
<li v-show='rightClickFlag=="h"' @click="handleAddH">添加</li>
<li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li>
<li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li>
<li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li>
<li v-show='rightClickFlag=="c"' @click="handleAddC">添加</li>
<li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除</li>
</ul>
</div>
</template>
<script>
......@@ -109,6 +121,12 @@ export default {
searchNum: Math.random(),
//接收父组件传入的根据单元状态/房屋性质/房屋用途筛选的户bsmList
choosedList: [],
lpbChVisible:false, //层户右键菜单显隐
lpbChLeft:100,
lpbChTop:100,
//右键层户数据
chData:'',
rightClickFlag:""
};
},
created() {},
......@@ -247,7 +265,7 @@ export default {
},
//清除选中户
clearChoosedH() {
this.$nextTick(() => {
// this.$nextTick(() => {
//将每个选中的户的选中状态清除
this.$refs.hBsm.forEach((item) => {
if (item.className == "tdSelect") {
......@@ -256,8 +274,43 @@ export default {
});
// 清空hbsmList
this.hbsmList = [];
});
// });
},
//户右键点击事件
openMenu(e,item,type){
console.log(e,'e');
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
this.chData = item;
this.rightClickFlag = type;
this.lpbChVisible = true;
},
//关闭右键菜单
closeMenu(){
this.lpbChVisible = false
},
//户右键菜单 start
handleAddH(){
},
handleMoveH(){
},
handleDeleteH(){
},
handleSyczh(){
},
//end
// 层右键菜单 start
handleAddC(){
},
handleDeleteC(){
},
//end
},
computed: {
createFlagChange() {
......@@ -298,11 +351,19 @@ export default {
this.$refs.hBsm.forEach((item) => {
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
console.log(item.dataset.bsm+'----分割线-----'+i);
item.className = "tdSelect";
}
});
});
},
lpbChVisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
} else {
document.body.removeEventListener("click", this.closeMenu);
}
}
},
};
</script>
......@@ -311,7 +372,6 @@ export default {
width: 100%;
height: 100%;
overflow: hidden;
position: relative;
.lpbContent {
width: 100%;
height: 100%;
......@@ -438,8 +498,8 @@ export default {
height: 60px;
line-height: 60px;
background-color: darkgoldenrod;
position: absolute;
bottom: 6px;
position: relative;
bottom: 66px;
text-align: center;
transition: 0.5s;
}
......
<template>
<div class="zrz content-form main" v-loading="loading">
<el-form ref="form" :model="form" label-width="160px">
<div class="main">
<div class="formMenu">
<Qlr ref="qlrxxModule" :bsm="bsm"></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable">
<tbody>
<tr height="30">
<td colspan="12" align="center" ><font size="4">自然幢基本信息</font></td>
<tr>
<th colspan="12">自然幢基本信息</th>
</tr>
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="4" >
<tr>
<td colspan="2">宗地代码</td>
<td colspan="4" style="min-width:450px">
<input v-model="form.zddm" class="formInput" disabled>
<input v-show="false" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" align="center" >自然幢号</td>
<td colspan="2" >自然幢号</td>
<td colspan="4" >
<input class="formInput" v-model="form.zrzh" style="width: 70%">
<el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >项目名称</td>
<tr>
<td colspan="2" >项目名称</td>
<td colspan="4" >
<input class="formInput" v-model="form.xmmc">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
<td colspan="2" >不动产单元号</td>
<td colspan="4" >
<input class="formInput percent78" v-model="form.bdcdyh" style="width: 70%">
<input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%">
......@@ -33,19 +30,19 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >建筑物名称</td>
<tr>
<td colspan="2" >建筑物名称</td>
<td colspan="4" >
<input class="formInput" v-model="form.jzwmc">
</td>
<td colspan="2" align="center" >建筑物基本用途</td>
<td colspan="2" >建筑物基本用途</td>
<td colspan="4" >
<input class="formInput" v-model="form.jzwjbyt">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋性质</td>
<tr>
<td colspan="2" >房屋性质</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" >
<el-option
......@@ -56,7 +53,7 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >竣工日期</td>
<td colspan="2" >竣工日期</td>
<td colspan="4" >
<el-date-picker
v-model="form.jgrq"
......@@ -66,65 +63,65 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >建筑物高度(m)</td>
<tr>
<td colspan="2" >建筑物高度(m)</td>
<td colspan="4" >
<input class="formInput" v-model="form.jzwgd">
</td>
<td colspan="2" align="center" >总套数</td>
<td colspan="2" >总套数</td>
<td colspan="4" >
<input class="formInput" v-model="form.zts">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >幢用地面积(㎡)</td>
<tr>
<td colspan="2" >幢用地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" v-model="form.zydmj">
</td>
<td colspan="2" align="center" >幢占用地面积(㎡)</td>
<td colspan="2" >幢占用地面积(㎡)</td>
<td colspan="4" >
<input class="formInput" v-model="form.zzdmj">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >预测建筑面积(㎡)</td>
<tr>
<td colspan="2" >预测建筑面积(㎡)</td>
<td colspan="4" >
<input class="formInput" v-model="form.ycjzmj">
</td>
<td colspan="2" align="center" >实测建筑面积(㎡)</td>
<td colspan="2" >实测建筑面积(㎡)</td>
<td colspan="4" >
<input class="formInput" v-model="form.scjzmj">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >地下层数</td>
<tr>
<td colspan="2" >地下层数</td>
<td colspan="4" >
<input class="formInput" v-model="form.dxcs">
</td>
<td colspan="2" align="center" >地上层数</td>
<td colspan="2" >地上层数</td>
<td colspan="4" >
<input class="formInput" v-model="form.dscs">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >总层数</td>
<tr>
<td colspan="2" >总层数</td>
<td colspan="4" >
<input class="formInput" v-model="form.zcs">
</td>
<td colspan="2" align="center" >地下深度(m)</td>
<td colspan="2" >地下深度(m)</td>
<td colspan="4" >
<input class="formInput" v-model="form.dxsd">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >产别</td>
<tr>
<td colspan="2" >产别</td>
<td colspan="4" >
<el-select class="formInput" v-model="form.fwcbbsm" placeholder="请选择" >
<el-select v-model="form.fwcbbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cbOptions"
:key="item.bsm"
......@@ -133,9 +130,9 @@
</el-option>
</el-select>
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="2" >产权来源</td>
<td colspan="4" >
<el-select class="formInput" v-model="form.fwcqlybsm" placeholder="请选择" >
<el-select v-model="form.fwcqlybsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.cqlyOptions"
:key="item.bsm"
......@@ -146,18 +143,18 @@
</td>
</tr>
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
<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>用途</span>
</td>
<td width="30" colspan="1" align="center" >
<td colspan="1" style="min-width:120px">
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
规划用途
</td>
<td width="30" colspan="4" align="center" >
<el-select-tree class="formInput"
<td colspan="3" >
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -170,9 +167,9 @@
v-model="item1.fwytzdbsm"
></el-select-tree>
</td>
<td width="30" colspan="1" align="center" >用途</td>
<td width="30" colspan="4" align="center" >
<el-select-tree class="formInput"
<td colspan="2" >用途</td>
<td colspan="4" >
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -187,12 +184,12 @@
</td>
</tr>
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<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>
<span>房屋结构</span>
</td>
<td colspan="1" align="center" >
<td colspan="1" >
<span @click="deleteFwjgInfo(index)">删除</span>
</td>
<td colspan="9" >
......@@ -216,8 +213,8 @@
<tr></tr>
<tr></tr>
<tr height="30">
<td colspan="2" align="center" >
<tr>
<td colspan="2" >
<span>坐落</span>
</td>
<td colspan="10" >
......@@ -225,19 +222,19 @@
</td>
</tr>
<tr height="30">
<td colspan="2" rowspan="2" align="center" >
<tr>
<td colspan="2" rowspan="2" >
<span>附加说明</span>
</td>
<td colspan="10" rowspan="2" >
<input class="formInput" v-model="form.bz" type="textarea">
</td>
</tr>
<tr height="30">
<tr>
</tr>
<tr height="30">
<td colspan="2" rowspan="2" align="center" >
<tr>
<td colspan="2" rowspan="2" >
<span>调查意见</span>
</td>
<td colspan="10" >
......@@ -245,14 +242,14 @@
</td>
</tr>
<tr height="30">
<td colspan="4" rowspan="2" align="right" style="width:8.33%;padding-right:10px">
<tr>
<td colspan="4" rowspan="2">
<span>审查员</span>
</td>
<td colspan="2" >
<input class="formInput" v-model="form.scy">
</td>
<td colspan="2" align="right" style="width:8.33%;padding-right:10px">
<td colspan="2">
<span>审查日期</span>
</td>
<td colspan="2" >
......@@ -264,15 +261,14 @@
</el-date-picker>
</td>
</tr>
</tbody>
</table>
</el-form>
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
</div>
</div>
</div>
</template>
<script>
......@@ -549,50 +545,74 @@
}
</script>
<style rel="stylesheet/less" lang="less" scoped>
.zrz {
min-height: 200px;
width: 100%;
/deep/.el-input__inner{
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
.formMenu {
width: 100%;
border: 0;
margin: 0 auto;
}
/deep/textarea{
.zrzTable {
margin: 10px 0;
background-color: #fff;
font-size: 14px;
width: 100%;
border: 0;
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
.el-form-item{
font-weight: bold;
font-size: xx-large
td {
text-align: center;
height: 36px;
}
table{
background: #fff;
table-layout: fixed;
/deep/ .el-input__inner {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
td{
//bgcolor:#F1F4FC;
background-color:#fff;
width:8.33%
.percent78 {
width: 78%;
float: left;
}
.el-select{
display:block;
.percent68 {
width: 68% !important;
float: left;
position: relative;
top: 7px;
}
table{
font-size: 14px;
.percent47 {
width: 45% !important;
float: left;
}
.zrzTable{
margin-top: 10px;
td{
text-align: center;
height: 36px;
.percent4 {
height: 20px;
line-height: 20px;
width: 4% !important;
float: left;
}
.percent30 {
width: 30% !important;
float: left;
}
.createBtn {
position: absolute;
width: 50px;
padding: 6px 4px;
right: 4px;
top: 4px;
}
.el-input__icon {
line-height: 37px;
}
.el-select {
width: 100%;
}
}
}
......