Commit 565588ad authored by 吴卿华's avatar 吴卿华

Merge remote-tracking branch 'origin/master'

parents 72b74512 8a2bc2a5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<img src="../../assets/img/11.png" alt=""> <img src="../../assets/img/11.png" alt="">
</div> </div>
<div class="ru-in-r"> <div class="ru-in-r">
<span></span> <span></span>
<div style="color: #f95f5f;">0</div> <div style="color: #f95f5f;">0</div>
</div> </div>
</div> </div>
...@@ -29,14 +29,49 @@ ...@@ -29,14 +29,49 @@
<div class="ru-in-l"> <div class="ru-in-l">
<img src="../../assets/img/user.png" alt=""> <img src="../../assets/img/user.png" alt="">
</div> </div>
<div class="ru-in-r">
<span>在场</span>
<div style="color: #3a65ed">0</div>
</div>
</div>
</div>
</div>
<div class="ent-l ent">
<span>车辆出入</span>
<div class="ent-div"></div>
<div class="ent-ruchang">
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/Group 1.png" alt="">
</div>
<div class="ru-in-r"> <div class="ru-in-r">
<span>入场</span> <span>入场</span>
<div style="color: #0fb980;">0</div>
</div>
</div>
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/Gr.png" alt="">
</div>
<div class="ru-in-r">
<span>出场</span>
<div style="color: #f95f5f;">0</div>
</div>
</div>
<div class="ent-ru-in">
<div class="ru-in-l">
<img src="../../assets/img/Group.png" alt="">
</div>
<div class="ru-in-r">
<span>在场</span>
<div style="color: #3a65ed">0</div> <div style="color: #3a65ed">0</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ent-r ent">
<!-- <div class="ent-r ent">
<span>车辆出入</span> <span>车辆出入</span>
<div class="ent-div"></div> <div class="ent-div"></div>
<div class="ent-r-car"> <div class="ent-r-car">
...@@ -56,27 +91,65 @@ ...@@ -56,27 +91,65 @@
<p style="color: rgb(54 98 236);">0</p> <p style="color: rgb(54 98 236);">0</p>
</div> </div>
</div> </div>
</div> -->
</div>
<div class="entrance-l-a">
<div class="ent-b-car1">
<span>人员入场</span>
<div class="ent-div"></div>
<div class="ent-b-in">
<div class="a-in1">
<img src="../../assets/img/biguser.png" alt="">
</div>
<div class="a-in2">
<div>人员姓名:<span></span> </div>
<div>员工ID:<span></span> </div>
<div>入场时间:<span></span> </div>
</div>
</div>
</div>
<div class="ent-b-car1">
<div class="a-car-out">
<div>人员出场</div>
<div style="color: #c5c6c7;font-size: 14px;">出入记录</div>
</div>
<div class="ent-div"></div>
<div class="ent-b-in">
<div class="a-in1">
<img src="../../assets/img/biguser.png" alt="">
</div>
<div class="a-in2">
<div>人员姓名:<span></span> </div>
<div>员工ID:<span></span> </div>
<div>出场时间:<span></span> </div>
</div>
</div>
</div> </div>
</div> </div>
<div class="entrance-l-b"> <div class="entrance-l-b">
<div class="ent-b-car1"> <div class="ent-b-car1">
<span>车辆</span> <span>车辆</span>
<div class="ent-div"></div> <div class="ent-div"></div>
<div class="ent-b-in"> <div class="ent-b-in">
<img src="../../assets/img/car.png" alt=""> <img src="../../assets/img/car.png" alt="">
<div>车辆类型:<span></span> </div> <div>车辆类型:<span></span> </div>
<div>车辆牌:<span></span> </div> <div>车辆牌:<span></span> </div>
<div>场时间:<span></span> </div> <div>场时间:<span></span> </div>
</div> </div>
</div> </div>
<div class="ent-b-car1"> <div class="ent-b-car1">
<span>车辆出场</span> <div class="a-car-out">
<div>车辆出场</div>
<div style="color: #c5c6c7;font-size: 14px;">出入记录</div>
</div>
<div class="ent-div"></div> <div class="ent-div"></div>
<div class="ent-b-in"> <div class="ent-b-in">
<img src="../../assets/img/car.png" alt=""> <img src="../../assets/img/car.png" alt="">
<div>车辆类型:<span></span> </div> <div>车辆类型:<span></span> </div>
<div>车辆牌:<span></span> </div> <div>车辆牌:<span></span> </div>
<div>场时间:<span></span> </div> <div>场时间:<span></span> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -99,7 +172,7 @@ ...@@ -99,7 +172,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="address" prop="address"
label="场时间" label="场时间"
width="200"> width="200">
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -155,7 +228,7 @@ ...@@ -155,7 +228,7 @@
/* padding: 20px; */ /* padding: 20px; */
.entrance-l-t{ .entrance-l-t{
width: 100%; width: 100%;
height: 49%; height: 20%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.ent{ .ent{
...@@ -169,27 +242,34 @@ ...@@ -169,27 +242,34 @@
.ent-ruchang{ .ent-ruchang{
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 30px; padding-top: 10px;
display: flex;
justify-content: space-between;
.ent-ru-in{ .ent-ru-in{
width: 100%; width: 100%;
height: 30%; height: 30%;
display: flex; display: flex;
margin-top: 4%; margin-top: 4%;
.ru-in-l{ .ru-in-l{
width: 70px; width: 50px;
height: 70px; height: 50px;
border-radius: 50px; border-radius: 50px;
background: rgb(247, 247, 247); background: rgb(247, 247, 247);
line-height: 80px; line-height: 55px;
text-align: center; text-align: center;
margin-top: 10px;
img{ img{
width: 35%; width: 35%;
} }
} }
.ru-in-r{ .ru-in-r{
padding: 7px 0 0 10px; padding: 7px 0 0 10px;
span{
font-size: 15px;
}
div{ div{
font-size: 30px; font-size: 25px;
margin-top: 7px; margin-top: 7px;
} }
} }
...@@ -220,6 +300,60 @@ ...@@ -220,6 +300,60 @@
} }
} }
} }
.entrance-l-a{
width: 100%;
height: 27%;
margin-top: 2%;
border-radius: 7px;
background: #fff;
display: flex;
justify-content: space-between;
.ent-b-car1{
width: 47%;
height: 90%;
padding: 20px;
.a-car-out{
width: 100%;
display: flex;
justify-content: space-between;
}
.ent-b-in{
padding: 7% 20px 20px 20px;
display: flex;
justify-content: space-between;
width: 100%;
height: 100%;
.a-in1{
width: 30%;
height: 100%;
img{
width: 100%;
}
}
.a-in2{
width: 65%;
height: 90%;
display: flex;
flex-direction:column;
align-content: flex-end;
div{
font-size: 15px;
span{
color: #a39e9e;
}
}
div:nth-child(2){
margin-top: 35px;
}
div:last-child{
margin-top: 35px;
}
}
}
}
}
.entrance-l-b{ .entrance-l-b{
width: 100%; width: 100%;
height: 49%; height: 49%;
...@@ -232,6 +366,11 @@ ...@@ -232,6 +366,11 @@
width: 47%; width: 47%;
height: 90%; height: 90%;
padding: 20px; padding: 20px;
.a-car-out{
width: 100%;
display: flex;
justify-content: space-between;
}
.ent-b-in{ .ent-b-in{
padding: 30px 20px; padding: 30px 20px;
img{ img{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment