Merge branch 'master' of http://39.106.78.171:3000/13562321995/AnxinCloudDisk

src/app/navigation/navigation.component.html

@@ -33,6 +33,7 @@
 
                 <mat-expansion-panel >
                     <mat-expansion-panel-header>
+                      <div class="logoIcon">支</div>
                        支队级
                     </mat-expansion-panel-header>
                     <ul>
@@ -42,6 +43,7 @@
               
                 <mat-expansion-panel>
                     <mat-expansion-panel-header>
+                      <div class="logoIcon">大</div>
                        大队级
                     </mat-expansion-panel-header>
                     <ul>
@@ -50,6 +52,7 @@
                 </mat-expansion-panel>
                 <mat-expansion-panel>
                     <mat-expansion-panel-header>
+                      <div class="logoIcon">站</div>
                         消防救援站
                     </mat-expansion-panel-header>
                     <ul>
@@ -59,6 +62,7 @@
 
                 <mat-expansion-panel *ngIf="isAdmin">
                     <mat-expansion-panel-header>
+                      <mat-icon style="margin:0 12px 0 1px;font-size: 24px;">settings</mat-icon>
                         系统管理
                     </mat-expansion-panel-header>
                     <ul>

src/app/navigation/navigation.component.scss

@@ -193,13 +193,13 @@ mat-sidenav{
     mat-expansion-panel{
         background-color: #4699f6;
         mat-expansion-panel-header{
-            padding-left: 46px;
+            padding-left: 15px;
             color: white;
         }
         ul{
             li{
                 text-align: left;
-                padding-left: 56px;
+                padding-left: 60px;
             }
         }
         // mat-panel-title{
@@ -224,4 +224,17 @@ mat-sidenav{
 .example-sidenav-content{
   height: 100%;
   overflow: hidden;
+}
+
+//一级目录前图标
+.logoIcon{
+  display: inline-block;
+  margin-right: 10px;
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+  text-align: center;
+  border-radius: 50%;
+  border: 2px solid #fff;
+  font-weight: 550;
 }

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

@@ -142,10 +142,10 @@
     </div>
 </div>
 <div class="openSystem" *ngIf="!selectedDataBank.includes('/')">
-    <a (click)="openteacher()" href="ax://startup?"><img src="../../../assets/images/house.gif" alt="">战术授课<span>进入</span></a>
+    <a (click)="openteacher()" href="ax://startup?"> <mat-icon style="vertical-align: middle; font-size: 24px;">account_balance</mat-icon> 战术授课<span>进入</span></a>
 </div>
 <div class="openSystem" *ngIf="!selectedDataBank.includes('/')">
-    <a (click)="openlearn()" href="ax2://startup?"><img src="../../../assets/images/house.gif" alt="">战术学习<span>进入</span></a>
+    <a (click)="openlearn()" href="ax2://startup?"> <mat-icon style="vertical-align: middle; font-size: 24px;">account_balance</mat-icon> 战术学习<span>进入</span></a>
 </div>