Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 71a65df4 68b05121
Inline Side-by-side
Showing 6 changed files with 92 additions and 26 deletions
......@@ -49,10 +49,10 @@
</div>
<el-table
:data="tableData"
:height="tableHeight"
height="240"
:row-class-name="tableRowClassName"
>
<el-table-column prop="title" width="500" align="left" label="标题">
<el-table-column prop="title" width="500" align="left" class="tr-title" label="标题">
</el-table-column>
<el-table-column
prop="date"
......@@ -69,20 +69,47 @@
</div>
<el-table
:data="downloadData"
:height="tableHeight"
height="240"
border
@row-click="download"
:row-class-name="tableRowClassName"
>
<el-table-column
type="index" align="center"
width="50" label="序号">
width="70" label="序号">
</el-table-column>
<el-table-column prop="name" align="center" label="下载文件">
</el-table-column>
</el-table>
</el-card>
</div>
<div class="tj">
<el-card class="panel_right">
<div slot="header" class="clearfix">
<span>成果类别占比</span>
</div>
<div class="enter_box" ref="enterBox">
<img src="../../assets/images/cglbzb.png" :style="{'height':imgHeight + 'px'}" alt="">
</div>
</el-card>
<el-card class="cghj">
<div slot="header" class="clearfix">
<span>成果汇交数量</span>
<img src="../../assets/images/cghjsllegend.png" style="float: right;" alt="">
</div>
<div class="enter_box">
<img src="../../assets/images/cghjsl.png" :style="{'height':imgHeight + 'px'}" alt="">
</div>
</el-card>
<el-card class="cghj-pie">
<div slot="header" class="clearfix">
<span>成果汇交数量</span>
</div>
<div class="enter_box">
<img src="../../assets/images/cghjsl-pie.png" :style="{'height':imgHeight + 'px'}" alt="">
</div>
</el-card>
</div>
</div>
</template>
......@@ -120,18 +147,18 @@ export default {
title:"我市不动产登记改革跨入新领域",
date:"2020-12-30"
},
{
title:"住建委发布白皮书 持续推进房地产市场平稳健康发展",
date:"2020-12-30"
},
{
title:"不动产登记与公证业务全面联办 中心城区下月起实行",
date:"2020-12-30"
},
{
title:"坚持以人民为中心发展思想 推进解决房地产历史遗留问题",
date:"2020-12-30"
}
// {
// title:"住建委发布白皮书 持续推进房地产市场平稳健康发展",
// date:"2020-12-30"
// },
// {
// title:"不动产登记与公证业务全面联办 中心城区下月起实行",
// date:"2020-12-30"
// },
// {
// title:"坚持以人民为中心发展思想 推进解决房地产历史遗留问题",
// date:"2020-12-30"
// }
],
downloadData:[
{
......@@ -144,12 +171,14 @@ export default {
],
tableHeight: 0,
total: 0,
isEdit:false
isEdit:false,
imgHeight:200
};
},
mounted() {
this.$nextTick(() => {
this.tableHeight = this.$refs.notice.offsetHeight - 54;
// this.tableHeight = this.$refs.notice.offsetHeight - 54;
this.imgHeight = this.$refs.enterBox.offsetHeight - 10
});
this.getDbxCount();
},
......@@ -222,9 +251,8 @@ export default {
.main {
display: flex;
flex-direction: column;
overflow: hidden;
overflow: scroll;
height: 100%;
.clearfix {
span {
color: #6d7278;
......@@ -247,12 +275,12 @@ export default {
width: 100%;
padding: 0 0 18px!important;
.panel_left {
width: 35%;
width: 33.333%;
margin-right: 20px;
flex: 1;
}
.panel_right {
width: 65%;
width: 66.666%;
}
.enter_box {
@flex();
......@@ -306,12 +334,13 @@ export default {
}
}
/deep/ .el-card__body {
padding: 50px 20px;
padding: 30px 20px;
}
}
.notice {
padding: 0;
height: calc(100% - 266px);
height: 295px;
padding-bottom: 18px;
@flex();
.news {
float: left;
......@@ -340,11 +369,48 @@ export default {
background-color: #FBFBFB;
}
}
.tj{
flex: 1;
width: 100%;
display: -webkit-box;
display: -moz-box;
display: box;
>div{
flex: 1;
-webkit-box-orient: vertical; /*属性值：[horizontal]横向/[vertical]纵向*/
-moz-box-orient: horizontal;
box-orient: horizontal;
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);
overflow: hidden;
.enter_box{
height: 100%;
overflow: hidden;
img{
height: 200px;
display: block;
margin: 0 auto;
}
}
}
}
.cghj-pie{
margin-right: 0;
}
}
.pagination {
padding: 18px;
}
.el-table{
border: 0!important;
}
/deep/ .el-table .cell{
padding-left: 20px;
}
}
</style>
......
......@@ -97,7 +97,7 @@
align="center"
>
<i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
<span>用途</span>
<span>房屋用途</span>
</td>
<td colspan="1" align="center">
<i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
......@@ -276,7 +276,7 @@ export default {
deleteYtInfo(index) {
if (this.form.ytList.length <= 1) {
this.$message({
message: "不能删除，最少含有一条用途信息",
message: "不能删除，最少含有一条房屋用途信息",
type: "warning",
});
} else {
......