Skip to content

W
wisdom-ces
Commit e8f4e54d authored by wangqinghua's avatar wangqinghua
Browse files
Options

签到

parent d05028a8
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 146 deletions
src/pages/report/reportDetail/reportDetail.html
View file @ e8f4e54d
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
</div> </div>
<div class="content-box"> <div class="content-box">
<div class="content-box-item i3" (click)="change(1)"> <div class="content-box-item {{type == 1?'bgc-34b4fc':''}}" (click)="change(1)">
<span class="item-title">未报备</span> <span class="item-title">未报备</span>
<span class="item-count">{{itemsOfNotReport.length}}人</span> <span class="item-count">{{itemsOfNotReport.length}}人</span>
</div> </div>
<div class="content-box-item i2" (click)="change(2)"> <div class="content-box-item {{type == 2?'bgc-34b4fc':''}}" (click)="change(2)">
<span class="item-title">离沪</span> <span class="item-title">离沪</span>
<span class="item-count">{{itemsOfLeave.length}}人</span> <span class="item-count">{{itemsOfLeave.length}}人</span>
</div> </div>
<div class="content-box-item i1" (click)="change(3)"> <div class="content-box-item {{type == 3?'bgc-34b4fc':''}}" (click)="change(3)">
<span class="item-title">不离沪</span> <span class="item-title">不离沪</span>
<span class="item-count">{{itemsOfNotLeave.length}}人</span> <span class="item-count">{{itemsOfNotLeave.length}}人</span>
</div> </div>
...@@ -39,9 +39,15 @@ ...@@ -39,9 +39,15 @@
<p *ngIf="type == 2" class="person-batch">离沪地点：{{item.address}}</p> <p *ngIf="type == 2" class="person-batch">离沪地点：{{item.address}}</p>
</div> </div>
</div> </div>
<button ion-button round class="btn color1" *ngIf="type == 1">未报备</button> <div>
<button ion-button round class="btn color2" *ngIf="type == 2">离沪</button> <p>
<button ion-button round class="btn color3" *ngIf="type == 3">不离沪</button> <button ion-button round class="btn color1" *ngIf="type == 1">未报备</button>
<button ion-button round class="btn color2" *ngIf="type == 2">离沪</button>
<button ion-button round class="btn color3" *ngIf="type == 3">不离沪</button>
</p>
<p style="color:#24bafc;margin-top: 6px">协助报备</p>
</div>
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
......
src/pages/report/reportDetail/reportDetail.scss
View file @ e8f4e54d
page-reportDetail { page-reportDetail {
.searchToolBar{ .searchToolBar {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: left; justify-content: left;
box-sizing: border-box; box-sizing: border-box;
} }
.activity-title{ .activity-title {
background-color: #f5f5f5; background-color: #f5f5f5;
font-size: 12px; font-size: 12px;
color: #b2b2b2; color: #b2b2b2;
padding-left: 10px; padding-left: 10px;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
} }
.content-box{ .content-box {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #cccccc;
} }
.content-box-item{ .content-box-item {
width: 105px; width: 105px;
height: 45px; padding: 12px;
margin: 8px 7px; margin: 8px 7px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-sizing: border-box; box-sizing: border-box;
font-size: 14px; font-size: 14px;
border-radius: 2px; border-radius: 2px;
color: white; color: white;
border: 1px solid #34b4fc;
} }
.content-box-item.bgc-34b4fc .item-title,
.item-count{ .content-box-item.bgc-34b4fc .item-count{
font-weight: bold; color: white;
} }
.i1{ .item-title{
background-color: #70c1df; color: #34b4fc;
} }
.item-count{
.i2{ color: #999999;
background-color: #64d262; }
} .i1 {
background-color: #70c1df;
.i3{ }
background-color: #ef8355;
} .i2 {
background-color: #64d262;
.btn{ }
float: right;
background-color: white; .i3 {
border: 1px solid #90da91; background-color: #ef8355;
color: #90da91; }
margin: 0 0;
font-size: 6px; .btn {
} background-color: white;
border: 1px solid #90da91;
.color1{ color: #90da91;
border-color: #93cfe5; margin: 0 0;
color: #93cfe5; font-size: 6px;
} }
.color2{ .color1 {
border-color: #90db90; border-color: #93cfe5;
color: #90db90; color: #93cfe5;
} border-radius: 3px;
}
.color3{
border-color: #f3a778; .color2 {
color: #f3a778; border-color: #90db90;
} color: #90db90;
border-radius: 3px;
.group{ }
display: flex;
flex-direction: row; .color3 {
align-items: center; border-color: #f3a778;
justify-content: space-between; color: #f3a778;
box-sizing: border-box; border-radius: 3px;
} }
.inner-group{ .group {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: left; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
} }
.person-photo{ .inner-group {
width: 48px; display: flex;
height: 48px; flex-direction: row;
margin-right: 10px; align-items: center;
} justify-content: left;
box-sizing: border-box;
.item-box{ }
display: inline-block;
} .person-photo {
width: 48px;
.person-name{ height: 48px;
font-size: 18px; margin-right: 10px;
color: black; }
} .item-box {
display: inline-block;
.person-sex-male{ }
font-size: 14px;
color: #6bc7fd; .person-name {
font-weight: bolder; font-size: 18px;
margin-left: 5px; color: black;
}
}
.person-sex-female{
font-size: 14px; .person-sex-male {
color: #f0a7ea; font-size: 14px;
font-weight: bolder; color: #6bc7fd;
margin-left: 5px; font-weight: bolder;
} margin-left: 5px;
}
.person-batch{
font-size: 14px; .person-sex-female {
color: #666666; font-size: 14px;
} color: #f0a7ea;
font-weight: bolder;
.back-btn{ margin-left: 5px;
width: 30px; }
height: 30px;
} .person-batch {
font-size: 14px;
color: #666666;
}
.back-btn {
width: 30px;
height: 30px;
}
.bgc-34b4fc{
background-color: #34b4fc;
}
} }
src/pages/report/reportTrack/reportTrack.html
View file @ e8f4e54d
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<button class="participation">人员参与情况</button> <span class="color-24bafc">人员参与情况 ></span>
</div> </div>
</div> </div>
</div> </div>
......
src/pages/report/reportTrack/reportTrack.scss
View file @ e8f4e54d
...@@ -14,19 +14,27 @@ page-ReportTrack { ...@@ -14,19 +14,27 @@ page-ReportTrack {
justify-content: left; justify-content: left;
box-sizing: border-box; box-sizing: border-box;
} }
.list-ios .item-block .item-inner{
border-bottom: none;
}
.item-ios{
margin-bottom:10px;
}
.item-header{ .item-header{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
font-size: 2rem;
padding: 10px 0;
border-bottom: 1px solid #ddd;
} }
.item-content{ .item-content{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: flex-end; align-items: flex-start;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -42,11 +50,16 @@ page-ReportTrack { ...@@ -42,11 +50,16 @@ page-ReportTrack {
} }
.left{ .left{
color: #cccccc; color: #333333;
font-size: 8px;
// height: 70px;
// display: inline-block;
margin-left: 25px; margin-left: 25px;
font-size: 1.5rem;
div{
margin: 5px 0;
}
}
.right{
margin: 5px 0;
font-size: 1.4rem;
} }
.data{ .data{
...@@ -61,7 +74,7 @@ page-ReportTrack { ...@@ -61,7 +74,7 @@ page-ReportTrack {
color: white color: white
} }
.color1{ .color1{
border-color: #f3d88a; border-color: #f3d88a;
color: #f3d88a; color: #f3d88a;
...@@ -91,6 +104,7 @@ page-ReportTrack { ...@@ -91,6 +104,7 @@ page-ReportTrack {
box-sizing: border-box; box-sizing: border-box;
} }
.back-btn{ .back-btn{
width: 30px; width: 30px;
height: 30px; height: 30px;
......
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