Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
ydLife
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sweet Zhang
ydLife
Commits
47c72de7
Commit
47c72de7
authored
Sep 16, 2020
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
战队业绩样式修改
parent
76400ed3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
162 additions
and
104 deletions
+162
-104
src/app/my/add-task/add-task.component.ts
+6
-6
src/app/my/my-center-home/my-center-home.component.ts
+1
-1
src/app/my/team-panel/team-panel.component.html
+37
-42
src/app/my/team-panel/team-panel.component.scss
+28
-16
src/app/my/team-sales-score/team-sales-score.component.html
+15
-11
src/app/my/team-sales-score/team-sales-score.component.scss
+65
-19
src/app/my/todo-list/todo-list.component.html
+1
-1
src/app/my/todo-list/todo-list.component.scss
+1
-0
src/app/my/todo-list/todo-list.component.ts
+8
-8
No files found.
src/app/my/add-task/add-task.component.ts
View file @
47c72de7
...
@@ -60,13 +60,13 @@ export class AddTaskComponent implements OnInit {
...
@@ -60,13 +60,13 @@ export class AddTaskComponent implements OnInit {
{
label
:
'17:30'
,
id
:
20
},
{
label
:
'17:30'
,
id
:
20
},
{
label
:
'18:00'
,
id
:
21
},
{
label
:
'18:00'
,
id
:
21
},
{
label
:
'18:30'
,
id
:
22
},
{
label
:
'18:30'
,
id
:
22
},
{
label
:
'1
8
:00'
,
id
:
23
},
{
label
:
'1
9
:00'
,
id
:
23
},
{
label
:
'19:30'
,
id
:
24
},
{
label
:
'19:30'
,
id
:
24
},
{
label
:
'
17:3
0'
,
id
:
25
},
{
label
:
'
20:0
0'
,
id
:
25
},
{
label
:
'
18:0
0'
,
id
:
26
},
{
label
:
'
20:3
0'
,
id
:
26
},
{
label
:
'
18:3
0'
,
id
:
27
},
{
label
:
'
21:0
0'
,
id
:
27
},
{
label
:
'
18:0
0'
,
id
:
28
},
{
label
:
'
21:3
0'
,
id
:
28
},
{
label
:
'
19:3
0'
,
id
:
29
},
{
label
:
'
22:0
0'
,
id
:
29
},
];
];
// console.log(this.router.getCurrentNavigation().extras.state)
// console.log(this.router.getCurrentNavigation().extras.state)
}
}
...
...
src/app/my/my-center-home/my-center-home.component.ts
View file @
47c72de7
...
@@ -335,7 +335,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
...
@@ -335,7 +335,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
//获取今日任务数量
//获取今日任务数量
queryScheduleTrackList
(){
queryScheduleTrackList
(){
this
.
myService
.
queryScheduleTrackList
({
practitionerId
:
this
.
lifeCustomerInfo
.
practitionerId
,
track
Dat
e
:
dayjs
().
format
(
'YYYY-MM-DD'
)}).
subscribe
((
res
)
=>
{
this
.
myService
.
queryScheduleTrackList
({
practitionerId
:
this
.
lifeCustomerInfo
.
practitionerId
,
track
Tim
e
:
dayjs
().
format
(
'YYYY-MM-DD'
)}).
subscribe
((
res
)
=>
{
if
(
res
[
'success'
]){
if
(
res
[
'success'
]){
this
.
taskLen
=
res
[
'data'
][
'dataList'
];
this
.
taskLen
=
res
[
'data'
][
'dataList'
];
}
else
{
}
else
{
...
...
src/app/my/team-panel/team-panel.component.html
View file @
47c72de7
<div
class=
"taem_panel_wrapper"
>
<div
class=
"taem_panel_wrapper"
>
<div
class=
"teamInfo"
>
<div
class=
"teamInfo"
>
<span
class=
"icon-tuandui iconfont"
<!-- <span class="icon-tuandui iconfont"
style=
"position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"
></span>
style="position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"></span> -->
<div
style=
"float: left;"
>
{{subordinateSystemName}}战队
</div>
<img
src=
"assets/images/cup_icon.png"
>
<div
style=
"float: left;letter-spacing: 5px;margin-left: 5%;"
>
{{subordinateSystemName.split('').join('/')}}/战/队
</div>
</div>
</div>
<div
class=
"taem_panel_item_wrapper"
>
<div
class=
"taem_panel_item_wrapper"
style=
"margin-top: -15px;"
>
<div
class=
"taem_panel_item_top"
>
<div
class=
"item_title"
>
战队业绩(¥)
</div>
<ul
class=
"tab"
>
<li
[
ngClass
]="{
selected:selectedRecruitingItem=
==1}"
(
click
)="
subordinateSystemMemberQuery
(
1
)"
>
本月
</li>
<li
[
ngClass
]="{
selected:selectedRecruitingItem=
==3}"
(
click
)="
subordinateSystemMemberQuery
(
3
)"
>
本季
</li>
<li
[
ngClass
]="{
selected:selectedRecruitingItem=
==2}"
(
click
)="
subordinateSystemMemberQuery
(
2
)"
>
本年
</li>
</ul>
</div>
<div
class=
"taem_panel_item_content"
>
<ul>
<li
class=
"big"
style=
"width: 30%;"
>
{{statisticInfo?.fyp | number: "1.0-2"}}
</li>
<li
class=
"big"
style=
"width: 30%;"
>
{{statisticInfo?.fyc | number: "1.0-2"}}
</li>
<li
class=
"big"
style=
"width: 15%;"
>
{{statisticInfo?.count | number}}
</li>
<li
class=
"big"
style=
"width: 15%;"
>
{{statisticInfo?.completionRate + '%'}}
</li>
</ul>
<ul>
<li
style=
"width: 30%;"
>
首年保费
</li>
<li
style=
"width: 30%;"
>
首年佣金
</li>
<li
style=
"width: 15%;"
>
件数
</li>
<li
style=
"width: 15%;"
>
达成率
</li>
</ul>
</div>
<div
class=
"next"
>
<span
class=
"iconfont icon-ar-r"
routerLink=
"/teamRank"
></span>
</div>
</div>
<div
class=
"taem_panel_item_wrapper"
>
<div
class=
"taem_panel_item_top"
>
<div
class=
"taem_panel_item_top"
>
<div
class=
"item_title"
>
<div
class=
"item_title"
>
战队销售活动量
<div>
战队PEP活动量
</div>
<span
class=
"iconfont icon-ar-r"
routerLink=
"teamSalesScore"
></span>
</div>
</div>
</div>
</div>
<div
class=
"taem_panel_item_content"
>
<div
class=
"taem_panel_item_content"
>
...
@@ -53,12 +26,10 @@
...
@@ -53,12 +26,10 @@
<li>
本周新增商机
</li>
<li>
本周新增商机
</li>
</ul>
</ul>
</div>
</div>
<div
class=
"next"
>
<span
class=
"iconfont icon-ar-r"
routerLink=
"teamSalesScore"
></span>
</div>
</div>
</div>
<div
class=
"taem_panel_item_wrapper"
>
<
!-- <
div class="taem_panel_item_wrapper">
<div class="taem_panel_item_top">
<div class="taem_panel_item_top">
<div class="item_title">
<div class="item_title">
我的增员活动量
我的增员活动量
...
@@ -81,7 +52,34 @@
...
@@ -81,7 +52,34 @@
<div class="next">
<div class="next">
<span class="iconfont icon-ar-r" routerLink="/recruiting"></span>
<span class="iconfont icon-ar-r" routerLink="/recruiting"></span>
</div>
</div>
</div> -->
<div
class=
"taem_panel_item_wrapper"
>
<div
class=
"taem_panel_item_top"
>
<div
class=
"item_title"
>
战队业绩(¥)
</div>
<ul
class=
"tab"
>
<li
[
ngClass
]="{
selected:selectedRecruitingItem=
==1}"
(
click
)="
subordinateSystemMemberQuery
(
1
)"
>
本月
</li>
<li
[
ngClass
]="{
selected:selectedRecruitingItem=
==3}"
(
click
)="
subordinateSystemMemberQuery
(
3
)"
>
本季
</li>
<li
[
ngClass
]="{
selected:selectedRecruitingItem=
==2}"
(
click
)="
subordinateSystemMemberQuery
(
2
)"
>
本年
</li>
</ul>
<span
class=
"iconfont icon-ar-r"
routerLink=
"/teamRank"
></span>
</div>
<div
class=
"taem_panel_item_content"
>
<ul>
<li
class=
"big"
style=
"width: 30%;"
>
{{statisticInfo?.fyp | number: "1.0-2"}}
</li>
<li
class=
"big"
style=
"width: 30%;"
>
{{statisticInfo?.fyc | number: "1.0-2"}}
</li>
<li
class=
"big"
style=
"width: 15%;"
>
{{statisticInfo?.count | number}}
</li>
<li
class=
"big"
style=
"width: 15%;"
>
{{statisticInfo?.completionRate + '%'}}
</li>
</ul>
<ul>
<li
style=
"width: 30%;"
>
首年保费
</li>
<li
style=
"width: 30%;"
>
首年佣金
</li>
<li
style=
"width: 15%;"
>
件数
</li>
<li
style=
"width: 15%;"
>
达成率
</li>
</ul>
</div>
</div>
</div>
<div
class=
"taem_panel_item_wrapper"
>
<div
class=
"taem_panel_item_wrapper"
>
<div
class=
"taem_panel_item_top"
>
<div
class=
"taem_panel_item_top"
>
<div
class=
"item_title"
>
<div
class=
"item_title"
>
...
@@ -92,6 +90,7 @@
...
@@ -92,6 +90,7 @@
<li
[
ngClass
]="{
selected:selectedSalseItem=
=='quarter'}"
(
click
)="
selectSales
('
quarter
')"
>
本季
</li>
<li
[
ngClass
]="{
selected:selectedSalseItem=
=='quarter'}"
(
click
)="
selectSales
('
quarter
')"
>
本季
</li>
<li
[
ngClass
]="{
selected:selectedSalseItem=
=='year'}"
(
click
)="
selectSales
('
year
')"
>
本年
</li>
<li
[
ngClass
]="{
selected:selectedSalseItem=
=='year'}"
(
click
)="
selectSales
('
year
')"
>
本年
</li>
</ul>
</ul>
<span
class=
"iconfont icon-ar-r"
routerLink=
"forecast"
></span>
</div>
</div>
<div
class=
"taem_panel_item_content forecast"
>
<div
class=
"taem_panel_item_content forecast"
>
<ul>
<ul>
...
@@ -107,8 +106,5 @@
...
@@ -107,8 +106,5 @@
<li>
{{selectedSalseItemName}}完成率
</li>
<li>
{{selectedSalseItemName}}完成率
</li>
</ul>
</ul>
</div>
</div>
<div
class=
"next"
>
<span
class=
"iconfont icon-ar-r"
routerLink=
"forecast"
></span>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/app/my/team-panel/team-panel.component.scss
View file @
47c72de7
.taem_panel_wrapper
{
.taem_panel_wrapper
{
padding
:
5px
8px
;
padding
:
5px
8px
;
background
:
#eff0f1
;
background
:
url('../../../assets/images/team_bg.png')
no-repeat
;
// background: #0664a4
;
background-size
:
100%
;
height
:
auto
;
height
:
auto
;
min-height
:
100%
;
ul
li
,
ol
li
{
ul
li
,
ol
li
{
list-style
:
none
;
list-style
:
none
;
}
}
.teamInfo
{
.teamInfo
{
font-size
:
2
4
px
;
font-size
:
2
6
px
;
position
:
relative
;
position
:
relative
;
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
padding
:
15px
0
10px
0
;
text-align
:
center
;
text-align
:
center
;
overflow
:
hidden
;
overflow
:
hidden
;
border-radius
:
6px
;
border-radius
:
6px
;
color
:
#ff002a
;
color
:
#fff
;
width
:
100%
;
height
:
130px
;
img
{
width
:
12%
;
margin-left
:
-8%
;
}
}
}
.taem_panel_item_wrapper
{
.taem_panel_item_wrapper
{
margin
:
1
0
px
0
;
margin
:
1
5
px
0
;
background
:
#fff
;
background
:
#fff
;
box-shadow
:
0
0px
2
.5px
#eceaea
;
box-shadow
:
0
0px
2
.5px
#eceaea
;
border-radius
:
6px
;
border-radius
:
6px
;
...
@@ -28,18 +34,28 @@
...
@@ -28,18 +34,28 @@
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
height
:
38
px
;
height
:
45
px
;
.item_title
{
.item_title
{
font-weight
:
bold
;
font-weight
:
bold
;
font-size
:
16px
;
font-size
:
18px
;
display
:
flex
;
justify-content
:
space-between
;
width
:
100%
;
align-items
:
baseline
;
}
span
{
font-size
:
14px
;
font-weight
:
bold
;
}
}
.tab
{
.tab
{
display
:
flex
;
display
:
flex
;
width
:
35
%
;
width
:
60
%
;
justify-content
:
space-around
;
justify-content
:
space-around
;
li
.selected
{
li
.selected
{
font-weight
:
bold
;
font-weight
:
bold
;
border-bottom
:
3px
red
solid
;
border-bottom
:
3px
#F8001B
FF
solid
;
color
:
#F8001B
FF
;
}
}
}
}
}
}
...
@@ -50,8 +66,8 @@
...
@@ -50,8 +66,8 @@
li
{
li
{
width
:
20%
;
width
:
20%
;
text-align
:
center
;
text-align
:
center
;
height
:
3
0
px
;
height
:
3
5
px
;
line-height
:
3
0
px
;
line-height
:
3
5
px
;
overflow
:
hidden
;
overflow
:
hidden
;
}
}
li
.big
{
li
.big
{
...
@@ -73,8 +89,5 @@
...
@@ -73,8 +89,5 @@
width
:
40%
;
width
:
40%
;
}
}
}
}
.next
{
text-align
:
right
;
}
}
}
}
}
\ No newline at end of file
src/app/my/team-sales-score/team-sales-score.component.html
View file @
47c72de7
<div
class=
"team_sales_detail_wrapper"
>
<div
class=
"team_sales_detail_wrapper"
>
<div
class=
"teamHeader"
>
<div
class=
"teamHeader"
>
<div
class=
"teamItem teamInfo"
>
<div
class=
"teamItem teamInfo"
>
<span
class=
"icon-tuandui iconfont"
<!-- <span class="icon-tuandui iconfont"
style=
"position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"
></span>
style="position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"></span> -->
<div
style=
"float: left;"
>
{{subordinateSystemName}}战队
</div>
<img
src=
"assets/images/cup_icon.png"
>
<div
style=
"float: left;letter-spacing: 5px;margin-left: 5%;"
>
{{subordinateSystemName.split('').join('/')}}/战/队
</div>
</div>
</div>
</div>
</div>
<div
*
ngIf=
"this.showType==='teamSalesScore'"
>
<div
*
ngIf=
"this.showType==='teamSalesScore'"
>
<div
class=
"rankInfoWrapper"
>
<div
class=
"rankInfoWrapper"
>
<div
class=
"rankContent"
>
<div
class=
"rankContent"
>
<div
style=
"font-size: 18px;margin
-bottom: 10px;"
>
战队成员销售
活动量得分
</div>
<div
style=
"font-size: 18px;margin
: 5px auto;text-align: center;"
>
战队成员
活动量得分
</div>
<div
class=
"content_wrapper"
>
<div
class=
"content_wrapper"
>
<ul>
<ul
style=
"border: none;"
>
<li>
姓名
</li>
<li>
姓名
</li>
<li>
今天得分
</li>
<li
class=
"day"
>
今天
</li>
<li>
本周得分
</li>
<li>
本周
</li>
<li>
本月得分
</li>
<li>
本月
</li>
<li>
本周新增商机
</li>
<li
style=
"line-height: 15px;"
>
月分效(FYC/分)
</li>
<li></li>
</ul>
</ul>
<div
style=
"width: 100%;text-align: center;float: left;height: 35px;"
<div
style=
"width: 100%;text-align: center;float: left;height: 35px;"
*
ngIf=
"playerSalesActivityInfo?.length <=0"
>
*
ngIf=
"playerSalesActivityInfo?.length <=0"
>
暂无战队成员,努力去增员吧
暂无战队成员,努力去增员吧
</div>
</div>
<ul
*
ngFor=
"let playerSalesActivityItem of playerSalesActivityInfo;index as i;"
>
<ul
*
ngFor=
"let playerSalesActivityItem of playerSalesActivityInfo;index as i;"
>
<li>
{{playerSalesActivityItem.name}}
</li>
<li><span>
{{i + 1}}
</span>
<li>
{{playerSalesActivityItem.scoreDay!=null?playerSalesActivityItem.scoreDay:'-'}}
</li>
{{playerSalesActivityItem.name}}
</li>
<li
class=
"day"
>
{{playerSalesActivityItem.scoreDay!=null?playerSalesActivityItem.scoreDay:'-'}}
</li>
<li>
{{playerSalesActivityItem.scoreWeek!=null?playerSalesActivityItem.scoreWeek:'-'}}
</li>
<li>
{{playerSalesActivityItem.scoreWeek!=null?playerSalesActivityItem.scoreWeek:'-'}}
</li>
<li>
{{playerSalesActivityItem.scoreMonth!=null?playerSalesActivityItem.scoreMonth:'-'}}
</li>
<li>
{{playerSalesActivityItem.scoreMonth!=null?playerSalesActivityItem.scoreMonth:'-'}}
</li>
<li>
{{playerSalesActivityItem.addOpportunityNum!=null?playerSalesActivityItem.addOpportunityNum:'-'}}
</li>
<li>
{{playerSalesActivityItem.addOpportunityNum!=null?playerSalesActivityItem.addOpportunityNum:'-'}}
</li>
<li><i
class=
"iconfont icon-ar-r"
style=
"color: #A4A4A4FF;font-size: 12px;"
[
routerLink
]="
playerSalesActivityItem
.
practitionerId
"
></i></li>
</ul>
</ul>
</div>
</div>
...
...
src/app/my/team-sales-score/team-sales-score.component.scss
View file @
47c72de7
.team_sales_detail_wrapper
{
.team_sales_detail_wrapper
{
padding
:
5px
8px
;
background
:
#fff
;
background
:
#eff0f1
;
overflow
:
auto
;
overflow
:
auto
;
height
:
100%
;
height
:
100%
;
ul
li
,
ol
li
{
ul
li
,
ol
li
{
list-style
:
none
;
list-style
:
none
;
}
}
.teamInfo
{
.teamHeader
{
font-size
:
24px
;
background
:url
(
'../../../assets/images/team_bg.png'
)
no-repeat
;
position
:
relative
;
background-size
:
100%
;
display
:
flex
;
.teamInfo
{
align-items
:
center
;
font-size
:
24px
;
justify-content
:
center
;
position
:
relative
;
padding
:
15px
0
10px
0
;
display
:
flex
;
text-align
:
center
;
align-items
:
center
;
overflow
:
hidden
;
justify-content
:
center
;
border-radius
:
6px
;
text-align
:
center
;
color
:
#ff002a
;
overflow
:
hidden
;
border-radius
:
6px
;
color
:
#fff
;
height
:
135px
;
img
{
width
:
12%
;
margin-left
:
-8%
;
}
}
}
}
.rankInfoWrapper
{
.rankInfoWrapper
{
overflow
:
auto
;
overflow
:
auto
;
width
:
100%
;
width
:
100%
;
...
@@ -27,8 +35,8 @@
...
@@ -27,8 +35,8 @@
width
:
100%
;
width
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
background
:
#fff
;
background
:
#fff
;
box-shadow
:
0
0px
2
.5px
#eceaea
;
//
box-shadow: 0 0px 2.5px #eceaea;
border-radius
:
6px
;
//
border-radius: 6px;
padding
:
5px
;
padding
:
5px
;
.tab
{
.tab
{
display
:
flex
;
display
:
flex
;
...
@@ -49,17 +57,25 @@
...
@@ -49,17 +57,25 @@
.content_wrapper
{
.content_wrapper
{
ul
{
ul
{
width
:
100%
;
width
:
100%
;
height
:
30px
;
height
:
38px
;
line-height
:
30px
;
margin
:
5px
0px
;
line-height
:
38px
;
border-bottom
:
1px
#ddd
solid
;
li
{
li
{
float
:
left
;
float
:
left
;
width
:
18%
;
width
:
18%
;
text-align
:
center
;
text-align
:
center
;
margin
:
0
1%
;
margin
:
0
1%
;
position
:
relative
;
position
:
relative
;
margin-bottom
:
5px
;
overflow
:
hidden
;
overflow
:
hidden
;
height
:
30px
;
height
:
38px
;
font-family
:
'微软雅黑'
;
span
{
position
:
absolute
;
left
:
-2px
;
width
:
15px
;
text-align
:
center
;
}
li
.icon
.iconfont
{
li
.icon
.iconfont
{
position
:
absolute
;
position
:
absolute
;
}
}
...
@@ -67,10 +83,40 @@
...
@@ -67,10 +83,40 @@
li
.name
{
li
.name
{
width
:
20%
;
width
:
20%
;
}
}
li
.day
{
width
:
12%
;
}
li
:last-child
{
li
:last-child
{
width
:
3%
;
margin-right
:
0
;
margin-right
:
0
;
}
}
}
}
ul
:nth-child
(
2
),
ul
:nth-child
(
3
),
ul
:nth-child
(
4
)
{
border-radius
:
5px
;
border
:
none
;
li
span
{
font-size
:
18px
;
font-weight
:
bold
;
}
}
ul
:nth-child
(
2
)
{
background
:
#feccd5
;
li
span
{
color
:
#F8002E
FF
;
}
}
ul
:nth-child
(
3
)
{
background
:
#d1deeb
;
li
span
{
color
:
#1B5B99
FF
;
}
}
ul
:nth-child
(
4
)
{
background
:
#fff4da
;
li
span
{
color
:
#FAB218
FF
;
}
}
}
}
.content_wrapper.forecast
{
.content_wrapper.forecast
{
ul
li
{
ul
li
{
...
...
src/app/my/todo-list/todo-list.component.html
View file @
47c72de7
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
</div>
</div>
</div>
</div>
<ul
class=
"week"
>
<ul
class=
"week"
>
<li
*
ngFor=
"let weekItem of weekArr;index as i;"
[
ngClass
]="{'
selected
'
:weekItem
.
date =
=
track
Dat
e
}"
(
click
)="
selectDay
(
weekItem
)"
>
<li
*
ngFor=
"let weekItem of weekArr;index as i;"
[
ngClass
]="{'
selected
'
:weekItem
.
date =
=
track
Tim
e
}"
(
click
)="
selectDay
(
weekItem
)"
>
<div>
{{weekItem.day}}
</div>
<div>
{{weekItem.day}}
</div>
<span>
{{lifeCommonService.getWeek(weekItem.week)}}
</span>
<span>
{{lifeCommonService.getWeek(weekItem.week)}}
</span>
</li>
</li>
...
...
src/app/my/todo-list/todo-list.component.scss
View file @
47c72de7
...
@@ -138,6 +138,7 @@ ul,ol{
...
@@ -138,6 +138,7 @@ ul,ol{
line-height
:
50px
;
line-height
:
50px
;
bottom
:
-15%
;
bottom
:
-15%
;
right
:
8%
;
right
:
8%
;
z-index
:
100
;
.iconfont
{
.iconfont
{
font-size
:
30px
;
font-size
:
30px
;
}
}
...
...
src/app/my/todo-list/todo-list.component.ts
View file @
47c72de7
...
@@ -12,7 +12,7 @@ export class TodoListComponent implements OnInit {
...
@@ -12,7 +12,7 @@ export class TodoListComponent implements OnInit {
weekArr
:
Array
<
any
>
;
weekArr
:
Array
<
any
>
;
taskList
:
Array
<
any
>
=
[];
taskList
:
Array
<
any
>
=
[];
taskTimeList
:
Array
<
any
>
=
[];
taskTimeList
:
Array
<
any
>
=
[];
track
Dat
e
:
string
;
track
Tim
e
:
string
;
state
:
any
=
{
state
:
any
=
{
en
:
false
,
en
:
false
,
date
:
null
,
date
:
null
,
...
@@ -49,11 +49,11 @@ export class TodoListComponent implements OnInit {
...
@@ -49,11 +49,11 @@ export class TodoListComponent implements OnInit {
ngOnInit
()
{
ngOnInit
()
{
//进页面清除上次缓存的时间
//进页面清除上次缓存的时间
sessionStorage
.
removeItem
(
"track
Dat
e"
);
sessionStorage
.
removeItem
(
"track
Tim
e"
);
this
.
practitionerId
=
JSON
.
parse
(
localStorage
.
getItem
(
'lifeCustomerInfo'
))[
'practitionerId'
];
this
.
practitionerId
=
JSON
.
parse
(
localStorage
.
getItem
(
'lifeCustomerInfo'
))[
'practitionerId'
];
this
.
weekArr
=
this
.
lifeCommonService
.
makeDate
();
this
.
weekArr
=
this
.
lifeCommonService
.
makeDate
();
//初始化追踪时间为今天
//初始化追踪时间为今天
this
.
track
Dat
e
=
dayjs
().
format
(
'YYYY-MM-DD'
);
this
.
track
Tim
e
=
dayjs
().
format
(
'YYYY-MM-DD'
);
this
.
queryScheduleTrackList
();
this
.
queryScheduleTrackList
();
}
}
...
@@ -62,9 +62,9 @@ export class TodoListComponent implements OnInit {
...
@@ -62,9 +62,9 @@ export class TodoListComponent implements OnInit {
}
}
selectDay
(
weekItem
){
selectDay
(
weekItem
){
this
.
track
Dat
e
=
weekItem
[
'date'
];
this
.
track
Tim
e
=
weekItem
[
'date'
];
//缓存任务时间
//缓存任务时间
sessionStorage
.
setItem
(
'track
Date'
,
this
.
trackDat
e
);
sessionStorage
.
setItem
(
'track
Time'
,
this
.
trackTim
e
);
this
.
queryScheduleTrackList
();
this
.
queryScheduleTrackList
();
}
}
...
@@ -106,15 +106,15 @@ export class TodoListComponent implements OnInit {
...
@@ -106,15 +106,15 @@ export class TodoListComponent implements OnInit {
endDate
endDate
};
};
this
.
triggerCancel
();
this
.
triggerCancel
();
this
.
track
Dat
e
=
dayjs
(
startDate
).
format
(
'YYYY-MM-DD'
);
this
.
track
Tim
e
=
dayjs
(
startDate
).
format
(
'YYYY-MM-DD'
);
//缓存任务时间
//缓存任务时间
sessionStorage
.
setItem
(
'track
Date'
,
this
.
trackDat
e
);
sessionStorage
.
setItem
(
'track
Time'
,
this
.
trackTim
e
);
this
.
queryScheduleTrackList
();
this
.
queryScheduleTrackList
();
this
.
weekArr
=
this
.
lifeCommonService
.
makeDate
(
startDate
);
this
.
weekArr
=
this
.
lifeCommonService
.
makeDate
(
startDate
);
}
}
queryScheduleTrackList
(){
queryScheduleTrackList
(){
this
.
myService
.
queryScheduleTrackList
({
practitionerId
:
this
.
practitionerId
,
track
Date
:
this
.
trackDat
e
}).
subscribe
((
res
)
=>
{
this
.
myService
.
queryScheduleTrackList
({
practitionerId
:
this
.
practitionerId
,
track
Time
:
this
.
trackTim
e
}).
subscribe
((
res
)
=>
{
if
(
res
[
'success'
]){
if
(
res
[
'success'
]){
this
.
taskList
=
res
[
'data'
][
'dataList'
];
this
.
taskList
=
res
[
'data'
][
'dataList'
];
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment