From 3157782e25f37f27042e26bb307d6f455ba70bed Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 15 Jul 2020 14:14:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/ui/eharts-statistics/eharts-statistics.component.ts | 6 +++++-
 .../learning-record-details.component.html                  | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.ts b/src/app/ui/eharts-statistics/eharts-statistics.component.ts
index f189e82..4493ff2 100644
--- a/src/app/ui/eharts-statistics/eharts-statistics.component.ts
+++ b/src/app/ui/eharts-statistics/eharts-statistics.component.ts
@@ -150,7 +150,11 @@ export class EhartsStatisticsComponent implements OnInit {
     let that = this
     let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp');
     let option = {
-      title: { text: that.idName },
+      title: { 
+        text: that.idName,
+        left:45,
+        top:20
+       },
       tooltip: {
         trigger: 'axis',
         axisPointer: {type: 'shadow'}
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 59eb70d..460a05e 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
@@ -25,7 +25,7 @@
         </div>
     </div>
     <mat-divider></mat-divider>
-    <div class="listbox">
+    <div class="listbox" [hidden]="noRecord">
         <ul>
             <li *ngFor="let item of recordList;let key = index">
                 <p class="timeTitle" *ngIf="key ==0 || item.time != recordList[key - 1].time">{{item.time}}</p>
@@ -37,6 +37,7 @@
             </li>
         </ul>
         <mat-paginator 
+            
             [length]="length"
             [pageSize]="pageSize"
             (page)="chagePage($event)">

From 47b352703cd3ff27bd3dd0eaf0f8be8dbbad393f Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 16 Jul 2020 09:17:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=B0=86=E6=88=98?=
 =?UTF-8?q?=E6=9C=AF=E5=AD=A6=E4=B9=A0=E5=92=8C=E6=8E=88=E8=AF=BE=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/navigation/navigation.component.html |  4 +--
 src/app/navigation/navigation.component.scss |  3 +-
 src/app/ui/all-file/all-file.component.html  | 11 +++++++-
 src/app/ui/all-file/all-file.component.scss  | 29 ++++++++++++++++++++
 src/app/ui/all-file/all-file.component.ts    |  1 -
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html
index 1cc8b01..8802dfe 100644
--- a/src/app/navigation/navigation.component.html
+++ b/src/app/navigation/navigation.component.html
@@ -5,12 +5,12 @@
             <img src="../../assets/images/logo.png" alt="logo">
         </div>
         <div class="navbox">
-            <div class="openSystem" style="border-bottom: 1px solid gray;">
+            <!-- <div class="openSystem" style="border-bottom: 1px solid gray;">
                 <a href="ax://startup?" style="color: white">战术授课</a>
             </div>
             <div class="openSystem">
                 <a href="ax2://startup?" style="color: white">战术学习</a>
-            </div>
+            </div> -->
             <!-- <div class="addBankBtn" (click)="addDataBank()" *ngIf="islogin.isLogin">
                 <mat-icon>note_add</mat-icon> <span>新增资料库</span>
             </div>
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss
index af14ecb..122765b 100644
--- a/src/app/navigation/navigation.component.scss
+++ b/src/app/navigation/navigation.component.scss
@@ -168,7 +168,7 @@ mat-sidenav{
    }
    .biglogobox{
        width: 194px;
-       height: 149px;
+       height: 148px;
        background-color: #4699f6;
        display: block;
        text-align: center;
@@ -177,6 +177,7 @@ mat-sidenav{
        margin-bottom: 20px;
        color: #FFF;
        margin: 0 auto;
+       border-bottom: 1px solid rgba(0, 0, 0, 0.12);
        img{
             width: 138px;
             height: 138px;
diff --git a/src/app/ui/all-file/all-file.component.html b/src/app/ui/all-file/all-file.component.html
index 4fe4929..49d9f6f 100644
--- a/src/app/ui/all-file/all-file.component.html
+++ b/src/app/ui/all-file/all-file.component.html
@@ -138,10 +138,19 @@
             (click)="clickCheckBoxLi($event,row)">
         </tr>
     </table>
-    <div class="nofiles" *ngIf="isNoFileTitle">
+    
+    <div class="nofiles" *ngIf="isNoFileTitle && selectedDataBank.includes('/')">
         <span style="font-size: 14px;cursor: default;">您还没上传过文件哦～</span>
     </div>
 </div>
+<div class="openSystem" *ngIf="!selectedDataBank.includes('/')">
+    <a href="ax://startup?"><img src="../../../assets/images/pdf.png" alt="">战术授课<span>进入</span></a>
+</div>
+<div class="openSystem" *ngIf="!selectedDataBank.includes('/')">
+    <a href="ax2://startup?"><img src="../../../assets/images/pdf.png" alt="">战术学习<span>进入</span></a>
+    
+</div>
+
 
 <div class="fixedBox" [hidden]="!uploadisLoading2">
   <app-upload-files [thatFile]='this' #child></app-upload-files>
diff --git a/src/app/ui/all-file/all-file.component.scss b/src/app/ui/all-file/all-file.component.scss
index b02e205..04d8486 100644
--- a/src/app/ui/all-file/all-file.component.scss
+++ b/src/app/ui/all-file/all-file.component.scss
@@ -233,4 +233,33 @@
     top: 50%;
     text-align: center;
     margin: -78px 0 0 -244px;
+}
+.openSystem{
+    position: relative;
+    a{
+        color: rgba(0, 0, 0, 0.87);
+        font-size: 14px;
+        display: block;
+        width: 100%;
+        height: 48px;
+        line-height: 48px;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+        padding-left: 4%;
+        background-color: white;
+        img{
+            position: relative;
+            width: 26px;
+            height: 26px;
+            top: 6px;
+            margin-right: 8px;
+        }
+        span{
+            position: absolute;
+            right: 31.3%;
+            line-height: 48px;
+            font-size: 14px;
+        }
+    }
+    
+    
 }
\ No newline at end of file
diff --git a/src/app/ui/all-file/all-file.component.ts b/src/app/ui/all-file/all-file.component.ts
index 017c49a..205ccc9 100644
--- a/src/app/ui/all-file/all-file.component.ts
+++ b/src/app/ui/all-file/all-file.component.ts
@@ -8,7 +8,6 @@ import { IsLoginService } from '../../is-login.service'
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import {UploadFilesComponent} from '../upload-files/upload-files.component'
 import { ComponentServiceService } from '../../component-service.service'
-import { element } from 'protractor';
 @Component({
   selector: 'app-all-file',
   templateUrl: './all-file.component.html',