From 0be938c8384830ce3986690becbfab34ce1a7f7e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 9 Jul 2020 09:15:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=B0=86=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8E=E7=BD=91=E7=9B=98=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BB=8E=E7=88=B6=E5=AD=90=E5=B5=8C=E5=A5=97=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=8F=98=E4=B8=BA=E9=9D=9E=E5=B5=8C=E5=A5=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.module.ts | 3 ++- src/app/component-service.service.ts | 11 +++++++++++ src/app/navigation/navigation.component.html | 4 ++-- src/app/navigation/navigation.component.ts | 10 +++++++--- src/app/ui/all-file/all-file.component.ts | 9 ++++++++- 5 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 src/app/component-service.service.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a3dedb5..df21705 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -17,6 +17,7 @@ import { httpInterceptorProviders } from './http-interceptors/index' import {CacheTokenService} from './http-interceptors/cache-token.service' import { TreeService } from'./http-interceptors/tree.service' import { IsLoginService } from './is-login.service'; +import { ComponentServiceService } from './component-service.service'; @NgModule({ declarations: [ @@ -35,7 +36,7 @@ import { IsLoginService } from './is-login.service'; FormsModule, HttpClientModule ], - providers: [httpInterceptorProviders, CacheTokenService,TreeService], + providers: [httpInterceptorProviders, CacheTokenService,TreeService,ComponentServiceService], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/component-service.service.ts b/src/app/component-service.service.ts new file mode 100644 index 0000000..f7de8b7 --- /dev/null +++ b/src/app/component-service.service.ts @@ -0,0 +1,11 @@ +import { Injectable, EventEmitter, OnInit } from '@angular/core'; +@Injectable({ + providedIn: 'root' +}) +export class ComponentServiceService { + public eventEmit: any; + + constructor() { + this.eventEmit = new EventEmitter(); + } +} diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 4d29728..9258602 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -62,8 +62,8 @@
- - + +
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index 9091e1b..1315752 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -6,6 +6,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { IsLoginService } from '../is-login.service' import { AllFileComponent } from '../ui/all-file/all-file.component'; +import { ComponentServiceService } from '../component-service.service'; +import { Router,ActivatedRoute } from '@angular/router' @Component({ selector: 'app-navigation', templateUrl: './navigation.component.html', @@ -13,7 +15,7 @@ import { AllFileComponent } from '../ui/all-file/all-file.component'; }) export class NavigationComponent implements OnInit { - constructor(public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } + constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } @ViewChild('child') child:AllFileComponent; //父组件中获得子组件的引用 @@ -134,8 +136,10 @@ export class NavigationComponent implements OnInit { clickLi(item){ this.selectedDataBank = item.id //触发子组件的方法 - this.child.getALLFileList(item.id); - this.child.selection.clear(); + // this.child.getALLFileList(item.id); + // this.child.selection.clear(); + this.router.navigate([`/home`]) + this.emitService.eventEmit.emit(item.id); } diff --git a/src/app/ui/all-file/all-file.component.ts b/src/app/ui/all-file/all-file.component.ts index df3aca5..1f52c50 100644 --- a/src/app/ui/all-file/all-file.component.ts +++ b/src/app/ui/all-file/all-file.component.ts @@ -7,6 +7,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; 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' @Component({ selector: 'app-all-file', templateUrl: './all-file.component.html', @@ -16,7 +17,7 @@ export class AllFileComponent { displayedColumns: string[] = ['select', 'name', 'weight', 'time']; dataSource:any = new MatTableDataSource; - constructor(private http: HttpClient,public snackBar: MatSnackBar,public downloadFile:IsLoginService,public dialog: MatDialog,private zone: NgZone) { } + constructor(public emitService: ComponentServiceService,private http: HttpClient,public snackBar: MatSnackBar,public downloadFile:IsLoginService,public dialog: MatDialog,private zone: NgZone) { } isCancel:boolean = false //搜索框的X是否显示 searchData:any = "搜索您的文件" //搜索框内容 isClickFile:boolean = false //是否点击过文件 @@ -66,6 +67,12 @@ export class AllFileComponent { this.dataSource.sort = this.sort; // this.getAllDataBank() this.getALLFileList("支队级-主官") + + // 接收发射过来的数据 + this.emitService.eventEmit.subscribe((value: any) => { + this.getALLFileList(value) + this.selection.clear(); + }); } //获得所有资料库，默认显示第一个资料库的文件