[合并]合并代码

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
     }

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{

src/app/ui/all-file/all-file.component.html

@@ -25,7 +25,7 @@
             <mat-icon>save_alt</mat-icon> <span>下载</span>
         </div>
 
-        <div class="newFile" style="width: 88px;" *ngIf="isDelete && isAdmin" (click)="deleteFiles()" > 
+        <div class="newFile delete" style="width: 88px;" *ngIf="isAdmin" (click)="deleteFiles()" > 
             <mat-icon>delete</mat-icon> <span>删除</span>
         </div>
 
@@ -100,16 +100,13 @@
               <img *ngIf="element.type == 'doc' || element.type == 'docx'" src="../../../assets/images/word.png" alt=""> 
               <img *ngIf="element.type == 'xlsx'" src="../../../assets/images/excel.png" alt=""> 
               <img *ngIf="element.type == 'zip'" src="../../../assets/images/zip.png" alt=""> 
-              <img *ngIf="element.type == 'MP4' || element.type == 'mp4'" src="../../../assets/images/MP4.png" alt="">
-              <!-- <img *ngIf="element.type == 'bmp'" src="../../../assets/images/bmp.png" alt=""> -->
-              <img *ngIf="element.type == 'txt'" src="../../../assets/images/txt.png" alt="">
+              <img *ngIf="element.type == 'MP4' || element.type == 'mp4'" src="../../../assets/images/video.png" alt="">
+              <img *ngIf="element.type == 'txt'" src="../../../assets/images/text.png" alt="">
               <img *ngIf="element.type == 'pptx'" src="../../../assets/images/ppt.png" alt="">
               <img *ngIf="element.type == 'cad' || element.type == 'CAD'" src="../../../assets/images/cad.png" alt="">
-              <img *ngIf="element.type == 'avi' || element.type == 'swf'|| element.type == 'mov'" src="../../../assets/images/shipinlogo.gif" alt="">
-              <img *ngIf="element.type == 'mp3' || element.type == 'aif' || element.type == 'wav' || element.type == 'flac'" src="../../../assets/images/music.gif" alt="">
-              <img *ngIf="element.isDir" src="../../../assets/images/file.gif" alt="">
-
-
+              <img *ngIf="element.type == 'avi' || element.type == 'swf'|| element.type == 'mov'" src="../../../assets/images/video.png" alt="">
+              <img *ngIf="element.type == 'mp3' || element.type == 'aif' || element.type == 'wav' || element.type == 'flac'" src="../../../assets/images/music.png" alt="">
+              <img *ngIf="element.isDir" src="../../../assets/images/file.png" alt="">
               <img *ngIf="element.type == 'gaopenche' || element.type == 'denggao'" src="../../../assets/images/gaopenche.gif" alt="">
               <img *ngIf="element.type == 'jiqiren' || element.type == 'konghuqi'" src="../../../assets/images/shebei.jpg" alt="">
               <img *ngIf="element.type == 'waifu' || element.type == 'neifu' || element.type == 'gong' || element.type == 'qiu'" src="../../../assets/images/sheshi.jpg" alt="">
@@ -141,8 +138,8 @@
             (click)="clickCheckBoxLi($event,row)">
         </tr>
     </table>
-    <div *ngIf="isNoFileTitle" style="width: 100%;text-align: center;margin-top: 10px;">
-        <span style="font-size: 14px;">暂无文件，请先上传!</span>
+    <div class="nofiles" *ngIf="isNoFileTitle">
+        <span style="font-size: 14px;cursor: default;">您还没上传过文件哦～</span>
     </div>
 </div>
 

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;
@@ -219,3 +224,13 @@
   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;
+}

src/app/ui/eharts-statistics/eharts-statistics.component.html

@@ -33,6 +33,7 @@
   </div>
 
   <div class="center" id="center"></div>
-  <div style="position: fixed; top: 30%; left: 50%;" *ngIf="!echartsData.length">暂无学习记录</div>
-
+  <div class="nofiles" *ngIf="!echartsData.length">
+    <span style="font-size: 14px;cursor: default;">暂无学习记录～</span>
+  </div>
 </div>

src/app/ui/eharts-statistics/eharts-statistics.component.scss

@@ -38,3 +38,13 @@
   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;
+}

src/app/ui/learning-record-details/learning-record-details.component.html

@@ -41,6 +41,8 @@
             [pageSize]="pageSize"
             (page)="chagePage($event)">
         </mat-paginator>
-
+    </div>
+    <div class="nofiles" *ngIf="noRecord">
+        <span style="font-size: 14px;cursor: default;">该时间段未查询到学习记录～</span>
     </div>
 </div>

src/app/ui/learning-record-details/learning-record-details.component.scss

@@ -45,3 +45,13 @@
     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;
+}

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)