Browse Source

[新增]将战术学习和授课更换位置

master
邵佳豪 5 years ago
parent
commit
47b352703c
  1. 4
      src/app/navigation/navigation.component.html
  2. 3
      src/app/navigation/navigation.component.scss
  3. 11
      src/app/ui/all-file/all-file.component.html
  4. 29
      src/app/ui/all-file/all-file.component.scss
  5. 1
      src/app/ui/all-file/all-file.component.ts

4
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>

3
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;

11
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>

29
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;
}
}
}

1
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',

Loading…
Cancel
Save