|
@@ -124,8 +124,9 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="mt_20 table_box">
|
|
|
- <div class="each_card_box">
|
|
|
- <div class="clearfix">
|
|
|
+ <!-- <div class="each_card_box"> -->
|
|
|
+ <el-card class="box-card width_33">
|
|
|
+ <div slot="header" class="clearfix">
|
|
|
<h3 class="title_class">最近通行记录</h3>
|
|
|
</div>
|
|
|
<el-table
|
|
@@ -138,9 +139,9 @@
|
|
|
<el-table-column prop="dmRoomDevice.name" label="通行地点" />
|
|
|
<el-table-column prop="accessTime" label="时间" />
|
|
|
</el-table>
|
|
|
- </div>
|
|
|
- <div class="each_card_box">
|
|
|
- <div class="clearfix">
|
|
|
+ </el-card>
|
|
|
+ <el-card class="box-card width_33">
|
|
|
+ <div slot="header" class="clearfix">
|
|
|
<h3 class="title_class">最近消费记录</h3>
|
|
|
</div>
|
|
|
<el-table
|
|
@@ -154,6 +155,38 @@
|
|
|
<el-table-column prop="money" label="金额" width="60" />
|
|
|
<el-table-column prop="createDate" label="时间" />
|
|
|
</el-table>
|
|
|
+ </el-card>
|
|
|
+ <el-card class="box-card width_33">
|
|
|
+ <div slot="header" class="clearfix">
|
|
|
+ <h3 class="title_class">最近通行记录</h3>
|
|
|
+ </div>
|
|
|
+ <el-table
|
|
|
+ :data="currentTableData"
|
|
|
+ :header-cell-style="rowClass"
|
|
|
+ style="width: 100%; margin-top: 12px"
|
|
|
+ height="260"
|
|
|
+ >
|
|
|
+ <el-table-column prop="NO" label="序号" width="50" />
|
|
|
+ <el-table-column prop="dmRoomDevice.name" label="通行地点" />
|
|
|
+ <el-table-column prop="accessTime" label="时间" />
|
|
|
+ </el-table>
|
|
|
+ </el-card>
|
|
|
+ <!-- <div class="clearfix" /> -->
|
|
|
+ <!-- </div> -->
|
|
|
+ <!-- <div class="each_card_box">
|
|
|
+ <div class="clearfix">
|
|
|
+ <h3 class="title_class">最近访客预约记录</h3>
|
|
|
+ </div>
|
|
|
+ <el-table
|
|
|
+ :data="visitorTableData"
|
|
|
+ :header-cell-style="rowClass"
|
|
|
+ style="width: 100%; margin-top: 12px"
|
|
|
+ height="260"
|
|
|
+ >
|
|
|
+ <el-table-column prop="NO" label="序号" width="50" />
|
|
|
+ <el-table-column prop="visitor_name" label="访客名称" />
|
|
|
+ <el-table-column prop="start_time" label="到访时间" />
|
|
|
+ </el-table>
|
|
|
</div>
|
|
|
<div class="each_card_box">
|
|
|
<div class="clearfix">
|
|
@@ -169,7 +202,7 @@
|
|
|
<el-table-column prop="visitor_name" label="访客名称" />
|
|
|
<el-table-column prop="start_time" label="到访时间" />
|
|
|
</el-table>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="">
|
|
|
<el-card class="box-card" style="margin-top: 16px">
|
|
@@ -491,7 +524,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.back_container {
|
|
|
- background-color: #f7f7f7;
|
|
|
+ background-color: #f5f5f5;
|
|
|
|
|
|
header {
|
|
|
height: 34px;
|
|
@@ -550,7 +583,7 @@ export default {
|
|
|
height: 200px;
|
|
|
// padding: 20px;
|
|
|
box-sizing: border-box;
|
|
|
- align-items: flex-end;
|
|
|
+ align-items: center;
|
|
|
|
|
|
.block {
|
|
|
width: 120px;
|
|
@@ -866,7 +899,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.mt_20 {
|
|
|
- margin-top: 35px;
|
|
|
+ margin-top: 16px;
|
|
|
}
|
|
|
|
|
|
.content {
|
|
@@ -920,4 +953,7 @@ export default {
|
|
|
> .el-card__header {
|
|
|
padding: 15px 15px 10px;
|
|
|
}
|
|
|
+.width_33 {
|
|
|
+ width: 32.9%;
|
|
|
+}
|
|
|
</style>
|