Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b40efab6 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents e5b2927a c8965602
Expand all
Inline Side-by-side
Showing 14 changed files with 224 additions and 128 deletions
......@@ -42,7 +42,7 @@ export default {
this.isShow = true;
this.tips = tips+'...';
},
loadingHide(tips){
loadingHide(){
this.isShow = false;
}
},
......
......@@ -126,3 +126,13 @@ export function cxlzZrzList(data) {
})
}
/**
* 查询权籍_建筑物区分所有权业主共有部分调查表
*/
export function getHCountByZrzbsm(id) {
return request({
url: '/fw/qjZrz/getHCountByZrzbsm',
method: 'get',
params: {id}
})
}
......
......@@ -98,6 +98,9 @@ ol, ul { list-style:none; }
::-webkit-scrollbar-track {
border-radius: 0;
}
/deep/ .el-tabs--border-card{
border: 0;
}
//二级菜单样式
.tabs{
>.el-tabs__content{
......@@ -153,7 +156,7 @@ ol, ul { list-style:none; }
}
.el-dialog__header{
border-bottom: 1px solid #F1F1F1;
background: #3FA2E1;
background: #0091FF;
}
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
color: #fff;
......@@ -305,16 +308,16 @@ ol, ul { list-style:none; }
}
//实预测转换按钮样式
/deep/.el-radio-button__inner {
border: 1px solid #3fa2e1!important;
color: #3fa2e1;
border: 1px solid #00cacd!important;
color: #00cacd;
}
/deep/.el-radio-button__inner:hover {
color: #3fa2e1;
color: #00cacd;
}
/deep/.is-active .el-radio-button__inner {
color: #fff;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #3fa2e1;
border-color: #3fa2e1;
background-color: #00cacd;
border-color: #00cacd;
}
\ No newline at end of file
......
......@@ -608,7 +608,7 @@ export default {
exportText(){
var self = this;
var type = this.zdData.type;
var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm;
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0 && features[0].geometry.rings.length > 0){
var data = features[0];
......@@ -637,7 +637,7 @@ export default {
exportToShp(){
var self = this;
var type = this.zdData.type;
var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm;
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0 && features[0].geometry.rings.length > 0) {
var data = JSON.stringify(features[0]);
......@@ -656,7 +656,7 @@ export default {
exportExcel(){
var self = this;
var type = this.zdData.type;
var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm;
this.queryGeoByBsm(BSM,type,function (features) {
if (features && features.length > 0 && features[0].geometry.rings.length > 0) {
var data = features[0];
......@@ -696,7 +696,7 @@ export default {
//图形定位
postionToMap(){
var type = this.zdData.type;
var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm;
var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm;
if(this.$route.path == "/viewMap"){
//定位到当前空间位置
// TODO 这个方法只是为了支撑功能
......
......@@ -223,7 +223,7 @@ export default {
})
},
//保存或者编辑属性信息
updAttributes(bsm,type,attributes,callBackFunction){
updAttributes(bsm,type,attributes,callBackFunction,ydybsm){
var layer = null;
if(type == 'zd'){
layer = this.getLayerByName("ZDJBXX");
......@@ -232,7 +232,7 @@ export default {
}
var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
featureUrl += "/"+layer.id;
this.queryGeoByBsm(bsm,type,function (features) {
this.queryGeoByBsm(ydybsm ? ydybsm:bsm,type,function (features) {
if(features && features.length > 0){
attributes.OBJECTID = features[0].attributes.OBJECTID;
features[0].attributes = attributes;
......@@ -240,6 +240,9 @@ export default {
features[0].geometry.spatialReference = {
wkt:wkt
}*/
if(ydybsm){
features[0].attributes.BSM = ydybsm;
}
featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction);
}else{
var graphic = {
......
......@@ -21,9 +21,8 @@ function errorLog() {
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// loadingInstance.close();
// });
MessageBox.alert('报错了请联系管理员', '消息提示', {
confirmButtonText: '确定',
type: 'warning'
Message.error({
message: "出现错误，请稍后再试"
})
}
//定义loading
......
......@@ -12,36 +12,37 @@
<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
</div>
<div class="search-box">
<el-input
maxlength="28"
v-model="treeKey"
class="searchInput"
placeholder="请输入关键字"
><i
slot="suffix"
class="el-input__icon el-icon-search"
@click="inputChange"
></i
></el-input>
</div>
<div class="treeModule" :style="{height:treeHeight+'px'}">
<LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
<div class="wrap">
<div class="search-box">
<el-input
maxlength="28"
v-model="treeKey"
class="searchInput"
placeholder="请输入关键字"
><i
slot="suffix"
class="el-input__icon el-icon-search"
@click="inputChange"
></i
></el-input>
</div>
<div class="treeModule" :style="{height:treeHeight+'px'}">
<LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
</div>
</div>
</el-aside>
<el-container class="calcWidth">
<el-header>
<div class="header-top">
<!-- <div class="top-items" @click="toggleClick">
<div class="top-items" @click="toggleClick">
<i class="iconfont iconsuojin" v-show="!isActive"></i>
<i class="iconfont iconzhankai" v-show="isActive"></i>
</div> -->
</div>
<div
class="top-items"
v-for="(item, index) in headTop"
:key="index + '1'"
:class="{ 'is-active': item.select }"
:style="{'height':item.name == '首页' && item.select ? '64'+'px' : '65'+'px'}"
@click="selectTopItems(index)"
>
<i :class="item.icon"></i>
......@@ -475,11 +476,13 @@ export default {
height: 66px;
// border-bottom: 1px solid#EAEAEA;
box-sizing: border-box;
background-image: url('../assets/images/banner.png');
// background-image: url('../assets/images/banner.png');
background-color: #006CFF;
display: flex;
flex-grow: 1;
justify-content: center;
align-items: center;
border-left: 1px solid #3E9FFF;
// justify-content: center;
// align-items: center;
.top-items {
cursor: pointer;
height: 66px;
......@@ -504,10 +507,10 @@ export default {
}
}
.top-items:hover{
background: hsla(0,0%,100%,.2);
background: #0091FF;
}
.top-items.is-active {
background: hsla(0,0%,100%,.2);
background: #0091FF;
}
}
.header-bottom {
......@@ -536,8 +539,11 @@ export default {
background-color: #ffffff;
color: #333;
// text-align: center;
overflow: hidden;
overflow: overlay;
transition: width 0.3s;
box-shadow: 1px 0px 2px 1px rgba(49, 132, 245, 0.1);
position: relative;
z-index: 1000;
.logo-box {
width: 100%;
height: 66px;
......@@ -545,7 +551,7 @@ export default {
box-sizing: border-box;
padding: 10px 20px;
transition: width 0.3s;
background-color: #287CC5;
background-color: #006CFF;
.logo-img {
width: 44px;
float: left;
......@@ -557,27 +563,29 @@ export default {
font-size: 20px;
}
}
.search-box{
height: 65px;
box-sizing: border-box;
padding: 18px 20px;
border-right: 1px solid #dedede;
.searchInput{
/deep/ .el-input__inner{
width: 240px;
height: 38px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #DEDEDE;
}
/deep/ .el-input__suffix{
top: 0!important;
.wrap{
height: calc(100% - 66px);
overflow-x: hidden;
.search-box{
height: 65px;
box-sizing: border-box;
padding: 18px 20px;
.searchInput{
/deep/ .el-input__inner{
width: 240px;
height: 38px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #DEDEDE;
}
/deep/ .el-input__suffix{
top: 0!important;
}
}
}
}
.treeModule {
box-sizing: border-box;
border-right: 1px solid #dedede;
.treeModule {
box-sizing: border-box;
}
}
.logo-box-show {
width: 64px;
......
......@@ -44,4 +44,5 @@
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -625,9 +625,9 @@
} else {
Message.error("保存失败")
}
}).catch((err)=>{
vm.loadingHide()
Message.error(err)
}).catch((error)=>{
vm.loadingHide();
console.log(error);
})
}else{
Message.warning("请完善分割后的宗地项目名称后重试")
......
......@@ -347,14 +347,12 @@ export default {
float: left;
margin-right: 20px;
flex: 1;
border: 1px solid #E6E6E6;
/deep/ .el-card__body{
padding: 0;
}
}
.download {
width: 50%;
border: 1px solid #E6E6E6;
/deep/ .el-card__body{
padding: 0;
}
......@@ -379,7 +377,6 @@ export default {
height: 100%;
margin-right: 20px;
background: #fff;
border: 1px solid #E6E6E6;
box-shadow: 0 0 8px 0 rgba(232, 237, 250, 0.6), 0 2px 4px 0 rgba(232, 237, 250, 0.5);
/deep/ .el-card__body{
height: calc(100% - 93px);
......
......@@ -183,25 +183,25 @@
switch (row.dylx) {
case "zd":
this.$store.state.zdbsm = row.glbsm;
this.getRightTree(row.glbsm,'1');
this.getRightTree(row.glbsm,'0,1,2');
break;
case "zrz":
this.$store.state.zrzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'1');
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
break;
case "h":
case "h0":
case "h1":
this.$store.state.hbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,'h','1');
this.getTreeByBsm(row.glbsm,'h','0,1,2');
break;
case "dz":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'1');
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
break;
case "gzw":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'1');
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
break;
default:
......
......@@ -556,6 +556,9 @@
//权利性质数据传给子组件
this.$refs.qlxzModule.countList = res.result.list;
})
if(res.result.ydybsm){
this.saveZdGraphicAtrributes(res.result.ydybsm);
}
} else {
this.$nextTick(() => {
//权利性质数据传给子组件
......@@ -788,41 +791,9 @@
})
.catch((error) => {
vm.loadingHide();
this.$message({
message: error.message+"，查看日志，联系管理员",
type: "error",
});
console.log(error);
});
//保存到空间库里面
var self = this;
for (var key in this.geoAttributes) {
if (key == "BSM") {
self.geoAttributes[key] = this.$store.state.zdbsm
} else if (key == 'QLSDFS') {
var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else if(key == 'QLR'){
var qlrTableData = this.$refs.qlrxxModule.tableData;
if(qlrTableData.length > 0){
for(var i = 0;i < qlrTableData.length;i++){
if(i = 0){
self.geoAttributes[key] = qlrTableData[i].qlrmc;
}else{
self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc;
}
}
}
} else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
});
this.saveZdGraphicAtrributes();
}
}
} else {
......@@ -835,6 +806,43 @@
})
},
//保存空间图形
saveZdGraphicAtrributes(ybsm){
//保存到空间库里面
var self = this;
/* var ybsm = null;
if(this.ydybsm){
ybsm = this.ydybsm;
} */
for (var key in this.geoAttributes) {
if (key == "BSM") {
self.geoAttributes[key] = this.$store.state.zdbsm
} else if (key == 'QLSDFS') {
var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else if(key == 'QLR'){
var qlrTableData = this.$refs.qlrxxModule.tableData;
if(qlrTableData.length > 0){
for(var i = 0;i < qlrTableData.length;i++){
if(i = 0){
self.geoAttributes[key] = qlrTableData[i].qlrmc;
}else{
self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc;
}
}
}
} else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
},ybsm);
},
inputBlur(e) {
if (e.target.value != '') {
e.target.style.border = ""
......
......@@ -14,7 +14,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<input class="formInput percent80" ref="zrzh" @blur="inputBlurZrzh($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
......@@ -25,7 +25,7 @@
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
<td colspan="4">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="disabled" maxlength="28" v-model="form.bdcdyh">
<input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" disabled maxlength="28" v-model="form.bdcdyh">
</td>
</tr>
......@@ -285,7 +285,7 @@
<script>
import Qlr from "@components/formMenu/qlr";
import Qlxz from "@components/formMenu/qlxz";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "@api/zrz"
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz"
import {getQjZdjbxxDetailById} from "@api/zd"
import {submit,registerCall} from "@api/common"
import geoUtils from "@components/lineTree/tx/js/geoUtils";
......@@ -315,6 +315,12 @@
lx:"zrz",
bsm:'',
initZrzh:'',
finishZrzh:'',
hcount:0,
booleanUpdateH:false,
form:{
zrzbsm:'', //自然幢标识码
zdbsm:'', //宗地标识码
......@@ -360,6 +366,7 @@
glbsm:'', //关联标识码
sx:'', //顺序
}],
booleanUpdateH:false,
},
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
......@@ -467,6 +474,10 @@
}
},
onSave(){
//保存之前的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
this.finishZrzh = this.form.zrzh;
this.form.booleanUpdateH =this.booleanUpdateH;
//判断自然幢号和不动产单元号是否手动修改过（自然幢号和不动产单元号的前19位是否和宗地代码一致）
console.log(this.form,'this.form');
//给校验项赋值
......@@ -567,24 +578,7 @@
this.loading=false;
})
this.loading=false;
//保存到空间库里面
var self = this;
for(var key in this.geoAttributes){
if(key == "BSM"){
self.geoAttributes[key] = this.bsm
}else if(key == 'JGRQ'){
var formKay = key.toLowerCase();
self.geoAttributes[key] = new Date(self.form[formKay]).getTime();
}else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.form[formKay];
}
}
self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
console.log("属性保存完成!!");
});
}
this.saveGraphicAttributes(); }
}else{
this.$message({
// message: item.name+'不能为空',
......@@ -594,6 +588,25 @@
}
})
},
//保存空间信息
saveGraphicAttributes(ybsm){
//保存到空间库里面
var self = this;
for(var key in this.geoAttributes){
if(key == "BSM"){
self.geoAttributes[key] = this.bsm
}else if(key == 'JGRQ'){
var formKay = key.toLowerCase();
self.geoAttributes[key] = new Date(self.form[formKay]).getTime();
}else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.form[formKay];
}
}
self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) {
console.log("属性保存完成!!");
},ybsm);
},
onSubmit(){
let data={
glbsm:this.bsm,
......@@ -612,6 +625,7 @@
})
},
open() {
const self = this;
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -621,6 +635,16 @@
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
console.log(self.initZrzh,self.hcount,"self")
if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
self.booleanUpdateH =true;
self.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}
});
this.$message({
type: 'success',
......@@ -634,6 +658,7 @@
});
},
generatorCode(){
const self = this;
console.log(this.form,'this.form');
if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){
this.open();
......@@ -641,8 +666,18 @@
}
getBdcdyh(this.form.zddm,"zrz")
.then((res)=>{
this.form.zrzh=res.result.substring(0,24);
this.form.bdcdyh=res.result;
self.form.zrzh=res.result.substring(0,24);
self.form.bdcdyh=res.result;
console.log(self.initZrzh,self.hcount,"self")
if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){
self.booleanUpdateH =true;
self.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}
})
},
......@@ -664,6 +699,9 @@
getZrzDetailByBsm(data).then((res)=>{
if(res.code===200){
this.form=res.result;
if(res.result.ydybsm){
this.saveGraphicAttributes(res.result.ydybsm);
}
if(res.result.gygyqlrqk!=null){
this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk);
}
......@@ -676,6 +714,8 @@
}else {
this.disabled = true
}
//初始化的自然幢号，用于判断该自然幢的不动产单元号是否更改，是否更改其下户的不动产单元号
this.initZrzh = res.result.zrzh;
this.$store.state.zrzh = res.result.zrzh;
if(this.form.fwjgList.length===0){
this.form.fwjgList.push({
......@@ -729,6 +769,27 @@
e.target.style.boxSizing = 'border-box';
}
},
inputBlurZrzh(e){
if(this.initZrzh != null && this.initZrzh !== ''&& e.target.value !==''&& this.hcount>0){
if(this.initZrzh !== e.target.value){
this.booleanUpdateH =true;
this.$notify({
title: '提示',
message: '修改自然幢号，可能会影响该自然幢下户的不动产单元号的重新生成！',
duration: 0,
type: 'warning'
});
}else {
this.booleanUpdateH =false;
}
}
if(e.target.value!=''){
e.target.style.border=""
}else{
e.target.style.border="1px solid red";
e.target.style.boxSizing = 'border-box';
}
}
},
created(){
//todo 怎么判断进入到该页面是从新建处进来的，还是从右键宗地进来的！如果是从新建进来的就需要把虚拟宗标识码带过来；
......@@ -748,6 +809,11 @@
}
},
mounted() {
getHCountByZrzbsm(this.$route.query.bsm).then((res)=>{
if(res.code === 200){
this.hcount = res.result;
}
});
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
......@@ -770,6 +836,7 @@
"form.zrzh":function (val) {
if (val != '') {
this.$refs.zrzh.style.border = '';
this.form.bdcdyh = val+"0000";
}
},
"form.fwxzbsm":{
......