Skip to content

任超 / js.CadastralSystem

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

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

# Conflicts:
#	src/views/zd/zddcb/index.vue
2 parents 1fdac3f5 09e91025
Expand all
Inline Side-by-side
Showing 25 changed files with 515 additions and 151 deletions
......@@ -175,6 +175,18 @@ export function loadFile(url) {
}
})
}
/**
* 删除文件
*/
export function deleteFile(id) {
return request({
url:"/file/delete",
method:'delete',
params:{
id
}
})
}
/**
* 多个宗地代码获取树的数据信息
......@@ -186,3 +198,13 @@ export function getListMenu(data) {
data:data
})
}
/**
* 登记调用
*/
export function registerCall(data) {
return request({
url:'/system/basiccommon/registerCall',
method:'post',
data:data
})
}
......
......@@ -168,3 +168,14 @@ export function deleteZdy(id) {
}
})
}
/**
* 批量提交
*/
export function batchCommit(data) {
return request({
url:'/fw/lpbbatch/batchCommit',
method:'post',
data:data
})
}
......
......@@ -160,9 +160,22 @@ ol, ul { list-style:none; }
margin: 0;
padding: 7px 16px;
cursor: pointer;
position: relative;
.childUl{
display: none;
position: absolute;
left: 92px !important;
top: 0!important;
li{
width: 76px;
}
}
}
li:hover {
background: #eee;
>.childUl{
display: block;
}
}
.noEdit{
color: #E6E6E6;
......
......@@ -105,9 +105,10 @@
:disabled="formData.qszt!='0'"
v-model="childItem.tdsyqssj"
type="date"
:picker-options="childItem.pickerStart"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@input="startTime(index,childIndex)"
>
</el-date-picker>
</li>
......@@ -211,7 +212,8 @@
:disabled="formData.qszt!='0'"
v-model="childItem.tdsyjssj"
type="date"
:picker-options="childItem.pickerEnd"
@input="endTime(index,childIndex)"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
......@@ -290,6 +292,8 @@ export default {
sjytmj: 0,
syqx: "",
tdsyjssj: "",
pickerStart:{},
pickerEnd:{},
tdsyqssj: "",
tdzh: "",
},
......@@ -304,6 +308,42 @@ export default {
console.log(this.formData,'formData');
},
methods: {
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();
this.countList[index].list[childIndex].syqx=endYear-startYear;
}
},
endTime(index,childIndex){
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();
this.countList[index].list[childIndex].syqx=endYear-startYear;
}
},
//外层操作
handleClick(ind, type) {
let outsideObj = {
......@@ -325,6 +365,8 @@ export default {
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
pickerStart:{},
pickerEnd:{},
sjytmc: "",
sjytmj: 0,
syqx: "",
......@@ -360,6 +402,8 @@ export default {
sjytdm: "",
sjytmc: "",
sjytmj: 0,
pickerStart:{},
pickerEnd:{},
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
......@@ -402,7 +446,7 @@ export default {
border-bottom: 1px solid #E6E6E6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
border-right: 1px solid #E6E6E6;
position: relative;
.qlxz {
line-height: 34px;
......@@ -448,7 +492,7 @@ export default {
}
.childYT {
height: 114px;
border-top: 1px solid grey;
border-top: 1px solid #E6E6E6;
ul {
margin-top: 0;
li {
......@@ -478,7 +522,7 @@ export default {
height: 34px;
line-height: 34px;
background-color: #fff;
border-bottom: 1px solid grey;
border-bottom: 1px solid #E6E6E6;
position: absolute;
right: 0;
top: 0;
......@@ -516,7 +560,9 @@ export default {
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
height: 34px !important;
position: relative;
top: -1px;
}
}
}
......
......@@ -329,7 +329,7 @@ export default {
border-bottom: 1px solid #e6e6e6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
border-right: 1px solid #E6E6E6;
position: relative;
.qlxz {
line-height: 34px;
......@@ -375,7 +375,7 @@ export default {
}
.childYT {
height: 114px;
border-top: 1px solid grey;
border-top: 1px solid #E6E6E6;
ul {
margin-top: 0;
li {
......@@ -405,7 +405,7 @@ export default {
height: 34px;
line-height: 34px;
background-color: #fff;
border-bottom: 1px solid grey;
border-bottom: 1px solid #E6E6E6;
position: absolute;
right: 0;
top: 0;
......
......@@ -58,7 +58,15 @@
>
<li @click="postionToMap">定位</li>
<li @click="importGeo">导入图形</li>
<li @click="exportToShp">导出图形</li>
<li @click="exportToShp">
导出图形
<ul class="contextmenu childUl">
<li>文本</li>
<li>CAD</li>
<li>Excel</li>
<li>ESRI Shape</li>
</ul>
</li>
<li v-show="isZD">导入属性</li>
<li v-show="!isZD">导入楼盘</li>
<li>重叠分析</li>
......
......@@ -3,7 +3,7 @@
<el-dialog
title="新增"
:visible.sync="isVisible"
width="50%"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
......
......@@ -66,6 +66,11 @@ export default {
LineTree,
Create,
},
provide(){
return{
getRightTree: this.getRightTree
}
},
data() {
return {
navigationList: [],
......@@ -557,10 +562,8 @@ export default {
-webkit-box-shadow: inset -14px 0px 16px red;
box-shadow: inset -23px 0px 16px #1d50dd;
transition: 0.3s;
display: none;
}
.w0{
display: block;
width: 64px;
}
}
......
......@@ -199,6 +199,7 @@
<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>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
......@@ -209,13 +210,14 @@
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {saveDzInfo,getBdcdyh,getDzDetailByBsm} from "../../../api/dz";
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
import {submit,registerCall} from "../../../api/common"
export default {
name:'zrz',
components:{
Qlr,
Qlxz,
},
inject:['getRightTree'],
data () {
return {
......@@ -289,6 +291,18 @@
}
},
methods: {
registerCall(){
let data={
type:'dz',
bsm:this.$route.query.bsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......
......@@ -18,7 +18,7 @@
<td>操作</td>
</tr>
<tr v-if="zdhbqData.length==0">
<td colspan="7">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -134,9 +134,10 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="">操作</td>
</tr>
<tr v-if="dzhbqData.length==0">
<td colspan="7">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -154,6 +155,7 @@
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz" @click="deleteData(index)"><span>删除</span></td>
</tr>
</table>
</div>
......@@ -250,9 +252,10 @@
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="">操作</td>
</tr>
<tr v-if="hhbqData.length==0">
<td colspan="7">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
......@@ -270,6 +273,7 @@
readonly="readonly"/></td>
<td class="zl"><input type="text" class="formInput" v-model="item.zl"
readonly="readonly"/></td>
<td class="cz" @click="deleteData(index)"><span>删除</span></td>
</tr>
</table>
</div>
......
......@@ -8,9 +8,9 @@
@tab-click="handleClick">
<el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd">
<el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline">
<el-form-item label="行政区划" class="w100" required prop="xmmc">
<el-form-item label="行政区划" class="w100" prop="xzqbsm">
<el-col :span="7">
<el-form-item required prop="xzqbsm">
<el-form-item prop="xzqbsm">
<el-select v-model="ruleForm.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)">
<el-option
v-for="item in xzq"
......@@ -48,13 +48,13 @@
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="项目名称" class="w100" required prop="xmmc">
<el-form-item label="项目名称" class="w100" prop="xmmc">
<el-input
v-model="ruleForm.xmmc"
placeholder="项目名称"
></el-input>
</el-form-item>
<el-form-item label="所有权类型" class="w100" required prop="syqlxbsm">
<el-form-item label="所有权类型" class="w100" prop="syqlxbsm">
<el-select
v-model="ruleForm.syqlxbsm"
placeholder="所有权类型"
......@@ -68,7 +68,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="特征码" class="w100" required prop="zdtzmbsm">
<el-form-item label="特征码" class="w100" prop="zdtzmbsm">
<el-select
v-model="ruleForm.zdtzmbsm"
placeholder="宗地特征码"
......
......@@ -56,6 +56,7 @@
<hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
</div>
......@@ -110,6 +111,11 @@
this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户提交
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
......
......@@ -33,7 +33,10 @@
<td class="lx">{{item.filepostfix}}</td>
<td class="cz">
<span @click="downloadFile(item.fileurl)">下载</span>
<span>/</span>
<span @click="loadFile(item.fileurl)">预览</span>
<span>/</span>
<span @click="deleteFile(item.bsm)">删除</span>
</td>
</tr>
</table>
......@@ -41,7 +44,7 @@
</template>
<script>
import {insertFile, getFileLis, downloadFile,loadFile} from "./../../../api/common"
import {insertFile, getFileLis, downloadFile,loadFile,deleteFile} from "./../../../api/common"
import {Message} from "element-ui"
export default {
......@@ -69,21 +72,29 @@
}
},
mounted() {
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
this.filesData.glbsm = this.$store.state.zdbsm
break;
case "自然幢":
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
default:
break
}
this.getFileList(this.filesData.glbsm)
this.getFileList()
},
methods: {
deleteFile(bsm){
this.$confirm('将删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteFile(bsm).then(res=>{
if (res.success) {
this.getFileList();
}else {
this.$message.error("删除失败")
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
loadFile(url){
loadFile(url).then(res=>{
if (res.success) {
......@@ -94,8 +105,20 @@
downloadFile(url) {
window.open(`/api/file/download?url=`+url);
},
getFileList(bsm) {
getFileLis(bsm).then(res => {
getFileList() {
switch (this.$route.name) {
case "宗地":
this.filesData.dylx = 'zd';
this.filesData.glbsm = this.$store.state.zdbsm
break;
case "自然幢":
this.filesData.dylx = 'zrz';
this.filesData.glbsm = this.$store.state.zrzbsm
break
default:
break
}
getFileLis(this.filesData.glbsm ).then(res => {
if (res.success) {
this.list = res.result;
} else {
......@@ -140,7 +163,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
}
table {
......
......@@ -2,12 +2,12 @@
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane>
<el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
<el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -29,11 +29,40 @@ export default {
data() {
return {
activeName: "djdcb",
mjftbVisible:false,
jzdVisible:false,
jzxVisible:false,
djbVisible:false,
lshsVisible:false,
fjclVisible:false,
};
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
switch (tab.name) {
case 'mjftb':
this.mjftbVisible = true;
break;
case 'jzd':
this.jzdVisible = true;
break;
case 'jzx':
this.jzxVisible = true;
break;
case 'djb':
this.djbVisible = true;
break;
case 'lshs':
this.lshsVisible = true;
break;
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
created() {},
......
......@@ -87,6 +87,14 @@
</span>
</el-dialog>
</div>
<!--
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" @click="oneExit">编辑</el-button>
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="batchExit">批量修改</el-button>
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div> -->
</div>
</template>
......@@ -276,7 +284,25 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: ;
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);
}
}
table {
margin-top: 10px;
background-color: #fff;
......
......@@ -344,7 +344,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
table {
margin-top: 10px;
background-color: #fff;
......
<template>
<div class="lshs-content">
<div class="slot">
<div><span class="tip-title">范围属性变更：</span></div>
<div><span class="tip-title">宗地分割：</span></div>
<div><span class="tip-title">宗地合并：</span></div>
</div>
<!-- <div class="slot">-->
<!-- <div><span class="tip-title">范围属性变更：</span></div>-->
<!-- <div><span class="tip-title">宗地分割：</span></div>-->
<!-- <div><span class="tip-title">宗地合并：</span></div>-->
<!-- </div>-->
<div id="mountNode" ref="containerWidth"></div>
<div id="mountNodeRight"></div>
</div>
</template>
......@@ -51,9 +52,9 @@ export default {
drawShape(cfg, group) {
const rect = group.addShape('rect', {
attrs: {
x: -75,
x: -100,
y: -25,
width: 150,
width: 200,
height: 50,
radius: 10,
stroke: '#5B8FF9',
......@@ -83,43 +84,19 @@ export default {
'single-node',
);
G6.registerEdge(
'circle-running',
'polyline1',
{
afterDraw(cfg, group) {
const shape = group.get('children')[0];
const startPoint = shape.getPoint(0);
const circle = group.addShape('circle', {
attrs: {
x: startPoint.x,
y: startPoint.y,
fill: '#1890ff',
r: 3,
console.log(cfg.data+":cfg")
console.log(group.toString()+"group")
},
name: 'circle-shape',
});
circle.animate(
(ratio) => {
const tmpPoint = shape.getPoint(ratio);
return {
x: tmpPoint.x,
y: tmpPoint.y,
};
},
{
repeat: true,
duration: 3000,
},
);
},
},
'line',
'polyline',
);
const tooltip = new G6.Tooltip({
offsetX: 10 + 10,
offsetY: 10 + 10,
offsetX: 210,
offsetY: 210,
itemTypes: ['node', 'edge'],
getContent: (e) => {
const outDiv = document.createElement('div');
......@@ -141,28 +118,25 @@ export default {
console.log(container)
const graph = new G6.Graph({
container: 'mountNode',
width:1000,
width:eWidth,
height:1000,
layout: {
type: 'dagre',
nodesepFunc: (d) => {
if (d.id === '3') {
return 500;
}
return 50;
return 100;
},
ranksep: 70,
ranksep: 30,
controlPoints: true,
},
defaultNode: {
type: 'sql',
},
defaultEdge: {
type: 'polyline',
type: 'polyline1',
style: {
radius: 20,
offset: 45,
endArrow: true,
radius: 10,
offset: 10,
// endArrow: true,
lineWidth: 2,
stroke: 'rgba(78,142,230,0.45)',
},
......@@ -184,25 +158,6 @@ export default {
],
},
// 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,
});
......@@ -234,7 +189,7 @@ export default {
getLshsData(){
let _this = this;
const data = {
"bsm": "c0818d9e4286b35b8ee9b96d90b522aa",
"bsm": "d85a274a332ad2d35c922a3a95eb154f",
"type": "zd"
};
getLshs(data).then((res)=>{
......@@ -253,10 +208,21 @@ export default {
.lshs-content{
width: 100%;
height: 100%;
}
#mountNode{
width: 100%;
/*height: calc(100% - 68px);*/
margin-top: -60px;
width: 60%;
float: left;
}
#mountNodeRight{
width: 38%;
float: right;
height: 1000px;
border: 0 solid #5ebbff;
}
.slot{
......
<template>
<div class="main">
<div class="main" ref="mainBox">
<table border="1">
<tr>
<td colspan="2">土地坐落</td>
......@@ -67,8 +67,12 @@
<td class="fttjmj">{{sumFttdmj}}</td>
</tr>
</table>
<div class="pers">
<!-- <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>
......@@ -100,7 +104,8 @@
tdsyqsyqmj: '' // 土地所有权/使用权面积
}
]
}
},
mainBoxWidth:0
}
},
......@@ -198,7 +203,6 @@
console.log("create init...")
},
mounted() {
console.log("mounted init...")
this.mjftData.zdbsm = this.$store.state.zdbsm
this.zdmj = this.$store.state.zdmj
this.tdzl = this.$store.state.zdzl
......@@ -206,6 +210,9 @@
if (this.mjftData.zdbsm) {
this.getData(this.mjftData.zdbsm)
}
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
watch: {
"$store.state.zdbsm": function (bsm) {
......@@ -229,8 +236,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
width: 100%;
table {
margin-top: 10px;
......@@ -238,14 +244,7 @@
font-size: 14px;
width: 100%;
cursor: pointer;
td {
text-align: center;
height: 36px;
min-width: 50px;
}
}
table .formInput {
.formInput {
margin: 0;
height: 36px;
outline: none;
......@@ -255,7 +254,31 @@
text-align: center;
cursor: text;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
}
.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);
}
}
}
.pers {
text-align: center;
margin-top: 10px;
......
<template>
<div class="main">
<div class="main" ref="mainBox">
<div class="formMenu">
<Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
<!-- <el-button
......@@ -207,7 +207,7 @@
</td>
<td colspan="2">容积说明</td>
<td colspan="4" class="psr">
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjsm" />
<input type="text" :disabled="formData.qszt!='0'" class="formInput" v-model="formData.rjlsm" />
</td>
</tr>
<tr>
......@@ -338,9 +338,18 @@
</tr>
</table>
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="updateZDxx">保存</el-button>
<!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" class="saveBtn" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
</div>
</div>
......@@ -356,7 +365,8 @@ import {
getListByXzqbsm,
getListByPbsm,
submit,
getTree
getTree,
registerCall
} from "../../../api/common";
import {
getBdcdyh,
......@@ -365,6 +375,7 @@ import {
} from "../../../api/zd";
export default {
inject:['getRightTree'],
name: "",
components: {
Qlr,
......@@ -411,6 +422,7 @@ export default {
formData: {},
dpdm:'', //宗地底盘代码
curZdbsm:'',
mainBoxWidth:0,
geoAttributes:{
OBJECTID:"",
BSM:"",
......@@ -464,8 +476,23 @@ export default {
},
mounted() {
this.getZdjbxxData(this.$store.state.zdbsm);
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
methods: {
registerCall(){
let data={
type:'zd',
bsm:this.$store.state.zdbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
//根据zdbsm查询基本信息
getZdjbxxData(bsm) {
getQjZdjbxxDetailById(bsm)
......@@ -815,6 +842,7 @@ export default {
td {
text-align: center;
height: 36px;
border-color: #E6E6E6;
}
/deep/ .el-input__inner {
margin: 0;
......@@ -852,5 +880,26 @@ export default {
width: 100%;
}
}
.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>
......
......@@ -46,8 +46,8 @@ export default {
};
</script>
<style scoped lang="less">
// .content_box{
// box-sizing: border-box;
.content_box{
padding: 0 0 16px;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
......@@ -65,5 +65,5 @@ export default {
// width: 100%;
// height: 100%;
// }
// }
}
</style>
......
......@@ -403,7 +403,8 @@
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz"
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit} from "./../../../../../api/common"
export default {
name:'zrz',
components:{
......@@ -697,6 +698,18 @@
}
})
},
onSubmit(bsm,yclx){
let data={
glbsm:bsm,
status:1,
type:"h"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成！");
}
})
},
onReset(){
this.form.bdcdyh='', //不动产单元号
this.form.mjdwbsm='', //面积单位编号
......
......@@ -2,7 +2,7 @@
<div class="edit">
<div class="tab-header">
<el-row class="searchContent">
<el-col :span="8">
<el-col :span="6">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="1">实测</el-radio-button>
<el-radio-button label="0">预测</el-radio-button>
......@@ -23,7 +23,7 @@
></i
></el-input>
</el-col>
<el-col :span="16">
<el-col :span="18">
<div class="fr">
<el-button class="radioBtn" label="1" border @click="create"
><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
......@@ -66,9 +66,16 @@
class="radioBtn"
label="7"
border
@click="hcxlzVisible = true"
@click="hcxlz"
><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
>
<el-button
class="radioBtn"
label="7"
border
@click="batchCommit"
><i class="iconfont iconhuzhongxinlazong"></i>批量提交</el-button
>
</div>
</el-col>
</el-row>
......@@ -252,8 +259,10 @@
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</el-dialog>
</div>
......@@ -272,7 +281,8 @@ import addZdy from "./zdy/index";
import addCh from "./ch/index";
import hbj from "./hbj/index";
import lpbContent from "./lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz } from "../../../../api/lpb";
import {registerCall} from "../../../../api/common";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "../../../../api/lpb";
export default {
name: "",
......@@ -289,6 +299,7 @@ export default {
hbj,
HCxlz,
},
inject:['getRightTree'],
props: {},
data() {
return {
......@@ -395,6 +406,29 @@ export default {
}, 100);
},
methods: {
registerCall(){
let data={
type:'h',
bsm:this.hbsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
batchCommit(){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
return
}
batchCommit(this.bsms).then(res=>{
if (res.success) {
Message.success("提交成功")
}
})
},
hcxlz(){
if (this.bsms.length <= 0) {
Message.warning("请选择操作户")
......@@ -454,13 +488,15 @@ export default {
//清空已选中层户
this.cbsmList = [];
this.bsms = [];
console.log(this.$refs.lpbContent.$refs.cBsm,'this.$refs.lpbContent.$refs.cBsm');
this.$nextTick(()=>{
//户
this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
item.style.borderColor = 'rgb(230, 230, 230)';
if (item.className == "tdSelect") {
item.className = "";
}
});
//层
this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
console.log(item.className,'item.className');
item.className = "floor";
......@@ -545,12 +581,10 @@ export default {
} else {
//单击 TO DO
}
console.log(this.bsms);
},
//获取选中层bsmlist
getCbsm(data){
this.cbsmList = data;
console.log(this.cbsmList);
},
//不动产单元号输入框事件
inputFocus() {
......@@ -574,6 +608,10 @@ export default {
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户保存
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
......
......@@ -21,6 +21,7 @@
ref="ljz"
v-for="(ljzs, ljzIndex) in lpbData.ljzs"
:key="ljzIndex"
:style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
>
<!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
<!-- 循环逻辑幢下的幢单元 -->
......@@ -65,6 +66,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
</td>
</tr>
</table>
......@@ -116,6 +120,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
</td>
</tr>
</table>
......@@ -172,6 +179,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
</td>
</tr>
</table>
......@@ -213,6 +223,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
</td>
</tr>
</table>
......@@ -327,11 +340,14 @@ export default {
sjc: "", //当前的层的SJC +1
},
formLabelWidth: "120px",
yclpbData:{},
sclpbData:{}
};
},
created() {},
mounted() {
this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx);
this.getLpb(this.$store.state.zrzbsm, "0");
this.getLpb(this.$store.state.zrzbsm, "1");
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
......@@ -354,7 +370,14 @@ export default {
res.result.ljzs = res.result.ljzs
.sort(this.compare("place"))
.reverse();
this.lpbData = res.result == null ? this.lpbData : res.result;
// this.lpbData = res.result == null ? this.lpbData : res.result;
//给实预测楼盘表对象赋值，默认加载预测楼盘表数据
if(scyclx == 0){
this.yclpbData = res.result == null ? this.yclpbData : res.result;
this.lpbData = this.yclpbData;
}else{
this.sclpbData = res.result == null ? this.sclpbData : res.result;
}
this.$nextTick(() => {
//渲染楼盘表
this.dataChange();
......@@ -426,6 +449,7 @@ export default {
}
//计算逻辑幢下的幢单元和层户的高度
this.ljzzdyHeight = 1;
if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
//判断自然幢下有没有比层户高的幢单元
let higher = true;
......@@ -605,6 +629,9 @@ export default {
});
},
//end
qsztClick(){
},
},
computed: {
createFlagChange() {
......@@ -619,7 +646,12 @@ export default {
},
watch: {
scyclx(n) {
this.getLpb(this.$store.state.zrzbsm, n);
// this.getLpb(this.$store.state.zrzbsm, n);
if(n == '0'){
this.lpbData = this.yclpbData;
}else{
this.lpbData = this.sclpbData;
}
},
createFlagChange: function(val) {
setTimeout(() => {
......@@ -784,6 +816,31 @@ export default {
line-height: 64px;
text-align: center;
cursor: pointer;
position: relative;
.hqszt{
display: inline-block;
width: 16px;
height: 16px;
font-size: 12px;
line-height: 16px;
position: absolute;
left: 6px;
top: 6px;
border: 1px solid;
border-radius: 8px;
}
.lin{
color:#F7B500;
border-color: #F7B500;
}
.zheng{
color: #1AD6E1;
border-color: #1AD6E1;
}
.xian{
color: #45AEFD;
border-color: #45AEFD;
}
}
.tdSelect {
border: 1px solid #006cff !important;
......
......@@ -265,6 +265,7 @@
<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>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
</div>
</div>
......@@ -275,14 +276,14 @@
import Qlxz from "../../../components/formMenu/qlxz_simple";
import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz"
import {getQjZdjbxxDetailById} from "../../../api/zd"
import {submit} from "../../../api/common"
import {submit,registerCall} from "../../../api/common"
export default {
name:'zrz',
components:{
Qlr,
Qlxz,
},
inject:['reload'],
inject:['reload','getRightTree'],
data () {
return {
......@@ -395,6 +396,18 @@
}
},
methods: {
registerCall(){
let data={
type:'zrz',
bsm:this.$route.query.bsm
}
registerCall(data).then(res=>{
if (res.success) {
this.$message.success("登记成功")
this.getRightTree(this.$store.state.zdbsm)
}
})
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......