Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
f0fcba17 by 杨威
Options

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

# Conflicts:
#	src/components/lineTree/lineItem.vue
#	src/components/lineTree/lineTree.vue
2 parents 0ed2b73f c0d9c30c
Expand all
Inline Side-by-side
Showing 43 changed files with 1199 additions and 448 deletions
......@@ -12,6 +12,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@antv/g6": "^4.0.2",
"axios": "^0.19.0",
"core-js": "^2.6.5",
"e-icon-picker": "^1.0.7",
......@@ -20,6 +21,7 @@
"element-ui": "^2.13.2",
"file-saver": "^2.0.2",
"form-making": "^1.2.9",
"insert-css": "^2.0.0",
"js-cookie": "^2.2.1",
"mockjs": "^1.1.0",
"screenfull": "^5.0.2",
......
import request from "@/plugin/axios";
/**
* 历史回溯
* @param data
* @constructor
*/
export function getLshs(data) {
return request({
url: "/bg/fwsxbg/lshs",
method: "post",
data: data,
});
}
......@@ -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,
scyclx:lx,
},
})
}
......@@ -73,7 +73,7 @@ export function batchScYcChange (data) {
*/
export function getLpbTj (data) {
return request({
url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx,
url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx,
method: 'get',
data:data
})
......@@ -102,8 +102,46 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
*/
export function getLpbFwytAndQlxz (data) {
return request({
url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx,
url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx,
method: 'get',
data:data
})
}
\ No newline at end of file
}
/**
* 楼盘表 添加层
// "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码
// "hcount": 3,//添加户数
// "scyclx": "1",//实测预测类型
// "sjc": 4//当前的层的SJC ± 1
*/
export function insertUpDownC (data) {
return request({
url: 'fw/lpbright/insertUpDownC',
method: 'post',
data:data
})
}
/**
* 楼盘表 删除层
*"bsm": "c0818d9e4286b35b8ee9b96d90b522aa",
*"scyclx": "1"
*/
export function deleteCByBsm (data) {
return request({
url: '/fw/lpbright/deleteCByBsm',
method: 'delete',
data:data
})
}
/**
* 上下左右移动户
* @param data
*/
export function moveH(data) {
return request({
url:'fw/lpbright/insertMoveH',
method:'post',
data:data
})
}
......
......@@ -9,3 +9,11 @@ export function getSearchList(data) {
data : data,
})
}
export function zdlist(data) {
return request({
url: '/zd/qjZdjbxx/zdlist',
method: 'post',
data:data
})
}
......
......@@ -40,6 +40,9 @@ table{
table,td,tr,.el-col,.title{
border-color: #E6E6E6 !important;
}
.el-table th{
background-color: #FBFBFB;
}
.formInput {
height: 100%;
width: 100%;
......@@ -54,6 +57,7 @@ table,td,tr,.el-col,.title{
}
input:disabled{
cursor: not-allowed;
background-color: #F5F7FA;
}
.formInput:focus{
border: 1px solid #A0C5F6!important;
......@@ -145,15 +149,70 @@ ol, ul { list-style:none; }
font-size: 12px;
font-weight: 400;
color: #333;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
}
li:hover {
background: #eee;
}
.noEdit{
color: #E6E6E6;
cursor: not-allowed;
}
.noEdit:hover{
background: #ffffff;
}
}
.contextmenu li {
margin: 0;
padding: 7px 16px;
cursor: pointer;
// end
//生成按钮样式
.el-button--warning{
color: #FFF;
background-color: #F79700;
border-color: #F79700;
}
.contextmenu li:hover {
background: #eee;
.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;
}
// end
\ No newline at end of file
.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
......@@ -91,7 +91,7 @@
</template>
<script>
import {getSearchList} from './../../api/search'
import {zdlist} from './../../api/search'
import {zrzcxlz} from './../../api/h'
import {Message} from 'element-ui'
......@@ -103,9 +103,8 @@
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -141,7 +140,7 @@
},
methods: {
saveNotarize: function (val) {
this.zdbsm = val.glbsm;
this.zdbsm = val.zdbsm;
this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -176,7 +175,7 @@
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -186,8 +185,7 @@
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
zdlist(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
......
......@@ -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
>
......@@ -132,6 +132,7 @@
<li>
<input
type="text"
style="top: -1px;"
:disabled="formData.qszt!='0'"
placeholder="请输入"
v-model="childItem.pzytdm"
......@@ -398,7 +399,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;
......@@ -422,6 +423,8 @@ export default {
input {
position: relative;
top: -2px;
height: 35px;
width: calc(100% - 1px) !important;
}
.el-input__inner {
height: 34px;
......
......@@ -64,19 +64,19 @@
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
<query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
:isZdClose="true"></query-data>
<zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"
:isZdClose="true"></zd-query-data>
</el-dialog>
</template>
<script>
import queryData from './../../components/queryData/queryData'
import zdQueryData from './../../components/zdQueryData/zdQueryData'
import {zdXlcd, hzl} from './../../api/zd'
import {Message} from 'element-ui'
export default {
name: "hCxlz",
components: {queryData},
components: {zdQueryData},
data() {
return {
zd: {},
......
......@@ -48,6 +48,9 @@
active_color: item.expand,
}"
>
<span v-if="item.qszt=='0'" style="color:red">(临)</span>
<span v-if="item.qszt=='1'" style="color:green">(正)</span>
<span v-if="item.qszt=='2'" style="color:blue">(现)</span>
{{ item.mc }}
</div>
</div>
......@@ -97,7 +100,7 @@ export default {
}
},
mounted(){
},
methods: {
itemClick(item) {
......@@ -229,6 +232,10 @@ export default {
width: 100%;
cursor: pointer;
}
// .ofy_scroll{
// overflow-y: scroll;
// overflow-x: hidden;
// }
.basic_layer {
width: 100%;
position: relative;
......@@ -261,7 +268,7 @@ export default {
position: relative;
// padding-bottom: 15px;
width: 100%;
padding-left: 40px;
padding-left: 25px;
}
.white_layer {
color: black!important;
......@@ -272,19 +279,21 @@ export default {
position: absolute;
height: 1px;
width: 16px;
left: 9px;
top: 9px;
background: url('../../assets/images/rowline.png');
left: 8px;
top: 8px;
opacity: .5;
background: url('../../assets/images/rowline1.png');
background-position-y: center;
}
.third_layer::before {
content: "";
position: absolute;
height: 1px;
width: 22px;
left: 9px;
top: 9px;
background: url('../../assets/images/rowline.png');
width: 16px;
left: 8px;
top: 8px;
opacity: .5;
background: url('../../assets/images/rowline1.png');
background-position-y: center;
}
......@@ -295,7 +304,8 @@ export default {
width: 1px;
left: 7px;
top: 0px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
.linkLine_first::after {
......@@ -306,18 +316,20 @@ export default {
height: calc(100% + 14px);
width: 1px;
left: 7px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
// 上半截
.linkLine_half_top::after {
content: "";
position: absolute;
height: 24px;
height: 23px;
top: -14px;
width: 1px;
left: 7px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
.linkLine_last::after {
......@@ -327,28 +339,33 @@ export default {
width: 1px;
left: 7px;
top: 0px;
background: url('../../assets/images/colline.png');
opacity: .5;
background: url('../../assets/images/colline1.png');
background-position-x: center;
}
.reTree_collapse_icon {
// opacity: .5;
background: url("../../assets/images/reTree_collapse_.svg") no-repeat center
center;
background-size: contain;
}
.reTree_default_icon {
// opacity: .5;
background: url("../../assets/images/reTree_default_.svg") no-repeat center
center;
background-size: contain;
}
.reTree_expand_icon {
// opacity: .5;
background: url("../../assets/images/reTree_expand_.svg") no-repeat center
center;
background-size: contain;
}
.reTree_focus_icon {
// opacity: .5;
background: url("../../assets/images/reTree_focus_.svg") no-repeat center
center;
background-size: contain;
......
......@@ -27,7 +27,7 @@
reTree_collapse_icon: item.expand && item.children.length > 0,
reTree_expand_icon: !item.expand && item.children.length > 0,
}"
></div>
></div>
<div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div>
</div>
......@@ -62,7 +62,8 @@
<li v-show="isZD">导入属性</li>
<li v-show="!isZD">导入楼盘</li>
<li>重叠分析</li>
<li v-show="isZD" @click="openCreateDialog">添加定着物</li>
<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
<li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li>
<li @click="deleteByBsm()">删除</li>
</ul>
<ul
......@@ -93,7 +94,6 @@
<import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
</el-dialog>
<!-- 添加定着物弹框 -->
<el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
<Create @closeDialog="closeDialog" :auth="true"></Create>
</el-dialog>
......@@ -141,7 +141,9 @@ export default {
//控制新建宗地菜单
createVisible:false,
//多幢
dzVisible:false
dzVisible:false,
//宗地权属状态
zdQszt:null,
};
},
watch: {
......@@ -149,7 +151,7 @@ export default {
this.formatData = this.preDealData(n);
console.log(this.formatData);
},
lpbvisible(value) {
if (value) {
document.body.addEventListener("click", this.closeMenu);
......@@ -185,7 +187,8 @@ export default {
this.visible = data;
},
changeZdData(data) {
this.zdData = data
this.zdData = data;
this.zdQszt = data.qszt;
},
changeTop(data) {
this.top = data;
......@@ -301,7 +304,7 @@ export default {
},
//楼盘表右键菜单项打开父组件弹框
openLpbDialog(type){
this.$parent.openLpbDialog(this.zdData,type);
this.$parent.openLpbDialog(this.zdData,type);
},
detailDoubleClick(data) {
clearTimeout(this.timer);
......@@ -310,102 +313,131 @@ export default {
},
//右键菜单的删除
deleteByBsm(){
var self = this;
let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
if(this.zdData.type=='zd'){
params={"bsm":this.zdData.zdbsm,"type":this.zdData.type};
let name='';
switch (this.zdData.type) {
case 'zd':
name = '宗地'
break;
case 'dz':
name = '多幢'
break;
case 'zrz':
name = '自然幢'
break;
default:
break;
}
deleteZdInfoByBsm(params)
.then((res) => {
if(res.code=200){
this.$message({
message: res.message,
type: "success",
});
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
.catch((error) => {});
//删除图形相关信息
var type = this.zdData.type;
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0){
var layer = null;
if(type == 'zd'){
layer = self.getLayerByName("ZDJBXX");
}else{
layer = self.getLayerByName("ZRZ");
this.$confirm('是否确定删除该'+name+'?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params={"bsm":this.zdData.bsm,"type":this.zdData.type};
deleteZdInfoByBsm(params)
.then((res) => {
console.log(res);
if(res.success){
this.$message({
type: 'success',
message: '删除成功!'
});
this.$router.push("/panel");
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
.catch((error) => {});
}).catch(() => {
}
var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
featureUrl += "/"+layer.id;
self.delGraphic(featureUrl,features[0],null);
}
});
var self = this;
var BSM = "";
var type = this.zdData.type;
if(type == "zd"){
BSM = this.zdData.zdbsm;
}else {
BSM = this.zdData.bsm;
}
//删除图形相关信息
var type = this.zdData.type;
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0){
var layer = null;
if(type == 'zd'){
layer = self.getLayerByName("ZDJBXX");
}else{
layer = self.getLayerByName("ZRZ");
}
var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer");
featureUrl += "/"+layer.id;
self.delGraphic(featureUrl,features[0],null);
}
});
},
/*
* 导入图形
* */
importGeo(){
var self = this;
var BSM = "";
//先这么写着 后面返回类型 根据类型判断
var type = this.zdData.type;
if(type == "zd"){
BSM = this.zdData.zdbsm;
}else {
BSM = this.zdData.bsm;
}
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0){
if(features[0].geometry){
self.$confirm('该条数据有地块信息，是否继续导入?', '提示', {
confirmButtonText: '继续',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
self.improtDialog = true;
self.currentClickZdGeo = features[0];
}).catch(() => {
self.$message({
type: 'info',
message: '已取消'
});
});
/*
* 导入图形
* */
importGeo(){
var self = this;
var BSM = "";
//先这么写着 后面返回类型 根据类型判断
var type = this.zdData.type;
if(type == "zd"){
BSM = this.zdData.zdbsm;
}else {
self.currentClickZdGeo = features[0];
self.improtDialog = true;
BSM = this.zdData.bsm;
}
this.queryGeoByBsm(BSM,type,function (features){
if(features && features.length > 0){
if(features[0].geometry){
self.$confirm('该条数据有地块信息，是否继续导入?', '提示', {
confirmButtonText: '继续',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
self.improtDialog = true;
self.currentClickZdGeo = features[0];
}).catch(() => {
self.$message({
type: 'info',
message: '已取消'
});
});
}else {
self.currentClickZdGeo = features[0];
self.improtDialog = true;
}
}else{
self.currentClickZdGeo = null;
self.improtDialog = true;
}
});
},
//导出
exportToShp(){
var self = this;
var BSM = this.zdData.zdbsm;
var type = this.zdData.type;
this.queryGeoByBsm(BSM,type,function (features){
var data = JSON.stringify(features[0]);
if(features && features.length > 0){
}else{
self.currentClickZdGeo = null;
self.improtDialog = true;
}
});
},
//导出
exportToShp(){
var self = this;
var BSM = this.zdData.zdbsm;
var type = this.zdData.type;
this.queryGeoByBsm(BSM,type,function (features){
var data = JSON.stringify(features[0]);
if(features && features.length > 0){
window.location.href = "/api/tx/shpUtils/writeShp?strObj="+encodeURI(data)
/*exportShp({
"strObj":encodeURI(data)
}).then(res => {
debugger
/*exportShp({
"strObj":encodeURI(data)
}).then(res => {
debugger
});*/
}else{
self.$message.warning("暂无空间信息!!!!");
}else{
self.$message.warning("暂无空间信息!!!!");
}
});
},
});
},
//图形定位
postionToMap(){
var curretRouterInfo = {
......@@ -475,7 +507,6 @@ export default {
position: relative;
color: #ffffff;
cursor: pointer;
moz-user-select: -moz-none;
-moz-user-select: none;
-o-user-select: none;
-khtml-user-select: none;
......
<template>
<div>
<el-dialog
title="移动户"
:visible.sync="isVisible"
width="50%"
@close="close"
:modal-append-to-body="false"
center>
<div>
<div class="bottom-radio">
<el-radio-group v-model="moveHdata.sxzylx">
<el-radio label="up">向上</el-radio>
<el-radio label="down">向下</el-radio>
<el-radio label="left">向左</el-radio>
<el-radio label="right">向右</el-radio>
</el-radio-group>
</div>
<div class="bottom-buttom">
<el-button type="primary" @click="save">确认</el-button>
<el-button type="primary" @click="cacel">取消</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import {moveH} from './../../api/lpb'
import {Message} from 'element-ui'
export default {
name: "moveH",
data() {
return {
isVisible: false,
moveHdata: {
hbsm: "",
sxzylx: "",
type: ""
}
}
},
props: {
moveHvisible: {
type: Boolean,
default: false
},
hbsm: {
type: String
},
type: {
type: String
}
},
methods: {
loading: function () {
this.$emit('loading')
},
save() {
this.moveHdata.hbsm = this.hbsm
this.moveHdata.type = this.type
moveH(this.moveHdata).then(res => {
console.log(res)
if (res.success) {
this.loading();
this.close();
Message.success("移动成功")
} else {
Message.error(res.message)
}
})
},
cacel() {
this.close()
},
close() {
this.$emit('close');
}
},
watch: {
moveHvisible(val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
.bottom-radio{
text-align: center;
}
.el-radio{
padding: 20px;
}
.bottom-buttom {
margin-top: 20px;
text-align: center;
}
</style>
......@@ -10,51 +10,51 @@
<div>
<table border="1">
<tr>
<td>层建筑面积</td>
<td>层建筑面积(㎡)</td>
<td>
<input type="text" v-model="qlcData.cjzmj" class="inputtitle"/>
<el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input>
</td>
<td>
层套内建筑面积
层套内建筑面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.ctnjzmj" class="inputtitle"/>
<el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input>
</td>
</tr>
<tr>
<td>层阳台面积</td>
<td>层阳台面积(㎡)</td>
<td>
<input type="text" v-model="qlcData.cytmj" class="inputtitle"/>
<el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input>
</td>
<td>
层半墙面积
层半墙面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.cbqmj" class="inputtitle"/>
<el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input>
</td>
</tr>
<tr>
<td>层共有建筑面积(㎡)</td>
<td>
<input type="text" v-model="qlcData.cgyjzmj" class="inputtitle"/>
<el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input>
</td>
<td>
层分摊建筑面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.cftjzmj" class="inputtitle"/>
<el-input v-model="qlcData.cftjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层分摊建筑面积(㎡)"></el-input>
</td>
</tr>
<tr>
<td>层高</td>
<td>层高(m)</td>
<td>
<input type="text" v-model="qlcData.cg" class="inputtitle"/>
<el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input>
</td>
<td>
水平投影面积(㎡)
</td>
<td>
<input text="text" v-model="qlcData.sptymj" class="inputtitle"/>
<el-input v-model="qlcData.sptymj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="水平投影面积(㎡)"></el-input>
</td>
</tr>
</table>
......@@ -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("保存成功！")
}
})
......
......@@ -12,7 +12,7 @@
<table border="1">
<tr>
<td>室号前缀</td>
<td>单元号</td>
<td>幢单元号</td>
<td>分割符A</td>
<td>层号前自动补0</td>
<td>层</td>
......@@ -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)
......
......@@ -107,7 +107,7 @@
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -151,7 +151,7 @@
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: "2",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......
......@@ -103,7 +103,7 @@ export default {
bdcqzh: "",
dylxs: [],
qlrmc: "",
qszt: "",
qszt: [],
xmmc: "",
zddm: "",
zl: "",
......@@ -131,7 +131,7 @@ export default {
bdcqzh: "",
dylxs: [],
qlrmc: "",
qszt: "",
qszt: [],
xmmc: "",
zddm: "",
zl: "",
......
<template>
<div>
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
@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-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-col>
</el-row>
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in Data" :key="index">
<td>{{index+1}}</td>
<td @click="addData(item)" class="xz">
<span>选择</span>
</td>
<td>{{item.zddm}}</td>
<td>{{item.bdcdyh}}</td>
<td>{{item.xmmc}}</td>
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
layout="prev, pager, next,total"
:page-size="queryData.pageSize"
:total="total"
@current-change="currentChange"
>
</el-pagination>
</div>
</el-dialog>
</div>
</template>
<script>
import {zdlist} from './../../api/search'
export default {
name: "zdQueryData",
data() {
return {
total:1,
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10,
},
Data: [],
isVisible: false
}
},
props: {
centerDialogVisible: {
type: Boolean,
default: function () {
return false
}
},
qszt:{
type:Array,
default:function () {
return ['2']
}
},
isZdClose:{
type:Boolean,
default:false
}
},
mounted() {
this.getData(this.queryData)
},
created() {
},
methods: {
currentChange: function (val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10
};
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
zdlist(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search: function () {
this.getData(this.queryData)
},
addData: function (val) {
this.$emit("getData", val)
if (this.isZdClose) {
this.close();
}
},
close: function () {
this.$emit('close')
this.result();
}
},
watch: {
centerDialogVisible(val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
background-color: #F5F7FA;
}
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
</style>
......@@ -168,9 +168,12 @@ export default {
this.getTreeList();
}
},
// "$store.state.zdbsm": function(bsm) {
// this.getRightTree(bsm);
// },
"$store.state.zdbsm": function(bsm) {
this.getRightTree(bsm);
},
},
mounted(){
},
created() {
if (this.$route.meta) {
......@@ -228,7 +231,7 @@ export default {
}
//刷新页面后根据不同路由高亮相对应的导航
if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){
}else{
this.headTop.forEach(item=>{
if (item.path == this.$route.path) {
......@@ -271,7 +274,7 @@ export default {
},
async getDicData(name) {
return await getDdicByMC(name).then((res)=> {
return res.result
return res.result
});
},
getRightTree(bsm) {
......@@ -451,7 +454,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
......
......@@ -61,7 +61,7 @@
total: 0,
pageNo: 1,
pageSize: 10,
qszt: 1,
qszt: ['1', '2'],
queryData: {},
formData: {
user: "",
......@@ -80,8 +80,8 @@
pageSize: this.pageSize,
})
this.$nextTick(() => {
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
});
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
});
},
methods: {
handleCurrentChange(val) {
......
......@@ -69,7 +69,7 @@ export default {
props: {},
data() {
return {
qszt: 2,
qszt: ['2'],
total: 0,
pageNo: 1,
pageSize: 10,
......@@ -121,56 +121,60 @@ export default {
},
//点击办理
handleClick(row) {
console.log("fwsxbg");
console.log(row);
var params = { bsm: row.glbsm, type: row.dylx };
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
type: "success",
});
var newGlbsm=res.result;
let path = "";
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = newGlbsm;
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = newGlbsm;
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = newGlbsm;
path = "/dz";
break;
default:
break;
}
this.$router.push({
path: path,
query: {
bsm: newGlbsm,
source: 2
let params = { bsm: row.glbsm, type: row.dylx };
this.$confirm('是否确定范围属性变更?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
type: "变更成功",
});
let path = "";
switch (row.dylx) {
case "zrz":
this.$store.state.zrzbsm = res.result;
path = "/zrz";
break;
case "zd":
this.$store.state.zdbsm = res.result;
path = "/zd";
break;
case "dz":
this.$store.state.dzbsm = res.result;
path = "/dz";
break;
default:
break;
}
});
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
this.$router.push({
path: path,
query: {
bsm: newGlbsm,
source: 2
}
});
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
.catch((error) => {
this.$message({
message: res.message,
type: "error",
});
});
});
}).catch(() => {
});
},
},
computed: {},
......
......@@ -144,13 +144,13 @@ export default {
djq: [],
djzq: [],
ruleForm:{
"djqbsm": "",
"djzqbsm": "",
"syqlxbsm": "",
"userbsm": "",
"xmmc": "",
"xzqbsm": "",
"zdtzmbsm": ""
djqbsm: "",
djzqbsm: "",
syqlxbsm: "",
userbsm: "",
xmmc: "",
xzqbsm: "",
zdtzmbsm: ""
},
ruleForm1:{
zdbsm:'',
......@@ -216,6 +216,12 @@ export default {
this.activeName = this.auth ? 'zrz':'zd'
},
methods: {
// 重置
result(){
this.$refs['ruleForm'].resetFields()
this.$refs["ruleForm1"].resetFields()
this.$refs["ruleForm2"].resetFields()
},
handleClick(tab, event) {
console.log(tab, event);
console.log(tab.name);
......@@ -280,7 +286,7 @@ export default {
return false;
}
});
},
newDz() {
//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
......@@ -364,6 +370,7 @@ export default {
},
close() {
this.$emit("closeDialog");
this.result();
},
},
computed: {},
......
......@@ -96,7 +96,7 @@ export default {
},
{ name: "新办房屋", img: require("../../assets/images/xbfw.png") },
{ name: "重新落宗", img: require("../../assets/images/cxlz.png") },
{ name: "添加", img: require("../../assets/images/cxlz.png") },
{ name: "添加", img: require("../../assets/images/tj.png") },
],
tableData: [],
tableHeight: 0,
......@@ -106,7 +106,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
this.tableHeight = this.$refs.notice.offsetHeight - 53;
this.tableHeight = this.$refs.notice.offsetHeight - 54;
});
},
methods: {
......@@ -217,25 +217,27 @@ 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;
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;
}
......
......@@ -12,7 +12,7 @@
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"
>办理
>更正
</el-button
>
<el-button type="text" size="small">定位</el-button>
......@@ -60,7 +60,7 @@
props: {},
data() {
return {
qszt: 1,
qszt: ['1'],
total: 0,
pageNo: 1,
pageSize: 10,
......@@ -116,44 +116,61 @@
},
//点击办理
handleClick(row) {
console.log(row);
let path = "";
var type;
var id = row.bsm;
let type;name;
switch (row.dylx) {
case "自然幢":
path = "/zrz";
type = "1";
this.$store.state.zrzbsm = row.glbsm;
break;
case "zd":
path = "/zd";
type = "0";
name = '宗地';
this.$store.state.zdbsm = row.glbsm
break;
case "户":
path = "h";
this.$store.state.hbsm = row.glbsm
case "zrz":
type = "1";
name = '自然幢';
this.$store.state.zrzbsm = row.glbsm;
break;
case "h":
case "h0":
case "h1":
type = "2";
name = "户"
this.$store.state.hbsm = row.glbsm;
case "dz":
type = "3";
name = "多幢";
this.$store.state.dzbsm = row.glbsm;
default:
break;
}
var data = {"id": id, "type": type};
updateQsztByBsm(data)
.then((res => {
if (res.code == 200) {
let data = {"id": row.bsm, "type": type};
this.$confirm('是否确定更正该'+name+'？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
updateQsztByBsm(data)
.then((res => {
if (res.code == 200) {
this.$message({
type: 'success',
message: '更正成功!'
});
this.$router.push("/"+path);
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})).catch(() => {
this.$message({
message: res.message,
type: "success",
type: "error",
});
} else {
this.$message({
message: res.message,
type: "warning",
});
}
}))
this.$router.push(path);
});
}).catch(() => {
});
},
},
computed: {},
......
......@@ -101,7 +101,6 @@
//户保存
hbjSaveInfo() {
this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
this.hbjVisible = false;
this.getData({pageSize:15});
},
//户编辑表单重置
......
<template>
<div class="">历史回溯</div>
<div class="">历史回溯
<div id="mountNode"></div>
</div>
</template>
<script>
import G6 from '@antv/g6';
import insertCss from 'insert-css';
import { getLshs } from "./../../../../src/api/fwsxbg";
export default {
name:"",
components:{},
props:{},
data(){
insertCss(`
.g6-tooltip {
border-radius: 6px;
font-size: 12px;
color: #fff;
background-color: #000;
padding: 2px 8px;
text-align: center;
}
`);
return {
data : {}
}
},
created(){
},
mounted(){
this.getLshsData();
},
methods: {
initG6() {
const data = this.data;
G6.registerNode(
'sql',
{
drawShape(cfg, group) {
const rect = group.addShape('rect', {
attrs: {
x: -75,
y: -25,
width: 150,
height: 50,
radius: 10,
stroke: '#5B8FF9',
fill: '#C6E5FF',
lineWidth: 1,
},
name: 'rect-shape',
});
if (cfg.name) {
group.addShape('text', {
attrs: {
text: cfg.name,
x: 0,
y: 0,
fill: '#00287E',
fontSize: 14,
textAlign: 'center',
textBaseline: 'middle',
fontWeight: 'bold',
},
name: 'text-shape',
});
}
return rect;
},
},
'single-node',
);
const container = document.getElementById('mountNode');
const graph = new G6.Graph({
container: 'mountNode',
width:1000,
height:800,
layout: {
type: 'dagre',
nodesepFunc: (d) => {
if (d.id === '3') {
return 500;
}
return 50;
},
ranksep: 70,
controlPoints: true,
},
defaultNode: {
type: 'sql',
},
defaultEdge: {
type: 'polyline',
style: {
radius: 20,
offset: 45,
endArrow: true,
lineWidth: 2,
stroke: '#C2C8D5',
},
},
nodeStateStyles: {
selected: {
stroke: '#d9d9d9',
fill: '#5394ef',
},
},
modes: {
default: [
'drag-canvas',
'zoom-canvas',
'click-select',
{
type: 'tooltip',
formatText(model) {
const cfg = model.conf;
const text = [];
cfg.forEach((row) => {
text.push(row.label + ':' + row.value + '<br>');
});
return text.join('\n');
},
offset: 30,
},
],
},
fitView: true,
});
graph.data(data);
graph.render();
if (typeof window !== 'undefined')
window.onresize = () => {
if (!graph || graph.get('destroyed')) return;
if (!container || !container.scrollWidth || !container.scrollHeight) return;
graph.changeSize(container.scrollWidth, container.scrollHeight);
};
},
getLshsData(){
let _this = this;
const data = {
"bsm": "c0818d9e4286b35b8ee9b96d90b522aa",
"type": "zd"
};
getLshs(data).then((res)=>{
if(res.code===200){
_this.data=res.result;
this.initG6();
}
})
}
},
created(){},
mounted(){},
methods:{},
computed: {},
watch: {},
}
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
......
......@@ -22,29 +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="cz">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="delRow(i)"
>-</el-button
>
</td>
<td class="dzwdm">
<el-input v-model="item.dzwdm" >
<el-input v-model="item.dzwdm" placeholder="请输入定着物代码">
</el-input>
</td>
<td class="syqmj">
<el-input
oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"
<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" oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"></el-input>
<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" oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"></el-input>
<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>
......@@ -119,16 +131,6 @@
console.log(error)
})
},
oninput(e) {
/* e.target.value = (e.target.value.match(/^(1|2|3|4|5|6|7|8|9|0)*(\.?\d{0,2})/g)[0]) || null*/
let value = e.target.value
if (isNaN(value)) {
value = null
}
if (value.indexOf('.') > 0) {
value = value.slice(0, value.indexOf('.') + 4)
}
},
addRow() {
this.mjftData.list.push({
dydytdmj: '',
......
......@@ -21,24 +21,20 @@
<tr>
<td colspan="2">行政区</td>
<td colspan="2">
<el-form :rules="rules" ref="ruleForm" :inline="true" >
<el-form-item >
<el-select
:disabled="formData.qszt!='0'"
class="formSelect"
v-model="formData.xzqbsm"
@change="changeXzq(formData.xzqbsm)"
>
<el-option
v-for="item in $store.state.xzqList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-select
:disabled="formData.qszt!='0'"
class="formSelect"
v-model="formData.xzqbsm"
@change="changeXzq(formData.xzqbsm)"
>
<el-option
v-for="item in $store.state.xzqList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm"
>
</el-option>
</el-select>
</td>
<td colspan="2">地籍区</td>
<td colspan="2">
......@@ -113,10 +109,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 +127,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>
......@@ -375,30 +371,30 @@ export default {
props: {},
data() {
return {
rules: {
hdmc: [
{ required: true, message: '请输入活动名称', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
],
xzq: [
{ required: true, message: '请选择活行政区', trigger: 'change' }
],
date1: [
{ type: 'date', required: true, message: '请选择日期', trigger: 'change' }
],
date2: [
{ type: 'date', required: true, message: '请选择时间', trigger: 'change' }
],
type: [
{ type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
],
resource: [
{ required: true, message: '请选择活动资源', trigger: 'change' }
],
desc: [
{ required: true, message: '请填写活动形式', trigger: 'blur' }
]
},
// rules: {
// hdmc: [
// { required: true, message: '请输入活动名称', trigger: 'blur' },
// { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
// ],
// xzq: [
// { required: true, message: '请选择活行政区', trigger: 'change' }
// ],
// date1: [
// { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
// ],
// date2: [
// { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
// ],
// type: [
// { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
// ],
// resource: [
// { required: true, message: '请选择活动资源', trigger: 'change' }
// ],
// desc: [
// { required: true, message: '请填写活动形式', trigger: 'blur' }
// ]
// },
rjl:'',
jzmd:'',
jzxg:'',
......@@ -483,10 +479,9 @@ export default {
}
});
console.log(this.formData.syqlxbsm);
this.dpdm = this.dpdm + this.formData.syqlxbsm;
this.$store.state.zdtzmList.forEach((item)=>{
if(item.zdtzmbsm === this.formData.zdtzmbsm){
if(item.bsm === this.formData.zdtzmbsm){
this.dpdm = this.dpdm + item.dm;
}
});
......@@ -567,7 +562,7 @@ export default {
type: "success",
});
// 保存成功再次查询
this.getZdjbxxData();
this.getZdjbxxData(this.$store.state.zdbsm);
} else {
this.$message({
message: res.message,
......@@ -673,7 +668,7 @@ export default {
this.$store.state.zddm = val;
},
zdbsm:function (val) {
this.getZdjbxxData()
this.getZdjbxxData(val)
}
},
};
......@@ -710,10 +705,6 @@ export default {
overflow: visible;
text-align: center;
}
.percent78 {
width: 78%;
float: left;
}
.percent68 {
width: 68% !important;
float: left;
......@@ -734,13 +725,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" >
......@@ -215,12 +215,23 @@
<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">
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
<el-button
type="primary"
style="margin-right: 10px"
class="changeBtn addMinus inAdd"
@click="addYtInfo"
>+</el-button
>
<span>用途<i class="requisite">*</i></span>
</td>
<td width="30" colspan="1" align="center" >
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
<el-button
type="primary"
class="changeBtn addMinus inMinus"
@click="deleteYtInfo(index)"
>-</el-button
>
规划用途
</td>
<td width="30" colspan="4" align="center" >
......@@ -256,7 +267,14 @@
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
<!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> -->
<el-button
type="primary"
style="margin-right: 10px"
class="changeBtn addMinus inAdd"
@click="addFwjgInfo"
>+</el-button
>
<span>房屋结构<i class="requisite">*</i></span>
</td>
<td colspan="1" align="center" >
......@@ -808,7 +826,6 @@
td{
//bgcolor:#F1F4FC;
bgcolor:#fff;
width:8.33%
}
......@@ -824,4 +841,11 @@
.hTable{
margin-top: 10px;
}
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
}
}
</style>
\ No newline at end of file
......
......@@ -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="scyclx" @change="scyclxChange">
<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是预测
scyclx: "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;
},
......@@ -406,6 +437,18 @@ export default {
plshClose() {
this.plShVisible = false;
},
//改变是预测数据类型
scyclxChange(val){
//清空已选中层户
this.cbsmList = [];
this.bsms = [];
console.log(this.$refs.lpbContent.$refs.hBsm,'this.$refs.lpbContent');
this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
if (item.className == "tdSelect") {
item.className = "";
}
})
},
//获取高度计算lpb内容区高度
getHeight() {
this.lpbContentHight = window.innerHeight - 285;
......@@ -484,6 +527,11 @@ export default {
}
console.log(this.bsms);
},
//获取选中层bsmlist
getCbsm(data){
this.cbsmList = data;
console.log(this.cbsmList);
},
//不动产单元号输入框事件
inputFocus() {
this.inputWidth = 200;
......@@ -554,7 +602,7 @@ export default {
getDyztBsmList() {
let data = {
zrzbsm: this.$store.state.zrzbsm,
syclx: "0",
scyclx: "0",
};
getLpbTj(data).then((res) => {
if (res.code === 200) {
......@@ -603,7 +651,7 @@ export default {
getLpbFwytAndQlxz(){
let data = {
zrzbsm: this.$store.state.zrzbsm,
syclx: "0",
scyclx: "0",
};
getLpbFwytAndQlxz(data).then((res) => {
if (res.code === 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>
......
......@@ -44,6 +44,7 @@ export default {
height: 100%;
box-sizing: border-box;
padding:18px;
padding-bottom: 0;
-webkit-user-select:none;
-moz-user-select:none;
-ms-user-select:none;
......
......@@ -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: '', // 建(构)筑物编号
......
......@@ -13,19 +13,19 @@
<input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm">
</td>
<td colspan="2" >自然幢号<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh">
<td colspan="4" class="psr">
<input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh">
<el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
</td>
</tr>
<tr>
<td colspan="2" >项目名称<i class="requisite">*</i></td>
<td colspan="4" >
<input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc">
<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">
<input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh">
</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="inMinus 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="inMinus 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>
......@@ -274,7 +272,7 @@
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
......@@ -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>
......