diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts
index 6c58c6c..9c3a581 100644
--- a/src/app/navigation/navigation.component.ts
+++ b/src/app/navigation/navigation.component.ts
@@ -18,70 +18,6 @@ export class NavigationComponent implements OnInit {
isAdmin:boolean = false
ngOnInit() {
- // if(sessionStorage.getItem("roleType") == "0"){
- // this.isAdmin = true
- // }
- }
-
- darktheme = false;//黑夜主题
- switchTheme (dark) { this.darktheme = dark; }
- defaulttheme () { this.darktheme = false }
- redtheme () { this.darktheme = true}
-
-}
-
-//新增资料库
-@Component({
- selector: 'adddatabank',
- templateUrl: './adddatabank.html',
- styleUrls: ['./navigation.component.scss']
-})
-export class AddDataBank {
- myControl = new FormControl();
- constructor(private http: HttpClient,public dialogRef: MatDialogRef
,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
-
- onNoClick(): void {
- this.dialogRef.close();
- }
-
- onSubmit(value){
- if ( value.name.includes('/') ) {
- let config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('名称不允许有特殊字符','确定',config);
- } else {
- this.dialogRef.close(value);
- }
}
}
-
-//更改资料库名称
-@Component({
- selector: 'editdatabankname',
- templateUrl: './editdatabankname.html',
- styleUrls: ['./navigation.component.scss']
-})
-export class EditDataBankName {
- myControl = new FormControl();
- constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
-
- dataBankName:any = this.data.name//要修改的资料库原名称
-
- onNoClick(): void {
- this.dialogRef.close();
- }
-
- onSubmit(value){
- if ( value.name.includes('/') ) {
- let config = new MatSnackBarConfig();
- config.verticalPosition = 'top';
- config.duration = 3000
- this.snackBar.open('名称不允许有特殊字符','确定',config);
- } else {
- this.dialogRef.close(value);
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/app/navigation/navigation.module.ts b/src/app/navigation/navigation.module.ts
index a127fcb..9b99dd6 100644
--- a/src/app/navigation/navigation.module.ts
+++ b/src/app/navigation/navigation.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { NavigationComponent, AddDataBank, EditDataBankName } from './navigation.component';
+import { NavigationComponent } from './navigation.component';
import { MatIconModule } from '@angular/material/icon';
import { MatSidenavModule } from '@angular/material/sidenav';
import { RouterModule } from '@angular/router';
@@ -54,9 +54,7 @@ import {MatTreeModule} from '@angular/material/tree';
@NgModule({
declarations: [
NavigationComponent,
- TabbarComponent,
- AddDataBank,
- EditDataBankName
+ TabbarComponent
],
imports: [
CommonModule,
diff --git a/src/app/pipes/size.pipe.ts b/src/app/pipes/size.pipe.ts
index 5cff3f8..7ce6619 100644
--- a/src/app/pipes/size.pipe.ts
+++ b/src/app/pipes/size.pipe.ts
@@ -1,29 +1,4 @@
import { Pipe, PipeTransform } from '@angular/core';
-@Pipe({name: 'name'})
-export class NamePipe implements PipeTransform {
- transform(name: string): string {
- let nameArr = name.split("/")
- return nameArr[nameArr.length - 1]
- }
-}
-@Pipe({name: 'name2'})
-export class NamePipe2 implements PipeTransform {
- transform(name: string): string {
- let nameArr = name.split("/")
- return nameArr[nameArr.length - 2]
- }
-}
-@Pipe({name: 'name3'})
-export class NamePipe3 implements PipeTransform {
- transform(name: string): string {
- if(name.charAt(name.length-1) == "/"){
- return name.substr(0, name.length - 1).replace(/\//g,'>').substring(9,name.length)
- }else{
- return name.replace(/\//g,'>').substring(9,name.length)
- }
- }
-}
-
@Pipe({name: 'testState'})
export class testState implements PipeTransform {
transform(name: string): string {
diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts
index 633536e..c90b195 100644
--- a/src/app/tabbar/tabbar.component.ts
+++ b/src/app/tabbar/tabbar.component.ts
@@ -25,16 +25,6 @@ import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
})
export class TabbarComponent implements OnInit {
- theme: boolean = true;
- @Output()
- toggle = new EventEmitter();
- @Output()
- toggleDarkTheme = new EventEmitter();
- @Output()
- defaulttheme = new EventEmitter();
- @Output()
- redtheme = new EventEmitter();
-
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public dialog: MatDialog,public isLogin:IsLoginService,public snackBar: MatSnackBar,) { }
ngOnInit() {
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index cb6fa9d..e868da5 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -45,7 +45,7 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatPaginatorIntl } from '@angular/material/paginator';
import { ChangepasswordComponent } from './changepassword/changepassword.component';
-import { NamePipe,NamePipe2, NamePipe3, testState} from '../pipes/size.pipe';
+import { testState} from '../pipes/size.pipe';
import {ConfirmpswDirective} from './changepassword/equal-validator.directive';
import { FileUploadModule } from 'ng2-file-upload'
import { ChangeuserdataComponent } from './changeuserdata/changeuserdata.component';
@@ -59,7 +59,7 @@ import {WorkingAreaComponent} from '../working-area/working-area.component'
import { NzTreeModule } from 'ng-zorro-antd/tree';
import { examinationQuestions,uploadQuestions } from './collection-tools/examinationQuestions'
@NgModule({
- declarations: [ChangepasswordComponent,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions],
+ declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions],
imports: [
NzDatePickerModule,
@@ -40,7 +40,7 @@