09a5643c by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 5345a113 5fece3e9
import request from '@/plugin/axios'
/**
* 新增构筑物基本信息
*/
export function insertGzwjbxx(data) {
return request({
url: '/system/qjGzw/insertQjGzw',
method: 'post',
data: data,
})
}
/**
* 生成不动产单元号
*/
export function getBdcdyh(dpdm, dptype) {
return request({
url: '/system/generator/getBdcdyh',
method: 'get',
params: {
dpdm: dpdm,
dptype: dptype
}
})
}
/**
* 更新构筑物基本信息
*/
export function updateGzwjbxx(data) {
return request({
url: '/system/qjGzw/updateQjGzw',
method: 'put',
data: data,
})
}
/**
* 获取构筑物基本信息
*/
export function getQjGzwDetailInfo(data) {
return request({
url: '/system/qjGzw/getQjGzwDetailById',
method: 'get',
params: {
id: data
}
})
}
\ No newline at end of file

25.4 KB | W: | H:

25.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -8,8 +8,8 @@
:modal-append-to-body="false"
>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
......
......@@ -18,7 +18,7 @@
</div>
<div slot="footer" class="dialog_footer">
<el-button type="primary" size="small" @click="submitForm('ruleForm')">保存</el-button>
<el-button size="small" @click="resetForm('ruleForm')">重置</el-button>
<el-button size="small" @click="resetForm('ruleForm')" icon="el-icon-refresh">重置</el-button>
<el-button size="small" @click="closeDialog('ruleForm')">关闭</el-button>
</div>
</el-dialog>
......
......@@ -196,8 +196,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......@@ -294,8 +294,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -30,8 +30,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -2,7 +2,8 @@
<div class="temp">
<div class="qlxzAdd fl">
<span>权利性质</span>
<i class="iconfont iconicon-test2" @click="handleClick(0, 'add')"></i>
<i class="iconfont iconicon-test2" v-if="formData.qszt=='0'" @click="handleClick(0, 'add')"></i>
<i class="iconfont iconicon-test2" v-if="formData.qszt!='0'" style="cursor: not-allowed;"></i>
</div>
<el-row
class="qlxzModule fl"
......@@ -16,7 +17,8 @@
:key="childIndex + '1'"
:class="childIndex > 0 ? 'childYT noTopBorder' : ''"
>
<i v-show="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" @click="handleClick(index, 'minus')"></i>
<i v-show="childIndex == 0 && formData.qszt=='0'" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" @click="handleClick(index, 'minus')"></i>
<i v-show="childIndex == 0 && formData.qszt!='0'" :style="{'margin-top':(items.list.length-1)*57 - 18 + 'px'}" class="iconfont icon- qlxzMinus" style="cursor: not-allowed;"></i>
<div
:class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
v-if="items.isInside"
......@@ -30,7 +32,8 @@
>
<template>
<span v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 - 40 + 'px'}">土地用途</span>
<i class="iconfont iconicon-test1" v-show ="childIndex == 0" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" @click="handleInClick(index, childIndex, 'add')"></i>
<i class="iconfont iconicon-test1" v-show ="childIndex == 0 && formData.qszt=='0'" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" @click="handleInClick(index, childIndex, 'add')"></i>
<i class="iconfont iconicon-test1" v-show ="childIndex == 0 && formData.qszt!='0'" :style="{'margin-top':(items.list.length-1)*57 + 'px'}" style="cursor: not-allowed;"></i>
</template>
</el-col>
<el-col
......@@ -39,7 +42,8 @@
:key="childIndex + '18'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<i class="iconfont iconicon-test" @click="handleInClick(index, childIndex, 'minus')"></i>
<i class="iconfont iconicon-test" v-if="formData.qszt=='0'" @click="handleInClick(index, childIndex, 'minus')"></i>
<i class="iconfont iconicon-test" v-if="formData.qszt!='0'" style="cursor: not-allowed;"></i>
</el-col>
<template v-if="hasSyqx">
<el-col
......
......@@ -171,7 +171,7 @@ export default {
},
// 右键点击事件
openMenu(e, item,list) {
console.log(list,'右键list');
console.log(item,'右键list');
this.$emit("changeTop", e.pageY);
this.$emit("changeLeft", e.pageX);
this.$emit("changeZdData",item);
......@@ -200,7 +200,9 @@ export default {
case 'ljz':
this.$emit("changeLpbVisible", true);
break;
case 'gzw':
this.$emit("changeGzwVisible", true);
break;
default:
break;
}
......@@ -209,29 +211,25 @@ export default {
dbclick(item,bsm) {
clearTimeout(this.time);
this.$store.state.newZdbsm = bsm;
//此处不要将$router移到if的外面,因为可能是双击行政区,就不知道去哪儿了
if (item.type == 'zd') {
this.$store.state.zdbsm = item.bsm;
this.$router.push({
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
}
});
}else if(item.type == 'zrz'){
this.$store.state.zrzbsm = item.bsm;
this.$router.push({
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
}
});
}else if(item.type == 'dz'){
this.$store.state.dzbsm = item.bsm;
switch (item.type) {
case 'zd':
this.$store.state.zdbsm = item.bsm;
break;
case 'zrz':
this.$store.state.zrzbsm = item.bsm;
break;
case 'dz':
this.$store.state.dzbsm = item.bsm;
break;
case 'gzw':
this.$store.state.gzwbsm = item.bsm;
break;
default:
break;
}
if(item.type){
this.$router.push({
path: '/'+item.type,
query:{
......
......@@ -45,6 +45,7 @@
@changeIsZD="changeIsZD"
@changeCreateVisible="changeCreateVisible"
@changeDzVisible="changeDzVisible"
@changeGzwVisible="changeGzwVisible"
:list="item.children"
:visible="visible"
:size="size"
......@@ -92,6 +93,14 @@
>
<li @click="openCreateDialog">新建宗地</li>
</ul>
<!-- 构筑物删除 -->
<ul
v-show="gzwVisible"
:style="{ left: left + 'px', top: top + 'px' }"
class="contextmenu"
>
<li @click="deleteByBsm">删除</li>
</ul>
<ul
v-show="lpbvisible"
:style="{ left: lpbleft + 'px', top: lpbtop + 'px' }"
......@@ -171,6 +180,8 @@ export default {
zdQszt:null,
wkt:"PROJCS[\"XADFZBX\",GEOGCS[\"GCS_WGS_1984\",DATUM[\"D_WGS_1984\",SPHEROID[\"WGS_1984\",6378137.0,298.257223563]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"False_Easting\",0.0],PARAMETER[\"False_Northing\",0.0],PARAMETER[\"Central_Meridian\",0.0],PARAMETER[\"Scale_Factor\",1.0],PARAMETER[\"Latitude_Of_Origin\",0.0],UNIT[\"Meter\",1.0]]",
createZrz:false,
//构筑物
gzwVisible:false
};
},
watch: {
......@@ -264,7 +275,11 @@ export default {
},
//多幢
changeDzVisible(data){
this.dzVisible = data
this.dzVisible = data;
},
//构筑物
changeGzwVisible(data){
this.gzwVisible = data;
},
//添加定着物
openCreateDialog(type){
......@@ -388,6 +403,9 @@ export default {
case 'zrz':
name = '自然幢'
break;
case 'gzw':
name = '构筑物'
break;
default:
break;
......@@ -640,10 +658,10 @@ export default {
},
//关闭图形弹框
closeImportDialog(){
this.improtDialog = false;
this.clearOverLayer();
}
closeImportDialog(){
this.improtDialog = false;
this.clearOverLayer();
}
},
};
......
......@@ -61,7 +61,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......
......@@ -211,7 +211,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="reset">重置</el-button>
<el-button type="primary" @click="reset" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......
......@@ -74,7 +74,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......
......@@ -94,7 +94,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="close">取消</el-button>
</div>
</el-dialog>
......
<template>
<div class="main">
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
......
......@@ -9,7 +9,7 @@
>
<div class="search">
<!-- <el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button> -->
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> -->
<el-row>
<el-col :span="24">
......@@ -33,8 +33,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -27,7 +27,7 @@
></el-input>
</el-form-item>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
<el-button
type="primary"
@click="moreSearch"
......@@ -74,6 +74,7 @@
<el-checkbox label="zd" name="type">宗地</el-checkbox>
<el-checkbox label="dz" name="type">多幢</el-checkbox>
<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="h" name="type" v-show="type !== 'add'"></el-checkbox>
<!-- <el-checkbox label="gzw" name="type">构筑物</el-checkbox>
<el-checkbox label="lq" name="type">林权</el-checkbox>
......
......@@ -30,8 +30,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -45,5 +45,9 @@ let bdcLxArray = [
label: "多幢",
value: "dz",
},
{
label: "构筑物",
value: "gzw",
},
];
createFilter("bdcLxFilter", bdcLxArray);
\ No newline at end of file
......
......@@ -77,6 +77,12 @@ const constantRoutes = [
component: () => import("@/views/systemH/index"),
},
{
path: "/gzw",
name: "构筑物",
code: "1-7",
component: () => import("@/views/gzw/index"),
},
{
path: "/viewMap",
name: "地图",
code: "0-6",
......
......@@ -41,6 +41,7 @@ const store = new Vuex.Store({
jgOptions:[],
gmjjhyflbsmList:[],
fwytList:[],
gzwlxList:[],
//创建自然幢时需要用到的临时存储信息
zrzbsm: '',
zjlxList: [],
......
......@@ -33,10 +33,10 @@
<span>{{ item.name }}</span>
</div>
<div class="top-items tuOrShu" >
<i class="iconfont iconiconset0403" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i>
<i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i>
</div>
<div class="top-items tuOrShu" >
<i class="iconfont iconiconset0403" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i>
<i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i>
</div>
</div>
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
......@@ -226,6 +226,8 @@ export default {
this.getRightTree(this.$store.state.zdbsm)
}else if(this.$route.path == '/dz'){
this.getTreeByBsm(this.$store.state.dzbsm,'dz',this.$route.query.auth)
}else if(this.$route.path == '/gzw'){
this.getTreeByBsm(this.$store.state.gzwbsm,'gzw',this.$route.query.auth)
}else{
this.getTreeList();
}
......@@ -272,6 +274,7 @@ export default {
s.hxList = s.hxList.length == 0 ?await this.getDicData("户型") : s.hxList;
s.hxjgList = s.hxjgList.length == 0 ?await this.getDicData("户型结构") : s.hxjgList;
s.fwjgList = s.fwjgList.length == 0 ?await this.getDicData("户型结构") : s.fwjgList;
s.gzwlxList = s.gzwlxList.length == 0 ?await this.getDicData("构(建)筑物类型") : s.gzwlxList;
s.fwxzOptions = s.fwxzOptions.length == 0 ?await this.getDicData("房屋性质") : s.fwxzOptions;
s.cbOptions = s.cbOptions.length == 0 ?await this.getDicData("房屋产别") : s.cbOptions;
......
<template>
<gzwInfo></gzwInfo>
</template>
<script>
import gzwInfo from './jbxx/index';
export default {
name: "index",
components:{
gzwInfo,
},
}
</script>
<style scoped>
</style>
\ No newline at end of file
......@@ -3,8 +3,8 @@
<div class="log-search">
字典名称:
<el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input>
<el-button type="primary" @click="query">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</div>
<div class="log-detail">
<div class="log-menu">
......
......@@ -19,8 +19,8 @@
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions">
</el-date-picker>
<el-button type="primary" @click="query">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
<el-button type="info" @click="getError">错误日志</el-button>
</div>
......
......@@ -25,8 +25,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
<el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" style="margin-left:10px" @click="result" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -4,7 +4,7 @@
<el-tab-pane label="宗地分割" name="zd">
<div class="fg-tabs top20">
<span class="tips">分割前宗地信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
<div class="fgq">
<el-card class="data">
<div slot="header" class="clearfix">
......@@ -181,7 +181,7 @@
<el-tab-pane label="多幢分割" name="dz">
<div class="fg-tabs top20">
<span class="tips">分割前多幢信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
<div class="fgq">
<el-card class="data">
<div slot="header" class="clearfix">
......@@ -1212,13 +1212,14 @@
}
.cz, .xh {
width: 100px;
width: 80px;
}
.xzq, .djq, .djzq {
width: 150px;
}
.search {
color: #BBB !important;
}
......@@ -1227,6 +1228,7 @@
width: 210px;
display: block;
margin: 10px auto;
border: 1px solid #F2F2F2;
}
/deep/ .el-select{
width: 100%;
......
......@@ -22,8 +22,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick" type="card">
<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
<el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
......
......@@ -133,10 +133,18 @@
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
</el-tab-pane>
<el-tab-pane class="eltabspane" v-if="!createZrz" label="构筑物" name="gzw">
<el-tab-pane class="eltabspane" label="构筑物" name="gzw">
<el-form :inline="true" :rules="rules4" :model="ruleForm4" ref="ruleForm4" class="demo-form-inline">
<el-form-item label="项目名称" class="w100" prop="xmmc">
<el-input
v-model="ruleForm4.xmmc"
placeholder="项目名称"
></el-input>
</el-form-item>
</el-form>
<div class="handleBtn">
<el-button type="primary" class="w98 import">导入图形</el-button>
<el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
<el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button>
<el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
</div>
</el-tab-pane>
......@@ -152,6 +160,7 @@ import {
import { insertQjZdjbxx } from "@api/zd";
import { insertZrzjbxx } from "@api/zrz";
import { insertDzjbxx } from "@api/dz";
import { insertGzwjbxx } from "@api/gzw";
export default {
name: "",
......@@ -199,6 +208,11 @@ export default {
xmmc:'',
userbsm:''
},
ruleForm4:{
zdzhbsm:'',
xmmc:'',
userbsm:''
},
rules: {
xzqbsm: [
{ required: true, message: '请选择行政区', trigger: 'change' }
......@@ -229,6 +243,11 @@ export default {
{ required: true, message: '请输入项目名称', trigger: 'blur' },
],
},
rules4: {
xmmc: [
{ required: true, message: '请输入项目名称', trigger: 'blur' },
],
},
syqlx: [
{
label: "国家所有",
......@@ -341,6 +360,39 @@ export default {
});
},
newGzw(){
this.$refs['ruleForm4'].validate((valid) => {
if (valid) {
if(1>0){
this.ruleForm4.zdzhbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
insertGzwjbxx(this.ruleForm4)
.then((res)=>{
if(res.code === 200){
//获取左侧树数据
this.getTreeByBsm(res.result.bsm,'gzw','0,1,2');
this.close();
this.$router.push({
path: '/gzw', query:{
source: 1,
bsm:res.result.bsm,
auth: '0,1,2'
}
});
}
})
}else {
this.close();
this.$router.push({
path: '/gzw', query:{
source: 1,
bsm:"12345678901234567890",
auth: '0,1,2'
}
});
}
}
})
},
newDz() {
//todo 在新增时,如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
this.$refs['ruleForm2'].validate((valid) => {
......
......@@ -152,6 +152,11 @@
this.$store.state.hbsm=row.glbsm
this.getTreeByBsm(row.glbsm,'h','0,1,2');
break;
case "gzw":
this.$store.state.gzwbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,"gzw",'0,1,2');
path = "/gzw";
break;
default:
break;
}
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></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>
......@@ -9,7 +9,7 @@
<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>
<!-- </div> -->
</template>
<script>
......@@ -71,4 +71,22 @@ export default {
watch: {},
};
</script>
<style scoped lang="less"></style>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
background: #eaedf5;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -245,7 +245,7 @@
width: 100%;
table {
margin-top: 10px;
// margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
......
......@@ -785,6 +785,10 @@
}
})
.catch((error) => {
this.$message({
message: error.message+",查看日志,联系管理员",
type: "error",
});
});
//保存到空间库里面
var self = this;
......
......@@ -241,7 +241,7 @@
</div>
<div class="btnGroup">
<el-button type="primary" @click="saveInfo">保存</el-button>
<el-button type="primary" @click="resetInfo">重置</el-button>
<el-button type="primary" @click="resetInfo" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="dialogVisible = false"
>取消</el-button
>
......