Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
1f374220 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents 4cd04f02 b266090b
Expand all
Inline Side-by-side
Showing 37 changed files with 636 additions and 246 deletions
......@@ -13,42 +13,42 @@
},
"dependencies": {
"@antv/g6": "^4.0.3",
"axios": "^0.19.0",
"core-js": "^2.6.5",
"e-icon-picker": "^1.0.7",
"axios": "^0.19.2",
"core-js": "^2.6.12",
"e-icon-picker": "^1.0.15",
"el-select-tree": "^1.0.26",
"el-tree-select": "^3.1.10",
"element-ui": "^2.13.2",
"el-tree-select": "^3.1.11",
"element-ui": "^2.14.1",
"esri-loader": "^2.16.0",
"file-saver": "^2.0.2",
"form-making": "^1.2.9",
"file-saver": "^2.0.5",
"form-making": "^1.2.10",
"insert-css": "^2.0.0",
"js-cookie": "^2.2.1",
"mockjs": "^1.1.0",
"screenfull": "^5.0.2",
"shapefile": "^0.6.6",
"style-resources-loader": "^1.3.3",
"style-resources-loader": "^1.4.1",
"terraformer-arcgis-parser": "^1.1.0",
"terraformer-wkt-parser": "^1.2.1",
"vue": "^2.6.10",
"vue": "^2.6.12",
"vue-cli-plugin-style-resources-loader": "^0.1.4",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.0.3",
"vuex": "^3.0.1",
"vue-router": "^3.4.9",
"vuex": "^3.6.0",
"webpack-theme-color-replacer": "^1.3.14",
"xlsx": "^0.16.6"
"xlsx": "^0.16.9"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.11.0",
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-service": "^3.11.0",
"babel-eslint": "^10.0.1",
"@vue/cli-plugin-babel": "^3.12.1",
"@vue/cli-plugin-eslint": "^3.12.1",
"@vue/cli-service": "^3.12.1",
"babel-eslint": "^10.1.0",
"babel-polyfill": "^6.26.0",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"less": "^3.0.4",
"less": "^3.12.2",
"less-loader": "^5.0.0",
"script-loader": "^0.7.2",
"vue-template-compiler": "^2.6.10"
"vue-template-compiler": "^2.6.12"
}
}
......
......@@ -43,22 +43,27 @@ export default {
margin-bottom: 10px;
li{
cursor: pointer;
padding: 4px 16px;
padding: 8px 16px;
position: relative;
i{
position: absolute;
right: 20px;
top: 6px;
top: 11px;
color: #4EB2FF;
display: none;
}
}
li:hover{
background: #eee;
background: #F0F9FF;
}
.cantClick{
color: #BBB!important;
cursor: not-allowed!important;
}
.cantClick:hover{
background: #ffffff!important;
}
.choosed{
color: #4EB2FF;
background-color: #F0F9FF!important;
i{
display: inline-block;
}
......
......@@ -166,12 +166,12 @@ export function getFileLis(glbsm) {
/**
* 获取文件预览地址
*/
export function loadFile(url) {
export function loadFile(id) {
return request({
url:"/file/loadImage",
method:'get',
params:{
url
id
}
})
}
......
......@@ -75,3 +75,25 @@ export function ZdfggetZxx(zdbsm) {
}
})
}
/**
* 多幢分割获取自然幢信息
*/
export function dzfgGetZrzxx(dzbsm) {
return request({
url:"/bg/dzSplitMerge/fgSelectZrz",
method:'get',
params:{
dzbsm
}
})
}
/**
* 多幢分割保存
*/
export function saveDzFg(data) {
return request({
url: '/bg/dzSplitMerge/dzFg',
method: 'post',
data: data,
})
}
......
......@@ -179,3 +179,18 @@ export function batchCommit(data) {
data:data
})
}
/**
* 批量提交
*/
export function getDetailInfo(zrzbsm,lx) {
return request({
url:'/fw/lpb/getDetailInfo',
method:'get',
params: {
zrzbsm:zrzbsm,
scyclx:lx,
},
})
}
......
......@@ -31,6 +31,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe779;</span>
<div class="name">多幢</div>
<div class="code-name">&amp;#xe779;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe77a;</span>
<div class="name">自然幢</div>
<div class="code-name">&amp;#xe77a;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe778;</span>
<div class="name">户重新落宗</div>
<div class="code-name">&amp;#xe778;</div>
......@@ -285,6 +297,24 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont iconduochuang"></span>
<div class="name">
多幢
</div>
<div class="code-name">.iconduochuang
</div>
</li>
<li class="dib">
<span class="icon iconfont iconziranchuang"></span>
<div class="name">
自然幢
</div>
<div class="code-name">.iconziranchuang
</div>
</li>
<li class="dib">
<span class="icon iconfont iconhuzhongxinlazong"></span>
<div class="name">
户重新落宗
......@@ -621,6 +651,22 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconduochuang"></use>
</svg>
<div class="name">多幢</div>
<div class="code-name">#iconduochuang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconziranchuang"></use>
</svg>
<div class="name">自然幢</div>
<div class="code-name">#iconziranchuang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#iconhuzhongxinlazong"></use>
</svg>
<div class="name">户重新落宗</div>
......
......@@ -6,6 +6,20 @@
"description": "",
"glyphs": [
{
"icon_id": "18727148",
"name": "多幢",
"font_class": "duochuang",
"unicode": "e779",
"unicode_decimal": 59257
},
{
"icon_id": "18727149",
"name": "自然幢",
"font_class": "ziranchuang",
"unicode": "e77a",
"unicode_decimal": 59258
},
{
"icon_id": "18623953",
"name": "户重新落宗",
"font_class": "huzhongxinlazong",
......
......@@ -20,6 +20,12 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="duochuang" unicode="&#59257;" d="M68.266667 793.6h546.133333v-819.2H68.266667v819.2z m68.266666-68.266667v-682.666666h409.6v682.666666H136.533333zM238.933333 622.933333h68.266667v-68.266666h-68.266667V622.933333z m136.533334 0h68.266666v-68.266666h-68.266666V622.933333zM238.933333 486.4h68.266667v-68.266667h-68.266667V486.4z m136.533334 0h68.266666v-68.266667h-68.266666V486.4zM238.933333 349.866667h68.266667v-68.266667h-68.266667V349.866667z m136.533334 0h68.266666v-68.266667h-68.266666V349.866667zM238.933333 213.333333h68.266667v-68.266666h-68.266667v68.266666z m136.533334 0h68.266666v-68.266666h-68.266666v68.266666zM546.133333 588.8h409.6v-614.4H546.133333v614.4z m68.266667-68.266667v-477.866666h273.066667v477.866666H614.4zM716.8 486.4h68.266667v-68.266667h-68.266667zM716.8 349.866667h68.266667v-68.266667h-68.266667zM716.8 213.333333h68.266667v-68.266666h-68.266667z" horiz-adv-x="1024" />
<glyph glyph-name="ziranchuang" unicode="&#59258;" d="M170.666667 793.6h682.666666v-819.2h-682.666666v819.2z m68.266666-68.266667v-682.666666h546.133334v682.666666h-546.133334zM341.333333 622.933333h68.266667v-68.266666H341.333333V622.933333z m136.533334 0h68.266666v-68.266666H477.866667V622.933333z m136.533333 0h68.266667v-68.266666H614.4V622.933333zM341.333333 486.4h68.266667v-68.266667H341.333333V486.4z m136.533334 0h68.266666v-68.266667H477.866667V486.4z m136.533333 0h68.266667v-68.266667H614.4V486.4zM341.333333 349.866667h68.266667v-68.266667H341.333333V349.866667z m136.533334 0h68.266666v-68.266667H477.866667V349.866667z m136.533333 0h68.266667v-68.266667H614.4V349.866667zM341.333333 213.333333h68.266667v-68.266666H341.333333v68.266666z m136.533334 0h68.266666v-68.266666H477.866667v68.266666z m136.533333 0h68.266667v-68.266666H614.4v68.266666z" horiz-adv-x="1024" />
<glyph glyph-name="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" />
......
......@@ -101,9 +101,11 @@
<li>
<el-date-picker
v-model="childItem.tdsyqssj"
:picker-options="childItem.pickerStart"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@input="startTime(index,childIndex)"
>
</el-date-picker>
</li>
......@@ -148,7 +150,9 @@
v-model="childItem.tdsyjssj"
type="date"
value-format="yyyy-MM-dd"
:picker-options="childItem.pickerEnd"
placeholder="选择日期"
@input="endTime(index,childIndex)"
>
</el-date-picker>
</li>
......@@ -221,6 +225,8 @@ export default {
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
pickerStart:{},
pickerEnd:{},
tdzh: "",
},
],
......@@ -317,6 +323,42 @@ export default {
getQlxzDataList() {
return this.countList;
},
//起始时间判断
startTime(index,childIndex){
let startTime= this.countList[index].list[childIndex].tdsyqssj;
let endTime=this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerEnd={
disabledDate: (time) => {
if (Object.keys(startTime).length>0) {
return new Date(startTime).getTime()>time.getTime();
}else {
return time.getTime()< Date.now();
}
}
}
if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
let startYear= new Date(startTime).getFullYear();
let endYear=new Date(endTime).getFullYear();
}
},
endTime(index,childIndex,e){
console.log(e,'eeeeee');
let startTime = this.countList[index].list[childIndex].tdsyqssj;
let endTime = this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerStart={
disabledDate: (time) => {
if (Object.keys(endTime).length>0) {
return new Date(endTime).getTime()<time.getTime();
}else {
return time.getTime() > Date.now();
}
}
}
if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
let startYear= new Date(startTime).getFullYear();
let endYear=new Date(endTime).getFullYear();
}
},
},
};
</script>
......
......@@ -175,31 +175,35 @@ export default {
// 左键双击事件
dbclick(item) {
clearTimeout(this.time);
if(item.type == 'zd' || item.type == 'zrz' ||item.type == 'dz'){
//此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
if (item.type == 'zd') {
this.$store.state.zdbsm = item.bsm;
this.$router.push({
path: '/'+item.type,
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm
}
});
}else if(item.type == 'zrz'){
this.$store.state.zrzbsm = item.bsm;
this.$router.push({
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm
}
});
}else if(item.type == 'dz'){
this.$store.state.dzbsm = item.bsm;
this.$router.push({
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm
}
});
}
// if (item.type == 'zd') {
// this.$router.push({
// path: '/zd',
// query:{
// source: 2,
// bsm:item.bsm
// }
// });
// }else if(item.type == 'zrz'){
// this.$router.push({
// path: '/zrz',
// query:{
// bsm:item.bsm
// }
// });
// }
},
closeMenu() {
this.$emit("changeVisible", false);
......
......@@ -255,6 +255,8 @@ export default {
this.$store.state.zdbsm = this.zdData.zdbsm;
if(this.zdData.type == 'dz'){
this.$store.state.dzbsm = this.zdData.bsm;
}else{
this.$store.state.dzbsm = '';
}
},
//关闭添加定着物弹框
......
......@@ -187,7 +187,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -218,7 +218,7 @@
</template>
<script>
import Qlxz from "./../../components/formMenu/qlxz_simple";
import Qlxz from "./../../components/formMenu/qlxz";
import {batchUpdateQjH} from "../../api/h";
export default {
name: "plH",
......
......@@ -3,14 +3,60 @@
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-row :gutter="10" class="shop">
<!-- <el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button> -->
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入不动产权证号"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落"
></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
......@@ -23,10 +69,10 @@
<el-col :span="8" class="">
<el-input v-model="queryData.bdcqzh"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
</el-row> -->
<!-- <el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产权单元号:
不动产单元号:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.bdcdyh"></el-input>
......@@ -45,7 +91,7 @@
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
</el-col>
</el-row>
</el-row> -->
<table border="1">
<tr>
<td>序号</td>
......@@ -77,8 +123,6 @@
</table>
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
......@@ -142,11 +186,11 @@
created() {
},
methods: {
currentChange: function (val) {
currentChange(val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
reset(){
this.queryData = {
bdcdyh: "",
bdcqzh: "",
......@@ -160,25 +204,25 @@
};
this.getData(this.queryData)
},
getData: function (data) {
getData(data){
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search: function () {
search(){
this.getData(this.queryData)
},
addData: function (val) {
addData(val){
this.$emit("getData", val)
if (this.isZdClose) {
this.close();
}
},
close: function () {
close(){
this.$emit('close')
this.result();
this.reset();
}
},
watch: {
......@@ -197,6 +241,10 @@
height: auto;
width: 80%;
}
/deep/ .el-form-item__label{
width: 96px;
text-align: right;
}
table {
margin-top: 10px;
......@@ -233,5 +281,8 @@
.noData {
color: #b2b2b2;
}
.page{
margin-top: 20px;
}
</style>
......
......@@ -3,47 +3,54 @@
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
不动产权证号:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.bdcqzh"></el-input>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入不动产权证号"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
</el-form>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产权单元号:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.bdcdyh"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
权利人:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.qlrmc"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
坐落:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落"
></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
<table border="1">
......@@ -77,8 +84,6 @@
</table>
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
......@@ -146,7 +151,7 @@
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
reset: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
......@@ -178,7 +183,7 @@
},
close: function () {
this.$emit('close')
this.result();
this.reset();
}
},
watch: {
......@@ -197,6 +202,11 @@
height: auto;
width: 80%;
}
/deep/ .el-form-item__label{
width: 96px;
text-align: right;
}
table {
margin-top: 10px;
......@@ -233,5 +243,8 @@
.noData {
color: #b2b2b2;
}
.page{
margin-top: 20px;
}
</style>
......
......@@ -169,6 +169,8 @@ export default {
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm);
}else if(newPath == "/dz"){
this.getRightTreeByDzbsm(this.$store.state.dzbsm);
}else if(newPath == "/h"){
this.getRightTreeByHbsm(this.$store.state.hbsm);
} else if(newPath == "/viewMap"){
this.isMap = true;
if(this.$route.query.type == "zd"){
......@@ -329,6 +331,14 @@ export default {
});
},
getRightTreeByHbsm(bsm) {
getTreeByBsm(bsm,"h").then((res) => {
if (res.success) {
this.pd = res.result;
}
});
},
sortNavigation(data, selectId) {
let headTop = this.headTop;
data.forEach((item, index) => {
......@@ -439,7 +449,7 @@ export default {
width: 100%;
height: 100vh;
position: relative;
min-width: 1500px;
min-width: 1680px;
overflow-x: auto;
.calcWidth{
width: calc(100% - 300px);
......
......@@ -141,7 +141,7 @@
<tr>
<td colspan="12" align="center">
<Qlxz ref="qlxzModule" :formData="form"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
......@@ -207,7 +207,7 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz_simple";
import Qlxz from "../../../components/formMenu/qlxz";
import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit,registerCall} from "../../../api/common"
......
......@@ -19,7 +19,7 @@
data() {
return {
activeName: "dzxx",
dzJbxxVisble:false,
dzJbxxVisble:true,
fjclVisible:false
};
},
......
......@@ -564,7 +564,7 @@
let arr=[];
switch (this.tabName) {
case "zd":
arr=this.zdhbqData.filter(i=>i.zddm==data.zddm);
arr=this.zdhbqData.filter(i=>i.zdbsm==data.zdbsm);
if (arr.length>0) {
break
}
......@@ -756,4 +756,7 @@
color: blue;
text-decoration: underline;
}
/deep/ .el-select {
width: 100%;
}
</style>
......
......@@ -290,8 +290,9 @@ export default {
//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
this.$refs['ruleForm1'].validate((valid) => {
if (valid) {
this.ruleForm1.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
insertZrzjbxx(this.ruleForm1)
.then((res) => {
if (res.code == "200") {
......
......@@ -6,6 +6,7 @@
:data="tableData"
:height="tableHeight"
:row-class-name="tableRowClassName"
@row-dblclick="doubleClick"
>
<el-table-column type="index" width="80" align="center" label="序号">
</el-table-column>
......@@ -81,6 +82,9 @@
methods: {
onSubmit() {
},
doubleClick(row, column, event){
this.handleClick(row);
},
tableRowClassName({row, rowIndex}) {
if (rowIndex % 2 !== 0) {
return "even-row";
......
......@@ -3,6 +3,7 @@
<el-upload
class="upload-demo"
action="/api/file/uploadList"
:data="fileData"
:on-preview="handlePreview"
:on-remove="handleRemove"
:before-remove="beforeRemove"
......@@ -33,7 +34,7 @@
<td class="cz">
<span @click="downloadFile(item.fileurl)">下载</span>
<span>/</span>
<span @click="loadFile(item.fileurl)">预览</span>
<span @click="loadFile(item.bsm)">预览</span>
<span>/</span>
<span @click="deleteFile(item.bsm)">删除</span>
</td>
......@@ -50,24 +51,24 @@
name: "fjcl",
data() {
return {
fileData:{
glbsm:'',
dylx:''
},
list: [
{
filename: '调查文档1',
filepostfix: 'doc',
fileurl: ''
}
],
filesData: {
/* filesData: {
dylx: "",
glbsm: "",
list: [
{
filename: "",
filepostfix: "",
fileurl: ""
fileurl: "",
preViewUrl:""
}
]
},
},*/
}
},
mounted() {
......@@ -94,8 +95,8 @@
});
});
},
loadFile(url){
loadFile(url).then(res=>{
loadFile(bsm){
loadFile(bsm).then(res=>{
if (res.success) {
window.open(res.message)
}
......@@ -105,28 +106,27 @@
window.open(`/api/file/download?url=`+url);
},
getFileList() {
console.log(this.$route.name,'NAME')
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
this.filesData.glbsm = this.$store.state.zdbsm
this.fileData.dylx = 'zd';
this.fileData.glbsm = this.$store.state.zdbsm
break;
case "自然幢":
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
this.fileData.dylx = 'zrz';
this.fileData.glbsm = this.$store.state.zrzbsm
break
case "多幢":
this.filesData.dylx = 'dz';
this.filesData.glbsm = this.$store.state.dzbsm
this.fileData.dylx = 'dz';
this.fileData.glbsm = this.$store.state.dzbsm
break
case "户":
this.filesData.dylx = 'h';
this.filesData.glbsm = this.$store.state.hbsm
this.fileData.dylx = 'h';
this.fileData.glbsm = this.$store.state.hbsm
break;
default:
break
}
getFileLis(this.filesData.glbsm ).then(res => {
getFileLis(this.fileData.glbsm ).then(res => {
if (res.success) {
this.list = res.result;
} else {
......@@ -138,15 +138,7 @@
console.log("上传文件失败", err)
},
uploadSuccess(res, file, fileList) {
this.filesData.list = res.result;
insertFile(this.filesData).then(res => {
if (res.success) {
Message.success("上传成功")
this.getFileList(this.filesData.glbsm)
} else {
Message.error(res.message)
}
})
this.getFileList();
},
handleRemove(file, fileList) {
console.log(file, fileList);
......
......@@ -2,7 +2,7 @@
<div ref="lpb" class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy></yzgy></el-tab-pane>
<el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
......@@ -28,6 +28,7 @@ export default {
return {
activeName: "zrzxx",
lpbLoad:false, //默认不加载楼盘表组件
yzgyLoad:false,
};
},
methods: {
......@@ -35,6 +36,9 @@ export default {
if(!this.lpbLoad){
this.lpbLoad = tab.name == 'lpb' ? true : false
}
if(!this.yzgyLoad){
this.yzgyLoad = tab.name == 'yzgy' ? true : false
}
},
},
created() {},
......
<template>
<div class="h content-form">
<el-form ref="form" :model="form" label-width="160px">
<div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''">
<el-form ref="form" :model="form" label-width="160px" class="form" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}">
<Qlr ref="qlrxxModule" :bsm='bsm'></Qlr>
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable">
<tbody>
......@@ -310,7 +310,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -391,22 +391,19 @@
</tbody>
</table>
</el-form>
<div class="btnGroup">
<el-button type="primary" @click="onSave">保存</el-button>
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
<!-- <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>
</template>
<script>
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import Qlxz from "./../../../../../components/formMenu/qlxz";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit,registerCall} from "./../../../../../api/common"
......@@ -425,9 +422,7 @@
},
data () {
return {
disableFlag:false,
//树型结构
show:true,
clearable: true,
......@@ -523,12 +518,18 @@
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
fwjgTitleRowspan:1, //房屋结构的单元格垂直合并数量
formHeight:0,
mainBoxWidth:0,
}
},
created(){
let bsm=this.$store.state.hbsm
console.log(bsm,'户BSM')
this.getHInfo(bsm);
this.$nextTick(()=>{
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320
})
},
methods: {
registerCall(){
......@@ -590,13 +591,8 @@
if(res.code===200){
this.form = res.result;
if(res.result.qszt !== '0'){
console.log(JSON.stringify(res)+":res")
console.log(JSON.stringify(res.result)+":res.result")
console.log(res.result.qszt+":res.result.qszt")
console.log(res.result.qszt !== '0'+":res.result.qszt!==0")
this.disableFlag = true;
}
console.log(this.disableFlag)
if(this.form.scyclx==='0'){
this.$set(this.form,"ycjzmj", this.form.jzmj)
this.$set(this.form,"yctnjzmj", this.form.tnjzmj)
......@@ -888,6 +884,15 @@
.el-select{
display:block;
}
.form{
overflow-y: scroll;
overflow-x: hidden;
margin-bottom: 30px;
}
}
.hpage{
box-sizing: border-box;
padding: 8px 6px 18px 18px;
}
table{
......@@ -904,8 +909,25 @@
height: 30px !important;
}
}
.btnGroup{
text-align: center;
margin-top: 20px;
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: 6px;
text-align: center;
background-color: #ffffff;
.el-button{
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
</style>
......
......@@ -468,6 +468,7 @@ export default {
//清空已选中层户
this.cbsmList = [];
this.bsms = [];
this.$refs.lpbContent.hbsmList = [];
this.$nextTick(()=>{
//户
this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
......@@ -484,6 +485,7 @@ export default {
})
//获取图例数据
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
},
//获取高度计算lpb内容区高度
getHeight() {
......@@ -550,16 +552,17 @@ export default {
},
//获取选中户bsm
getHbsm(data, type) {
this.bsms = data;
if (type) {
// 双击
this.hbsm = this.bsms[this.bsms.length - 1];
this.hbsm = data;
this.$store.state.hbsm=this.data;
this.hbjVisible = true;
this.$nextTick(function() {
this.$refs.hbj.getHInfo(this.hbsm);
});
} else {
//单击 TO DO
this.bsms = data;
}
},
//获取选中层bsmlist
......@@ -586,9 +589,9 @@ export default {
},
//调用楼盘表信息查询接口
getlpbData() {
this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
//改变楼盘表子组件的key值，重新渲染
this.time = new Date().getTime();
// this.time = new Date().getTime();
},
//实预测装换
plScYcChange() {
......@@ -607,7 +610,7 @@ export default {
//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
this.$refs.lpbContent.choosedList = [];
this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
item.style.borderColor = '#E6E6E6';
item.style.border = '';
});
// console.log(bsms,'bsms');
// console.log(color,'color');
......@@ -740,7 +743,7 @@ export default {
},
selectedZt(n){
this.legendToggleFlag = true;
}
},
},
};
</script>
......
......@@ -21,13 +21,13 @@
ref="ljz"
v-for="(ljzs, ljzIndex) in lpbData.ljzs"
:key="ljzIndex"
:style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
:style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}"
>
<!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
<!-- 循环逻辑幢下的幢单元 -->
<div
class="ljz-zdy"
:style="{ 'min-height': ljzzdyHeight + 40 + 'px' }"
:style="{ 'min-height': ljzzdyHeight + 40 + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
ref="ljzzdy"
v-show="ljzs.zdys.length > 0"
v-for="(zdys, zdyIndex) in ljzs.zdys"
......@@ -294,7 +294,7 @@
@close="moveHClose"
:move-hvisible="moveHvisible"
:type="scyclx"
@loading="loadingData"
@loading="loadingData($store.state.zrzbsm,$parent.scyclx)"
></move-h>
</div>
</template>
......@@ -363,11 +363,11 @@ export default {
}, 200);
},
methods: {
loadingData() {
this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx);
loadingData(zrzbsm,scyclx) {
this.getLpb(zrzbsm,scyclx,true);
},
//获取楼盘表数据
getLpb(zrzbsm, scyclx) {
getLpb(zrzbsm, scyclx,actual) {
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
this.loading = false;
......@@ -382,6 +382,9 @@ export default {
}else{
this.sclpbData = res.result == null ? this.sclpbData : res.result;
}
if(actual){
this.lpbData = res.result == null ? this.yclpbData : res.result;
}
this.$nextTick(() => {
//渲染楼盘表
this.dataChange();
......@@ -508,8 +511,8 @@ export default {
//户双击事件
dbclick(bsm) {
clearTimeout(this.time);
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(this.hbsmList, true);
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(bsm, true);
},
//删除多重数组中的某一项
deleteArrOption(arr, item) {
......@@ -689,9 +692,9 @@ export default {
// console.log(this.choosedList,'this.choosedList');
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
console.log(item.style.borderColor ,'item.style.borderColor ');
console.log(this.borderColor,'this.borderColor');
item.style.borderColor = this.borderColor;
// console.log(item.style.border,'item.style.border');
// console.log(this.borderColor,'this.borderColor');
item.style.border = '1px solid '+this.borderColor;
}
});
});
......@@ -724,7 +727,7 @@ export default {
height: auto;
overflow: hidden;
.ljz {
margin-bottom: 20px;
// margin-bottom: 20px;
display: table;
// position: relative;
// .ljz-zdy-wrap {
......@@ -732,7 +735,6 @@ export default {
// display: table;
.ljz-zdy {
height: auto;
margin-right: 20px;
float: left;
position: relative;
.zdy-name {
......@@ -772,13 +774,13 @@ export default {
}
}
.bottom40 {
position: absolute;
bottom: 40px;
margin-bottom: -30px;
}
.zdy-wrap {
height: auto;
overflow: hidden;
margin-bottom: 60px;
margin-top: 30px;
.zdy {
float: left;
margin-right: 20px;
......
<template>
<div class=""></div>
<div class="">
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 20px;"
row-key="bsm"
border
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="mc"
label="地址(单元名称)">
</el-table-column>
<el-table-column
prop="bdcdyh"
label="不动产单元号">
</el-table-column>
<el-table-column
prop="ch"
label="层号"
:formatter="chFilter">
</el-table-column>
<el-table-column
prop="hh"
label="户号"
:formatter="hhFilter">
</el-table-column>
<el-table-column
prop="fwyt"
label="房屋用途">
</el-table-column>
<el-table-column
prop="fwjg"
label="房屋结构">
</el-table-column>
<el-table-column
prop="jzmj"
label="面积">
</el-table-column>
<el-table-column
prop="tnjzmj"
label="套内建筑面积">
</el-table-column>
<el-table-column
prop="ftjzmj"
label="分摊建筑面积">
</el-table-column>
<el-table-column
prop="dxbfjzmj"
label="地下部分建筑面积">
</el-table-column>
<el-table-column
prop="qtjzmj"
label="其它建筑面积">
</el-table-column>
</el-table>
</div>
</template>
<script>
import {getDetailInfo} from "./../../../../api/lpb"
export default {
name:"",
components:{},
props:{},
data(){
return {
tableData: []
}
},
created(){},
mounted(){},
methods:{},
mounted(){
this.getData();
},
methods:{
chFilter(row, column){
if(row.ch === 0){
return ''
}else {
return row.ch;
}
},
hhFilter(row, column){
if(row.hh === 0){
return ''
}else {
return row.hh;
}
},
getData(){
let zrzbsm = '12a4eb0cf2b527273ff5f0b96820715a';
let scyclx = '0';
getDetailInfo(zrzbsm,scyclx).then((res)=>{
if(res.code===200){
console.log(res.result)
this.tableData = res.result;
}
})
},
load(tree, treeNode, resolve) {
setTimeout(() => {
resolve([
{
id: 31,
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
id: 32,
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}
])
}, 1000)
}
},
computed: {},
watch: {},
}
......
<template>
<div class="">
<div class="main">
<table border="1">
<tr>
<td colspan="3">宗地代码</td>
<td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td>
</tr>
<tr>
<td colspan="3">建筑物区分所有权业主共有部分权利人</td>
<td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td>
</tr>
</table>
<table border="1">
<tr>
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+</el-button
>
</td>
<td>建(构)筑物编号</td>
<td>建(构)筑物数量</td>
<td>建(构)筑物面积(㎡)</td>
<td>占地面积(㎡)</td>
<td>分摊土地面积(㎡)</td>
<td>附记</td>
</tr>
<tr v-for="(item,i) in Data.list" :key="i">
<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>
<td>{{sumTdsyqsyqmj}}</td>
<td>{{sumDydytdmj}}</td>
<td>{{sumFttdmj}}</td>
<td>{{sumFttdmj}}</td>
<td>{{sumFttdmj}}</td>
<td>{{sumFttdmj}}</td>
</tr>-->
</table>
<div class="pers">
<el-button @click="save" type="primary">保存</el-button>
</div>
<div class="main" ref="mainBox">
<table border="1">
<tr>
<td colspan="3">宗地代码</td>
<td colspan="4"><input type="text" class="formInput" v-model="zddm " disabled/></td>
</tr>
<tr>
<td colspan="3">建筑物区分所有权业主共有部分权利人</td>
<td colspan="4"><input type="text" class="formInput" v-model="Data.qlr" disabled/></td>
</tr>
</table>
<table border="1">
<tr>
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+</el-button
>
</td>
<td>建(构)筑物编号</td>
<td>建(构)筑物数量</td>
<td>建(构)筑物面积(㎡)</td>
<td>占地面积(㎡)</td>
<td>分摊土地面积(㎡)</td>
<td>附记</td>
</tr>
<tr v-for="(item,i) in Data.list" :key="i">
<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>
<td>{{sumTdsyqsyqmj}}</td>
<td>{{sumDydytdmj}}</td>
<td>{{sumFttdmj}}</td>
<td>{{sumFttdmj}}</td>
<td>{{sumFttdmj}}</td>
<td>{{sumFttdmj}}</td>
</tr>-->
</table>
<!-- <div class="pers">
<el-button @click="save" type="primary">保存</el-button>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</template>
......@@ -83,7 +84,8 @@
fttdmj: '', //分摊土地面积
fj: ''
}]
}
},
mainBoxWidth:0
}
},
......@@ -127,10 +129,12 @@
console.log("create init...")
},
mounted() {
console.log("mounted init...")
// console.log(this.$refs.mainBox.clientWidth,"this.$refs.mainBox.clientWidth")
this.Data.glbsm = this.$store.state.zrzbsm
this.zddm = this.$store.state.zddm
this.getData(this.Data.glbsm)
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
watch: {
"$store.state.zdbsm": function (bsm) {
......@@ -147,7 +151,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
}
table {
......@@ -186,4 +190,22 @@
.dzwsl {
width: 200px;
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: 0;
text-align: center;
background-color: #ffffff;
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
</style>
......