Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c8965602 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents ef94474d 5d9eb672
Inline Side-by-side
Showing 8 changed files with 69 additions and 64 deletions
......@@ -42,7 +42,7 @@ export default {
this.isShow = true;
this.tips = tips+'...';
},
loadingHide(tips){
loadingHide(){
this.isShow = false;
}
},
......
......@@ -98,6 +98,9 @@ ol, ul { list-style:none; }
::-webkit-scrollbar-track {
border-radius: 0;
}
/deep/ .el-tabs--border-card{
border: 0;
}
//二级菜单样式
.tabs{
>.el-tabs__content{
......@@ -153,7 +156,7 @@ ol, ul { list-style:none; }
}
.el-dialog__header{
border-bottom: 1px solid #F1F1F1;
background: #3FA2E1;
background: #0091FF;
}
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
color: #fff;
......@@ -305,16 +308,16 @@ ol, ul { list-style:none; }
}
//实预测转换按钮样式
/deep/.el-radio-button__inner {
border: 1px solid #3fa2e1!important;
color: #3fa2e1;
border: 1px solid #00cacd!important;
color: #00cacd;
}
/deep/.el-radio-button__inner:hover {
color: #3fa2e1;
color: #00cacd;
}
/deep/.is-active .el-radio-button__inner {
color: #fff;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
background-color: #3fa2e1;
border-color: #3fa2e1;
background-color: #00cacd;
border-color: #00cacd;
}
\ No newline at end of file
......
......@@ -21,9 +21,8 @@ function errorLog() {
// this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
// loadingInstance.close();
// });
MessageBox.alert('报错了请联系管理员', '消息提示', {
confirmButtonText: '确定',
type: 'warning'
Message.error({
message: "出现错误，请稍后再试"
})
}
//定义loading
......
......@@ -12,36 +12,37 @@
<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
</div>
<div class="search-box">
<el-input
maxlength="28"
v-model="treeKey"
class="searchInput"
placeholder="请输入关键字"
><i
slot="suffix"
class="el-input__icon el-icon-search"
@click="inputChange"
></i
></el-input>
</div>
<div class="treeModule" :style="{height:treeHeight+'px'}">
<LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
<div class="wrap">
<div class="search-box">
<el-input
maxlength="28"
v-model="treeKey"
class="searchInput"
placeholder="请输入关键字"
><i
slot="suffix"
class="el-input__icon el-icon-search"
@click="inputChange"
></i
></el-input>
</div>
<div class="treeModule" :style="{height:treeHeight+'px'}">
<LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
</div>
</div>
</el-aside>
<el-container class="calcWidth">
<el-header>
<div class="header-top">
<!-- <div class="top-items" @click="toggleClick">
<div class="top-items" @click="toggleClick">
<i class="iconfont iconsuojin" v-show="!isActive"></i>
<i class="iconfont iconzhankai" v-show="isActive"></i>
</div> -->
</div>
<div
class="top-items"
v-for="(item, index) in headTop"
:key="index + '1'"
:class="{ 'is-active': item.select }"
:style="{'height':item.name == '首页' && item.select ? '64'+'px' : '65'+'px'}"
@click="selectTopItems(index)"
>
<i :class="item.icon"></i>
......@@ -475,11 +476,13 @@ export default {
height: 66px;
// border-bottom: 1px solid#EAEAEA;
box-sizing: border-box;
background-image: url('../assets/images/banner.png');
// background-image: url('../assets/images/banner.png');
background-color: #006CFF;
display: flex;
flex-grow: 1;
justify-content: center;
align-items: center;
border-left: 1px solid #3E9FFF;
// justify-content: center;
// align-items: center;
.top-items {
cursor: pointer;
height: 66px;
......@@ -504,10 +507,10 @@ export default {
}
}
.top-items:hover{
background: hsla(0,0%,100%,.2);
background: #0091FF;
}
.top-items.is-active {
background: hsla(0,0%,100%,.2);
background: #0091FF;
}
}
.header-bottom {
......@@ -536,8 +539,11 @@ export default {
background-color: #ffffff;
color: #333;
// text-align: center;
overflow: hidden;
overflow: overlay;
transition: width 0.3s;
box-shadow: 1px 0px 2px 1px rgba(49, 132, 245, 0.1);
position: relative;
z-index: 1000;
.logo-box {
width: 100%;
height: 66px;
......@@ -545,7 +551,7 @@ export default {
box-sizing: border-box;
padding: 10px 20px;
transition: width 0.3s;
background-color: #287CC5;
background-color: #006CFF;
.logo-img {
width: 44px;
float: left;
......@@ -557,27 +563,29 @@ export default {
font-size: 20px;
}
}
.search-box{
height: 65px;
box-sizing: border-box;
padding: 18px 20px;
border-right: 1px solid #dedede;
.searchInput{
/deep/ .el-input__inner{
width: 240px;
height: 38px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #DEDEDE;
}
/deep/ .el-input__suffix{
top: 0!important;
.wrap{
height: calc(100% - 66px);
overflow-x: hidden;
.search-box{
height: 65px;
box-sizing: border-box;
padding: 18px 20px;
.searchInput{
/deep/ .el-input__inner{
width: 240px;
height: 38px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #DEDEDE;
}
/deep/ .el-input__suffix{
top: 0!important;
}
}
}
}
.treeModule {
box-sizing: border-box;
border-right: 1px solid #dedede;
.treeModule {
box-sizing: border-box;
}
}
.logo-box-show {
width: 64px;
......
......@@ -44,4 +44,5 @@
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -625,9 +625,9 @@
} else {
Message.error("保存失败")
}
}).catch((err)=>{
vm.loadingHide()
Message.error(err)
}).catch((error)=>{
vm.loadingHide();
console.log(error);
})
}else{
Message.warning("请完善分割后的宗地项目名称后重试")
......
......@@ -347,14 +347,12 @@ export default {
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;
}
......@@ -379,7 +377,6 @@ export default {
height: 100%;
margin-right: 20px;
background: #fff;
border: 1px solid #E6E6E6;
box-shadow: 0 0 8px 0 rgba(232, 237, 250, 0.6), 0 2px 4px 0 rgba(232, 237, 250, 0.5);
/deep/ .el-card__body{
height: calc(100% - 93px);
......
......@@ -791,10 +791,7 @@
})
.catch((error) => {
vm.loadingHide();
this.$message({
message: error.message+"，查看日志，联系管理员",
type: "error",
});
console.log(error);
});
this.saveZdGraphicAtrributes();
}
......