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 @@ ...@@ -49,10 +49,10 @@
49 </div> 49 </div>
50 <el-table 50 <el-table
51 :data="tableData" 51 :data="tableData"
52 :height="tableHeight" 52 height="240"
53 :row-class-name="tableRowClassName" 53 :row-class-name="tableRowClassName"
54 > 54 >
55 <el-table-column prop="title" width="500" align="left" label="标题"> 55 <el-table-column prop="title" width="500" align="left" class="tr-title" label="标题">
56 </el-table-column> 56 </el-table-column>
57 <el-table-column 57 <el-table-column
58 prop="date" 58 prop="date"
...@@ -69,20 +69,47 @@ ...@@ -69,20 +69,47 @@
69 </div> 69 </div>
70 <el-table 70 <el-table
71 :data="downloadData" 71 :data="downloadData"
72 :height="tableHeight" 72 height="240"
73 border 73 border
74 @row-click="download" 74 @row-click="download"
75 :row-class-name="tableRowClassName" 75 :row-class-name="tableRowClassName"
76 > 76 >
77 <el-table-column 77 <el-table-column
78 type="index" align="center" 78 type="index" align="center"
79 width="50" label="序号"> 79 width="70" label="序号">
80 </el-table-column> 80 </el-table-column>
81 <el-table-column prop="name" align="center" label="下载文件"> 81 <el-table-column prop="name" align="center" label="下载文件">
82 </el-table-column> 82 </el-table-column>
83 </el-table> 83 </el-table>
84 </el-card> 84 </el-card>
85 </div> 85 </div>
86 <div class="tj">
87 <el-card class="panel_right">
88 <div slot="header" class="clearfix">
89 <span>成果类别占比</span>
90 </div>
91 <div class="enter_box" ref="enterBox">
92 <img src="../../assets/images/cglbzb.png" :style="{'height':imgHeight + 'px'}" alt="">
93 </div>
94 </el-card>
95 <el-card class="cghj">
96 <div slot="header" class="clearfix">
97 <span>成果汇交数量</span>
98 <img src="../../assets/images/cghjsllegend.png" style="float: right;" alt="">
99 </div>
100 <div class="enter_box">
101 <img src="../../assets/images/cghjsl.png" :style="{'height':imgHeight + 'px'}" alt="">
102 </div>
103 </el-card>
104 <el-card class="cghj-pie">
105 <div slot="header" class="clearfix">
106 <span>成果汇交数量</span>
107 </div>
108 <div class="enter_box">
109 <img src="../../assets/images/cghjsl-pie.png" :style="{'height':imgHeight + 'px'}" alt="">
110 </div>
111 </el-card>
112 </div>
86 </div> 113 </div>
87 </template> 114 </template>
88 115
...@@ -120,18 +147,18 @@ export default { ...@@ -120,18 +147,18 @@ export default {
120 title:"我市不动产登记改革跨入新领域", 147 title:"我市不动产登记改革跨入新领域",
121 date:"2020-12-30" 148 date:"2020-12-30"
122 }, 149 },
123 { 150 // {
124 title:"住建委发布白皮书 持续推进房地产市场平稳健康发展", 151 // title:"住建委发布白皮书 持续推进房地产市场平稳健康发展",
125 date:"2020-12-30" 152 // date:"2020-12-30"
126 }, 153 // },
127 { 154 // {
128 title:"不动产登记与公证业务全面联办 中心城区下月起实行", 155 // title:"不动产登记与公证业务全面联办 中心城区下月起实行",
129 date:"2020-12-30" 156 // date:"2020-12-30"
130 }, 157 // },
131 { 158 // {
132 title:"坚持以人民为中心发展思想 推进解决房地产历史遗留问题", 159 // title:"坚持以人民为中心发展思想 推进解决房地产历史遗留问题",
133 date:"2020-12-30" 160 // date:"2020-12-30"
134 } 161 // }
135 ], 162 ],
136 downloadData:[ 163 downloadData:[
137 { 164 {
...@@ -144,12 +171,14 @@ export default { ...@@ -144,12 +171,14 @@ export default {
144 ], 171 ],
145 tableHeight: 0, 172 tableHeight: 0,
146 total: 0, 173 total: 0,
147 isEdit:false 174 isEdit:false,
175 imgHeight:200
148 }; 176 };
149 }, 177 },
150 mounted() { 178 mounted() {
151 this.$nextTick(() => { 179 this.$nextTick(() => {
152 this.tableHeight = this.$refs.notice.offsetHeight - 54; 180 // this.tableHeight = this.$refs.notice.offsetHeight - 54;
181 this.imgHeight = this.$refs.enterBox.offsetHeight - 10
153 }); 182 });
154 this.getDbxCount(); 183 this.getDbxCount();
155 }, 184 },
...@@ -222,9 +251,8 @@ export default { ...@@ -222,9 +251,8 @@ export default {
222 .main { 251 .main {
223 display: flex; 252 display: flex;
224 flex-direction: column; 253 flex-direction: column;
225 overflow: hidden; 254 overflow: scroll;
226 height: 100%; 255 height: 100%;
227
228 .clearfix { 256 .clearfix {
229 span { 257 span {
230 color: #6d7278; 258 color: #6d7278;
...@@ -247,12 +275,12 @@ export default { ...@@ -247,12 +275,12 @@ export default {
247 width: 100%; 275 width: 100%;
248 padding: 0 0 18px!important; 276 padding: 0 0 18px!important;
249 .panel_left { 277 .panel_left {
250 width: 35%; 278 width: 33.333%;
251 margin-right: 20px; 279 margin-right: 20px;
252 flex: 1; 280 flex: 1;
253 } 281 }
254 .panel_right { 282 .panel_right {
255 width: 65%; 283 width: 66.666%;
256 } 284 }
257 .enter_box { 285 .enter_box {
258 @flex(); 286 @flex();
...@@ -306,12 +334,13 @@ export default { ...@@ -306,12 +334,13 @@ export default {
306 } 334 }
307 } 335 }
308 /deep/ .el-card__body { 336 /deep/ .el-card__body {
309 padding: 50px 20px; 337 padding: 30px 20px;
310 } 338 }
311 } 339 }
312 .notice { 340 .notice {
313 padding: 0; 341 padding: 0;
314 height: calc(100% - 266px); 342 height: 295px;
343 padding-bottom: 18px;
315 @flex(); 344 @flex();
316 .news { 345 .news {
317 float: left; 346 float: left;
...@@ -340,11 +369,48 @@ export default { ...@@ -340,11 +369,48 @@ export default {
340 background-color: #FBFBFB; 369 background-color: #FBFBFB;
341 } 370 }
342 } 371 }
372 .tj{
373 flex: 1;
374 width: 100%;
375 display: -webkit-box;
376 display: -moz-box;
377 display: box;
378 >div{
379 flex: 1;
380 -webkit-box-orient: vertical; /*属性值：[horizontal]横向/[vertical]纵向*/
381 -moz-box-orient: horizontal;
382 box-orient: horizontal;
383 height: 100%;
384 margin-right: 20px;
385 background: #fff;
386 border: 1px solid #E6E6E6;
387 box-shadow: 0 0 8px 0 rgba(232, 237, 250, 0.6), 0 2px 4px 0 rgba(232, 237, 250, 0.5);
388 /deep/ .el-card__body{
389 height: calc(100% - 93px);
390 overflow: hidden;
391 .enter_box{
392 height: 100%;
393 overflow: hidden;
394 img{
395 height: 200px;
396 display: block;
397 margin: 0 auto;
398 }
399 }
400 }
401 }
402 .cghj-pie{
403 margin-right: 0;
404 }
405 }
343 .pagination { 406 .pagination {
344 padding: 18px; 407 padding: 18px;
345 } 408 }
346 .el-table{ 409 .el-table{
347 border: 0!important; 410 border: 0!important;
348 } 411 }
412 /deep/ .el-table .cell{
413 padding-left: 20px;
414 }
349 } 415 }
350 </style> 416 </style>
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 align="center" 97 align="center"
98 > 98 >
99 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i> 99 <i class="iconfont iconicon-test1" style="margin-right: 8px;color:#66b1ff;font-size:30px" @click="addYtInfo"></i>
100 <span>用途</span> 100 <span>房屋用途</span>
101 </td> 101 </td>
102 <td colspan="1" align="center"> 102 <td colspan="1" align="center">
103 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i> 103 <i class="iconfont iconicon-test" style="color:#FA6400;font-size:30px" @click="deleteYtInfo(index)"></i>
...@@ -276,7 +276,7 @@ export default { ...@@ -276,7 +276,7 @@ export default {
276 deleteYtInfo(index) { 276 deleteYtInfo(index) {
277 if (this.form.ytList.length <= 1) { 277 if (this.form.ytList.length <= 1) {
278 this.$message({ 278 this.$message({
279 message: "不能删除，最少含有一条用途信息", 279 message: "不能删除，最少含有一条房屋用途信息",
280 type: "warning", 280 type: "warning",
281 }); 281 });
282 } else { 282 } else {
......