diff --git a/proxy.config.json b/proxy.config.json
index 4498db3..fc28c34 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://121.37.20.190:8100",
+ "target": "http://121.37.20.190:8100/",
"secure": false,
"changeOrigin": true
}
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss
index 5cb721d..af14ecb 100644
--- a/src/app/navigation/navigation.component.scss
+++ b/src/app/navigation/navigation.component.scss
@@ -178,9 +178,9 @@ mat-sidenav{
color: #FFF;
margin: 0 auto;
img{
-
- width: 149px;
- height: 149px;
+ width: 138px;
+ height: 138px;
+ margin-top: 6px;
}
}
mat-panel-title mat-icon{
diff --git a/src/app/ui/all-file/all-file.component.html b/src/app/ui/all-file/all-file.component.html
index c5936ae..4fe4929 100644
--- a/src/app/ui/all-file/all-file.component.html
+++ b/src/app/ui/all-file/all-file.component.html
@@ -25,7 +25,7 @@
save_alt 下载
-
+
delete 删除
@@ -100,16 +100,13 @@
-
-
-
+
+
-
-
-
-
-
+
+
+
@@ -141,8 +138,8 @@
(click)="clickCheckBoxLi($event,row)">
-
-
暂无文件,请先上传!
+
+ 您还没上传过文件哦~
diff --git a/src/app/ui/all-file/all-file.component.scss b/src/app/ui/all-file/all-file.component.scss
index 876806e..b02e205 100644
--- a/src/app/ui/all-file/all-file.component.scss
+++ b/src/app/ui/all-file/all-file.component.scss
@@ -81,7 +81,12 @@
left: 41px;
}
}
-
+ .delete{
+ color: rgba(245, 59, 59);
+ border: 0.5px solid rgba(245, 59, 59);
+ // background-color: red;
+ // color: white;
+ }
}
.rightbox{
float: right;
@@ -218,4 +223,14 @@
bottom: 3%;
right: 3%;
width: 500px;
+}
+.nofiles{
+ background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent;
+ padding-top: 150px;
+ width: 488px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ text-align: center;
+ margin: -78px 0 0 -244px;
}
\ No newline at end of file
diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.html b/src/app/ui/eharts-statistics/eharts-statistics.component.html
index 375550c..a8f0263 100644
--- a/src/app/ui/eharts-statistics/eharts-statistics.component.html
+++ b/src/app/ui/eharts-statistics/eharts-statistics.component.html
@@ -33,6 +33,7 @@
- 暂无学习记录
-
+
+ 暂无学习记录~
+
diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.scss b/src/app/ui/eharts-statistics/eharts-statistics.component.scss
index 4f208e6..b87f2e0 100644
--- a/src/app/ui/eharts-statistics/eharts-statistics.component.scss
+++ b/src/app/ui/eharts-statistics/eharts-statistics.component.scss
@@ -37,4 +37,14 @@
flex: 1;
box-sizing: border-box;
padding: 10px;
+}
+.nofiles{
+ background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent;
+ padding-top: 150px;
+ width: 488px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ text-align: center;
+ margin: -96px 0 0 -244px;
}
\ No newline at end of file
diff --git a/src/app/ui/learning-record-details/learning-record-details.component.html b/src/app/ui/learning-record-details/learning-record-details.component.html
index c58b5c2..59eb70d 100644
--- a/src/app/ui/learning-record-details/learning-record-details.component.html
+++ b/src/app/ui/learning-record-details/learning-record-details.component.html
@@ -41,6 +41,8 @@
[pageSize]="pageSize"
(page)="chagePage($event)">
-
+
+
+ 该时间段未查询到学习记录~
diff --git a/src/app/ui/learning-record-details/learning-record-details.component.scss b/src/app/ui/learning-record-details/learning-record-details.component.scss
index 6bf57f4..e2cb681 100644
--- a/src/app/ui/learning-record-details/learning-record-details.component.scss
+++ b/src/app/ui/learning-record-details/learning-record-details.component.scss
@@ -44,4 +44,14 @@
.mat-paginator {
background-color: hsla(0,0%,100%,0);
padding-right: 10%;
+}
+.nofiles{
+ background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent;
+ padding-top: 150px;
+ width: 488px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ text-align: center;
+ margin: -88px 0 0 -244px;
}
\ No newline at end of file
diff --git a/src/app/ui/learning-record-details/learning-record-details.component.ts b/src/app/ui/learning-record-details/learning-record-details.component.ts
index 539b457..f7673c6 100644
--- a/src/app/ui/learning-record-details/learning-record-details.component.ts
+++ b/src/app/ui/learning-record-details/learning-record-details.component.ts
@@ -28,10 +28,11 @@ export class LearningRecordDetailsComponent implements OnInit {
id:any = this.route.snapshot.queryParams.id//身份证
PostName:any = this.route.snapshot.queryParams.PostName || "" //传过来的职务名称
- recordList:any//渲染的100条列表
+ recordList:any = false//渲染的100条列表
oneMonthDate:number = 30*24*60*60*1000; //一个月的时间戳
+ noRecord:boolean
//分页
@ViewChild(MatPaginator, {static: true})
pageEvent: PageEvent;
@@ -72,6 +73,11 @@ export class LearningRecordDetailsComponent implements OnInit {
}
this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => {
this.recordList = data.items
+ if(data.items.length == 0){
+ this.noRecord = true
+ }else{
+ this.noRecord = false
+ }
this.recordList.forEach((item) => {
item.time = item.creationTime.substring(0,10)
item.time2 = item.creationTime.substring(11,16)
@@ -104,6 +110,11 @@ export class LearningRecordDetailsComponent implements OnInit {
}
this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => {
this.recordList = data.items
+ if(data.items.length == 0){
+ this.noRecord = true
+ }else{
+ this.noRecord = false
+ }
this.recordList.forEach((item) => {
item.time = item.creationTime.substring(0,10)
item.time2 = item.creationTime.substring(11,16)
@@ -132,6 +143,11 @@ export class LearningRecordDetailsComponent implements OnInit {
}
this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => {
this.recordList = data.items
+ if(data.items.length == 0){
+ this.noRecord = true
+ }else{
+ this.noRecord = false
+ }
this.recordList.forEach((item) => {
item.time = item.creationTime.substring(0,10)
item.time2 = item.creationTime.substring(11,16)
diff --git a/src/assets/images/MP4.png b/src/assets/images/MP4.png
deleted file mode 100644
index 383df41..0000000
Binary files a/src/assets/images/MP4.png and /dev/null differ
diff --git a/src/assets/images/bmp.png b/src/assets/images/bmp.png
deleted file mode 100644
index f9ee5e6..0000000
Binary files a/src/assets/images/bmp.png and /dev/null differ
diff --git a/src/assets/images/excel.png b/src/assets/images/excel.png
index d795bf5..d40d805 100644
Binary files a/src/assets/images/excel.png and b/src/assets/images/excel.png differ
diff --git a/src/assets/images/file.gif b/src/assets/images/file.gif
deleted file mode 100644
index 63a8256..0000000
Binary files a/src/assets/images/file.gif and /dev/null differ
diff --git a/src/assets/images/file.png b/src/assets/images/file.png
new file mode 100644
index 0000000..32648b0
Binary files /dev/null and b/src/assets/images/file.png differ
diff --git a/src/assets/images/img.png b/src/assets/images/img.png
index c18de0d..42dd42b 100644
Binary files a/src/assets/images/img.png and b/src/assets/images/img.png differ
diff --git a/src/assets/images/jpg.png b/src/assets/images/jpg.png
deleted file mode 100644
index f31ba88..0000000
Binary files a/src/assets/images/jpg.png and /dev/null differ
diff --git a/src/assets/images/music.gif b/src/assets/images/music.gif
deleted file mode 100644
index 3c804ea..0000000
Binary files a/src/assets/images/music.gif and /dev/null differ
diff --git a/src/assets/images/music.png b/src/assets/images/music.png
new file mode 100644
index 0000000..b874ac4
Binary files /dev/null and b/src/assets/images/music.png differ
diff --git a/src/assets/images/nofiles.png b/src/assets/images/nofiles.png
new file mode 100644
index 0000000..ac17b9c
Binary files /dev/null and b/src/assets/images/nofiles.png differ
diff --git a/src/assets/images/pdf.png b/src/assets/images/pdf.png
index 31971f9..9cb40f5 100644
Binary files a/src/assets/images/pdf.png and b/src/assets/images/pdf.png differ
diff --git a/src/assets/images/ppt.png b/src/assets/images/ppt.png
index e5db8d5..3f5829d 100644
Binary files a/src/assets/images/ppt.png and b/src/assets/images/ppt.png differ
diff --git a/src/assets/images/shipinlogo.gif b/src/assets/images/shipinlogo.gif
deleted file mode 100644
index d1bf3e6..0000000
Binary files a/src/assets/images/shipinlogo.gif and /dev/null differ
diff --git a/src/assets/images/text.png b/src/assets/images/text.png
new file mode 100644
index 0000000..d826cd5
Binary files /dev/null and b/src/assets/images/text.png differ
diff --git a/src/assets/images/txt.png b/src/assets/images/txt.png
deleted file mode 100644
index 0e698cc..0000000
Binary files a/src/assets/images/txt.png and /dev/null differ
diff --git a/src/assets/images/video.png b/src/assets/images/video.png
new file mode 100644
index 0000000..987bf84
Binary files /dev/null and b/src/assets/images/video.png differ
diff --git a/src/assets/images/word.png b/src/assets/images/word.png
index 681903c..ff00849 100644
Binary files a/src/assets/images/word.png and b/src/assets/images/word.png differ
diff --git a/src/assets/images/zip.png b/src/assets/images/zip.png
index 7fc00ef..86c3ded 100644
Binary files a/src/assets/images/zip.png and b/src/assets/images/zip.png differ