Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
417eb778 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 663c7eac 898dbff4
Inline Side-by-side
Showing 21 changed files with 107 additions and 242 deletions
......@@ -60,7 +60,7 @@ export default {
position: absolute;
top: 0;
left: 0;
z-index: 1;
z-index: 1000;
.content{
width: 240px;
height: 160px;
......
......@@ -101,6 +101,7 @@ ol, ul { list-style:none; }
/deep/ .el-tabs--border-card{
border: 0;
}
//二级菜单样式
.tabs{
>.el-tabs__content{
......@@ -115,28 +116,24 @@ ol, ul { list-style:none; }
width: 100%;
margin-bottom: 0;
border-top: 1px solid #F4F9FF;
// >.is-top>.el-tabs__nav-scroll{
// height: 50px;
// background-color: #ffffff;
// box-sizing: border-box;
// padding-left: 20px;
// .el-tabs__active-bar{
// display: none;
// }
// >.el-tabs__nav{
// >.el-tabs__item{
// border: 1px solid #DEDEDE;
// height: 30px;
// line-height: 28px;
// padding: 0 20px;
// margin: 9px 10px 9px 0;
// }
// .is-active{
// color: #006CFF;
// background-color: #ffffff;
// }
// }
// }
}
}
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: 100%;
}
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
.el-tabs__item{
......
......@@ -495,8 +495,10 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vm.loadingShow('业务办理中');
fwsxbgbl(params)
.then((res) => {
vm.loadingHide();
if (res.success) {
// this.$message({
// message: res.message,
......@@ -538,6 +540,7 @@
}
})
.catch((error) => {
vm.loadingHide();
this.$message({
message: res.message,
type: "error",
......
......@@ -55,6 +55,10 @@
<i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
<i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
</div>
<div class="user-info">
<span>admin</span>
<img src="https://himg.bdimg.com/sys/portraitn/item/a1b5badad3b61739" alt="">
</div>
</div>
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
......@@ -528,10 +532,38 @@ export default {
right: 18px;
top: 20px;
.tuOrShu{
float: left;
.iconfont{
cursor: pointer;
color:#ffffff;
font-size:30px
font-size:26px;
position: relative;
top: 2px;
}
}
.user-info{
float: left;
margin-left: 20px;
cursor: pointer;
span{
line-height: 30px;
vertical-align: middle;
color: #fff;
font-size: 14px;
}
img{
// padding: 2px;
width: 24px;
height: 24px;
margin-left: 6px;
border-radius: 50%;
border: 1px solid #fff;
vertical-align: middle;
}
}
.user-info:hover{
span{
color: #006CFF;
}
}
}
......
......@@ -189,33 +189,15 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
......@@ -247,6 +229,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
}
</style>
......
......@@ -72,33 +72,13 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
border-top: 1px solid #E4E7ED;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
......@@ -131,6 +111,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
}
</style>
......
......@@ -507,7 +507,9 @@
this.$nextTick(()=> {
if (flag && this.$refs.qlxzModule.getRulesResult()) {
vm.loadingShow('请求发送中');
saveDzInfo(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存完成！")
}else {
......@@ -517,6 +519,10 @@
});
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}else {
this.$message({
// message: item.name+'不能为空',
......
......@@ -63,22 +63,4 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -237,11 +237,17 @@
this.bsm=this.$route.query.bsm;
this.form.bsm=this.bsm;
this.form.jgsj=this.form.jgrq;
vm.loadingShow('请求发送中');
updateGzwjbxx(this.form).then((res)=>{
vm.loadingHide();
if(res.code === 200){
this.$message.success("保存完成!");
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}
})
......
......@@ -30,19 +30,4 @@
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
}
/deep/ .el-tabs__item {
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -162,25 +162,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -211,6 +193,5 @@
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -305,8 +305,7 @@
newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(data, '宗地合并数据')
vm.loadingShow();
vm.loadingShow('请求发送中');
ZdHb(data).then(res => {
vm.loadingHide();
if (res.success) {
......@@ -335,7 +334,7 @@
newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
zdbsm: this.$refs.dzhb.zdbsm
}
vm.loadingShow();
vm.loadingShow('请求发送中');
DzHb(data).then(res => {
vm.loadingHide();
if (res.success) {
......
......@@ -69,23 +69,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: calc(100% - 40px);
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -493,11 +493,14 @@ export default {
</script>
<style lang="less">
.eltabs {
height: 366px;
height: 366px!important;
width: 100%;
position: relative;
margin-left: 20px;
margin-top: 20px;
/deep/.el-tabs__content{
position: relative!important;
}
.eltabspane {
height: 100%;
width: 100%;
......
......@@ -243,24 +243,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -291,6 +274,5 @@
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -193,24 +193,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -250,6 +233,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
</style>
......
......@@ -109,23 +109,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -72,41 +72,5 @@ export default {
<style scoped lang="less">
.content_box{
padding: 0 0 6px;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
// height: 100%;
// display: flex;
// flex-direction: column;
// }
// /deep/.el-tabs__content{
// width: 100%;
// height: 100%;
// flex:1;
// position: unset;
// }
// .el-tab-pane{
// width: 100%;
// height: 100%;
// }
.el-tabs{
height: calc(100% - 50px);
/deep/ .el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
}
</style>
......
......@@ -904,7 +904,9 @@
this.form.qtjzmj=this.form.scqtjzmj;
this.form.ftxs=this.form.scftxs;
}
vm.loadingShow('请求发送中');
updateQjH(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存成功！")
console.log(this,"this")
......@@ -912,6 +914,10 @@
this.$message.warning(res.message)
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}else {
this.$message({
// message: item.name+'不能为空',
......
......@@ -913,8 +913,9 @@ export default {
"zdybsm": this.fghbChoosedList[0].zdybsm,
"zrzbsm": this.fghbChoosedList[0].zrzbsm
}
// console.log(params,'params');
vm.loadingShow('请求发送中');
hhb(params).then((res) => {
vm.loadingHide();
if(res.code == 200){
Message.success('合并成功');
// 清除选中户
......@@ -926,7 +927,10 @@ export default {
Message.error(res.message);
}
})
.catch(() => {});
.catch((error) => {
vm.loadingHide();
console.log(error);
});
})
.catch(() => {});
}else{
......@@ -939,7 +943,9 @@ export default {
},
//户分割保存
savefgData(){
vm.loadingShow('请求发送中');
hfg(this.fgData).then((res) => {
vm.loadingHide();
if(res.code == 200){
Message.success('分割成功');
// 清除选中户
......@@ -952,7 +958,10 @@ export default {
Message.error(res.message);
}
})
.catch(() => {});
.catch((error) => {
vm.loadingHide();
console.log(error);
});
},
//范围属性变更
handleFwsxbg(){
......
......@@ -565,7 +565,9 @@
type: "warning",
});
}else{
vm.loadingShow('请求发送中');
saveZrzInfo(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存完成！")
this.getZrzDetailByBsm(this.$route.query.bsm)
......@@ -577,6 +579,10 @@
}
this.loading=false;
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
this.loading=false;
this.saveGraphicAttributes(); }
}else{
......