Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 5871b1ea 80e074a9
Inline Side-by-side
Showing 8 changed files with 158 additions and 48 deletions
......@@ -446,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;
......@@ -492,7 +492,7 @@ export default {
}
.childYT {
height: 114px;
border-top: 1px solid grey;
border-top: 1px solid #E6E6E6;
ul {
margin-top: 0;
li {
......@@ -522,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;
......@@ -560,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;
......
......@@ -163,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="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></fjcl></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -29,14 +29,39 @@ 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);
if (tab.name == 'lshs') {
this.lshsVisible = true;
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;
}
},
},
......
......@@ -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="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,33 +236,49 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
cursor: pointer;
td {
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
cursor: pointer;
.formInput {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
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;
height: 36px;
min-width: 50px;
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 .formInput {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
.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,10 +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>
......@@ -414,6 +422,7 @@ export default {
formData: {},
dpdm:'', //宗地底盘代码
curZdbsm:'',
mainBoxWidth:0,
geoAttributes:{
OBJECTID:"",
BSM:"",
......@@ -467,6 +476,9 @@ export default {
},
mounted() {
this.getZdjbxxData(this.$store.state.zdbsm);
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
methods: {
registerCall(){
......@@ -830,6 +842,7 @@ export default {
td {
text-align: center;
height: 36px;
border-color: #E6E6E6;
}
/deep/ .el-input__inner {
margin: 0;
......@@ -867,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>
......