diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 36785e4..5207e6a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,13 +2,10 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { LoginComponent } from './pages/login/login.component'; import { NavigationComponent } from './navigation/navigation.component'; -import { LockscreenComponent } from './pages/lockscreen/lockscreen.component'; -import {HomeComponent} from './home/home.component' +import {HomeComponent} from './ui/home/home.component' //路由守卫 import {AuthGuard} from './auth.guard' -import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥 - @@ -21,22 +18,11 @@ const routes: Routes = [ children:[ {path:'ui',loadChildren:() => import('./ui/ui.module').then(m => m.UiModule)}, {path:'keyUnit',loadChildren:() => import('./key-unit/key-unit.module').then(m => m.KeyUnitModule)}, - {path:'planManagement',loadChildren:() => import('./plan-management/plan-management.module').then(m => m.PlanManagementModule)}, - {path:'planAudit',loadChildren:() => import('./plan-audit/plan-audit.module').then(m => m.PlanAuditModule)}, - {path:'home',loadChildren:() => import('./pages/pages.module').then(m => m.PagesModule)}, - {path:'visualization',component: HomeComponent}, - {path:'gis',loadChildren:() => import('./gis-management/gis-management.module').then(m => m.GISManagementModule)} ] }, - {path:'login', - component:LoginComponent}, - - {path:'getNoMToken', - component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 + {path:'login',component:LoginComponent}, + {path:'home', component:HomeComponent,canActivate: [AuthGuard],}//守卫验证 - {path:'lockscreen', - component:LockscreenComponent, - canActivate: [AuthGuard]}//守卫验证 ]; @NgModule({ diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts index 4b14ae9..38a7e07 100644 --- a/src/app/http-interceptors/base-interceptor.ts +++ b/src/app/http-interceptors/base-interceptor.ts @@ -24,7 +24,7 @@ export class BaseInterceptor implements HttpInterceptor { }); if(!req.cancelToken) { /*获取token*/ - let token = sessionStorage.getItem("token") + let token = sessionStorage.getItem("token") || '' /*此处设置额外请求头，token令牌*/ newReq.headers = newReq.headers.set('Authorization', `Bearer ${token}`) diff --git a/src/app/pages/login/login.component.scss b/src/app/pages/login/login.component.scss index 97f585f..0c628e3 100644 --- a/src/app/pages/login/login.component.scss +++ b/src/app/pages/login/login.component.scss @@ -51,7 +51,8 @@ background-image:-webkit-linear-gradient(right,#f18d6f,#FF4923); font-weight: 800; font-family: KaiTi; - -webkit-background-clip:text; + -webkit-background-clip:text; + font-size: 0.273438rem; -webkit-text-fill-color:transparent; } .mat-input-element { diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 0782bf3..38ef74d 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -30,7 +30,7 @@ export class LoginComponent implements OnInit { sessionStorage.setItem("level",data.level); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); - this.router.navigate([`/ui/home`]) + this.router.navigate([`/home`]) //调用服务中的function刷新token this.token.startUp() }, diff --git a/src/app/ui/authority/authority.component.html b/src/app/ui/authority/authority.component.html deleted file mode 100644 index 8acc302..0000000 --- a/src/app/ui/authority/authority.component.html +++ /dev/null @@ -1,25 +0,0 @@ -
- - - - {{node.name}} - - - - - - - - {{node.name}} - - - - - -
\ No newline at end of file diff --git a/src/app/ui/authority/authority.component.scss b/src/app/ui/authority/authority.component.scss deleted file mode 100644 index dea1283..0000000 --- a/src/app/ui/authority/authority.component.scss +++ /dev/null @@ -1,30 +0,0 @@ -table { - width: 100%; - th,td{ - text-align: center; - } -} -form{ - text-align: center; - button{ - margin: 0 12px; - } -} -mat-tree{ - width: 500px; - button{ - display: block; - float: right; - } - mat-tree-node{ - position: relative; - .deleted{ - position: absolute; - right: 0; - } - .create{ - position: absolute; - right: 40px; - } - } -} diff --git a/src/app/ui/authority/authority.component.ts b/src/app/ui/authority/authority.component.ts deleted file mode 100644 index 239757c..0000000 --- a/src/app/ui/authority/authority.component.ts +++ /dev/null @@ -1,144 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { HttpClient } from '@angular/common/http'; -import { TreeService } from '../../http-interceptors/tree.service' -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -export interface authority { - id: string, - name: string, - value: string, - order: number, - parentId: string -} -@Component({ - selector: 'app-authority', - templateUrl: './authority.component.html', - styleUrls: ['./authority.component.scss'] -}) -export class AuthorityComponent implements OnInit { - - data:any =[] - newdata = []; - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - constructor(private http: HttpClient,public dialog: MatDialog,private tree:TreeService) { } - - //重新拉去列表函数 - getlist = ():void=>{ - this.http.get('/api/Permissions').subscribe((data: any[])=>{ - this.newdata = this.tree.toTree(data) - const nodes = this.treeControl.dataNodes; - const expandNodes = []; - nodes.forEach((item) => { - if(item.expandable && this.treeControl.isExpanded(item)){ - expandNodes.push(item.id); - } - }); - this.dataSource.data = this.newdata; - let newNodes = this.treeControl.dataNodes; - newNodes = newNodes.filter(n => { - return expandNodes.indexOf(n.id) >= 0; - }); - newNodes.forEach(item => { - this.treeControl.expand(item); - }); - }) - } - - //初始化视图 - ngOnInit() { - this.http.get('/api/Permissions').subscribe((data: any[])=>{ - this.dataSource.data = this.tree.toTree(data) - }) - } - hasChild = (_: number, node: any) => node.expandable; - - //创建按钮 - createauthority(value){ - const dialogRef = this.dialog.open(CreateAuthority, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data: {id:value.id} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - this.newdata = [] - this.getlist() - } - } - ); - } - //删除按钮 - deleted(authority){ - var isdeleted = confirm("确定要删除此用户吗？") - if(isdeleted){ - //请求删除接口 - this.newdata = [] - this.http.delete(`/api/Permissions/${authority.id}`).subscribe( data=>{ - this.getlist() - }) - } - } -} - - -//创建组件 -@Component({ - selector: 'createauthority', - templateUrl: './createauthority.component.html', - styleUrls: ['./authority.component.scss'] -}) -export class CreateAuthority { - myControl = new FormControl(); - options: string[] = ['0', '1','2', '3','4', '5','6', '7','8']; - - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar, - @Inject(MAT_DIALOG_DATA) public data) {} - - onNoClick(): void { - this.dialogRef.close(); - } - onSubmit(value){ - - if(value.parentId == "null"){ - value.parentId = null - } - //编写请求创建用户接口(value是参数)//并且刷新一下 - this.http.post( - '/api/Permissions', - { - id: '', - name: value.name, - value: value.value, - order: Number(value.order), - parentId: this.data.id - } - ).subscribe( - data=>{ - this.dialogRef.close(data); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - } -} \ No newline at end of file diff --git a/src/app/ui/authority/createauthority.component.html b/src/app/ui/authority/createauthority.component.html deleted file mode 100644 index b8e7500..0000000 --- a/src/app/ui/authority/createauthority.component.html +++ /dev/null @@ -1,36 +0,0 @@ -
- - - - - - - - - - - - - - - {{option}} - - - - - -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/badge/badge.component.html b/src/app/ui/badge/badge.component.html deleted file mode 100644 index ef434c9..0000000 --- a/src/app/ui/badge/badge.component.html +++ /dev/null @@ -1,18 +0,0 @@ -

- 未读信息 -

- -

- -

- -

- home -

- diff --git a/src/app/ui/badge/badge.component.scss b/src/app/ui/badge/badge.component.scss deleted file mode 100644 index d91e4df..0000000 --- a/src/app/ui/badge/badge.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -p{ - margin: 30px; -} \ No newline at end of file diff --git a/src/app/ui/badge/badge.component.spec.ts b/src/app/ui/badge/badge.component.spec.ts deleted file mode 100644 index 21c0577..0000000 --- a/src/app/ui/badge/badge.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BadgeComponent } from './badge.component'; - -describe('BadgeComponent', () => { - let component: BadgeComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ BadgeComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(BadgeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/badge/badge.component.ts b/src/app/ui/badge/badge.component.ts deleted file mode 100644 index a64e7c1..0000000 --- a/src/app/ui/badge/badge.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-badge', - templateUrl: './badge.component.html', - styleUrls: ['./badge.component.scss'] -}) -export class BadgeComponent implements OnInit { - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/ui/button/button.component.html b/src/app/ui/button/button.component.html deleted file mode 100644 index 1c1d3c0..0000000 --- a/src/app/ui/button/button.component.html +++ /dev/null @@ -1,6 +0,0 @@ - -
    -
  • {{item.name}}
    • -
- - \ No newline at end of file diff --git a/src/app/ui/button/button.component.scss b/src/app/ui/button/button.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/button/button.component.spec.ts b/src/app/ui/button/button.component.spec.ts deleted file mode 100644 index 794fc67..0000000 --- a/src/app/ui/button/button.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ButtonComponent } from './button.component'; - -describe('ButtonComponent', () => { - let component: ButtonComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ButtonComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ButtonComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/button/button.component.ts b/src/app/ui/button/button.component.ts deleted file mode 100644 index a59ed36..0000000 --- a/src/app/ui/button/button.component.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop'; -@Component({ - selector: 'app-button', - templateUrl: './button.component.html', - styleUrls: ['./button.component.scss'] -}) -export class ButtonComponent implements OnInit { - - constructor(public http: HttpClient) { } - - - data =[ - { - id:"1", - name:"广西总队", - order:0, - parentId:null, - children:[ - { - id:"2", - name:"南宁支队", - order:2, - parentId:1, - children:[ - { - id:"6", - name:"南宁特勤大队", - order:0, - parentId:2, - children:[ - { - id:"6", - name:"南宁特勤3中队", - order:3, - parentId:6, - }, - { - id:"6", - name:"南宁特勤2中队", - order:2, - parentId:6, - }, - { - id:"6", - name:"南宁特勤1中队", - order:1, - parentId:6, - } - ] - } - ] - }, - { - id:"3", - name:"北海支队", - order:1, - parentId:1 - }, - { - id:"4", - name:"梧州支队", - order:0, - parentId:1 - }, - { - id:"5", - name:"桂林支队", - order:3, - parentId:1 - }, - ] - } - ] - - - ngOnInit() { - var str = "xxxx.jjjj" - // console.log(2222,str.split('.')[1]) - } - - drop(event: CdkDragDrop) { - moveItemInArray(this.data, event.previousIndex, event.currentIndex); - - } - - -} diff --git a/src/app/ui/card/card.component.html b/src/app/ui/card/card.component.html deleted file mode 100644 index da5b6ca..0000000 --- a/src/app/ui/card/card.component.html +++ /dev/null @@ -1,12 +0,0 @@ - - 简单的卡片 - 卡片的字幕 - 原来爱情的世界很大,大得可以装下一百种委屈;原来爱情的世界很小,小得三个人就会窒息。 - - - - - - 我要被固定在卡片底部 - - \ No newline at end of file diff --git a/src/app/ui/card/card.component.scss b/src/app/ui/card/card.component.scss deleted file mode 100644 index feb037a..0000000 --- a/src/app/ui/card/card.component.scss +++ /dev/null @@ -1,10 +0,0 @@ - -mat-card{ - width: 300px; - height: 600px; - img{ - width: 300px; - height: 300px; - padding: 16px; - } -} \ No newline at end of file diff --git a/src/app/ui/card/card.component.spec.ts b/src/app/ui/card/card.component.spec.ts deleted file mode 100644 index e141708..0000000 --- a/src/app/ui/card/card.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CardComponent } from './card.component'; - -describe('CardComponent', () => { - let component: CardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CardComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/card/card.component.ts b/src/app/ui/card/card.component.ts deleted file mode 100644 index ae25273..0000000 --- a/src/app/ui/card/card.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-card', - templateUrl: './card.component.html', - styleUrls: ['./card.component.scss'] -}) -export class CardComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/ui/dateselect/dateselect.component.html b/src/app/ui/dateselect/dateselect.component.html deleted file mode 100644 index c400626..0000000 --- a/src/app/ui/dateselect/dateselect.component.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - -
-
{{e}}
-
- - diff --git a/src/app/ui/dateselect/dateselect.component.scss b/src/app/ui/dateselect/dateselect.component.scss deleted file mode 100644 index be335f5..0000000 --- a/src/app/ui/dateselect/dateselect.component.scss +++ /dev/null @@ -1,7 +0,0 @@ -.example-events { - width: 400px; - height: 200px; - border: 1px solid #555; - overflow: auto; - } - \ No newline at end of file diff --git a/src/app/ui/dateselect/dateselect.component.spec.ts b/src/app/ui/dateselect/dateselect.component.spec.ts deleted file mode 100644 index 1e4f0dc..0000000 --- a/src/app/ui/dateselect/dateselect.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { DateselectComponent } from './dateselect.component'; - -describe('DateselectComponent', () => { - let component: DateselectComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ DateselectComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DateselectComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/dateselect/dateselect.component.ts b/src/app/ui/dateselect/dateselect.component.ts deleted file mode 100644 index 6c3347c..0000000 --- a/src/app/ui/dateselect/dateselect.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import {MatDatepickerInputEvent} from '@angular/material/datepicker'; - - - -@Component({ - selector: 'app-dateselect', - templateUrl: './dateselect.component.html', - styleUrls: ['./dateselect.component.scss'], -}) - -export class DateselectComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - events: string[] = []; - - addEvent(type: string, event: MatDatepickerInputEvent) { - this.events.push(`${type}: ${event.value}`); - } -} diff --git a/src/app/ui/enterpriseuser/addenterpriseuser.component.html b/src/app/ui/enterpriseuser/addenterpriseuser.component.html deleted file mode 100644 index 1ee3b98..0000000 --- a/src/app/ui/enterpriseuser/addenterpriseuser.component.html +++ /dev/null @@ -1,44 +0,0 @@ -

创建企业用户

- -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
-

{{errmsg}}

-
- -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/enterpriseuser/addenterpriseuser.component.ts b/src/app/ui/enterpriseuser/addenterpriseuser.component.ts deleted file mode 100644 index 0ebea60..0000000 --- a/src/app/ui/enterpriseuser/addenterpriseuser.component.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import {MatDialogRef} from '@angular/material/dialog'; - - - -@Component({ - selector: 'addenterpriseuser', - templateUrl: './addenterpriseuser.component.html', - styleUrls: ['./enterpriseuser.component.scss'] - }) -export class AddEnterpriserUser { - - constructor(private http: HttpClient,public dialogRef: MatDialogRef) {} - - errmsg:any; //捕获错误信息 - //提交创建表单 - onSubmit (e) { - let date = new Date() - this.http.post('/api/CompanyUsers',{ - name:e.loginName, - phone:e.tel, - enabled:true, - creationTime:date, - usci:e.creditcode, - companyName:e.unitname - }).subscribe(data=>{ - this.dialogRef.close(data)}, - error=>{this.errmsg=error} - ) - } - - - -} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/editenterpriseuser.html b/src/app/ui/enterpriseuser/editenterpriseuser.html deleted file mode 100644 index 2b8a15a..0000000 --- a/src/app/ui/enterpriseuser/editenterpriseuser.html +++ /dev/null @@ -1,40 +0,0 @@ -

编辑企业用户

- -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.html b/src/app/ui/enterpriseuser/enterpriseuser.component.html deleted file mode 100644 index af329b3..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.html +++ /dev/null @@ -1,78 +0,0 @@ -
-
-
- -
- -
- -
- - -
- -
- - -
- -
- - -
- -
-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
登录账号{{element.name}}(该账号已被注销)单位名称{{element.companyName}}统一社会信用代码{{element.usci}}创建时间 - {{element.creationTime|date:'yyyy-MM-dd'}} - 操作 - - - - - - - -
- - - diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.scss b/src/app/ui/enterpriseuser/enterpriseuser.component.scss deleted file mode 100644 index 6171aff..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.scss +++ /dev/null @@ -1,38 +0,0 @@ -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } - } -.maginleft { - margin-left: 5px; -} - - - -.header { - width: 100%; - padding: 10px; - margin-bottom: 10px; - box-sizing: border-box; - border-bottom: 1px solid rgba(0,0,0,0.12); - .queryBox { - box-sizing: border-box; - padding: 5px 15px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items:center; - justify-content:center; - .queryField { - margin: 0 15px; - input { - width: 180px; - height: 22px; - line-height: 22px; - border-radius: 3px;} - } - - } //queryBox -} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts deleted file mode 100644 index 044b696..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EnterpriseuserComponent } from './enterpriseuser.component'; - -describe('EnterpriseuserComponent', () => { - let component: EnterpriseuserComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EnterpriseuserComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EnterpriseuserComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.ts deleted file mode 100644 index 08603ed..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.ts +++ /dev/null @@ -1,241 +0,0 @@ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import {HttpClient} from '@angular/common/http' -import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { PageEvent } from '@angular/material/paginator'; -import { AddEnterpriserUser } from './addenterpriseuser.component' -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - - - -@Component({ - selector: 'app-enterpriseuser', - templateUrl: './enterpriseuser.component.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class EnterpriseuserComponent implements OnInit { - - constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - ngOnInit() { - this.initData() - } - - displayedColumns: string[] = ['loginName', 'unitName', 'creditcode','time', 'operation']; - dataSource:any; //所有企业用户 - - userLogin:string; //搜索账号 - userName:string; //搜索名称 - creditcode:string//统一社会信用代码 - //分页 - @ViewChild(MatPaginator, {static: true}) - pageEvent: PageEvent; - paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 - - //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 - let data= { - Name: this.userLogin || '', - CompanyName: this.userName || '', - USCI: this.creditcode || '', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/CompanyUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //页面初始化 + 查询 + 重置 - initData () { - let data= { - Name: this.userLogin || '', - CompanyName: this.userName || '', - USCI: this.creditcode || '', - PageNumber: '1', - } - this.http.get('/api/CompanyUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //更新当前页数据 - getAllCompanyUsers () { - let data= { - Name: this.userLogin || '', - CompanyName: this.userName || '', - USCI: this.creditcode || '', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/CompanyUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //清空搜索 - empty () { - this.userLogin = '' - this.userName = '' - this.creditcode = '' - this.initData() - } - - //创建企业用户 - open(){ - let dialogRef = this.dialog.open(AddEnterpriserUser); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getAllCompanyUsers()} - }); - } - - //编辑企业用户 - edit (e) { - let dialogRef = this.dialog.open(editenterpriseuser,{data:e}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getAllCompanyUsers()} - }); - } - - //重置密码 - reset (e) { - this.http.put(`/api/CompanyUsers/${e.name}/ResetPassword`,{}).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码成功!','确定',config); - }) - } - - //查看企业信息 - see (e) { - this.http.get(`/api/CompanyUsers/${e.name}`).subscribe( - data=> { - let dialogRef = this.dialog.open(seeenterpriseuser, {data}); - dialogRef.afterClosed().subscribe(); - } - ) - } - - //启用 - enabled (e) { - this.http.put(`/api/CompanyUsers/${e.name}`,{ - name:e.name, - phone:e.phone, - enabled:true, - creationTime:e.creationTime, - usci:e.usci, - companyId:e.companyId, - companyName:e.companyName - }).subscribe(data=>{ - this.getAllCompanyUsers() - }) - } - - //禁用 - noEnabled (e) { - this.http.put(`/api/CompanyUsers/${e.name}`,{ - name:e.name, - phone:e.phone, - enabled:false, - creationTime:e.creationTime, - usci:e.usci, - companyId:e.companyId, - companyName:e.companyName - }).subscribe(data=>{ - this.getAllCompanyUsers() - }) - } - - //注销用户 - logoff (e) { - let isTrue = confirm('注销是不可逆操作,您确定要注销吗') - if (isTrue) { - this.http.delete(`/api/CompanyUsers/${e.name}/Cancel`).subscribe(data=>{ - this.getAllCompanyUsers() }) - } - } - - //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') - if (isTrue) { - this.http.delete(`/api/CompanyUsers/${e.name}`).subscribe(data=>{ - this.getAllCompanyUsers() - }) - } - } - - - -} - - - -//编辑企业用户 -@Component({ - selector: 'app-editenterpriseuser', - templateUrl: './editenterpriseuser.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class editenterpriseuser { - - constructor(public http: HttpClient,public dialog: MatDialog, - @Inject(MAT_DIALOG_DATA) public data,public dialogRef: MatDialogRef,) { } - - ngOnInit() { - this.companyName = this.data.companyName - this.companyPhone = this.data.phone - this.companyUsci = this.data.usci - } - - companyName:any; //企业单位名称 - companyPhone:any; //企业电话 - companyUsci:any; //企业统一社会信用代码 - - //提交表单 - onSubmit (e) { - this.http.put(`/api/CompanyUsers/${this.data.name}`,{ - name:this.data.name, - phone:e.tel, - enabled:this.data.enabled, - creationTime:this.data.creationTime, - usci:e.creditcode, - companyId:this.data.companyId, - companyName:e.unitname - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - - - -} - - - -//查看企业用户 -@Component({ - selector: 'app-seeenterpriseuser', - templateUrl: './seeenterpriseuser.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class seeenterpriseuser { - - constructor(public http: HttpClient,public dialog: MatDialog, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit() {} - -} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/seeenterpriseuser.html b/src/app/ui/enterpriseuser/seeenterpriseuser.html deleted file mode 100644 index a5e8a1c..0000000 --- a/src/app/ui/enterpriseuser/seeenterpriseuser.html +++ /dev/null @@ -1,29 +0,0 @@ -查看企业用户 - -
- - 登录账号: - {{data.name}} - - 单位名称: - {{data.companyName}} - - 联系电话: - {{data.phone}} - - 统一社会信用代码: - {{data.usci}} - - 创建时间: - {{data.creationTime|date:'yyyy-MM-dd'}} - - 是否禁用: - 否 - 是 - - -
- -
- -
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/addBuilt-in.html b/src/app/ui/fire-fighting-facilities-formwork/addBuilt-in.html deleted file mode 100644 index 0b7db78..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/addBuilt-in.html +++ /dev/null @@ -1,20 +0,0 @@ -
新增内置分组
-
-
- -
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/addBuilt-inAttribute.html b/src/app/ui/fire-fighting-facilities-formwork/addBuilt-inAttribute.html deleted file mode 100644 index 44f46e2..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/addBuilt-inAttribute.html +++ /dev/null @@ -1,34 +0,0 @@ -
新增内置分组属性
-
-
- -
- - - -
-
- - - 是 - 否 - -
-
- - - 是 - 否 - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/addFireFightingFacilitiesFormwork.html b/src/app/ui/fire-fighting-facilities-formwork/addFireFightingFacilitiesFormwork.html deleted file mode 100644 index 19d1c0f..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/addFireFightingFacilitiesFormwork.html +++ /dev/null @@ -1,20 +0,0 @@ -
新增消防设施模板
-
-
- -
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/addOptional.html b/src/app/ui/fire-fighting-facilities-formwork/addOptional.html deleted file mode 100644 index 1065e7f..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/addOptional.html +++ /dev/null @@ -1,37 +0,0 @@ -
新增可选分组
-
-
- -
- - - -
-
- - - 表单 - 表格 - - -
-
- - - 不新增 - 新增行 - 新增组 - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/addOptionalAttribute.html b/src/app/ui/fire-fighting-facilities-formwork/addOptionalAttribute.html deleted file mode 100644 index ff98186..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/addOptionalAttribute.html +++ /dev/null @@ -1,71 +0,0 @@ -
新增可选分组属性
-
-
- -
- - - -
- -
- - - - {{item.viewValue}} - - - - - - -
- -
- - - 是 - 否 - -
- -
- - - 不验证 - ≥ - ≤ - 区间 - 正则匹配 - - - - - -
- -
- - - -
- -
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/editBuilt-inAttribute.html b/src/app/ui/fire-fighting-facilities-formwork/editBuilt-inAttribute.html deleted file mode 100644 index 7b897c8..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/editBuilt-inAttribute.html +++ /dev/null @@ -1,40 +0,0 @@ -
编辑内置分组属性
-
-
- -
- - - -
-
- - - 是 - 否 - -
-
- - - 是 - 否 - -
-
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/editFireFightingFacilitiesFormwork.html b/src/app/ui/fire-fighting-facilities-formwork/editFireFightingFacilitiesFormwork.html deleted file mode 100644 index 8ef636a..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/editFireFightingFacilitiesFormwork.html +++ /dev/null @@ -1,20 +0,0 @@ -
编辑消防设施模板
-
-
- -
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/editOptionalAttribute.html b/src/app/ui/fire-fighting-facilities-formwork/editOptionalAttribute.html deleted file mode 100644 index 3207882..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/editOptionalAttribute.html +++ /dev/null @@ -1,76 +0,0 @@ -
编辑可选分组属性
-
-
- -
- - - -
- -
- - - - {{item.viewValue}} - - - - - - -
- -
- - - 是 - 否 - -
- -
- - - 不验证 - ≥ - ≤ - 区间 - 正则匹配 - - - - - -
- -
- - - - - - -
- -
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.html b/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.html deleted file mode 100644 index cfad728..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.html +++ /dev/null @@ -1,189 +0,0 @@ -
-
-
- 消防设施模板 -
- - - - -
-
-
-
- {{item.name}} - block -
-
-
- -
- - - -
-
- - - arrow_upward - arrow_downward -
- -
-

- - - add_box - block - block - delete -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称 - {{element.name}} - 是否逐层统计 - - - 是否合并 - - - 操作 - border_color - delete -
-
-
- -
- - - -
-
- - - arrow_upward - arrow_downward -
- -
-

- - - add_box - star - star_border - block - block - delete -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称 - {{element.propertyName}} - 类型 - - - - - - - - - - 默认值 - {{element.propertyValue}} - 必填 - - - 单位 - {{element.physicalUnit}} - 操作 - border_color - delete -
-
-
- -
- - - - -
-
- diff --git a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss b/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss deleted file mode 100644 index 5ca7442..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.scss +++ /dev/null @@ -1,80 +0,0 @@ -.content { - margin: 0 0 0 10px; - width: 100%; - height: 90%; - overflow-y: auto; - display: flex; - .leftBox { - flex: 20%; - padding-top: 10px; - } - .rightBox { - border-left: 1px solid #999; - flex: 80%; - overflow-y: auto; - } -} - -//左侧样式 -.bank { - display: flex; - font-size: 18px; - font-weight: 500; -} -.mat-icon { - width: 18px; - height: 18px; - vertical-align:top; - margin-right: 8px; - cursor:pointer; -} -.material { - cursor:pointer; - height: 30px; - font-size: 16px; - margin-top: 10px; - padding-left: 25px; - .overFlowText { - width: 135px; - display: inline-block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - .blockBtn { - float: right; - margin-right: 12px; - width: 16px; - height: 16px; - } -} -//选择样式 -.active { - background-color: rgba(225,225,225,0.8) -} - -//右侧样式 -.groupingContent { - height: 100%; - overflow-y: auto; - .groupingButton{ - padding-left: 10px; - margin: 10px 0; - .mat-icon{ - margin: 5px 0 0 15px;} - } - .groupingHeader{ - background-color: #d7d7d7; - padding: 5px 0 0 25px; - height: 30px; - display: flex; - .mat-icon {margin: 0 5px;} - } -} -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } -} \ No newline at end of file diff --git a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.spec.ts b/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.spec.ts deleted file mode 100644 index 4d81e94..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FireFightingFacilitiesFormworkComponent } from './fire-fighting-facilities-formwork.component'; - -describe('FireFightingFacilitiesFormworkComponent', () => { - let component: FireFightingFacilitiesFormworkComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ FireFightingFacilitiesFormworkComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FireFightingFacilitiesFormworkComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.ts b/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.ts deleted file mode 100644 index b3bb4e1..0000000 --- a/src/app/ui/fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component.ts +++ /dev/null @@ -1,806 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; - - - -@Component({ - selector: 'app-fire-fighting-facilities-formwork', - templateUrl: './fire-fighting-facilities-formwork.component.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class FireFightingFacilitiesFormworkComponent implements OnInit { - - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - displayedColumn = ['checked','name','isEachFloor','isMerged','operation'] - displayedColumns = ['checked','name', 'type', 'default','required','physicalUnit','operation']; - - ngOnInit(): void { - this.http.get('/api/FacilityCategories').subscribe(data=>{ - this.allFireProtectionFacilities = data - this.selectFireProtectionFacilities = data[0] - this.getBuiltInGrouping() - this.getOptionalGrouping() - }) - } - - allFireProtectionFacilities:any = []; //所有的消防设施模板 - selectFireProtectionFacilities:any; //选中的消防设施模板 - FireProtectionFacilitiesIndex:any = 0; //选中的消防设施模板下标 - builtInGrouping:any = []; //当前模板的内置分组 - optionalGrouping:any = []; //当前模板的可选分组 - - //获取所有的消防设施模板 - getAllTemplate () { - this.http.get('/api/FacilityCategories').subscribe(data=>{ - this.allFireProtectionFacilities = data - this.selectFireProtectionFacilities = data[this.FireProtectionFacilitiesIndex] - }) - } - - //获取当前模板内置分组 - getBuiltInGrouping () { - if (this.selectFireProtectionFacilities){ - let id = {categoryId: this.selectFireProtectionFacilities.id} - this.http.get(`/api/FacilityGroups`,{params:id}).subscribe(data=>{ - this.builtInGrouping = data - this.selectBuiltIn = [] - }) - } - } - - //获取当前模板可选分组 - getOptionalGrouping () { - if (this.selectFireProtectionFacilities){ - let id = {categoryId: this.selectFireProtectionFacilities.id} - this.http.get(`/api/OptionalGroups`,{params:id}).subscribe(data=>{ - this.optionalGrouping = data - this.selectOptional = [] - }) - } - } - - //切换左侧模板时 - selectFire (e,index) { - if (this.FireProtectionFacilitiesIndex != index) { - this.selectFireProtectionFacilities = e - this.FireProtectionFacilitiesIndex = index - this.selectBuiltIn = [] - this.selectOptional = [] - this.getBuiltInGrouping() - this.getOptionalGrouping() - } - } - - //新增消防设施模板 - addTemplate () { - const dialogRef = this.dialog.open(addFireFightingFacilitiesFormworkComponent,{}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getAllTemplate()} - }); - } - - //编辑消防设施模板 - editTemplate () { - if (this.selectFireProtectionFacilities) { - let data = this.selectFireProtectionFacilities - const dialogRef = this.dialog.open(editFireFightingFacilitiesFormworkComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getAllTemplate()} - }); - } - } - - //禁启用消防设施模板 - enabledTemplate () { - if (this.selectFireProtectionFacilities) { - let data = this.selectFireProtectionFacilities - if (data.enabled) { - let newDate = { - id: data.id, - name: data.name, - enabled: false} - this.http.put(`/api/FacilityCategories/${data.id}`,newDate).subscribe(data=>{ - this.getAllTemplate()}) - } else{ - let newDate = { - id: data.id, - name: data.name, - enabled: true} - this.http.put(`/api/FacilityCategories/${data.id}`,newDate).subscribe(data=>{ - this.getAllTemplate()}) - } - } - } - - //删除消防设施模板 - deleteTemplate () { - if (this.selectFireProtectionFacilities) { - let isDelete = confirm('您确定要删除吗') - if (isDelete) { - this.http.delete(`/api/FacilityCategories/${this.selectFireProtectionFacilities.id}`).subscribe(data=>{ - this.http.get('/api/FacilityCategories').subscribe(data=>{ - this.allFireProtectionFacilities = data - this.selectFireProtectionFacilities = data[this.FireProtectionFacilitiesIndex] - this.builtInGrouping = [] - this.optionalGrouping = [] - this.getBuiltInGrouping() - this.getOptionalGrouping() })//http.get - }) - } - } - } - - //新增内置分组 - addBuiltIn () { - if (this.selectFireProtectionFacilities) { - let data = {template:this.selectFireProtectionFacilities, order:this.builtInGrouping[this.builtInGrouping.length-1]} - const dialogRef = this.dialog.open(addBuiltInComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getBuiltInGrouping()} - }); - } - } - - //禁启用内置分组 - enabledBuilt (e) { - if (e.enabled) { - let data = { - id: e.id, - name: e.name, - order:e.order, - enabled: false, - facilityItems: e.facilityItems, - facilityCategoryId: e.facilityCategoryId} - this.http.put(`/api/FacilityGroups/${e.id}`,data).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('禁用成功','确定',config); - this.getBuiltInGrouping() - }) - } else { - let data = { - id: e.id, - name: e.name, - order:e.order, - enabled: true, - facilityItems: e.facilityItems, - facilityCategoryId: e.facilityCategoryId} - this.http.put(`/api/FacilityGroups/${e.id}`,data).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('启用成功','确定',config); - this.getBuiltInGrouping() - }) - } - } - - //删除内置分组 - deleteBuilt (e) { - let isDelete = confirm('您确定要删除吗') - if (isDelete) { - this.http.delete(`/api/FacilityGroups/${e.id}`).subscribe(data=>{ - this.getBuiltInGrouping() - }) - } - } - - //新增内置分组属性 - addBuiltInAttribute (e) { - let data = e - const dialogRef = this.dialog.open(addBuiltInAttributeComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getBuiltInGrouping()} - }); - } - - //编辑内置分组属性 - editBuiltInAttribute (e,element) { - let data = {grouping:e, attribute: element} - const dialogRef = this.dialog.open(editBuiltInAttributeComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getBuiltInGrouping()} - }); - } - - //删除内置分组属性 - deleteBuiltInAttribute (e,element){ - let isDelete = confirm('您确定要删除吗') - if (isDelete) { - e.facilityItems.splice(e.facilityItems.findIndex(item=>item==element),1) - this.http.put(`/api/FacilityGroups/${e.id}`,e).subscribe(data=>{ - this.getBuiltInGrouping() - }) - } - } - - //内置分组排序 - selectBuiltIn = []; //checked选中的内置分组 - - //内置分组change时 - changeBuilt (e,item) { - if (e.checked) { - this.selectBuiltIn.push(item) - } else{this.selectBuiltIn.splice(this.selectBuiltIn.findIndex(items=>items==item),1)} - } - - //内置分组上移 - topBuilt () { - if(this.selectBuiltIn.length) { - let attribute = this.selectBuiltIn[this.selectBuiltIn.length-1] //选中分组最后一项 - let newOrder = attribute.order //选中项的order - let index = this.builtInGrouping.findIndex(item=>item==attribute) //选中项在数组中的位置 - if (index!=0) { - this.builtInGrouping[index].order = this.builtInGrouping[index-1].order - this.http.put(`/api/FacilityGroups/${this.builtInGrouping[index].id}`,this.builtInGrouping[index]).subscribe(data=>{ - this.builtInGrouping[index-1].order = newOrder - this.http.put(`/api/FacilityGroups/${this.builtInGrouping[index-1].id}`,this.builtInGrouping[index-1]).subscribe(data=>{ - this.getBuiltInGrouping() - }) - }) - } - } - } - - //内置分组下移 - bottomBuilt () { - if(this.selectBuiltIn.length) { - let attribute = this.selectBuiltIn[this.selectBuiltIn.length-1] //选中分组最后一项 - let newOrder = attribute.order //最后一项的order - let index = this.builtInGrouping.findIndex(item=>item==attribute) - if (index!= this.builtInGrouping.length-1) { - this.builtInGrouping[index].order = this.builtInGrouping[index+1].order - this.http.put(`/api/FacilityGroups/${this.builtInGrouping[index].id}`,this.builtInGrouping[index]).subscribe(data=>{ - this.builtInGrouping[index+1].order = newOrder - this.http.put(`/api/FacilityGroups/${this.builtInGrouping[index+1].id}`,this.builtInGrouping[index+1]).subscribe(data=>{ - this.getBuiltInGrouping() - }) - }) - } - } - } - - - - //新增可选分组 - addOptional () { - if (this.selectFireProtectionFacilities) { - let data = {template:this.selectFireProtectionFacilities, order:this.optionalGrouping[this.optionalGrouping.length-1]} - const dialogRef = this.dialog.open(addOptionalComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getOptionalGrouping()} - }); - } - } - - //是否可选-可选分组 - isOptional (e) { - if (e.isOptional) { - let data = { - facilityCategoryId: e.facilityCategoryId, - id: e.id, - name: e.name, - type: e.type, - addMode: e.addMode, - isOptional: false, - order: e.order, - enabled: e.enabled, - propertyInfos: e.propertyInfos} - this.http.put(`/api/OptionalGroups/${e.id}`,data).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('现状态为不可选','确定',config); - this.getOptionalGrouping() - }) - } else { - let data = { - facilityCategoryId: e.facilityCategoryId, - id: e.id, - name: e.name, - type: e.type, - addMode: e.addMode, - isOptional: true, - order: e.order, - enabled: e.enabled, - propertyInfos: e.propertyInfos} - this.http.put(`/api/OptionalGroups/${e.id}`,data).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('现状态为可选','确定',config); - this.getOptionalGrouping() - }) - } - } - - //禁启用可选分组 - enabledOptional (e) { - if (e.enabled) { - let data = { - facilityCategoryId: e.facilityCategoryId, - id: e.id, - name: e.name, - type: e.type, - addMode: e.addMode, - isOptional: e.isOptional, - order: e.order, - enabled: false, - propertyInfos: e.propertyInfos} - this.http.put(`/api/OptionalGroups/${e.id}`,data).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('禁用成功','确定',config); - this.getOptionalGrouping() - }) - } else { - let data = { - facilityCategoryId: e.facilityCategoryId, - id: e.id, - name: e.name, - type: e.type, - addMode: e.addMode, - isOptional: e.isOptional, - order: e.order, - enabled: true, - propertyInfos: e.propertyInfos} - this.http.put(`/api/OptionalGroups/${e.id}`,data).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('启用成功','确定',config); - this.getOptionalGrouping() - }) - } - } - - //删除可选分组 - deleteOptional (e) { - let isDelete = confirm('您确定要删除吗') - if (isDelete) { - this.http.delete(`/api/OptionalGroups/${e.id}`).subscribe(data=>{ - this.getOptionalGrouping() - }) - } - } - - //新增可选分组属性 - addOptionalAttribute (e) { - let data = e - const dialogRef = this.dialog.open(addOptionalAttributeComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getOptionalGrouping()} - }); - } - - //编辑可选分组属性 - editOptionalAttribute (e,element) { - let data = {grouping:e, attribute: element} - const dialogRef = this.dialog.open(editOptionalAttributeComponent,{data}); - dialogRef.afterClosed().subscribe(data=>{ - if (data) {this.getOptionalGrouping()} - }); - } - - //删除可选分组属性 - deleteOptionalAttribute (e,element) { - let isDelete = confirm('您确定要删除吗') - if (isDelete) { - e.propertyInfos.splice(e.propertyInfos.findIndex(item=>item==element),1) - this.http.put(`/api/OptionalGroups/${e.id}`,e).subscribe(data=>{ - this.getOptionalGrouping() - }) - } - } - - //可选分组排序 - selectOptional = []; //checked选中的可选分组 - - //可选分组change时 - changeOptional (e,item) { - if (e.checked) { - this.selectOptional.push(item) - } else{this.selectOptional.splice(this.selectOptional.findIndex(items=>items==item),1)} - } - - //可选分组上移 - topOptional () { - if(this.selectOptional.length) { - let attribute = this.selectOptional[this.selectOptional.length-1] //选中分组最后一项 - let newOrder = attribute.order //选中项的order - let index = this.optionalGrouping.findIndex(item=>item==attribute) //选中项在数组中的位置 - if (index!=0) { - this.optionalGrouping[index].order = this.optionalGrouping[index-1].order - this.http.put(`/api/OptionalGroups/${this.optionalGrouping[index].id}`,this.optionalGrouping[index]).subscribe(data=>{ - this.optionalGrouping[index-1].order = newOrder - this.http.put(`/api/OptionalGroups/${this.optionalGrouping[index-1].id}`,this.optionalGrouping[index-1]).subscribe(data=>{ - this.getOptionalGrouping() - }) - }) - } - } - } - - //可选分组下移 - bottomOptional () { - if(this.selectOptional.length) { - let attribute = this.selectOptional[this.selectOptional.length-1] //选中分组最后一项 - let newOrder = attribute.order //选中项的order - let index = this.optionalGrouping.findIndex(item=>item==attribute) //选中项在数组中的位置 - if (index!=this.optionalGrouping.length-1) { - this.optionalGrouping[index].order = this.optionalGrouping[index+1].order - this.http.put(`/api/OptionalGroups/${this.optionalGrouping[index].id}`,this.optionalGrouping[index]).subscribe(data=>{ - this.optionalGrouping[index+1].order = newOrder - this.http.put(`/api/OptionalGroups/${this.optionalGrouping[index+1].id}`,this.optionalGrouping[index+1]).subscribe(data=>{ - this.getOptionalGrouping() - }) - }) - } - } - } - - - -} - - - -//新增消防设施模板 -@Component({ - selector: 'app-addFireFightingFacilitiesFormwork', - templateUrl: './addFireFightingFacilitiesFormwork.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class addFireFightingFacilitiesFormworkComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef) { } - - ngOnInit(): void { - - } - - //提交表单 - onSubmit (e) { - let data = { - name: e.name, - enabled: true - } - this.http.post('/api/FacilityCategories',data).subscribe(data=>{ - this.dialogRef.close(data); - }) - } - -} - - - -//编辑消防设施模板 -@Component({ - selector: 'app-editFireFightingFacilitiesFormwork', - templateUrl: './editFireFightingFacilitiesFormwork.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class editFireFightingFacilitiesFormworkComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - this.templateName = this.data.name - } - - templateName:any; //模板名字 - - //提交表单 - onSubmit (e) { - let data = { - id: this.data.id, - name: this.templateName, - enabled: this.data.enabled} - this.http.put(`/api/FacilityCategories/${this.data.id}`,data).subscribe(data=>{ - this.dialogRef.close('success'); - }) - } - -} - - - -//新增消防设施模板内置分组 -@Component({ - selector: 'app-addBuiltIn', - templateUrl: './addBuilt-in.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class addBuiltInComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - if (this.data.order) { - this.order = this.data.order.order+1 - } else{this.order=0} - } - - order:number; //order - //提交表单 - onSubmit (e) { - let data = { - name: e.name, - order: this.order, - enabled: true, - facilityItems: [], - facilityCategoryId: this.data.template.id} - this.http.post(`/api/FacilityGroups`,data).subscribe(data=>{ - this.dialogRef.close(data) - }) - } - -} - - - -//新增消防设施模板内置分组属性 -@Component({ - selector: 'app-addBuiltInAttribute', - templateUrl: './addBuilt-inAttribute.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class addBuiltInAttributeComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - if (this.data.facilityItems.length) { - this.order = this.data.facilityItems[this.data.facilityItems.length-1].order+1 - } else{ - this.order = 0 - } - } - - order:number; //order - - //提交表单 - onSubmit (e) { - let newFacilityItems = {name:e.name,isEachFloor:e.isEachFloor=='true'? true: false,order:this.order,isMerged:e.isMerged=='true'? true: false,} - this.data.facilityItems.push(newFacilityItems) - let data = { - id: this.data.id, - name: this.data.name, - order: this.data.order, - enabled: this.data.enabled, - facilityItems: this.data.facilityItems, - facilityCategoryId: this.data.facilityCategoryId} - this.http.put(`/api/FacilityGroups/${this.data.id}`,data).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - -} - - - -//编辑消防设施模板内置分组属性 -@Component({ - selector: 'app-editBuiltInAttribute', - templateUrl: './editBuilt-inAttribute.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class editBuiltInAttributeComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - this.attributeName = this.data.attribute.name - this.attributeIsEachFloor = String(this.data.attribute.isEachFloor) - this.attributeIsMerged = String(this.data.attribute.isMerged) - this.attributeOrder = this.data.attribute.order - } - - attributeName:any; //属性名 - attributeIsEachFloor:any; //是否逐层统计 - attributeIsMerged:any; //是否合并 - attributeOrder:number; //属性order - - //提交表单 - onSubmit (e) { - let data = { - name: e.name, - isEachFloor: e.isEachFloor=='true'? true: false, - isMerged: e.isMerged=='true'? true: false, - order: e.order} - this.data.grouping.facilityItems.splice(this.data.grouping.facilityItems.findIndex(item=>item==this.data.attribute),1) - this.data.grouping.facilityItems.push(data) - this.http.put(`/api/FacilityGroups/${this.data.grouping.id}`,this.data.grouping).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - - - -} - - - -//新增消防设施模板可选分组 -@Component({ - selector: 'app-addOptional', - templateUrl: './addOptional.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class addOptionalComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - if (this.data.order) { - this.order = this.data.order.order+1 - } else{this.order=0} - } - - order:number; //order - - //提交表单 - onSubmit (e) { - let data = { - facilityCategoryId: this.data.template.id, - name: e.name, - type: Number(e.type), - addMode: Number(e.addMode), - isOptional: true, - order: this.order, - enabled: true, - propertyInfos: [] - } - this.http.post('/api/OptionalGroups',data).subscribe(data=>{ - this.dialogRef.close(data) - }) - } - - - -} - - - -export interface Food { - value: number; - viewValue: string; -} -//新增消防设施模板可选分组属性 -@Component({ - selector: 'app-addOptionalAttribute', - templateUrl: './addOptionalAttribute.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class addOptionalAttributeComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - if (this.data.propertyInfos.length) { - this.order = this.data.propertyInfos[this.data.propertyInfos.length-1].order+1 - } else{ - this.order = 0 - } - } - - //定义属性数据 - propertyType:Food[]=[ - {value:0, viewValue: '单行文本'}, - {value:1, viewValue: '多行文本'}, - {value:2, viewValue: '数值'}, - {value:3, viewValue: '图片'}, - {value:4, viewValue: '图片数量'}, - {value:5, viewValue: '方向'}, - {value:6, viewValue: '布尔值'}, - {value:7, viewValue: '供给区域'}, - {value:8, viewValue: '供给类型'}] - - - order:number; //order - //提交表单 - onSubmit (e) { - let data = { - propertyName: e.propertyName, - propertyValue: e.propertyValue, - propertyType: e.propertyType, - required: e.required=='true'? true: false, - ruleName: e.ruleName, - ruleValue: e.ruleValue, - physicalUnit: e.physicalUnit, - order: this.order, - enabled: true, - visible: true, - tag: e.tag} - this.data.propertyInfos.push(data) - this.http.put(`/api/OptionalGroups/${this.data.id}`,this.data).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - - - -} - - - -//编辑消防设施模板可选分组属性 -@Component({ - selector: 'app-editOptionalAttribute', - templateUrl: './editOptionalAttribute.html', - styleUrls: ['./fire-fighting-facilities-formwork.component.scss'] -}) -export class editOptionalAttributeComponent { - - constructor(private http:HttpClient,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit(): void { - this.propertyName = this.data.attribute.propertyName, - this.propertyType = this.data.attribute.propertyType - this.propertyValue = this.data.attribute.propertyValue, - this.required = String(this.data.attribute.required), - this.ruleName = this.data.attribute.ruleName, - this.ruleValue = this.data.attribute.ruleValue, - this.physicalUnit = this.data.attribute.physicalUnit, - this.order = this.data.attribute.order, - this.tag = this.data.attribute.tag - } - - //定义属性数据 - type:Food[]=[ - {value:0, viewValue: '单行文本'}, - {value:1, viewValue: '多行文本'}, - {value:2, viewValue: '数值'}, - {value:3, viewValue: '图片'}, - {value:4, viewValue: '图片数量'}, - {value:5, viewValue: '方向'}, - {value:6, viewValue: '布尔值'}, - {value:7, viewValue: '供给区域'}, - {value:8, viewValue: '供给类型'}] - - propertyName:any; //属性名 - propertyType:number; //属性类型 - propertyValue:any; //默认值 - required:any; //是否必填 - ruleName:any; //验证规则 - ruleValue:any; //验证内容 - physicalUnit:any; //单位 - order:number; //order - tag:any; //注释说明 - - //提交表单 - onSubmit (e) { - let data = { - propertyName: e.propertyName, - propertyValue: e.propertyValue, - propertyType: e.propertyType, - required: e.required=='true'? true: false, - ruleName: e.ruleName, - ruleValue: e.ruleValue, - physicalUnit: e.physicalUnit, - order: e.order, - enabled: true, - visible: true, - tag: e.tag} - this.data.grouping.propertyInfos.splice(this.data.grouping.propertyInfos.findIndex(item=>item==this.data.attribute),1) - this.data.grouping.propertyInfos.push(data) - this.http.put(`/api/OptionalGroups/${this.data.grouping.id}`,this.data.grouping).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - - - -} \ No newline at end of file diff --git a/src/app/ui/fire-fighting-template/editingFireControl.html b/src/app/ui/fire-fighting-template/editingFireControl.html deleted file mode 100644 index 9d2be33..0000000 --- a/src/app/ui/fire-fighting-template/editingFireControl.html +++ /dev/null @@ -1,45 +0,0 @@ -
编辑消防要素模板
- -
-
- - - -
- - -
- -
- - - - - {{node.name}} - - - - - - - {{node.name}} - - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-template/fire-fighting-template.component.html b/src/app/ui/fire-fighting-template/fire-fighting-template.component.html deleted file mode 100644 index 0b62ce3..0000000 --- a/src/app/ui/fire-fighting-template/fire-fighting-template.component.html +++ /dev/null @@ -1,36 +0,0 @@ -
- 消防要素模板 - -
- - - - - - - - - - - - - - -
模板名称 {{element.name}} 操作 - - - - -
\ No newline at end of file diff --git a/src/app/ui/fire-fighting-template/fire-fighting-template.component.scss b/src/app/ui/fire-fighting-template/fire-fighting-template.component.scss deleted file mode 100644 index 06f7d26..0000000 --- a/src/app/ui/fire-fighting-template/fire-fighting-template.component.scss +++ /dev/null @@ -1,18 +0,0 @@ -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } -} -.magin { - margin: 10px; - font-weight: 600; -} -.marginLeft { - margin-left: 5px; -} -.tree { - height: 450px; - overflow: auto; -} \ No newline at end of file diff --git a/src/app/ui/fire-fighting-template/fire-fighting-template.component.ts b/src/app/ui/fire-fighting-template/fire-fighting-template.component.ts deleted file mode 100644 index f9aae74..0000000 --- a/src/app/ui/fire-fighting-template/fire-fighting-template.component.ts +++ /dev/null @@ -1,309 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatTreeFlattener, MatTreeFlatDataSource } from '@angular/material/tree'; -import { FlatTreeControl } from '@angular/cdk/tree'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - - - -@Component({ - selector: 'app-fire-fighting-template', - templateUrl: './fire-fighting-template.component.html', - styleUrls: ['./fire-fighting-template.component.scss'] -}) -export class FireFightingTemplateComponent implements OnInit { - - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - ngOnInit(): void { - this.getAllFireFighting() - } - - displayedColumns: string[] = ['name','operation']; - aLLFireFighting:any; //所有消防要素模板 - - //获取所有消防要素模板 - getAllFireFighting () { - this.http.get('/api/FireCategories').subscribe(data=>{ - this.aLLFireFighting=data - }) - } - - - - //新增消防模块窗口 - establish () { - let dialogRef = this.dialog.open(NewFireFighting, - { - width:'600px', - }); - dialogRef.afterClosed().subscribe((data)=>{ - if (data) {this.getAllFireFighting()} - }); - } - - //编辑消防模块窗口 - edit (e) { - let dialogRef = this.dialog.open(EditFireClassification, - { - width:'600px', - data:{e} - }); - dialogRef.afterClosed().subscribe((data)=>{ - if (data) {this.getAllFireFighting()} - }); - } - - //启用 - enable (e) { - this.http.put(`/api/FireCategories/${e.id}`,{ - id:e.id, - name:e.name, - enabled:true, - fireElements:e.fireElements - }).subscribe(data=>{ - this.getAllFireFighting() - }) - } - - //禁用 - prohibit (e) { - this.http.put(`/api/FireCategories/${e.id}`,{ - id:e.id, - name:e.name, - enabled:false, - fireElements:e.fireElements - }).subscribe(data=>{ - this.getAllFireFighting() - }) - } - - //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') - if (isTrue) { - this.http.delete(`/api/FireCategories/${e}`).subscribe(data=>{ - this.getAllFireFighting() - }) - } - } - - - - -} - - - -//新增消防分类窗口 -@Component({ - selector: 'app-newFireFighting', - templateUrl: './newFireFighting.html', - styleUrls: ['./fire-fighting-template.component.scss'] -}) -export class NewFireFighting { - newdata = []; - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - computed:node.computed, - order:node.order, - children:node.children ||'', - tag:node.tag, - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(private http:HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef) {} - - ngOnInit(): void { - this.rendering() - } - - - - checkedAll:boolean=false; //全选 - checkedList:any=[]; //选中的消防要素 - - //渲染Tree - rendering () { - this.http.get('/api/FireElements').subscribe((data:any)=>{ - this.newdata=[] - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) - } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] - } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) - } - } - }); - this.dataSource.data = this.newdata; - this.treeControl.expandAll() - }) - } - hasChild = (_: number, node: any) => node.expandable; - - //change时判断是否选中 - changed (e,id) { - if (e.checked) { - this.checkedList.push(id) - } else if (e.checked == false) { - this.checkedList.splice(this.checkedList.findIndex(item => item === id), 1) - } - } - - - - //提交创建 - onSubmit (e) { - if(this.checkedList.length) { - this.http.post('/api/FireCategories',{ - name:e.name, - enabled:true, - fireElements:this.checkedList - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - }else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择消防要素','确定',config); - } - } - - - -} - - - - - -//编辑消防分类窗口 -@Component({ - selector: 'app-editingFire', - templateUrl: './editingFireControl.html', - styleUrls: ['./fire-fighting-template.component.scss'] -}) -export class EditFireClassification { - newdata = []; - - private transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - computed:node.computed, - order:node.order, - children:node.children ||'', - tag:node.tag, - checked:node.checked, - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this.transformer, node => node.level, node => node.expandable, node => node.children); - newDataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(private http:HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public newdate) {} - - ngOnInit(): void { - this.fireID=this.newdate.e.id - this.fireName=this.newdate.e.name - this.rendering() - } - - - - fireID:any; //模板id - fireName:any; //模板name - checkedAll:boolean=false; //全选 - checkedList:any=[]; //选中的消防要素 - - //渲染Tree - rendering () { - this.http.get(`/api/FireCategories/${this.newdate.e.id}/FireElements`).subscribe((data:any)=>{ - data.forEach(item=>{ - if (item.checked === true) { - this.checkedList.push(item.id) - } - }) - this.newdata=[] - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) - } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] - } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) - } - } - }); - this.newDataSource.data = this.newdata; - this.treeControl.expandAll() - }) - } - hasChild = (_: number, node: any) => node.expandable; - - //change时判断是否选中 - changed (e,id) { - if (e.checked) { - this.checkedList.push(id) - } else if (e.checked == false) { - this.checkedList.splice(this.checkedList.findIndex(item => item === id), 1) - } - } - - //提交编辑修改 - onSubmit (e) { - if (this.checkedList.length) { - this.http.put(`/api/FireCategories/${this.fireID}`,{ - id:this.fireID, - name:e.name, - enabled:this.newdate.e.enabled, - fireElements:this.checkedList - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择消防要素','确定',config); - } - } - - - -} \ No newline at end of file diff --git a/src/app/ui/fire-fighting-template/newFireFighting.html b/src/app/ui/fire-fighting-template/newFireFighting.html deleted file mode 100644 index 9d9fa46..0000000 --- a/src/app/ui/fire-fighting-template/newFireFighting.html +++ /dev/null @@ -1,44 +0,0 @@ -
创建消防要素模板
- -
-
- - - -
- - -
- -
- - - - - {{node.name}} - - - - - - - {{node.name}} - - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/fire-protection-elements/editingFireControl.html b/src/app/ui/fire-protection-elements/editingFireControl.html deleted file mode 100644 index 0abff80..0000000 --- a/src/app/ui/fire-protection-elements/editingFireControl.html +++ /dev/null @@ -1,47 +0,0 @@ -
编辑消防要素
-
- -
- - - - - -
- - - -
- -
- - - - 是 - - - 否 - - -
- -
- - - 信息录入 - 预案管理 - 指挥系统 - - -
- -
- - -
- -
-
\ No newline at end of file diff --git a/src/app/ui/fire-protection-elements/establish.html b/src/app/ui/fire-protection-elements/establish.html deleted file mode 100644 index 50f86b8..0000000 --- a/src/app/ui/fire-protection-elements/establish.html +++ /dev/null @@ -1,41 +0,0 @@ -
创建消防要素
-
- -
- - - - - -
- - - - 是 - - - 否 - - -
- -
- - - 信息录入 - 预案管理 - 指挥系统 - - -
- -
- - -
- -
-
\ No newline at end of file diff --git a/src/app/ui/fire-protection-elements/fire-protection-elements.component.html b/src/app/ui/fire-protection-elements/fire-protection-elements.component.html deleted file mode 100644 index b390b48..0000000 --- a/src/app/ui/fire-protection-elements/fire-protection-elements.component.html +++ /dev/null @@ -1,67 +0,0 @@ -
-
-
- 消防要素 - -
- - - - {{node.name}} -
- - - - - -
- - - - - - {{node.name}} -
- - - - - -
- - - -
- -
- -
-
\ No newline at end of file diff --git a/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss b/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss deleted file mode 100644 index 12c709e..0000000 --- a/src/app/ui/fire-protection-elements/fire-protection-elements.component.scss +++ /dev/null @@ -1,36 +0,0 @@ - -.magin { - margin: 8px 0 8px 10px; - font-weight: 600; -} - -.Box { - width: 100%; - height: 90%; - overflow-y: auto; - display: flex; - padding-left: 10px; - .right { - width: 100%; - } -} - -.mat-tree-node { - width: 380px; - position: relative; - .float { - position: absolute; - right: 0; - } -} -.maginTop { - margin: 10px 0; -} - -.example-radio-group { - flex-direction: column; -} - -.example-radio-button { -margin: 5px; -} \ No newline at end of file diff --git a/src/app/ui/fire-protection-elements/fire-protection-elements.component.ts b/src/app/ui/fire-protection-elements/fire-protection-elements.component.ts deleted file mode 100644 index bb78d75..0000000 --- a/src/app/ui/fire-protection-elements/fire-protection-elements.component.ts +++ /dev/null @@ -1,284 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatTreeFlattener, MatTreeFlatDataSource } from '@angular/material/tree'; -import { FlatTreeControl } from '@angular/cdk/tree'; - -@Component({ - selector: 'app-fire-protection-elements', - templateUrl: './fire-protection-elements.component.html', - styleUrls: ['./fire-protection-elements.component.scss'] -}) -export class FireProtectionElementsComponent implements OnInit { - data:any =[] - newdata = []; - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - computed:node.computed, - order:node.order, - children:node.children ||'', - tag:node.tag - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(private http:HttpClient,public dialog: MatDialog) { } - - ngOnInit(): void { - this.getAllfireControl() - } - - //获取所有消防要素 - getAllfireControl () { - this.http.get('/api/FireElements').subscribe( - (data:any)=>{ - this.newdata=[] - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) - } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] - } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) - } - } - }); - this.dataSource.data = this.newdata; - } - - ) - } - - //更新数据后重新渲染Tree - getlist = ():void=>{ - this.http.get('/api/FireElements').subscribe( - (data:any)=>{ - this.newdata = [] - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) - } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] - } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) - } - } - }); - - const nodes = this.treeControl.dataNodes; - const expandNodes = []; - nodes.forEach((item) => { - if(item.expandable && this.treeControl.isExpanded(item)){ - expandNodes.push(item.id); - } - }); - this.dataSource.data = this.newdata; - let newNodes = this.treeControl.dataNodes; - newNodes = newNodes.filter(n => { - return expandNodes.indexOf(n.id) >= 0; - }); - newNodes.forEach(item => { - this.treeControl.expand(item); - }); - } - ) - } - - hasChild = (_: number, node: any) => node.expandable; - - //打开创建一级消防要素窗口 - addNew () { - let dialogRef = this.dialog.open(Establish); - dialogRef.afterClosed().subscribe((data)=>{ - if (data) {this.getlist()} - }); - } - - //打开创建窗口 - establish (e) { - let dialogRef = this.dialog.open(Establish, - { - data:e - }); - dialogRef.afterClosed().subscribe((data)=>{ - if (data) {this.getlist()} - }); - } - - //打开编辑窗口 - edit (e) { - let dialogRef = this.dialog.open(EditingFireControl, - { - data:e - }); - dialogRef.afterClosed().subscribe((data)=>{ - if (data) {this.getlist()} - }); - } - - //取消统计 - noStatistics (e) { - this.http.put(`/api/FireElements/${e.id}`,{ - expandable:e.expandable, - id:e.id, - name:e.name, - level:e.level, - order:e.order, - computed:false, - tag:e.tag, - parentId:e.parentId, - children:e.children - }).subscribe(data=>{ - this.getlist() - }) - } - - //确定统计 - statistics (e) { - this.http.put(`/api/FireElements/${e.id}`,{ - expandable:e.expandable, - id:e.id, - name:e.name, - level:e.level, - order:e.order, - computed:true, - tag:e.tag, - parentId:e.parentId, - children:e.children - }).subscribe(data=>{ - this.getlist() - }) - } - - //删除 - delete (e) { - let isTrue = confirm(`您确定要删除${e.name}吗`) - if (isTrue) { - this.http.delete(`/api/FireElements/${e.id}`).subscribe(data=>{ - this.getlist() - }) - } - } - - - - -} - - - -//创建窗口组件 -@Component({ - selector: 'app-establish', - templateUrl: './establish.html', - styleUrls: ['./fire-protection-elements.component.scss'] -}) -export class Establish { - - constructor(private http:HttpClient, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit(): void {} - - order:any; //创建消防要素order排序值 - - //提交创建消防要素 - onSubmit (e) { - if (this.data) { - if(this.data.children == '') { - this.order=0 - } else if (this.data.children.length) { - this.order=this.data.children[this.data.children.length-1].order+1 - } - this.http.post('/api/FireElements',{ - name:e.name, - order:this.order, - computed:e.radio, - tag:e.tag, - parentId:this.data.id - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } else { - this.http.post('/api/FireElements',{ - name:e.name, - order:0, - computed:e.radio, - tag:e.tag, - parentId:null - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - - } - - - -} - - - -//编辑窗口组件 -@Component({ - selector: 'app-editingFireControl', - templateUrl: './editingFireControl.html', - styleUrls: ['./fire-protection-elements.component.scss'] -}) -export class EditingFireControl { - - constructor(private http:HttpClient, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit(): void { - this.fireName=this.data.name - } - - fireName:any; //消防要素name - - //编辑提交 - onSubmit (e) { - this.http.put(`/api/FireElements/${this.data.id}`,{ - expandable:this.data.expandable, - id:this.data.id, - name:e.name, - level:this.data.level, - order:e.order, - computed:this.data.computed, - tag:this.data.tag, - parentId:this.data.parentId, - children:this.data.children - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } - - - - } diff --git a/src/app/ui/grid/grid.component.html b/src/app/ui/grid/grid.component.html deleted file mode 100644 index 9014316..0000000 --- a/src/app/ui/grid/grid.component.html +++ /dev/null @@ -1,34 +0,0 @@ -

网格列表

- - - 我是页眉 - - 我是页脚 - - - - - - - -


- - - - - - - - - - - - - - - - - - - - diff --git a/src/app/ui/grid/grid.component.scss b/src/app/ui/grid/grid.component.scss deleted file mode 100644 index f302609..0000000 --- a/src/app/ui/grid/grid.component.scss +++ /dev/null @@ -1,12 +0,0 @@ -mat-grid-tile { - background: lightblue; -} -h1{ - font-size: 26px; -} - -img { - width: 100%; - height: 100%; -} - diff --git a/src/app/ui/grid/grid.component.spec.ts b/src/app/ui/grid/grid.component.spec.ts deleted file mode 100644 index 6410123..0000000 --- a/src/app/ui/grid/grid.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { GridComponent } from './grid.component'; - -describe('GridComponent', () => { - let component: GridComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ GridComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(GridComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/grid/grid.component.ts b/src/app/ui/grid/grid.component.ts deleted file mode 100644 index 203cb0c..0000000 --- a/src/app/ui/grid/grid.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-grid', - templateUrl: './grid.component.html', - styleUrls: ['./grid.component.scss'] -}) -export class GridComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/ui/list/list.component.html b/src/app/ui/list/list.component.html deleted file mode 100644 index 2d7dbdf..0000000 --- a/src/app/ui/list/list.component.html +++ /dev/null @@ -1,63 +0,0 @@ - -

列表分隔线

- - Item 1 - - Item 2 - - Item 3 - -


-

导航列表

- - - {{ link.name }} - - - -


-

行动列表

- - - - -


-

选择列表

- - - {{shoe}} - - -

- 已选: {{shoes.selectedOptions.selected.length}}种 -

-


-

多行列表且带图标

- - - folder -

item标题

-

- 我是 - -- xxx -

- - - diff --git a/src/app/ui/list/list.component.scss b/src/app/ui/list/list.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/list/list.component.spec.ts b/src/app/ui/list/list.component.spec.ts deleted file mode 100644 index beacd15..0000000 --- a/src/app/ui/list/list.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ListComponent } from './list.component'; - -describe('ListComponent', () => { - let component: ListComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ListComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/list/list.component.ts b/src/app/ui/list/list.component.ts deleted file mode 100644 index 969eb9c..0000000 --- a/src/app/ui/list/list.component.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router,ActivatedRoute } from '@angular/router' -@Component({ - selector: 'app-list', - templateUrl: './list.component.html', - styleUrls: ['./list.component.scss'] -}) -export class ListComponent implements OnInit { - - constructor(private router:Router,private route:ActivatedRoute) { } - - ngOnInit() { - } - links = [ - {id:0,name:'小红'}, - {id:1,name:'小绿'}, - {id:2,name:'小兰'} - ] - typesOfShoes: string[] = ['耐克', '阿迪达斯', '彪马', '亚瑟士', '斯凯奇']; - showInfo(link){ - this.router.navigate([link.id],{relativeTo:this.route}) - } - save () { - - } - - undo () {} -} diff --git a/src/app/ui/material-bank/addAttribute.html b/src/app/ui/material-bank/addAttribute.html deleted file mode 100644 index 6f60aca..0000000 --- a/src/app/ui/material-bank/addAttribute.html +++ /dev/null @@ -1,71 +0,0 @@ -
新增属性
-
-
- -
- - - -
- -
- - - - {{item.viewValue}} - - - - - - -
- -
- - - 是 - 否 - -
- -
- - - 不验证 - ≥ - ≤ - 区间 - 正则匹配 - - - - - -
- -
- - - -
- -
- - - -
- -
- - -
-
-
\ No newline at end of file diff --git a/src/app/ui/material-bank/addmatlibrary.component.html b/src/app/ui/material-bank/addmatlibrary.component.html deleted file mode 100644 index 6ac2f4d..0000000 --- a/src/app/ui/material-bank/addmatlibrary.component.html +++ /dev/null @@ -1,23 +0,0 @@ -
- 创建素材库 - - - - - - - 信息录入 - 预案管理 - 指挥系统 - - - - -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/material-bank/addmatlibrary.component.ts b/src/app/ui/material-bank/addmatlibrary.component.ts deleted file mode 100644 index 366b348..0000000 --- a/src/app/ui/material-bank/addmatlibrary.component.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { HttpClient } from '@angular/common/http'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; - - - -@Component({ - selector: 'addmatlibrary', - templateUrl: './addmatlibrary.component.html', - styleUrls: ['./material-bank.component.scss'] - }) - export class AddMatLibrary { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit(): void { - if (this.data.length) { - this.order = this.data[this.data.length - 1].order + 1 - } else { - this.order =0 - } - } - - onNoClick(): void { - this.dialogRef.close(); - } - - order:number; //order - - onSubmit(value){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - this.http.post("/api/AssetLibraries",{ - id: "", - name: value.name, - order: this.order, - tag: value.tag, - enabled: true, - modifiedTime: time - }).subscribe(data=>{ - this.dialogRef.close(); - }) - } - - - - } \ No newline at end of file diff --git a/src/app/ui/material-bank/addoriginalcopy.component.html b/src/app/ui/material-bank/addoriginalcopy.component.html deleted file mode 100644 index eb0ac05..0000000 --- a/src/app/ui/material-bank/addoriginalcopy.component.html +++ /dev/null @@ -1,147 +0,0 @@ -
-
- 新增原件 -
-
-
- - - - - - 点 - 多点连线 - 多边形 - - -
- 是否来自建筑： - - 是 - 否 - -
-
- 是否允许连接： - - 是 - 否 - -
-
-
- 最大连接数： - -
-
-
- 固定大小： - - 是 - 否 - -
-
- 填充方式： - - 颜色 - 图片 - -
-
-
    -
  • -
-
- - - - - - 简单 - 九宫格 - 平铺 - - - -
- 九宫格边框数值： -
- 左： - -
-
- 右： - -
-
- 上： - -
-
- 下： - -
-
- - - - -
- 图片: -
- - -
- - -
- - - - - - - -
-
- -
- - - -
  • {{node.name}}
    • -     - - - - -
  • {{node.name}}
    • -     -     -
    -
    - -
    - - - -
    - - -
    - -
    diff --git a/src/app/ui/material-bank/addoriginalcopy.component.ts b/src/app/ui/material-bank/addoriginalcopy.component.ts deleted file mode 100644 index abe2bea..0000000 --- a/src/app/ui/material-bank/addoriginalcopy.component.ts +++ /dev/null @@ -1,242 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { HttpClient } from '@angular/common/http'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import format from 'date-fns/format'; -import { TreeService } from '../../http-interceptors/tree.service' -import { FileUploader } from 'ng2-file-upload' -import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; -import { DomSanitizer } from '@angular/platform-browser' -import { NgZone } from '@angular/core'; -import { ChangeDetectorRef } from '@angular/core' -@Component({ - selector: 'addoriginalcopy', - templateUrl: './addoriginalcopy.component.html', - styleUrls: ['./material-bank.component.scss'] - }) - export class AddOriginalCopy { - - uploader:FileUploader = new FileUploader({ - url: "/api/Objects/PlanPlatform", - method: "POST", - itemAlias: "uploadedfile", - removeAfterUpload:true - }); - - - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - children:node.children - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - myControl = new FormControl(); - displaynoneid = ""//选择的关联消防id - displaynonename = "" - padding = "0" - pige = "1" - from = "1" - connect = "1" - isallowconnect :boolean = true - constructor(public changeDetectorRef:ChangeDetectorRef,private zone: NgZone,private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,private tree:TreeService,private sanitizer:DomSanitizer,public snackBar: MatSnackBar) {} - - isallowconnect1(){ - this.isallowconnect = true - } - isallowconnect2(){ - this.isallowconnect = false - } - onNoClick(): void { - this.dialogRef.close(); - } - ngOnInit() { - // console.log(222,this.data.sourceMaterial) - //获取所有的消防要素 - this.http.get('/api/FireElements').subscribe(data=>{ - this.dataSource.data = this.tree.toTree(data) - }) - } - add(e){ - this.displaynoneid = e.id - this.displaynonename = e.name - } - isImg = true - selectedcolor2(){ - this.isImg = true - this.selectedcolor ="#066eed" - this.colorIndex = 0 - } - selectedimg2(){ - this.isImg = false - this.selectedcolor ="" - } - hasChild = (_: number, node: any) => node.expandable; - - colors = ['#066eed','#00e5ef','#00ef76','#ffff00','#efb522','#20b4ac','#836eff','#ff8d00','#ef00ef','#ffa17a','#ff6a6a','#ff0000','#ff6eb5','#00bfff','#54ff9f','#00cd00','#00ffff','#6495ed','#ffdbb9','#836eff'] - isshow = true//选择颜色或者上传图片 - colorIndex:any=0; //选中的颜色的index - selectedcolor = "#066eed" - imgUrl = ""//返回来的图片地址后缀 - selectcolor(item,key){ - if(this.colorIndex != key){ - this.colorIndex = key - } - this.selectedcolor = item - } - - imgsrc = "../../../assets/images/upload2.png" - - filechange(e){ - const file = e.srcElement.files[0]; // 获取图片这里只操作一张图片 - var reader = new FileReader(); - reader.readAsDataURL(file); - var image:any = new Image(); - reader.onload = function(){ - image.src = reader.result - } - setTimeout(() => { - if(image.width > 128 && image.height > 128){ - var obj = document.getElementById('selectedfile') ; - obj.outerHTML=obj.outerHTML; - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择分辨率小于128*128的图片','确定',config); - }else{ - this.upload() - } - }, 100); - } - - upload(){ - if(!this.uploader.queue[0]){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择文件','确定',config); - }else{ - this.uploader.queue[0].upload();//开始上传 - this.uploader.queue[0].onSuccess = (response, status, headers) => { - // 上传文件成功 - if (status == 201) { - // 上传文件后获取服务器返回的数据 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功','确定',config); - - let tempRes = JSON.parse(response); - this.imgUrl = tempRes.objectName - this.imgsrc = '/api/Objects/PlanPlatform/' + this.imgUrl - }else { - // 上传文件后获取服务器返回的数据错误 - } - }; - this.uploader.queue[0].onError = (response, status, headers) => { - if (status == 401) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传失败','确定',config); - } - }; - } - - } - showtype:string = '0' //默认渲染方式 - isbordernum:boolean = false - changeshowtype(e){ - if(e.value == "1"){ - this.isbordernum = true - }else{ - this.isbordernum = false - } - } - onSubmit(value){ - value.pige=Boolean(Number(value.pige)) - value.from=Boolean(Number(value.from)) - value.connect=Boolean(Number(value.connect)) - if(value.showtype == "1"){ - this.http.post(`/api/Assets`,{ - id:"", - name:value.name, - width: 0, - height: 0, - angle: 0, - interactiveMode: Number(value.tag),//交互方式 - isFromBuilding:value.from, - canConnect:value.connect, - holeMaxCount:value.connect ? value.maxconnect : 0, - fixedSize: value.pige, - fillMode: Number(value.padding),//填充方式 - color: this.selectedcolor+'80', - imageUrl:'/api/Objects/PlanPlatform/' + this.imgUrl, - drawMode: Number(value.showtype) , //渲染方式 - border:{ - x: value.left, - y: value.bottom, - z: value.right, - w: value.top - }, - order: this.data.sourceMaterial.length, - enabled: true, - propertyInfos: [], - fireElementId:this.displaynoneid - }, - { - params: { - libraryId:this.data.node.id, - } - }).subscribe((data)=>{ - this.dialogRef.close("ooo"); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('新建成功','确定',config); - }) - }else{ - this.http.post(`/api/Assets`,{ - id:"", - name:value.name, - width: 0, - height: 0, - angle: 0, - interactiveMode: Number(value.tag),//交互方式 - isFromBuilding:value.from, - canConnect:value.connect, - holeMaxCount:value.connect ? value.maxconnect : 0, - fixedSize: value.pige, - fillMode: Number(value.padding),//填充方式 - color: this.selectedcolor+'80', - imageUrl:'/api/Objects/PlanPlatform/' + this.imgUrl, - drawMode: Number(value.showtype) , //渲染方式 - border:{}, - order: this.data.sourceMaterial.length, - enabled: true, - propertyInfos: [], - fireElementId:this.displaynoneid - }, - { - params: { - libraryId:this.data.node.id, - } - }).subscribe((data)=>{ - this.dialogRef.close("ooo"); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('新建成功','确定',config); - }) - } - } - } \ No newline at end of file diff --git a/src/app/ui/material-bank/attribute.html b/src/app/ui/material-bank/attribute.html deleted file mode 100644 index 369a50d..0000000 --- a/src/app/ui/material-bank/attribute.html +++ /dev/null @@ -1,94 +0,0 @@ -
    -
    -
    {{data.name}}
    -
    - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - add_box - - - 名称 - {{element.propertyName}} - 类型 - - - - - - - - - - 默认值 - {{element.propertyValue}} - 必填 - - - 单位 - {{element.physicalUnit}} - 操作 - border_color - visibility - visibility_off - block - block - delete -
    -
    -
    \ No newline at end of file diff --git a/src/app/ui/material-bank/editAttribute.html b/src/app/ui/material-bank/editAttribute.html deleted file mode 100644 index 22a190c..0000000 --- a/src/app/ui/material-bank/editAttribute.html +++ /dev/null @@ -1,71 +0,0 @@ -
    编辑属性
    -
    -
    - -
    - - - -
    - -
    - - - - {{item.viewValue}} - - - - - - -
    - -
    - - - 是 - 否 - -
    - -
    - - - 不验证 - ≥ - ≤ - 区间 - 正则匹配 - - - - - -
    - -
    - - - -
    - -
    - - - -
    - -
    - - -
    -
    -
    \ No newline at end of file diff --git a/src/app/ui/material-bank/editmatlibrary.component.html b/src/app/ui/material-bank/editmatlibrary.component.html deleted file mode 100644 index c86c117..0000000 --- a/src/app/ui/material-bank/editmatlibrary.component.html +++ /dev/null @@ -1,23 +0,0 @@ -
    - 修改素材库 - - - - - - - 信息录入 - 预案管理 - 指挥系统 - - - - -
    - - -
    - -
    \ No newline at end of file diff --git a/src/app/ui/material-bank/editmatlibrary.component.ts b/src/app/ui/material-bank/editmatlibrary.component.ts deleted file mode 100644 index fcbba63..0000000 --- a/src/app/ui/material-bank/editmatlibrary.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { HttpClient } from '@angular/common/http'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; -@Component({ - selector: 'editmatlibrary', - templateUrl: './editmatlibrary.component.html', - styleUrls: ['./material-bank.component.scss'] - }) - export class EditMatLibrary { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - name:any - input:any - ngOnInit(): void { - this.name = this.data.material.name - this.input = this.data.material.tag - } - onNoClick(): void { - - this.dialogRef.close(); - } - onSubmit(value){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - this.http.put(`/api/AssetLibraries/${this.data.material.id}`,{ - id: this.data.material.id, - name: value.name, - order: this.data.material.order, - tag: value.tag, - enabled: true, - modifiedTime: time - }).subscribe(data=>{ - this.dialogRef.close(); - }) - } - } \ No newline at end of file diff --git a/src/app/ui/material-bank/editoriginalcopy.component.html b/src/app/ui/material-bank/editoriginalcopy.component.html deleted file mode 100644 index e00e323..0000000 --- a/src/app/ui/material-bank/editoriginalcopy.component.html +++ /dev/null @@ -1,149 +0,0 @@ -
    -
    - 编辑原件 -
    -
    -
    - - - - - - 点 - 多点连线 - 多边形 - - -
    - 是否来自建筑： - - 是 - 否 - -
    -
    - 是否允许连接： - - 是 - 否 - -
    -
    -
    - 最大连接数： - -
    -
    -
    - 固定大小： - - 是 - 否 - -
    - -
    - 填充方式： - - 颜色 - 图片 - -
    -
    -
      -
    • -
    -
    - - - - - - 简单 - 九宫格 - 平铺 - - - -
    -

    九宫格边框数值：

    -
    -
    - 左： - -
    -
    - 右： - -
    -
    - 上： - -
    -
    - 下： - -
    -
    - -
    - - - - - - - -
    - 图片: -
    - 暂无图片 - -
    - -
    - - - -
    -
    - -
    - - - -
  • {{node.name}}
    • -     - - - - -
  • {{node.name}}
    • -     -     -
    -
    - -
    - - - -
    - - -
    - -
    diff --git a/src/app/ui/material-bank/editoriginalcopy.component.ts b/src/app/ui/material-bank/editoriginalcopy.component.ts deleted file mode 100644 index 4a7f751..0000000 --- a/src/app/ui/material-bank/editoriginalcopy.component.ts +++ /dev/null @@ -1,305 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { HttpClient } from '@angular/common/http'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; -import { TreeService } from '../../http-interceptors/tree.service' -import { FileUploader } from 'ng2-file-upload' -import { DomSanitizer } from '@angular/platform-browser' -@Component({ - selector: 'editoriginalcopy', - templateUrl: './editoriginalcopy.component.html', - styleUrls: ['./material-bank.component.scss'] - }) - export class EditOriginalCopy { - - uploader:FileUploader = new FileUploader({ - url: "/api/Objects/PlanPlatform", - method: "POST", - itemAlias: "uploadedfile", - removeAfterUpload:true - }); - - - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - children:node.children - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - myControl = new FormControl(); - - displaynonename = "" - iscolor =null - isimg = null - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,private tree:TreeService,private sanitizer:DomSanitizer,public snackBar: MatSnackBar) {} - - colors = ['#066eed','#00e5ef','#00ef76','#ffff00','#efb522','#20b4ac','#836eff','#ff8d00','#ef00ef','#ffa17a','#ff6a6a','#ff0000','#ff6eb5','#00bfff','#54ff9f','#00cd00','#00ffff','#6495ed','#ffdbb9','#836eff'] - isshow = true//选择颜色或者上传图片 - colorIndex:any=0; //选中的颜色的index - selectedcolor = "#066eed" - imgUrl = ""//返回来的图片地址后缀 - defaultname = this.data.Original.name//点击的原件的name - OriginalId = this.data.Original.id//点击的原件的id - OriginalfireElementId = this.data.Original.fireElementId//点击的原件的消防id - displaynoneid = this.OriginalfireElementId//选择的关联消防id - OriginalfireElementName = null //点击的原件的消防name - OriginalpropertyInfos = this.data.Original.propertyInfos//点击原件的属性信息 - OriginalinteractiveMode = String(this.data.Original.interactiveMode) //点击原件的交互方式 - OriginalfixedSize = String(Number(this.data.Original.fixedSize))//点击原件的固定大小 - from = String(Number(this.data.Original.isFromBuilding)) - Originalpadding = null - Originalimageurl = this.data.Original.imageUrl//点击原件的图片地址 - Originalcolor = this.data.Original.color - padding = "0"// - showtype:any//默认渲染方式 - - left:number - right:number - top:number - bottom:number - isbordernum:boolean - connect:any - isallowconnect :boolean = true - connectvalue:any - onNoClick(): void { - this.dialogRef.close(); - } - isallowconnect1(){ - this.isallowconnect = true - } - isallowconnect2(){ - this.isallowconnect = false - } - changeshowtype(e){ - if(e.value == "1"){ - this.isbordernum = true - }else{ - this.isbordernum = false - } - } - ngOnInit() { - // console.log(this.data.Original) - if(this.data.Original.drawMode == 1){ - this.isbordernum = true - }else{ - this.isbordernum = false - } - this.connectvalue = this.data.Original.holeMaxCount - if(this.data.Original.canConnect){ - this.connect = "1" - }else{ - this.connect = "0" - } - this.isallowconnect = this.data.Original.canConnect - - this.showtype = this.data.Original.drawMode + '' - if(this.data.Original.border){ - this.left = this.data.Original.border.x - this.bottom = this.data.Original.border.y - this.right = this.data.Original.border.z - this.top = this.data.Original.border.w - } - - if(this.data.Original.fillMode == 1){ - this.isxxx = false - this.colorIndex = null - } - if(this.Originalcolor){//如果该原件有颜色 - let Originalcolordata =(this.Originalcolor).slice(0,7) - this.colors.forEach((item,index)=>{ - if(item == Originalcolordata){ - this.colorIndex = index - } - }) - } - - - - this.http.get('/api/FireElements').subscribe((data:any)=>{ - this.dataSource.data = this.tree.toTree(data) - data.forEach(item=>{ - if(item.id === this.OriginalfireElementId){ - this.OriginalfireElementName = item.name - } - }) - }) - - this.dataSource.data.forEach(item=>{ - - }) - - if(this.data.Original.fillMode == 0){ - this.Originalpadding ="0" - }else{ - this.Originalpadding ="1" - } - } - add(e){ - this.displaynoneid = e.id - this.OriginalfireElementName = e.name - } - hasChild = (_: number, node: any) => node.expandable; - //控制20种颜色是否显示 - isxxx = true - //点击选择颜色 - selcolor(){ - this.isxxx = true - if(this.data.Original.fillMode == 1){ - this.colorIndex = null - } - } - //点击选择图片 - selimg(){ - this.isxxx = false - } - selectcolor(item,key){ - if(this.colorIndex != key){ - this.colorIndex = key - } - this.selectedcolor = item - } - imgsrc = "" - filechange(e){ - const file = e.srcElement.files[0]; // 获取图片这里只操作一张图片 - var reader = new FileReader(); - reader.readAsDataURL(file); - var image:any = new Image(); - reader.onload = function(){ - image.src = reader.result - } - setTimeout(() => { - if(image.width > 128 && image.height > 128){ - var obj = document.getElementById('selectedfile') ; - obj.outerHTML=obj.outerHTML; - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择分辨率小于128*128的图片','确定',config); - }else{ - this.upload() - } - }, 100); - } - upload(){ - if(!this.uploader.queue[0]){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择文件','确定',config); - }else{ - this.uploader.queue[0].upload();//开始上传 - this.uploader.queue[0].onSuccess = (response, status, headers) => { - // 上传文件成功 - if (status == 201) { - // 上传文件后获取服务器返回的数据 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功','确定',config); - let tempRes = JSON.parse(response); - this.imgUrl = tempRes.objectName - this.Originalimageurl = '/api/Objects/PlanPlatform/' + this.imgUrl - }else { - // 上传文件后获取服务器返回的数据错误 - } - }; - this.uploader.queue[0].onError = (response, status, headers) => { - if (status == 401) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('无权限上传','确定',config); - } - }; - } - - } - newimageUrl = "" - onSubmit(value){ - // console.log(value) - if(!this.imgUrl){//判断编辑时是否重新上传了照片 - this.newimageUrl = this.Originalimageurl - }else{ - this.newimageUrl = '/api/Objects/PlanPlatform/' + this.imgUrl - } - value.from=Boolean(Number(value.from)) - value.pige=Boolean(Number(value.pige)) - value.connect=Boolean(Number(value.connect)) - if(value.showtype == "1"){ - this.http.put(`/api/Assets/${this.OriginalId}`,{ - id:this.OriginalId, - name:value.name, - width: 0, - height: 0, - angle: 0, - interactiveMode: Number(value.tag),//交互方式 - isFromBuilding:value.from, - canConnect:value.connect, - holeMaxCount:value.connect ? value.maxconnect : 0, - fixedSize: value.pige, - fillMode: Number(value.padding),//填充方式 - color: this.selectedcolor+'80', - imageUrl:this.newimageUrl, - drawMode: Number(value.showtype) , //渲染方式 - border: { - x: value.left, - y: value.bottom, - z: value.right, - w: value.top - }, - order: this.data.Original.order, - enabled: true, - propertyInfos: this.OriginalpropertyInfos, - fireElementId:this.displaynoneid - }).subscribe((data)=>{ - this.dialogRef.close("ooo"); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改成功','确定',config); - }) - }else{ - this.http.put(`/api/Assets/${this.OriginalId}`,{ - id:this.OriginalId, - name:value.name, - width: 0, - height: 0, - angle: 0, - interactiveMode: Number(value.tag),//交互方式 - isFromBuilding:value.from, - canConnect:value.connect, - holeMaxCount:value.connect ? value.maxconnect : 0, - fixedSize: value.pige, - fillMode: Number(value.padding),//填充方式 - color: this.selectedcolor+'80', - imageUrl:this.newimageUrl, - drawMode: Number(value.showtype) , //渲染方式 - border: {}, - order: this.data.Original.order, - enabled: true, - propertyInfos: this.OriginalpropertyInfos, - fireElementId:this.displaynoneid - }).subscribe((data)=>{ - this.dialogRef.close("ooo"); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改成功','确定',config); - }) - } - - - } - } \ No newline at end of file diff --git a/src/app/ui/material-bank/material-bank.component.html b/src/app/ui/material-bank/material-bank.component.html deleted file mode 100644 index e4eb8ba..0000000 --- a/src/app/ui/material-bank/material-bank.component.html +++ /dev/null @@ -1,68 +0,0 @@ -
    -
    -
    - keyboard_arrow_down - chevron_right - 素材库管理 -
    - - - - -
    -
    -
    -
    - folder{{item.name}} - block -
    -
    - -
    - -
    -
    -
    -

    {{material.name}}

    -
    - - - - - - -
    -
    - -
    -
    - - {{item.name}} - block -
    -
    - -
    - - -
    -
    diff --git a/src/app/ui/material-bank/material-bank.component.scss b/src/app/ui/material-bank/material-bank.component.scss deleted file mode 100644 index a42d67c..0000000 --- a/src/app/ui/material-bank/material-bank.component.scss +++ /dev/null @@ -1,310 +0,0 @@ -.content { - padding: 0 0 0 10px; - width: 100%; - height: 90%; - overflow-x: hidden; - overflow-y: auto; - display: flex; - .leftBox { - flex: 20%; - padding-top: 10px; - } - .rightBox { - border-left: 1px solid #999; - flex: 80%; - display: flex; - flex-direction: column; - .topBox { - flex:1; - .originalScript { - border-bottom: 1px solid #999; - background-color: #fafafa; - padding:5px 0; - width: 100%; - padding-left: 20px; - font-weight: 500; - display: flex; - flex-direction: row; - p{ - margin-top: 11px; - } - .mat-icon { - vertical-align:middle; - } - } - } - } -} - - - -.bank { - display: flex; - font-size: 18px; - font-weight: 500; -} - -.mat-icon { - width: 18px; - height: 18px; - vertical-align:top; - margin-right: 8px; - cursor:pointer; -} -.material { - cursor:pointer; - height: 30px; - font-size: 16px; - margin-top: 10px; - padding-left: 25px; - .btn { - color: #FFC122; - } - .blockBtn { - float: right; - margin-right: 15px; - width: 16px; - height: 16px; - } -} -.imgBox { - padding: 5px 0 0 5px; - margin-top: 5px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - .imgDiv { - span{ - overflow: hidden; - text-overflow: ellipsis; - } - display: inline-block; - margin-right: 10px; - margin-bottom: 10px; - width: 90px; - height: 165px; - text-align: center; - img { - width: 100%; - } - } -} - -.attribute { - padding-left: 25px; - display: flex; - flex-direction: row; - background-color: #d7d7d7; - div { - margin-right: 25px; - } - .attributeLeft{ - padding-top: 8px; - flex: 75%; - } -} -.btnBox .mat-icon{ - padding: 8px; -} -.overFlow { - height: 500px; - overflow: auto; -} -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } -} - - - -.active { - background-color: rgba(225,225,225,0.8) -} -.OriginalActive { - background-color: rgba(225,225,225,0.8); -} - -.btn{ - text-align: center; - button{ - margin: 0 8px; - } -} -.addbtn{ - width: 584px; - height: 32px; - border-top: 1px solid black; - text-align: center; - padding-top: 6px; - button{ - margin: 0 6px; - } -} -.mat-radio-button { - font-size: 14px; - margin-right: 5px; -} -.topbox{ - height: 32px; - border-bottom: 1px solid black; - -} -.mainbox{ - position: relative; - width: 582px; - height: 656px; - .mainleft{ - height: 646px; - width: 290px; - float: left; - border-right: 1px solid black; - padding-top: 10px; - mat-form-field{ - display: block; - width: 220px; - } - .padding{ - margin-top: 12px; - } - .color{ - height: 50px; - .color1{ - - margin-bottom: 5px; - margin-top: 12px; - li{ - width: 23px; - height: 23px; - list-style: none; - // margin: 2px; - float: left; - border: 2px solid white; - } - } - } - } - .mainright{ - width: 288px; - height: 654px; - float: left; - overflow: auto; - label{ - font-weight: 900; - } - } -} -.coloractive{ - border: 2px solid black !important; - -} -.pigepadding{ - font-size: 16px; -} -.selectoriginalcopybox{ - width: 423px; - height: 300px; - border: 1px solid black; - overflow: auto; - margin-bottom: 10px; -} -.originalcopyimg{ - width: 100px; - height: 120px; - float: left; - text-align: center; - img{ - width: 70px; - height: 70px; - } - p{ - font-size: 11px; - height: 11px; - } - -} -.selectedback{ - background-color:rgba(0,165,219,0.5); -} -.selecteditem{ - // background: grey; - cursor:not-allowed; - background-color: rgba(225, 225, 225, 0.8) -} -.selecteditemimg{ - opacity: 0.3; - filter: alpha(opacity=30); -} -.matname{ - margin-left: 6px; - -} -.divImg{ - width: 95px; - height: 95px; - font-size: 15px; - margin-left: 48px; - margin-top: -11px; - border: 1px dashed grey; - padding: 4px; - img{ - width: 100%; - height: 100%; - - } -} -.Input{ - width: 102px; - height: 103px; - position: absolute; - left:0px; - top: 0px; - cursor: pointer; - opacity:0 -} -.relevancefire{ - margin-top: 5px; -} -.fireli{ - list-style: none; - -} -.fireli:hover{ - background: rgba(225, 225, 225, 0.8); - cursor: pointer; -} -.firebtn{ - line-height: 24px; -} -.image{ - margin-bottom: 6px; -} - -.positionup{ - position: absolute; - top:407px; - left: 50px -} -.isbordernum{ - position: absolute; - top: 410px; - left: 50px -} -.from{ - margin-bottom: 10px; -} -.border{ - .bordernum{ - display: block; - } - .borderinputbox{ - float: left; - width: 142px; - input{ - width: 98px; - } - } - -} \ No newline at end of file diff --git a/src/app/ui/material-bank/material-bank.component.ts b/src/app/ui/material-bank/material-bank.component.ts deleted file mode 100644 index eb9e703..0000000 --- a/src/app/ui/material-bank/material-bank.component.ts +++ /dev/null @@ -1,572 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { AddMatLibrary } from './addmatlibrary.component' -import { EditMatLibrary } from './editmatlibrary.component' -import { AddOriginalCopy } from './addoriginalcopy.component' -import { MatTableDataSource } from '@angular/material/table'; -import { EditOriginalCopy } from './editoriginalcopy.component' -import { SelectOriginalCopy } from './selectoriginalcopy.component' -import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; - - - -@Component({ - selector: 'app-material-bank', - templateUrl: './material-bank.component.html', - styleUrls: ['./material-bank.component.scss'] -}) -export class MaterialBankComponent implements OnInit { - - constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - ngOnInit(): void { - this.http.get('/api/AssetLibraries').subscribe(data=>{ - this.material = data[0] - this.allMaterialBank = data - this.getSourceMaterial() - }) - } - - allMaterialBank:any = []; //所有素材库 - material:any={name:''}; //选中的素材库 - materialIndex:any=0; //选中的素材库index - - sourceMaterial:any; //素材库对应所有原件 - Original:any; //选中的原件 - OriginalIndex:any=null; //选中的原件index - isshow = true//左侧列表的显示隐藏 - - //收起左侧列表 - showlist(){ - this.isshow = !this.isshow - } - //获取所有素材库 - getMaterialBank () { - this.http.get('/api/AssetLibraries').subscribe(data=>{ - this.allMaterialBank = data - this.material = data[this.materialIndex] - }) - } - - //获得指定素材库所有原件 - getSourceMaterial () { - this.sourceMaterial = null - if (this.material) { - let data = { - libraryId:this.material.id - } - this.http.get('/api/Assets',{ - params:data - }).subscribe(data=>{ - this.sourceMaterial = data - this.Original = data[this.OriginalIndex] - }) - } - } - - //选中素材库 - add (e,index) { - this.Original = null - this.OriginalIndex = null - if (this.materialIndex != index) { - this.material = e - this.materialIndex = index - this.getSourceMaterial() - } - } - - //选中原件 - addOriginal (e,index) { - this.Original = e - this.OriginalIndex = index - } - - //打开查看属性弹窗 - viewProperties () { - if(this.Original){ - let data = this.Original - const dialogRef = this.dialog.open(attributeComponent, - {width: '1000px',data}); - dialogRef.afterClosed().subscribe( - (data)=>{if(data){this.getSourceMaterial()}} - ) - }else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择原件','确定',config); - } - } - - - - - //新增素材库 - addmatlibrary(){ - let data = this.allMaterialBank || [] - const dialogRef = this.dialog.open(AddMatLibrary, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data - }); - dialogRef.afterClosed().subscribe( - data=>{ - this.getMaterialBank () - } - ); - } - - //编辑素材库 - editmatlibrary(){ - const dialogRef = this.dialog.open(EditMatLibrary, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data: {allMaterialBank:this.allMaterialBank,material:this.material} - }); - dialogRef.afterClosed().subscribe( - data=>{ - this.getMaterialBank () - } - ); - } - - //删除素材库 - delete(){ - var isdeleted = confirm(`确定要删除${this.material.name}素材库吗？`) - if(isdeleted){ - //请求删除接口 - this.http.delete(`/api/AssetLibraries/${this.material.id}`).subscribe( data=>{ - this.materialIndex -= 1//删除之后焦点前移 - this.getMaterialBank () - }) - } - } - - //禁启用素材库 - disabled(){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - if(this.material.enabled){ - this.http.put(`/api/AssetLibraries/${this.material.id}`,{ - id: this.material.id, - name: this.material.name, - order: this.material.order, - tag: this.material.tag, - enabled: false, - modifiedTime: time - }).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('禁用成功','确定',config); - this.getMaterialBank () - }) - }else{ - this.http.put(`/api/AssetLibraries/${this.material.id}`,{ - id: this.material.id, - name: this.material.name, - order: this.material.order, - tag: this.material.tag, - enabled: true, - modifiedTime: time - }).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('启用成功','确定',config); - this.getMaterialBank () - }) - } - - } - - //新增素材原件 - addoriginalcopy(node){ - const dialogRef = this.dialog.open(AddOriginalCopy, {//调用open方法打开对话框并且携带参数过去 - // height:"715px", - width:"640px", - data: {allMaterialBank:this.allMaterialBank,node:node,sourceMaterial:this.sourceMaterial} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - this.getSourceMaterial () - } - - } - ); - } - //修改素材原件 - editoriginalcopy(node){ - if(this.Original){ - const dialogRef = this.dialog.open(EditOriginalCopy, {//调用open方法打开对话框并且携带参数过去 - // height:"580px", - width:"640px", - data: {allMaterialBank:this.allMaterialBank,node:node,Original:this.Original} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - this.getSourceMaterial () - } - } - ); - }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择原件','确定',config); - } - - } - - //禁启用原件 - disableoriginal(material){ - if(this.Original){ - this.http.put(`/api/Assets/${this.Original.id}`,{ - id:this.Original.id, - name:this.Original.name, - width: this.Original.width, - height: this.Original.height, - angle: this.Original.angle, - interactiveMode:this.Original.interactiveMode,//交互方式 - fixedSize: this.Original.fixedSize, - fillMode: this.Original.fillMode,//填充方式 - color: this.Original.color, - imageUrl:this.Original.imageUrl, - order: this.Original.order, - enabled: !this.Original.enabled, - propertyInfos: this.Original.propertyInfos, - fireElementId:this.Original.fireElementId - }).subscribe((data)=>{ - this.getSourceMaterial () - }) - }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择原件','确定',config); - } - } - - //删除原件 - deleteoriginal(material){ - if(this.Original){ - var isdeleted = confirm(`确定要删除当前原件吗？`) - if(isdeleted){ - //请求删除接口 - this.http.delete(`/api/Assets`,{ - params:{ - libraryId:material.id, - id:this.Original.id - } - }).subscribe( data=>{ - this.getSourceMaterial () - }) - } - }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择原件','确定',config); - } - } - - //选择原件素材 material为当前素材库的信息 - selectoriginal(material){ - const dialogRef = this.dialog.open(SelectOriginalCopy, {//调用open方法打开对话框并且携带参数过去 - // height:"525px", - data: {allMaterialBank:this.allMaterialBank,material:material} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - this.getSourceMaterial () - } - - } - ); - } - - - -} - - - -//原件对应所有属性弹窗 -@Component({ - selector: 'app-attribute', - templateUrl: './attribute.html', - styleUrls: ['./material-bank.component.scss'] -}) -export class attributeComponent { - - constructor(private http:HttpClient,public dialog: MatDialog, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) { } - - ngOnInit(): void { - if (this.data.propertyInfos == null) { - this.data.propertyInfos = [] - } - this.setIndex() - this.dataSource = new MatTableDataSource(this.data.propertyInfos) - } - - displayedColumns = ['checked', 'name', 'type', 'default','required','physicalUnit','operation']; - dataSource:any=[]; //当前原件属性渲染table - dataSourceIndex:any=[]; //选中属性的index - - - - //封装函数每次更改,重新获取下标 - setIndex () { - if (this.data.propertyInfos) { - this.data.propertyInfos.forEach((item,index)=>{ - item.index = index - }) - } - } - - //点击checked框获取当前属性index - checkedChange (e,index) { - if (e.checked) { - this.dataSourceIndex.push(index) - } else { - this.dataSourceIndex.splice(this.dataSourceIndex.findIndex(item=>item==index),1) - } - } - - //上移 - toTop () { - if(this.dataSourceIndex.length) { - let index = this.dataSourceIndex[this.dataSourceIndex.length-1] - if (index != 0) { - let data = this.data.propertyInfos[index] - this.data.propertyInfos[index]=this.data.propertyInfos[index-1] - this.data.propertyInfos[index-1] = data - this.dataSourceIndex[this.dataSourceIndex.length-1] = index-1 - this.setIndex() - this.dataSource = new MatTableDataSource(this.data.propertyInfos) - } - } - } - - //下移 - toBottom () { - if(this.dataSourceIndex.length) { - let index = this.dataSourceIndex[this.dataSourceIndex.length-1] - if (index != this.data.propertyInfos.length-1) { - let data = this.data.propertyInfos[index] - this.data.propertyInfos[index]=this.data.propertyInfos[index+1] - this.data.propertyInfos[index+1] = data - this.dataSourceIndex[this.dataSourceIndex.length-1] = index+1 - this.setIndex() - this.dataSource = new MatTableDataSource(this.data.propertyInfos) - } - } - } - - - - //新增属性弹窗 - add () { - const dialogRef = this.dialog.open(addAttributeComponent); - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) { - this.data.propertyInfos.push(data) - this.setIndex() - this.dataSource = new MatTableDataSource(this.data.propertyInfos)} - }) - } - - //编辑属性弹窗 - edit (e) { - - let data = this.data.propertyInfos[e] - const dialogRef = this.dialog.open(editAttribute,{data}); - dialogRef.afterClosed().subscribe( - data=>{ - if (data) { - this.data.propertyInfos[data.index] = data - this.setIndex() - this.dataSource = new MatTableDataSource(this.data.propertyInfos)} - }) - } - - //显示 - visible (e) { - this.data.propertyInfos[e].visible = true - } - //隐藏 - noVisible (e) { - this.data.propertyInfos[e].visible = false - } - //启用 - enabled (e) { - this.data.propertyInfos[e].enabled = true - } - //禁用 - noEnabled (e) { - this.data.propertyInfos[e].enabled = false - } - //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') - if (isTrue) { - this.data.propertyInfos.splice(e,1) - this.setIndex() - this.dataSource = new MatTableDataSource(this.data.propertyInfos) - } - } - - - - //原件属性保存 - preservation () { - if (this.data.propertyInfos.length) { - this.data.propertyInfos.forEach(item => { - delete item.index - }); - this.submit() - } else { - this.submit() - } - } - - //提交保存 - submit () { - this.http.put(`/api/Assets/${this.data.id}`,{ - id:this.data.id, - name:this.data.name, - width:this.data.width, - height:this.data.height, - angle:this.data.angle, - interactiveMode:this.data.interactiveMode, - isFromBuilding: this.data.isFromBuilding, - canConnect:this.data.canConnect, - holeMaxCount:this.data.holeMaxCount, - fixedSize:this.data.fixedSize, - fillMode:this.data.fillMode, - color:this.data.color, - imageUrl:this.data.imageUrl, - drawMode:this.data.drawMode, - border:this.data.border, - order:this.data.order, - enabled:this.data.enabled, - propertyInfos:this.data.propertyInfos, - fireElementId:this.data.fireElementId - }).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('保存成功','确定',config); - this.dialogRef.close('success') - }) - } - -} - - - -//新增属性弹窗 -export interface Food { - value: number; - viewValue: string; -} -@Component({ - selector: 'app-addAttribute', - templateUrl: './addAttribute.html', - styleUrls: ['./material-bank.component.scss'] -}) -export class addAttributeComponent { - - constructor(private http:HttpClient,public dialog: MatDialog, - public dialogRef: MatDialogRef,) { } - - ngOnInit(): void {} - - //定义属性数据 - propertyType:Food[]=[ - {value:0, viewValue: '单行文本'}, - {value:1, viewValue: '多行文本'}, - {value:2, viewValue: '数值'}, - {value:3, viewValue: '图片'}, - {value:4, viewValue: '图片数量'}, - {value:5, viewValue: '方向'}, - {value:6, viewValue: '布尔值'}, - {value:7, viewValue: '供给区域'}, - {value:8, viewValue: '供给类型'}] - - //提交表单 - onSubmit (e) { - e.order = 0 - e.enabled = true - e.visible = true - e.required = e.required=='true'? true: false, - this.dialogRef.close(e) - } - -} - - - -//编辑属性弹窗 -@Component({ - selector: 'app-editAttribute', - templateUrl: './editAttribute.html', - styleUrls: ['./material-bank.component.scss'] -}) -export class editAttribute { - - constructor(private http:HttpClient,public dialog: MatDialog, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data,) { } - - ngOnInit(): void { - this.propertyName = this.data.propertyName - this.propertyValue = this.data.propertyValue - this.propertyType = this.data.propertyType - this.required = String(this.data.required) - this.ruleName = this.data.ruleName - this.ruleValue = this.data.ruleValue - this.physicalUnit = this.data.physicalUnit - this.tag = this.data.tag} - - - propertyName:any - propertyValue:any; - propertyType:number; - required:any; - ruleName:any; - ruleValue:any; - physicalUnit:any; - tag:any; - - //定义属性数据 - type:Food[]=[ - {value:0, viewValue: '单行文本'}, - {value:1, viewValue: '多行文本'}, - {value:2, viewValue: '数值'}, - {value:3, viewValue: '图片'}, - {value:4, viewValue: '图片数量'}, - {value:5, viewValue: '方向'}, - {value:6, viewValue: '布尔值'}, - {value:7, viewValue: '供给区域'}, - {value:8, viewValue: '供给类型'}] - - //提交表单 - onSubmit (e) { - e.order = 0 - e.enabled = this.data.enabled - e.visible = this.data.visible - e.index = this.data.index - e.required = e.required=='true'? true: false, - this.dialogRef.close(e) - } - - - -} \ No newline at end of file diff --git a/src/app/ui/material-bank/selectoriginalcopy.component.html b/src/app/ui/material-bank/selectoriginalcopy.component.html deleted file mode 100644 index 00f4e33..0000000 --- a/src/app/ui/material-bank/selectoriginalcopy.component.html +++ /dev/null @@ -1,22 +0,0 @@ -
    - 选择原件 - - - {{item.name}} - - -
    -
    - -

    {{item.name}}

    - - -
    -
    - -
    - - -
    - -
    \ No newline at end of file diff --git a/src/app/ui/material-bank/selectoriginalcopy.component.ts b/src/app/ui/material-bank/selectoriginalcopy.component.ts deleted file mode 100644 index 65d195f..0000000 --- a/src/app/ui/material-bank/selectoriginalcopy.component.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { HttpClient } from '@angular/common/http'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; -@Component({ - selector: 'selectoriginalcopy', - templateUrl: './selectoriginalcopy.component.html', - styleUrls: ['./material-bank.component.scss'] - }) - export class SelectOriginalCopy { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - matlibrary = this.data.allMaterialBank//所有素材库 - selectedmatlibraryid = ""//当前下拉框选中的素材库id - sourceMaterial:any; //指定素材库对应所有原件 - atpresentSourceMaterial:any//当前选择原件素材库对应所有原件 - aaa = this.data.allMaterialBank[0].id//默认显示第一个素材库 - ngOnInit(): void { - this.getatpresentSourceMaterial ()//初始化时先获取一下当前素材库对应所有原件，然后在获取指定素材库原件时进行筛选对比 - let data = { - libraryId:this.data.allMaterialBank[0].id - } - this.http.get('/api/Assets',{ - params:data - }).subscribe((data : any)=>{ - data.forEach(item => { - this.atpresentSourceMaterial.forEach(n=>{ - if(n.id == item.id){ - item.isselected = true - } - }) - }); - this.sourceMaterial = data - }) - - } - onNoClick(): void { - this.dialogRef.close(); - } - - //获得指定素材库所有原件 - getSourceMaterial () { - let data = { - libraryId:this.selectedmatlibraryid - } - this.http.get('/api/Assets',{ - params:data - }).subscribe((data : any)=>{ - data.forEach(item => { - this.atpresentSourceMaterial.forEach(n=>{ - if(n.id == item.id){ - item.isselected = true - } - }) - }); - this.sourceMaterial = data - }) - } - //获得当前素材库所有原件 - getatpresentSourceMaterial (){ - let data = { - libraryId:this.data.material.id - } - this.http.get('/api/Assets',{ - params:data - }).subscribe(data=>{ - this.atpresentSourceMaterial = data - }) - } - selectmatlibrart(item){//点击下拉框中的一项 - this.selectedmatlibraryid = item.id - this.getSourceMaterial () - } - selectedimg = []//需要提交的原件id数组 - clickimg(item){//点击选择原件的多张图片 - if(!item.isselected){ - if(item.istrue){//如果图片已经被选中，此时点击 - item.istrue = false - this.selectedimg.forEach((n,index) => { - if(n == item.id){//将此id从数组中移除 - this.selectedimg.splice(index,1) - } - }); - }else{//如果图片还没有被选中 - item.istrue = true - this.selectedimg.push(item.id)//将选中图片id存入数组 - } - } - - } - onSubmit(value){ - this.http.post("/api/Assets/Select",{ - assetLibraryId:this.data.material.id , - assetIds: this.selectedimg - }).subscribe(data=>{ - this.dialogRef.close('ooo'); - }) - } - } \ No newline at end of file diff --git a/src/app/ui/menu/menu.component.html b/src/app/ui/menu/menu.component.html deleted file mode 100644 index 291721d..0000000 --- a/src/app/ui/menu/menu.component.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/ui/menu/menu.component.scss b/src/app/ui/menu/menu.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/menu/menu.component.spec.ts b/src/app/ui/menu/menu.component.spec.ts deleted file mode 100644 index beb2d9b..0000000 --- a/src/app/ui/menu/menu.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { MenuComponent } from './menu.component'; - -describe('MenuComponent', () => { - let component: MenuComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ MenuComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(MenuComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/menu/menu.component.ts b/src/app/ui/menu/menu.component.ts deleted file mode 100644 index e21108c..0000000 --- a/src/app/ui/menu/menu.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-menu', - templateUrl: './menu.component.html', - styleUrls: ['./menu.component.scss'] -}) -export class MenuComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/ui/navmenus/createmenus.component.html b/src/app/ui/navmenus/createmenus.component.html deleted file mode 100644 index 3258a3d..0000000 --- a/src/app/ui/navmenus/createmenus.component.html +++ /dev/null @@ -1,24 +0,0 @@ -
    - - - - - - - - - - - - - -
    - - -
    - -
    \ No newline at end of file diff --git a/src/app/ui/navmenus/editmenus.component.html b/src/app/ui/navmenus/editmenus.component.html deleted file mode 100644 index 2c37c37..0000000 --- a/src/app/ui/navmenus/editmenus.component.html +++ /dev/null @@ -1,24 +0,0 @@ -
    - - - - - - - - - - - - - -
    - - -
    - -
    \ No newline at end of file diff --git a/src/app/ui/navmenus/navmenus.component.html b/src/app/ui/navmenus/navmenus.component.html deleted file mode 100644 index 967468b..0000000 --- a/src/app/ui/navmenus/navmenus.component.html +++ /dev/null @@ -1,27 +0,0 @@ -
    - - - - {{node.name}} - - - - - - - - - {{node.name}} - - - - - - -
    \ No newline at end of file diff --git a/src/app/ui/navmenus/navmenus.component.scss b/src/app/ui/navmenus/navmenus.component.scss deleted file mode 100644 index f6123e2..0000000 --- a/src/app/ui/navmenus/navmenus.component.scss +++ /dev/null @@ -1,34 +0,0 @@ -table { - width: 100%; - th,td{ - text-align: center; - } -} -form{ - text-align: center; - button{ - margin: 0 12px; - } -} -mat-tree{ - width: 500px; - button{ - display: block; - float: right; - } - mat-tree-node{ - position: relative; - .deleted{ - position: absolute; - right: 0; - } - .create{ - position: absolute; - right: 80px; - } - .edit{ - position: absolute; - right: 40px; - } - } -} diff --git a/src/app/ui/navmenus/navmenus.component.spec.ts b/src/app/ui/navmenus/navmenus.component.spec.ts deleted file mode 100644 index 788f582..0000000 --- a/src/app/ui/navmenus/navmenus.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NavmenusComponent } from './navmenus.component'; - -describe('NavmenusComponent', () => { - let component: NavmenusComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ NavmenusComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(NavmenusComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/navmenus/navmenus.component.ts b/src/app/ui/navmenus/navmenus.component.ts deleted file mode 100644 index d7a9619..0000000 --- a/src/app/ui/navmenus/navmenus.component.ts +++ /dev/null @@ -1,228 +0,0 @@ -import { Component, OnInit,Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { HttpClient } from '@angular/common/http'; -import { TreeService } from '../../http-interceptors/tree.service' -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - - - -@Component({ - selector: 'app-navmenus', - templateUrl: './navmenus.component.html', - styleUrls: ['./navmenus.component.scss'] -}) -export class NavmenusComponent implements OnInit { - newdata = []; - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - children:node.children, - url:node.url, - icon:node.icon - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - constructor(private http: HttpClient,public dialog: MatDialog,private tree:TreeService,public snackBar: MatSnackBar) { } - getlist = ():void=>{ - this.http.get('/api/NavMenus').subscribe((data: any[])=>{ - this.newdata = this.tree.toTree(data) - const nodes = this.treeControl.dataNodes; - const expandNodes = []; - nodes.forEach((item) => { - if(item.expandable && this.treeControl.isExpanded(item)){ - expandNodes.push(item.id); - } - }); - this.dataSource.data = this.newdata; - let newNodes = this.treeControl.dataNodes; - newNodes = newNodes.filter(n => { - return expandNodes.indexOf(n.id) >= 0; - }); - newNodes.forEach(item => { - this.treeControl.expand(item); - }); - - }) - } - treedata:any - //初始化页面时渲染出tree - ngOnInit() { - this.http.get('/api/NavMenus').subscribe((data: any[])=>{ - // console.log(111,this.data) - // this.treedata = this.tree.toTree(data) - let _data = this.tree.toTree(data) - this.dataSource.data = _data - this.treedata = _data - console.log(111,this.treedata) - }) - } - hasChild = (_: number, node: any) => node.expandable; - - //弹出创建窗口按钮 - createauthority(value){ - const dialogRef = this.dialog.open(CreateMenus, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data: {id:value.id,children:value.children,icon:value.icon,url:value.url} - }); - dialogRef.afterClosed().subscribe( - data=>{ - this.newdata = [] - this.getlist() - } - ); - } - //删除按钮 - deleted(authority){ - var isdeleted = confirm("确定要删除此用户吗？") - if(isdeleted){ - //请求删除接口 - this.newdata = [] - this.http.delete(`/api/NavMenus/${authority.id}`).subscribe( data=>{ - this.getlist() - }) - } - } - //编辑按钮 - edit(value){ - const dialogRef = this.dialog.open(EditMenus, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data: {id:value.id,parentId:value.parentId,order:value.order,node:value} - }); - dialogRef.afterClosed().subscribe( - data=>{ - this.newdata = [] - this.getlist() - } - ); - } -} - -//创建组件 -@Component({ - selector: 'createmenus', - templateUrl: './createmenus.component.html', - styleUrls: ['./navmenus.component.scss'] -}) -export class CreateMenus { - myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef, - public snackBar: MatSnackBar,@Inject(MAT_DIALOG_DATA) public data) {} - - onNoClick(): void { - this.dialogRef.close(); - } - onSubmit(value){ - if(this.data.children){ - this.http.post( - '/api/NavMenus', - { - id: '', - name: value.name, - icon: value.icon, - url: value.url, - order:this.data.children[this.data.children.length -1].order + 1, - parentId: this.data.id - } - ).subscribe( - data=>{ - this.dialogRef.close(); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - }else{ - this.http.post( - '/api/NavMenus', - { - id: '', - name: value.name, - icon: value.icon, - url: value.url, - order:0, - parentId: this.data.id - } - ).subscribe( - data=>{ - this.dialogRef.close(); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - } - - } -} - - - -//编辑组件 -@Component({ - selector: 'editmenus', - templateUrl: './editmenus.component.html', - styleUrls: ['./navmenus.component.scss'] -}) -export class EditMenus { - myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar,@Inject(MAT_DIALOG_DATA) public data) {} - menuname:any //菜单名称 - menuiconurl:any //菜单图标地址 - menuweburl:any //菜单地址 - ngOnInit(): void { - this.menuname = this.data.node.name; - this.menuiconurl = this.data.node.icon; - this.menuweburl = this.data.node.url; - } - onNoClick(): void { - this.dialogRef.close(); - } - onSubmit(value){ - if(value.icon){ - this.data.icon = value.icon - } - if(value.url){ - this.data.url = value.url - } - this.http.put( - ` /api/NavMenus/${this.data.id}`, - { - id: this.data.id, - name: value.name, - icon: this.data.icon, - url: this.data.url, - order:this.data.order, - parentId: this.data.parentId - } - ).subscribe( - data=>{ - this.dialogRef.close(); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - } -} \ No newline at end of file diff --git a/src/app/ui/organization/createorganization.component.html b/src/app/ui/organization/createorganization.component.html deleted file mode 100644 index a3b56fb..0000000 --- a/src/app/ui/organization/createorganization.component.html +++ /dev/null @@ -1,33 +0,0 @@ -
    - - - - - - - - - - - - - - - -
    - - -
    - -
    diff --git a/src/app/ui/organization/editorganization.component.html b/src/app/ui/organization/editorganization.component.html deleted file mode 100644 index 7eedd0b..0000000 --- a/src/app/ui/organization/editorganization.component.html +++ /dev/null @@ -1,50 +0,0 @@ - -
    -
    - - - - - - - - - - - - - - -
    - - -
    - -
    -
    -
    - - - - -
  • {{node.name}}
    • -     - - - - -
  • {{node.name}}
    • -     -     -
    diff --git a/src/app/ui/organization/organization.component.html b/src/app/ui/organization/organization.component.html deleted file mode 100644 index 6f963b9..0000000 --- a/src/app/ui/organization/organization.component.html +++ /dev/null @@ -1,42 +0,0 @@ -
    - - - - {{node.name}} - - - - - - - - - - - - - - {{node.name}} - - - - - - - - - - - -
    - -

    努力加载中...

    -
    -
    - diff --git a/src/app/ui/organization/organization.component.scss b/src/app/ui/organization/organization.component.scss deleted file mode 100644 index 3e8692d..0000000 --- a/src/app/ui/organization/organization.component.scss +++ /dev/null @@ -1,71 +0,0 @@ -mat-tree{ - width:800px; - button{ - display: block; - float: right; - } - mat-tree-node{ - position: relative; - - .deleted{ - position: absolute; - right: 0px; - } - - .disabled{ - position: absolute; - right: 40px; - } - - .edit{ - position: absolute; - right:160px; - } - .create{ - position: absolute; - right: 200px; - } - .up{ - position: absolute; - right: 120px; - } - .down{ - position: absolute; - right: 80px; - } - } -} -form{ - text-align: center; - button{ - margin: 0 8px; - margin-top: 8px; - } -} - -.leftbox{ - width: 300px; - float: left; -} -.treebox{ - float: right; - height: 250px; - width: 300px; - /* overflow: auto; */ - overflow-x: hidden; - overflow-y: auto; -} -.smalltreebox{ - width: 300px; - mat-tree-node{ - width: 300px; - } -} -.orilist{ - list-style: none; - -} -.orilist:hover{ - cursor: pointer; - background-color: rgba(225, 225, 225, 0.8); -} \ No newline at end of file diff --git a/src/app/ui/organization/organization.component.ts b/src/app/ui/organization/organization.component.ts deleted file mode 100644 index fa592ec..0000000 --- a/src/app/ui/organization/organization.component.ts +++ /dev/null @@ -1,558 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { HttpClient } from '@angular/common/http'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { TreeService } from '../../http-interceptors/tree.service' -@Component({ - selector: 'app-organization', - templateUrl: './organization.component.html', - styleUrls: ['./organization.component.scss'] -}) -export class OrganizationComponent implements OnInit { - data:any =[] //存储所有组织机构 - newdata = []; - - private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - enabled:node.enabled, - order:node.order, - children:node.children, - isTop:node.isTop, - isBottom:node.isBottom, - code:node.code, - division:node.division - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { - } - isloading:any = false //loading效果 - //重新获取列表并且展开到上次位置的方法 - getlist = ():void=>{ - this.http.get('/api/Organizations').subscribe( - (data:any)=>{ - this.data = data; - this.newdata = this.tree.toTree(data) - - const nodes = this.treeControl.dataNodes; - const expandNodes = []; - nodes.forEach((item) => { - if(item.expandable && this.treeControl.isExpanded(item)){ - expandNodes.push(item.id); - } - }); - - - this.dataSource.data = this.newdata; - let newNodes = this.treeControl.dataNodes; - newNodes = newNodes.filter(n => { - return expandNodes.indexOf(n.id) >= 0; - }); - newNodes.forEach(item => { - this.treeControl.expand(item); - }); - this.isloading = false - - } - ) - } - //初始化视图 - ngOnInit() { - this.http.get('/api/Organizations').subscribe( - (data:any)=>{ - this.data = data; - this.dataSource.data = this.tree.toTree(data); - this.treeControl.expand(this.treeControl.dataNodes[0]); - } - ) - } - hasChild = (_: number, node: any) => node.expandable; - - //创建组织按钮 - create(value){ - const dialogRef = this.dialog.open(CreateOrganization, {//调用open方法打开对话框并且携带参数过去 - width: '260px', - data: {id:value.id,childlength:value.children,level:value.level} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - this.getlist() - } - } - ); - } - //编辑组织按钮 - edit(node){ - const dialogRef = this.dialog.open(EditOrganization, {//调用open方法打开对话框并且携带参数过去 - data: node - }); - dialogRef.afterClosed().subscribe( - data=>{ - this.getlist() - } - ); - } - //删除组织按钮 - delete(value){ - var isdeleted = confirm("确定要删除此组织？") - if(isdeleted){ - //请求删除接口 - this.isloading = true - this.http.delete(`/api/Organizations/${value.id}`).subscribe( data=>{ - this.getlist() - - }) - } - } - //禁用按钮 - disable(value){ - this.isloading = true - if(!value.enabled){ - this.http.put( - `/api/Organizations/${value.id}`, - { - id:value.id, - code:value.code, - name: value.name, - level:value.level, - order: value.order, - location: null, - enabled: true, - parentId: value.parentId - } - ).subscribe( - data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('启用成功','确定',config); - this.getlist() - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('操作无效','确定',config); - this.isloading = false - } - ) - - }else{ - // var isdeleted = confirm("确定要禁用此组织？") - // if(isdeleted){ - this.http.put( - `/api/Organizations/${value.id}`, - { - id:value.id, - code:value.code, - name: value.name, - level:value.level, - order: value.order, - location: null, - enabled: false, - parentId: value.parentId - } - ).subscribe( - data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('禁用成功','确定',config); - this.getlist() - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('操作无效','确定',config); - this.isloading = false - } - ) - // } - } - - - } - - - //向上箭头 - updata = [] - up(node){ - this.isloading = true - var olddata = this.data; - // console.log(1,olddata) - // console.log(2,node) - this.updata = [] - olddata.forEach(item => { - if(item.id == node.parentId){ - this.updata = item.children - } - }); - // console.log(this.updata) - this.updata.forEach((item,index)=>{ - if(item.name == node.name){ - this.http.put(//更改点击的节点为上一节点的order - `/api/Organizations/${this.updata[index].id}`, - { - id:this.updata[index].id, - code:this.updata[index].code, - name: this.updata[index].name, - level: this.updata[index].level, - order: this.updata[index - 1].order, - location: null, - enabled: true, - parentId: this.updata[index].parentId, - } - ).subscribe( - data=>{ - // this.getlist() - this.http.put(//更改上一节点为点击节点的order - `/api/Organizations/${this.updata[index - 1].id}`, - { - id:this.updata[index - 1].id, - code:this.updata[index - 1].code, - name: this.updata[index - 1].name, - level: this.updata[index - 1].level, - order: this.updata[index].order, - location: null, - enabled: true, - parentId: this.updata[index].parentId, - } - ).subscribe( - data=>{ - this.getlist() - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('更改order失败','确定',config); - this.isloading = false - } - ) - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('更改order失败','确定',config); - this.isloading = false - } - ) - - - } - - - - }) - - } - - - - //向下箭头 - downdata = [] - down(node){ - this.isloading = true - var olddata = this.data; - this.downdata = [] - olddata.forEach(item => { - if(item.id == node.parentId){ - this.downdata = item.children - } - }); - // console.log(this.downdata) - this.downdata.forEach((item,index)=>{ - if(item.name == node.name){ - this.http.put(//更改点击的节点为下一节点的order - `/api/Organizations/${this.downdata[index].id}`, - { - id:this.downdata[index].id, - code:this.downdata[index].code, - name: this.downdata[index].name, - level: this.downdata[index].level, - order: this.downdata[index + 1].order, - location: null, - enabled: true, - parentId: this.downdata[index].parentId, - } - ).subscribe( - data=>{ - // this.getlist() - this.http.put(//更改上一节点为点击节点的order - `/api/Organizations/${this.downdata[index + 1].id}`, - { - id:this.downdata[index + 1].id, - code:this.downdata[index + 1].code, - name: this.downdata[index + 1].name, - level: this.downdata[index + 1].level, - order: this.downdata[index].order, - location: null, - enabled: true, - parentId: this.downdata[index].parentId, - } - ).subscribe( - data=>{ - this.getlist() - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('更改order失败','确定',config); - this.isloading = false - } - ) - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('更改order失败','确定',config); - this.isloading = false - } - ) - - - } - - - - }) - } -} - - - - - -//创建组织 -@Component({ - selector: 'createorganization', - templateUrl: './createorganization.component.html', - styleUrls: ['./organization.component.scss'] -}) -export class CreateOrganization { - myControl = new FormControl(); - ishttp: boolean =false - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data, - public snackBar: MatSnackBar) {} - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - if(this.data.childlength){//如果点击节点存在children - this.http.post( - '/api/Organizations', - { - id:"", - code:value.number, - division:value.division, - name: value.name, - level:this.data.level + 1, - order: this.data.childlength[this.data.childlength.length -1].order + 1, - location: null, - enabled: true, - parentId: this.data.id, - } - ).subscribe( - data=>{ - this.dialogRef.close(data); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建组织成功','确定',config); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - }else{ - this.http.post( - '/api/Organizations', - { - id:"", - code:value.number, - division:value.division, - name: value.name, - level:this.data.level + 1, - order:0, - location: null, - enabled: true, - parentId: this.data.id, - } - ).subscribe( - data=>{ - this.dialogRef.close(data); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建组织成功','确定',config); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - } - - } -} - -//编辑组件 -@Component({ - selector: 'editorganization', - templateUrl: './editorganization.component.html', - styleUrls: ['./organization.component.scss'] -}) -export class EditOrganization { - newdata = []; - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - children:node.children, - division:node.division - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - myControl = new FormControl(); - organizationname:string=""//自己组织的名字 - organizationcode:any//自己组织的编号 - organizationName:any =''//上级组织的名字 - organizationId:any =''//上级组织的id - organizationLevel:number =null//上级组织的层级 - organizationchildlength:number = null - allOrganizations:any //所有组织机构 - division:any //区划 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data, - private tree:TreeService,public snackBar: MatSnackBar) {} - - //获取所有组织机构 - getMechanism () { - this.http.get('/api/Organizations').subscribe( - (data:any)=>{ - this.allOrganizations = data - this.dataSource.data = this.tree.toTree(data); - data.forEach(item=>{ - if(item.id == this.data.parentId){ - this.organizationName = item.name - } - }) - } - ) - } - - ngOnInit() { - // console.log(this.data) - this.getMechanism() - this.organizationname = this.data.name - this.organizationcode = this.data.code - this.division = this.data.division - } - hasChild = (_: number, node: any) => node.expandable; - onNoClick(): void { - this.dialogRef.close(); - } - add(e){ - this.organizationName=e.name - this.organizationId=e.id - this.organizationLevel=e.level - if(e.children){//如果点击的父组织有子节点 - this.organizationchildlength = e.children.length - }else{ - this.organizationchildlength = 0 - } - } - onSubmit(value){ - if(this.organizationLevel){//如果点击了右边的树 - this.http.put( - `/api/Organizations/${this.data.id}`, - { - id:this.data.id, - code:value.number, - division:value.division, - name: value.name, - level:this.organizationLevel + 1, - order: this.organizationchildlength, - location: null, - enabled: true, - parentId: this.organizationId, - } - ).subscribe( - data=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改成功','确定',config); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - }else{ //如果只改了姓名 - this.http.put( - `/api/Organizations/${this.data.id}`, - { - id:this.data.id, - code: value.number, - division:value.division, - name: value.name, - level:this.data.level, - order: this.data.order, - location: null, - enabled: true, - parentId: this.data.parentId, - } - ).subscribe( - data=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改成功','确定',config); - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写正确格式','确定',config); - } - ) - } - - } -} \ No newline at end of file diff --git a/src/app/ui/progress/progress.component.html b/src/app/ui/progress/progress.component.html deleted file mode 100644 index a858bc9..0000000 --- a/src/app/ui/progress/progress.component.html +++ /dev/null @@ -1,13 +0,0 @@ - -
    -

    确定进度条

    - -
    -

    不确定进度条

    - -
    -

    缓冲进度条

    - -
    -

    查询进度条

    - diff --git a/src/app/ui/progress/progress.component.scss b/src/app/ui/progress/progress.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/progress/progress.component.spec.ts b/src/app/ui/progress/progress.component.spec.ts deleted file mode 100644 index aea0b97..0000000 --- a/src/app/ui/progress/progress.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProgressComponent } from './progress.component'; - -describe('ProgressComponent', () => { - let component: ProgressComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ProgressComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ProgressComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/progress/progress.component.ts b/src/app/ui/progress/progress.component.ts deleted file mode 100644 index 93168b5..0000000 --- a/src/app/ui/progress/progress.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-progress', - templateUrl: './progress.component.html', - styleUrls: ['./progress.component.scss'] -}) -export class ProgressComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/ui/role/createrole.component.html b/src/app/ui/role/createrole.component.html deleted file mode 100644 index 4738ce2..0000000 --- a/src/app/ui/role/createrole.component.html +++ /dev/null @@ -1,54 +0,0 @@ -
    - - 创建新角色 - - - - 分配权限 -
    - - -
    - 关联数据权限 - 全选 - - - - - {{node.name}} - - - - - {{node.name}} - - -
    -
    - 关联导航菜单 - 全选 - - - - - {{node.name}} - - - - - {{node.name}} - - -
    -
    - - - -
    - - -
    - -
    \ No newline at end of file diff --git a/src/app/ui/role/editrole.component.html b/src/app/ui/role/editrole.component.html deleted file mode 100644 index 0471799..0000000 --- a/src/app/ui/role/editrole.component.html +++ /dev/null @@ -1,57 +0,0 @@ -
    - - 编辑角色 - - - - - - 分配权限 - -
    -
    - 关联数据权限 - - - - - {{node.name}} - - - - - - {{node.name}} - - -
    - - -
    - 关联导航菜单 - - - - - {{node.name}} - - - - - - {{node.name}} - - -
    -
    - - - -
    - - -
    - -
    diff --git a/src/app/ui/role/role.component.html b/src/app/ui/role/role.component.html deleted file mode 100644 index 3eeef51..0000000 --- a/src/app/ui/role/role.component.html +++ /dev/null @@ -1,42 +0,0 @@ -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    角色名称 {{roledata.name}} 创建/修改时间 {{roledata.creationTime | time }} 是否启用 {{roledata.enabled | isno}} 操作 - - - - - - - -
    - - -
    - \ No newline at end of file diff --git a/src/app/ui/role/role.component.scss b/src/app/ui/role/role.component.scss deleted file mode 100644 index d5b7c76..0000000 --- a/src/app/ui/role/role.component.scss +++ /dev/null @@ -1,49 +0,0 @@ -table { - width: 100%; - th,td{ - text-align: center; - } - button{ - margin: 0 3px; - } - -} -form{ - // text-align: center; - - button{ - - margin: 0 8px; - margin-bottom: 30px; - } - .mat-checkbox{ - display: block; - text-align: left; - } - .btn{ - padding-top: 18px; - text-align: center; - } - mat-form-field{ - margin-right:80px; - } - span{ - display: block; - margin-bottom: 10px; - } -} -.shareform{ - height: 300px; -} -.leftbox{ - width: 250px; - float: left; -} -.rightbox{ - width: 250px; - float: right; -} -.bigbox{ - height: 400px; - overflow: auto; -} \ No newline at end of file diff --git a/src/app/ui/role/role.component.ts b/src/app/ui/role/role.component.ts deleted file mode 100644 index a3b7501..0000000 --- a/src/app/ui/role/role.component.ts +++ /dev/null @@ -1,644 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { HttpClient } from '@angular/common/http'; -import { CacheTokenService } from '../../http-interceptors/cache-token.service' -import format from 'date-fns/format'; -import {CdkDragDrop, moveItemInArray} from '@angular/cdk/drag-drop'; -import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; -import {FlatTreeControl} from '@angular/cdk/tree'; -import { TreeService } from '../../http-interceptors/tree.service' -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - - - -export interface roledata { - id: string, - name: string,//名称 - order: number, - enabled: boolean, - creationTime: string -} -@Component({ - selector: 'app-role', - templateUrl: './role.component.html', - styleUrls: ['./role.component.scss'] -}) - -export class RoleComponent implements OnInit { - constructor(private http: HttpClient,public dialog: MatDialog,public createtime:CacheTokenService,private tree:TreeService,public snackBar: MatSnackBar) { } - displayedColumns: string[] = ['name','createtiome', 'edit']; - dataSource: any - - public compare(property){ - return function(a,b){ - var value1 = a[property]; - var value2 = b[property]; - return value1 - value2; - } - } - //获取角色列表并且给排头和排尾赋是否为首尾 - getlist(){ - this.http.get('/api/Roles').subscribe( (data:Array)=>{ - this.dataSource = data - this.dataSource[0].isTop = true; - this.dataSource[this.dataSource.length-1].isBottom = true - }) - } - //初始化视图 - ngOnInit() { - this.getlist() - } - //向上按钮 - up(node){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - this.http.put(//把上一节点order换成点击的节点 - `/api/Roles/${this.dataSource[node.order -1].id}`, - { - id:this.dataSource[node.order -1].id, - name: this.dataSource[node.order -1].name, - order: node.order, - enabled: true, - creationTime:time, - } - ).subscribe(data=>{ - this.getlist() - }) - - this.http.put(//把当前节点order换成上一点击的节点 - `/api/Roles/${node.id}`, - { - id:node.id, - name: node.name, - order: node.order-1, - enabled: true, - creationTime:time, - } - ).subscribe(data=>{ - this.getlist() - }) - - } - //向下按钮 - down(node){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - this.http.put(//把下一节点order换成点击的节点 - `/api/Roles/${this.dataSource[node.order + 1].id}`, - { - id:this.dataSource[node.order + 1].id, - name: this.dataSource[node.order + 1].name, - order: node.order, - enabled: true, - creationTime:time, - } - ).subscribe(data=>{ - this.getlist() - }) - - this.http.put(//把当前节点order换成下一点击的节点 - `/api/Roles/${node.id}`, - { - id:node.id, - name: node.name, - order: node.order + 1, - enabled: true, - creationTime:time, - } - ).subscribe(data=>{ - this.getlist() - }) - } - //创建按钮并且弹出对话框 - createuser(){ - const dialogRef = this.dialog.open(CreateRole, {//调用open方法打开对话框并且携带参数过去 - width: '600px', - height:'658px', - data: {name: this.createuser.name,data: this.dataSource,length:this.dataSource.length} - }); - dialogRef.afterClosed().subscribe( - data=>{ - this.getlist() - } - ); - } - - //删除按钮 - deleteduser(roledata){ - var isdeleted = confirm("确定要删除此用户吗？") - if(isdeleted){ - //请求删除接口 - this.http.delete(`/api/Roles/${roledata.id}`).subscribe( data=>{ - this.getlist() - }) - } - } - //编辑按钮 - allot(roledata){ - const dialogRef = this.dialog.open(EditRole, {//调用open方法打开对话框并且携带参数过去 - width: '600px', - height:'658px', - data: {id:roledata.id,name:roledata.name,order:roledata.order}//把点击的id传过去 - }); - - dialogRef.afterClosed().subscribe( - data=>{ - this.getlist() - } - ); - } - - //启用或禁用按钮 - open(roledata){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - this.http.put( - `/api/Roles/${roledata['id']}`, - { - id:roledata['id'], - name: roledata.name, - order: roledata.order, - enabled: !roledata.enabled, - creationTime: time, - } - ).subscribe( - data=>{ - this.getlist() - } - ) - } - - drop(event: CdkDragDrop) {//拖拽函数 - moveItemInArray(this.dataSource, event.previousIndex, event.currentIndex); - this.dataSource.forEach((item, index) => { - item.order = index; - }) - const a = [...this.dataSource]; - this.dataSource = []; - setTimeout(() => { - this.dataSource = a; - }, 10); - }; -} - - - - - - -//创建角色组件 -@Component({ - selector: 'createrole', - templateUrl: './createrole.component.html', - styleUrls: ['./role.component.scss'] -}) -export class CreateRole { - private _transformer = (node: any, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id:node.id - }; - } - treeControl = new FlatTreeControl( - node => node.level, node => node.expandable); - - treeFlattener = new MatTreeFlattener( - this._transformer, node => node.level, node => node.expandable, node => node.children); - - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - dataSource2 = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,private tree:TreeService,public snackBar: MatSnackBar) {} - olddata =[] - olddata2 = [] - xxx = {} - jjj = {} - //用于存放选中的数组 - checkedMap = {} - //初始化两棵tree - ngOnInit(){ - this.http.get('/api/Permissions').subscribe((data: any[])=>{ - this.olddata =data - this.dataSource.data = this.tree.toTree(data); - this.treeControl.expandAll() - this.dataSource.data.forEach(item=>{ - if(item.children){ - var childarr = [] - item.children.forEach(n => { - childarr.push(n.id) - }) - this.xxx[item.id] = childarr - } - }) - - }) - - this.http.get('/api/NavMenus').subscribe((data: any[])=>{ - this.olddata2 =data - this.dataSource2.data = this.tree.toTree(data); - this.treeControl.expandAll() - this.dataSource2.data.forEach(item=>{ - if(item.children){ - var childarr = [] - item.children.forEach(n => { - childarr.push(n.id) - }) - this.jjj[item.id] = childarr - } - }) - }) - } - - //选中后子节点默认选中 - selectedAll(event, node){ - this.olddata.forEach(item=>{ - if(item.parentId == node.id){ - this.checkedMap[item.id] = event.checked; - } - }) - - // console.log(this.olddata2,node ) - var menus =[] //导航菜单可能有三级 用于存储第二级 - //选中一级菜单 - this.olddata2.forEach(item=>{ - if(item.parentId == node.id){ - this.checkedMap[item.id] = event.checked; - menus.push(item) - } - }) - //将二级菜单也选中 - menus.forEach(item=>{ - if(item.children){ - item.children.forEach(n => { - this.checkedMap[n.id] = event.checked; - }); - } - }) - } - - //数据权限tree的全选功能 - leftTreeAll(event,form){ - const values = form.value; - for (let key in values) { - if(key.indexOf("second")){ - this.checkedMap[key.split('.')[1]] = event.checked; - } - } - } - //菜单权限tree的全选功能 - rightTreeAll(event,form){ - const values = form.value; - for (let key in values) { - if(key.indexOf("first")){ - this.checkedMap[key.split('.')[1]] = event.checked; - } - } - } - - hasChild = (_: number, node: any) => node.expandable; - - onNoClick(): void { - this.dialogRef.close(); - } - //提交 - onSubmit(value){ - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - this.http.post( - '/api/Roles', - { - id:"", - name: value.name, - order: this.data.data[this.data.data.length - 1].order + 1, - enabled: true, - creationTime: time, - } - ).subscribe( - data=>{ - var id = data['id'] - // console.log(value) - var keydata = [] //菜单权限id集合 - var keydata2 = [] //数据权限id集合 - for(let i in value){ - if(value[i]){ - if(i.indexOf("first") && i!="name"){ - keydata.push(i.split('.')[1]) - } - if(i.indexOf("second") && i!="name"){ - keydata2.push(i.split('.')[1]) - } - } - } - - function includes(arr1, arr2) { - return arr2.every(val => arr1.includes(val)); - } - const orginalList = [...keydata2]; - orginalList.forEach((item) => { // forEach 里面 splice 有问题，详见 https://blog.csdn.net/qq_38128179/article/details/92798157 - if (item in this.xxx) { // 根据 key，可以直接在 对象 里面获取数据 - const datachildarrboxArr = this.xxx[item]; - if (!includes(keydata2, datachildarrboxArr)) { // 如果不全部包含 - keydata2.splice(keydata2.findIndex(items => items == item), 1); - } - } - }); - - this.http.post( - `/api/Roles/${id}/Permissions`, - keydata2 - ).subscribe( - data=>{ - this.http.post( - `/api/Roles/${id}/NavMenus`, - keydata - ).subscribe( - data=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建成功','确定',config); - }, - err=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建菜单权限失败','确定',config); - } - ) - }, - err=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建数据权限失败','确定',config); - } - ) - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('角色名称不符合规范','确定',config); - } - ) - } -} - - - - - - - - - -//编辑组件 -@Component({ - selector: 'editrole', - templateUrl: './editrole.component.html', - styleUrls: ['./role.component.scss'] -}) -export class EditRole { - private _transformer = (node: any, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id:node.id, - children:node.children - }; - } - treeControl = new FlatTreeControl( - node => node.level, node => node.expandable); - - treeFlattener = new MatTreeFlattener( - this._transformer, node => node.level, node => node.expandable, node => node.children); - - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - dataSource2 = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar,@Inject(MAT_DIALOG_DATA) public data,private tree:TreeService) {} - - olddata =[] //原始所有--数据权限 - olddata2 =[] //原始所有--菜单权限 - newdata = [] - newdata2 = [] - placeholdername = this.data.name - datachildarrbox = {} //数据权限存放有children的 父id：子id1 子id2 子id3 - menuchildarrbox = {} //菜单权限存放有children的 父id：子id1 子id2 子id3 - checkedMap = {} - ngOnInit(){ - //获得角色的数据权限，选中的checked为true - this.http.get(`/api/Roles/${this.data.id}/Permissions`).subscribe((data: any[])=>{ - this.olddata =data - this.newdata = this.tree.toTree(this.olddata) - - //如果子节点存在选中则父节点默认选中 - this.newdata.forEach(item=>{ - if(item.children){ - item.children.forEach(element => { - if(element.checked){ - this.checkedMap[item.id] = true - } - }); - } - }) - - data.forEach(item=>{ - if(item.checked){ - this.checkedMap[item.id] = true; - } - - }) - this.dataSource.data = this.newdata; - this.treeControl.expandAll() - this.dataSource.data.forEach(item=>{ - if(item.children){ - var childarr = [] - item.children.forEach(n => { - childarr.push(n.id) - }) - this.datachildarrbox[item.id] = childarr - } - }) - }) - - - //获得角色的菜单权限，选中的checked为true - this.http.get(`/api/Roles/${this.data.id}/NavMenus`).subscribe((data: any[])=>{ - this.olddata2 =data - this.newdata2 = this.tree.toTree(this.olddata2) - data.forEach(item => { - if(item.checked){ - this.checkedMap[item.id] = item.checked; - } - }); - - this.dataSource2.data = this.newdata2; - this.treeControl.expandAll() - - this.dataSource2.data.forEach(item=>{ - if(item.children){ - var childarr = [] - item.children.forEach(n => { - childarr.push(n.id) - }) - this.menuchildarrbox[item.id] = childarr - } - }) - }) - } - - //选中对应小组 - selectedAll(event, node){ - this.olddata.forEach(item=>{ - if(item.parentId == node.id){ - this.checkedMap[item.id] = event.checked; - } - }) - // console.log(this.olddata2,node ) - var menus =[] //导航菜单可能有三级 用于存储第二级 - //选中一级菜单 - this.olddata2.forEach(item=>{ - if(item.parentId == node.id){ - this.checkedMap[item.id] = event.checked; - menus.push(item) - } - }) - //将二级菜单也选中 - menus.forEach(item=>{ - if(item.children){ - item.children.forEach(n => { - this.checkedMap[n.id] = event.checked; - }); - } - }) - } - - hasChild = (_: number, node: any) => node.expandable; - - onNoClick(): void { - this.dialogRef.close(); - } - - - onSubmit(value){ - var keydata = [] //存储选中的菜单权限 - var keydata2 = [] //存储选中的数据权限 - - for(let i in value){ - if(value[i]){ - if(i.indexOf("first") && i!="name" && i!="order"){ - keydata.push(i.split('.')[1]) - } - if(i.indexOf("second") && i!="name" && i!="order"){ - keydata2.push(i.split('.')[1]) - } - } - } - let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') - if(this.data['id'] != "0" && this.data['id'] != "1"){ - this.http.put( - `/api/Roles/${this.data['id']}`, - { - id:this.data['id'], - name: value.name, - order: this.data.order, - enabled: true, - creationTime:time, - } - ).subscribe(data=>{ - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改角色姓名请求失败','确定',config); - }) - function includes(arr1, arr2) { - return arr2.every(val => arr1.includes(val)); - } - const orginalList = [...keydata2]; - orginalList.forEach((item) => { // forEach 里面 splice 有问题，详见 https://blog.csdn.net/qq_38128179/article/details/92798157 - if (item in this.datachildarrbox) { // 根据 key，可以直接在 对象 里面获取数据 - const datachildarrboxArr = this.datachildarrbox[item]; - if (!includes(keydata2, datachildarrboxArr)) { // 如果不全部包含 - keydata2.splice(keydata2.findIndex(items => items == item), 1); - } - } - }); - this.http.post( - `/api/Roles/${this.data.id}/Permissions`, - keydata2 - ).subscribe(data=>{ - - }, - err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('分配数据权限请求失败','确定',config); - }) - } - this.http.post( - `/api/Roles/${this.data.id}/NavMenus`, - keydata - ).subscribe( - data=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('编辑成功','确定',config); - }, - err=>{ - this.dialogRef.close(); - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('分配菜单权限失败','确定',config); - } - ) - // this.http.put( - // `/api/Roles/${this.data['id']}`, - // { - // id:this.data['id'], - // name: value.name, - // order: this.data.order, - // enabled: true, - // creationTime:time, - // } - // ).subscribe( - // data=>{ - - - - // }, - // err=>{ - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('名称格式不正确','确定',config); - // } - // ) - - - - } -} - - diff --git a/src/app/ui/slide/slide.component.html b/src/app/ui/slide/slide.component.html deleted file mode 100644 index 46148bf..0000000 --- a/src/app/ui/slide/slide.component.html +++ /dev/null @@ -1 +0,0 @@ -{{xxx}} diff --git a/src/app/ui/slide/slide.component.scss b/src/app/ui/slide/slide.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/slide/slide.component.spec.ts b/src/app/ui/slide/slide.component.spec.ts deleted file mode 100644 index c82efb6..0000000 --- a/src/app/ui/slide/slide.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SlideComponent } from './slide.component'; - -describe('SlideComponent', () => { - let component: SlideComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SlideComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SlideComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/slide/slide.component.ts b/src/app/ui/slide/slide.component.ts deleted file mode 100644 index 2310459..0000000 --- a/src/app/ui/slide/slide.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-slide', - templateUrl: './slide.component.html', - styleUrls: ['./slide.component.scss'] -}) -export class SlideComponent implements OnInit { - - xxx:boolean=false - sss(){ - this.xxx = !this.xxx - console.log(this.xxx) - } - constructor() { - - } - - ngOnInit() { - } - -} diff --git a/src/app/ui/snackbar/snackbar.component.html b/src/app/ui/snackbar/snackbar.component.html deleted file mode 100644 index 49dfc20..0000000 --- a/src/app/ui/snackbar/snackbar.component.html +++ /dev/null @@ -1,10 +0,0 @@ -

    底部提示消息

    - - - - - - - - - diff --git a/src/app/ui/snackbar/snackbar.component.scss b/src/app/ui/snackbar/snackbar.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/snackbar/snackbar.component.spec.ts b/src/app/ui/snackbar/snackbar.component.spec.ts deleted file mode 100644 index 664d327..0000000 --- a/src/app/ui/snackbar/snackbar.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SnackbarComponent } from './snackbar.component'; - -describe('SnackbarComponent', () => { - let component: SnackbarComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SnackbarComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SnackbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/snackbar/snackbar.component.ts b/src/app/ui/snackbar/snackbar.component.ts deleted file mode 100644 index 1fcdc8c..0000000 --- a/src/app/ui/snackbar/snackbar.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import {MatSnackBar} from '@angular/material/snack-bar'; -@Component({ - selector: 'app-snackbar', - templateUrl: './snackbar.component.html', - styleUrls: ['./snackbar.component.scss'] -}) -export class SnackbarComponent implements OnInit { - - constructor(private _snackBar: MatSnackBar) { } - - ngOnInit() { - } - openSnackBar(message: string, action: string) { - this._snackBar.open(message, action, { - duration: 2000, - }); - } -} diff --git a/src/app/ui/stepper/stepper.component.html b/src/app/ui/stepper/stepper.component.html deleted file mode 100644 index c999bd3..0000000 --- a/src/app/ui/stepper/stepper.component.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -
    - 填写姓名 - - - - - -
    - - -
    -
    -     - - - -
    - 家庭住址 - - - -
    - - - -
    -
    -     - - - 完成 - 你已经完成了 -
    - - -
    -     -     - - diff --git a/src/app/ui/stepper/stepper.component.scss b/src/app/ui/stepper/stepper.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/stepper/stepper.component.spec.ts b/src/app/ui/stepper/stepper.component.spec.ts deleted file mode 100644 index 4bf2213..0000000 --- a/src/app/ui/stepper/stepper.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { StepperComponent } from './stepper.component'; - -describe('StepperComponent', () => { - let component: StepperComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ StepperComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(StepperComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/stepper/stepper.component.ts b/src/app/ui/stepper/stepper.component.ts deleted file mode 100644 index 943805a..0000000 --- a/src/app/ui/stepper/stepper.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import {FormBuilder, FormGroup, Validators} from '@angular/forms'; -@Component({ - selector: 'app-stepper', - templateUrl: './stepper.component.html', - styleUrls: ['./stepper.component.scss'] -}) -export class StepperComponent implements OnInit { - isLinear = false; - firstFormGroup: FormGroup; - secondFormGroup: FormGroup; - constructor(private _formBuilder: FormBuilder) { } - - ngOnInit() { - this.firstFormGroup = this._formBuilder.group({ - firstCtrl: ['', Validators.required] - }); - this.secondFormGroup = this._formBuilder.group({ - secondCtrl: ['', Validators.required] - }); - } - -} diff --git a/src/app/ui/tabgroup/tabgroup.component.html b/src/app/ui/tabgroup/tabgroup.component.html deleted file mode 100644 index 8df2739..0000000 --- a/src/app/ui/tabgroup/tabgroup.component.html +++ /dev/null @@ -1,22 +0,0 @@ - - 我是内容一 - 我是内容二 - 我是内容三 - - - - - - - - 一 二 三 - -

    四五六

    -     - - - thumb_down 失败者 - -

    rush B!!!

    -     -     diff --git a/src/app/ui/tabgroup/tabgroup.component.scss b/src/app/ui/tabgroup/tabgroup.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/tabgroup/tabgroup.component.spec.ts b/src/app/ui/tabgroup/tabgroup.component.spec.ts deleted file mode 100644 index 7e9fe94..0000000 --- a/src/app/ui/tabgroup/tabgroup.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabgroupComponent } from './tabgroup.component'; - -describe('TabgroupComponent', () => { - let component: TabgroupComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ TabgroupComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TabgroupComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/tabgroup/tabgroup.component.ts b/src/app/ui/tabgroup/tabgroup.component.ts deleted file mode 100644 index 12e1da3..0000000 --- a/src/app/ui/tabgroup/tabgroup.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-tabgroup', - templateUrl: './tabgroup.component.html', - styleUrls: ['./tabgroup.component.scss'] -}) -export class TabgroupComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - xxx(){ - console.log("xxxx") - } -} diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 98221c2..94ebf06 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -1,63 +1,21 @@ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; import { UiComponent } from './ui.component'; -import { DateselectComponent } from './dateselect/dateselect.component'; -import { MenuComponent } from './menu/menu.component'; -import { CardComponent } from './card/card.component'; -import { ListComponent } from './list/list.component'; -import { GridComponent } from './grid/grid.component'; -import { StepperComponent } from './stepper/stepper.component'; -import { TabgroupComponent } from './tabgroup/tabgroup.component'; -import { ButtonComponent } from './button/button.component'; -import { BadgeComponent } from './badge/badge.component'; -import { ProgressComponent } from './progress/progress.component'; import { PaginatorComponent } from './paginator/paginator.component'; import { PersonaldataComponent } from '../pages/personaldata/personaldata.component'; import { UserdataComponent } from './userdata/userdata.component'; -import { OrganizationComponent } from './organization/organization.component'; -import { UnittypeComponent } from './unittype/unittype.component'; -import { AuthorityComponent } from './authority/authority.component'; -import { RoleComponent } from './role/role.component'; -import { UsermanagementComponent } from './usermanagement/usermanagement.component'; -import { NavmenusComponent } from './navmenus/navmenus.component'; -import { FireProtectionElementsComponent } from './fire-protection-elements/fire-protection-elements.component'; -import {MaterialBankComponent} from './material-bank/material-bank.component' -import {UnitInformationComponent} from './unit-information/unit-information.component' -import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component'; -import { FireFightingFacilitiesFormworkComponent } from './fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component' +import {UnitInformationComponent} from './unit-information/unit-information.component'; import { CollectionToolsComponent } from './collection-tools/collection-tools.component'; -import { HomeComponent } from './home/home.component'; const routes: Routes = [ { path: '', component: UiComponent}, - { path: 'dateselect', component:DateselectComponent}, - { path: 'menu', component:MenuComponent}, - { path: 'card', component:CardComponent}, - { path: 'list', component:ListComponent}, - { path: 'grid', component:GridComponent}, - { path: 'stepper', component:StepperComponent}, - { path: 'tabgroup', component:TabgroupComponent}, - { path: 'btn', component:ButtonComponent }, - { path: 'badge', component:BadgeComponent }, - { path: 'progress', component:ProgressComponent }, { path: 'paginator', component:PaginatorComponent }, { path: 'person', component:PersonaldataComponent }, { path: 'userdata', component:UserdataComponent }, - { path: 'organization', component:OrganizationComponent }, - { path: 'unittype', component:UnittypeComponent }, - { path: 'authority', component:AuthorityComponent }, - { path: 'role', component:RoleComponent }, - { path: 'usermanagement', component:UsermanagementComponent }, - { path: 'navmenus', component:NavmenusComponent }, - { path: 'fireProtectionElements', component:FireProtectionElementsComponent }, - { path: 'materialBank', component:MaterialBankComponent }, { path: 'unitInformation', component:UnitInformationComponent }, - { path: 'enterpriseuser', component:EnterpriseuserComponent }, - { path: 'fireFightingFacilitiesFormwork', component:FireFightingFacilitiesFormworkComponent }, { path: 'collectionTools', component:CollectionToolsComponent }, - { path: 'home', component:HomeComponent } ]; @NgModule({ diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index eab254e..f577c5c 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UiComponent } from './ui.component'; -import { DateselectComponent } from './dateselect/dateselect.component'; import { UiRoutingModule } from './ui-routing.module'; import {A11yModule} from '@angular/cdk/a11y'; import {DragDropModule} from '@angular/cdk/drag-drop'; @@ -44,17 +43,7 @@ import {MatTabsModule} from '@angular/material/tabs'; import {MatToolbarModule} from '@angular/material/toolbar'; import {MatTooltipModule} from '@angular/material/tooltip'; import {MatTreeModule} from '@angular/material/tree'; -import { MenuComponent } from './menu/menu.component'; -import { CardComponent } from './card/card.component'; -import { ListComponent } from './list/list.component'; -import { GridComponent } from './grid/grid.component'; -import { StepperComponent } from './stepper/stepper.component'; import { ReactiveFormsModule, FormsModule } from '@angular/forms'; -import { TabgroupComponent } from './tabgroup/tabgroup.component'; -import { ButtonComponent } from './button/button.component'; -import { BadgeComponent } from './badge/badge.component'; -import { ProgressComponent } from './progress/progress.component'; -import { SnackbarComponent } from './snackbar/snackbar.component'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatPaginatorIntl } from '@angular/material/paginator'; import { PaginatorModule } from './paginator/paginator.module'; @@ -62,34 +51,16 @@ import { PersonaldataComponent } from '../pages/personaldata/personaldata.compon import { FooterComponent } from './footer/footer.component'; import { UserdataComponent, EditUser } from './userdata/userdata.component'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; -import { OrganizationComponent, CreateOrganization, EditOrganization } from './organization/organization.component'; -import { UnittypeComponent,DialogOverviewExampleDialog,editorialUnit } from './unittype/unittype.component'; -import { AuthorityComponent, CreateAuthority } from './authority/authority.component'; -import { RoleComponent, CreateRole, EditRole } from './role/role.component'; -import { UsermanagementComponent,CreateNewUser,EditNewUser,allRoles,seeInformation } from './usermanagement/usermanagement.component'; - import { IsnoPipe } from '../pipes/boolean.pipe'; import {ConfirmpswDirective} from './changepassword/equal-validator.directive' import { TimePipe } from '../pipes/time.pipe'; -import { NavmenusComponent, CreateMenus, EditMenus } from './navmenus/navmenus.component'; -import { FireProtectionElementsComponent, Establish, EditingFireControl } from './fire-protection-elements/fire-protection-elements.component'; -import { FireFightingTemplateComponent, NewFireFighting, EditFireClassification } from './fire-fighting-template/fire-fighting-template.component'; -import { MaterialBankComponent,attributeComponent,addAttributeComponent,editAttribute } from './material-bank/material-bank.component'; import { UnitInformationComponent,addUnitAttributeComponent,editUnitAttribute } from './unit-information/unit-information.component'; -import { AddMatLibrary } from './material-bank/addmatlibrary.component'; -import { EditMatLibrary } from './material-bank/editmatlibrary.component'; -import { AddOriginalCopy } from './material-bank/addoriginalcopy.component'; import { NzTreeModule } from 'ng-zorro-antd/tree'; import { FileUploadModule } from 'ng2-file-upload' -import { EditOriginalCopy } from './material-bank/editoriginalcopy.component'; -import { SelectOriginalCopy } from './material-bank/selectoriginalcopy.component'; import { EditUnitInfo } from './unit-information/editunitinfo.component'; import { AddUnitInfo } from './unit-information/addunitinfo.component'; import { AddGroups } from './unit-information/addgroups.component'; import { EditGroup } from './unit-information/editgroup.component'; -import { EnterpriseuserComponent,seeenterpriseuser,editenterpriseuser } from './enterpriseuser/enterpriseuser.component'; -import { AddEnterpriserUser } from './enterpriseuser/addenterpriseuser.component'; -import { FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent } from './fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component'; import { CollectionToolsComponent, CreateBuilding, EditBuilding, ViewDetails } from './collection-tools/collection-tools.component'; import { WorkingAreaComponent } from '../working-area/working-area.component'; @@ -97,7 +68,7 @@ import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeCo import { saveOneDialog, saveTwoDialog } from './collection-tools/save'; import { HomeComponent } from './home/home.component'; @NgModule({ - declarations: [UiComponent, DateselectComponent, MenuComponent, CardComponent, ListComponent, GridComponent, StepperComponent, TabgroupComponent, ButtonComponent, BadgeComponent, ProgressComponent, SnackbarComponent,PersonaldataComponent, FooterComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, HomeComponent], + declarations: [UiComponent,PersonaldataComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,UnitInformationComponent,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup,addUnitAttributeComponent,editUnitAttribute,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent], imports: [ CommonModule, diff --git a/src/app/ui/unittype/dialog-overview-example-dialog.html b/src/app/ui/unittype/dialog-overview-example-dialog.html deleted file mode 100644 index cc7f6a1..0000000 --- a/src/app/ui/unittype/dialog-overview-example-dialog.html +++ /dev/null @@ -1,69 +0,0 @@ -
    - 创建单位类型 - -
    -
    - - - -
    - -
    - - - {{item.name}} - - -
    - -
    - - - - {{food.name}} - - - -
    - -
    - - - {{item.name}} - - -
    - -
    - - -
    -
    -
    - -
    - - - - {{node.name}} check_circle_outline - - - - - - {{node.name}} check_circle_outline - - - -
    \ No newline at end of file diff --git a/src/app/ui/unittype/editorialUnit.html b/src/app/ui/unittype/editorialUnit.html deleted file mode 100644 index a0a2553..0000000 --- a/src/app/ui/unittype/editorialUnit.html +++ /dev/null @@ -1,48 +0,0 @@ -
    - 编辑单位类型 - -
    -
    - - - -
    - -
    - - - - {{item.name}} - - - -
    - -
    - - - - {{food.name}} - - - -
    - -
    - - - {{item.name}} - - -
    - -
    - - -
    -
    -
    \ No newline at end of file diff --git a/src/app/ui/unittype/unittype.component.html b/src/app/ui/unittype/unittype.component.html deleted file mode 100644 index 5926469..0000000 --- a/src/app/ui/unittype/unittype.component.html +++ /dev/null @@ -1,55 +0,0 @@ -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    单位类型{{element.name}}单位信息模板{{element.basicCategoryName}}消防要素模板{{element.fireCategoryName}}消防设施模板{{element.facilityCategoryName}}操作 - - - - - - - -
    -
    \ No newline at end of file diff --git a/src/app/ui/unittype/unittype.component.scss b/src/app/ui/unittype/unittype.component.scss deleted file mode 100644 index d4186d3..0000000 --- a/src/app/ui/unittype/unittype.component.scss +++ /dev/null @@ -1,30 +0,0 @@ -.left { - margin: 10px; -} -.marginLeft { - margin-left: 5px; -} -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } - } - -.leftBox { - width: 200px; - float: left; -} -.tree { - float: right; - width: 300px; - height: 350px; - overflow-y: auto; -} -.mat-icon { - font-size: 22px; -} -mat-form-field{ - width: 200px; -} \ No newline at end of file diff --git a/src/app/ui/unittype/unittype.component.ts b/src/app/ui/unittype/unittype.component.ts deleted file mode 100644 index c9d8dd5..0000000 --- a/src/app/ui/unittype/unittype.component.ts +++ /dev/null @@ -1,307 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import {HttpClient} from '@angular/common/http' -import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { FlatTreeControl } from '@angular/cdk/tree'; -import { MatTreeFlattener, MatTreeFlatDataSource } from '@angular/material/tree'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - - - -@Component({ - selector: 'app-unittype', - templateUrl: './unittype.component.html', - styleUrls: ['./unittype.component.scss'] -}) -export class UnittypeComponent implements OnInit { - - constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - displayedColumns: string[]=['company', 'template','fireControl','facilityCategory','operation']; - dataSource:any=[]; //所有单位类型 - allFireControl:any=[]; //所有消防要素模板 - - ngOnInit() { - this.getList() - this.getFireControl() - } - - - //获取所有单位类型 - getList () { - this.http.get('/api/BuildingTypes').subscribe( - (data: any[]) => { - this.dataSource=data - } - ) - } - - //获取所有消防要素模板 - getFireControl () { - this.http.get('/api/FireCategories').subscribe( - (data:any)=>{ - this.allFireControl=data - } - )} - - //创建单位弹窗 - open() { - let data = this.allFireControl || [] - let dialogRef = this.dialog.open(DialogOverviewExampleDialog,{data}); - dialogRef.afterClosed().subscribe( - (data)=>{if (data) {this.getList()}} - ); - } - - //编辑弹窗 - edit (e) { - let data= e - let allFireControl= this.allFireControl || [] - let dialogRef = this.dialog.open(editorialUnit, - { - width:"260px", - data:{data,allFireControl} - }); - dialogRef.afterClosed().subscribe( - (data)=>{if (data) {this.getList()}} - ); - } - - //启用 - enabled(e) { - this.http.put( - `/api/BuildingTypes/${e.id}`, - { - id:e.id, - name: e.name, - enabled: true, - basicCategoryId:e.basicCategoryId, - fireCategoryId:e.fireCategoryId, - facilityCategoryId: e.facilityCategoryId, - } - ).subscribe( - ()=> { - this.getList() - } - ) - } - - //禁用 - prohibit (e) { - this.http.put( - `/api/BuildingTypes/${e.id}`, - { - id:e.id, - name: e.name, - enabled: false, - basicCategoryId:e.basicCategoryId, - fireCategoryId:e.fireCategoryId, - facilityCategoryId: e.facilityCategoryId, - } - ).subscribe( - ()=> { - this.getList() - } - ) - } - - //删除 - delete(e) { - let isTrue = confirm('您确定要删除吗') - if(isTrue) { - this.http.delete(`/api/BuildingTypes/${e}`).subscribe( - ()=>{ - this.getList() - } - ) - } - } - - - -} - -//创建单位弹窗组件 -@Component({ - selector: 'dialog-overview-example-dialog', - templateUrl: 'dialog-overview-example-dialog.html', - styleUrls: ['./unittype.component.scss'] -}) -export class DialogOverviewExampleDialog { - data:any =[] - newdata = []; - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - computed:node.computed, - order:node.order, - checked:node.checked, - tag:node.tag - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public allFireControl) {} - - ngOnInit() { - this.getunitmsg() - this.getAllFacilityCategory() - } - - oldSelected:any; //选中的单位信息模板id - selected:any; //选中的消防要素模板id - allunitmsg:any //所有单位信息 - allFacilityCategory:any; //所有消防设施模板 - - //获得所有单位信息模板 - getunitmsg(){ - this.http.get('/api/BasicCategories').subscribe(data=>{ - this.allunitmsg = data - }) - } - - //获取所有消防设施模板 - getAllFacilityCategory () { - this.http.get('/api/FacilityCategories').subscribe(data=>{ - this.allFacilityCategory = data - }) - } - - //封装实现select框切换渲染更新Tree函数 - select () { - this.newdata=[] - let id = this.selected - this.http.get(`/api/FireCategories/${id}/FireElements`).subscribe( - (data:any)=>{ - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) - } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] - } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) - } - } - }); - this.dataSource.data = this.newdata; - } - ) - - } - - //select选择切换Tree - toggleDisplay() { - this.select() - } - - hasChild = (_: number, node: any) => node.expandable; - - //创建单位类型 - onSubmit (e) { - if(this.selected) { - this.http.post('/api/BuildingTypes',{ - name:e.name, - enabled:true, - basicCategoryId:e.basicCategoryName, - fireCategoryId:this.selected, - facilityCategoryId: e.facilityCategoryName - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写完整','确定',config); - } - } - - - -} - - -//编辑单位弹窗组件 -@Component({ - selector: 'app-editorialUnit', - templateUrl: './editorialUnit.html', - styleUrls: ['./unittype.component.scss'] -}) -export class editorialUnit { - -constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit() { - this.companyName=this.data.data.name - this.oldSelected = this.data.data.basicCategoryId - this.selected=this.data.data.fireCategoryId - this.facilityCategoryId = this.data.data.facilityCategoryId - this.getunitmsg() - this.getAllFacilityCategory() - } - - companyName:any; //单位类型name - oldSelected:any; //单位信息模板id - selected:any; //消防要素模板id - facilityCategoryId:any; //消防设施模板id - allunitmsg:any //所有单位信息模板 - allFacilityCategory:any; //所有消防设施模板 - - //获得所有单位信息模板 - getunitmsg(){ - this.http.get('/api/BasicCategories').subscribe(data=>{ - this.allunitmsg = data - }) - } - - //获取所有消防设施模板 - getAllFacilityCategory () { - this.http.get('/api/FacilityCategories').subscribe(data=>{ - this.allFacilityCategory = data - }) - } - - //编辑功能 - onSubmit (e) { - let id = this.data.data.id - let enabled = this.data.data.enabled - if(e.name&&this.selected&&this.oldSelected) { - this.http.put(`/api/BuildingTypes/${id}`,{ - id:id, - name:e.name, - enabled: enabled, - basicCategoryId:this.oldSelected, - fireCategoryId:this.selected, - facilityCategoryId: e.facilityCategoryName - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写完整','确定',config); - } - } - - - -} diff --git a/src/app/ui/usermanagement/allRoles.html b/src/app/ui/usermanagement/allRoles.html deleted file mode 100644 index 1b5dfd3..0000000 --- a/src/app/ui/usermanagement/allRoles.html +++ /dev/null @@ -1,29 +0,0 @@ -分配角色 - -
    -
    -
    所有角色
    -
    - - {{item.name}} - -
    -
    - -
    -
    用户角色
    -
    -

    - {{item.name}} -

    -
    -
    -
    - -
    - - -
    \ No newline at end of file diff --git a/src/app/ui/usermanagement/createUser.html b/src/app/ui/usermanagement/createUser.html deleted file mode 100644 index aa9fa1b..0000000 --- a/src/app/ui/usermanagement/createUser.html +++ /dev/null @@ -1,70 +0,0 @@ -
    - 创建用户 -
    - -
    - - - -
    -
    登录名格式为字母开头,5-18位
    -
    -
    - -
    - - - -
    - -
    - - - -
    - -
    - - - -
    - -
    - - - -
    - -
    -

    {{errmsg}}

    -
    - -
    - - -
    -
    -
    - -
    - 请选择所属机构 - - - -
  • {{node.name}}
    • -     - - - -
  • {{node.name}}
    • -     -     -
    \ No newline at end of file diff --git a/src/app/ui/usermanagement/editUser.html b/src/app/ui/usermanagement/editUser.html deleted file mode 100644 index 2f5e2c5..0000000 --- a/src/app/ui/usermanagement/editUser.html +++ /dev/null @@ -1,63 +0,0 @@ -
    - 编辑用户 -
    - -
    - - - -
    - -
    - - - -
    - -
    - - - -
    - -
    - - - -
    - -
    - - - -
    - -
    - - -
    -
    -
    - -
    - 请选择所属机构 - - - -
  • {{node.name}}
    • -     - - - -
  • {{node.name}}
    • -     -     -
    \ No newline at end of file diff --git a/src/app/ui/usermanagement/seeInformation.html b/src/app/ui/usermanagement/seeInformation.html deleted file mode 100644 index a627ce7..0000000 --- a/src/app/ui/usermanagement/seeInformation.html +++ /dev/null @@ -1,29 +0,0 @@ -查看用户 - -
    - - 登录账号: - {{data.name}} - - 真实姓名: - {{data.realName}} - - 所属机构: - {{data.organizationName}} - - 所属角色: - {{item}} - - 创建时间: - {{data.creationTime|date:'yyyy-MM-dd'}} - - 是否禁用: - 否 - 是 - - -
    - -
    - -
    \ No newline at end of file diff --git a/src/app/ui/usermanagement/usermanagement.component.html b/src/app/ui/usermanagement/usermanagement.component.html deleted file mode 100644 index 1b78d66..0000000 --- a/src/app/ui/usermanagement/usermanagement.component.html +++ /dev/null @@ -1,112 +0,0 @@ -
    -
    -
    - -
    - -
    - -
    - - -
    - -
    - - -
    - -
    - - - -
    -
    clear
    - - - -
  • {{node.name}}
    • -     - - -
  • {{node.name}}
    • -     -     -
    - -
    - -
    -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    登录账号{{element.name}}真实姓名{{element.realName}}所属机构{{element.organizationName}}所属角色 - {{item}} - 创建时间 - {{element.creationTime|date:'yyyy-MM-dd'}} - 操作 - - - - - - - - - - - - -
    - - - diff --git a/src/app/ui/usermanagement/usermanagement.component.scss b/src/app/ui/usermanagement/usermanagement.component.scss deleted file mode 100644 index 5466063..0000000 --- a/src/app/ui/usermanagement/usermanagement.component.scss +++ /dev/null @@ -1,155 +0,0 @@ -table { - width: 100%; - text-align: center; - .cdk-header-cell { - text-align: center; - } - } -.maginleft { - margin-left: 5px; -} - -.header { - width: 100%; - padding: 10px; - margin-bottom: 10px; - box-sizing: border-box; - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - .queryBox { - box-sizing: border-box; - padding: 5px 15px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items:center; - justify-content:center; - .queryField { - margin: 0 15px; - input { - width: 180px; - height: 22px; - line-height: 22px; - border-radius: 3px;} - } - - } //queryBox -} - - - -//创建用户 -.alert-danger{ - font-size: 14px; - color: red; -} -.leftTree { - width: 200px; - float: left; -} -.tree { - width: 300px; - height: 400px; - float: right; - overflow-y: auto; -} - - - -//分配角色 -.example-margin { - display: block; - margin-top: 5px; -} -.clearfix:after{/*伪元素是行内元素 正常浏览器清除浮动方法*/ - content: ""; - display: block; - height: 0; - clear:both; - visibility: hidden; -} -.clearfix{ - *zoom: 1;/*ie6清除浮动的方式 *号只有IE6-IE7执行，其他浏览器不执行*/ -} -.leftBox { - float: left; - width: 250px; - border-radius: 10px;; - border: 1px solid #999; -} -.rightBox { - float: right; - width: 250px; - border-radius: 10px;; - border: 1px solid #999; -} -.Userheader { - height: 30px; - line-height: 30px; - border-radius: 10px 10px 0 0; - padding-left: 10px; - background-color: #f9fafc; -} -.select { - height: 300px; - padding-left: 10px; - border-top: 1px solid #999; - overflow: auto; - p{ - height: 24px; - line-height: 24px; - } -} -.organizationlist{ - list-style: none -} -.organizationlist:hover{ - background: rgba(225, 225, 225, 0.8); - cursor: pointer; -} - - -//滚动条样式 -::-webkit-scrollbar{ - width: 5px; - background-color: white; -} -::-webkit-scrollbar-thumb{ - background-color: #999; -} -.organizationbox{ - width:450px; - height: 200px; - background: white; - position: absolute; - top: 25px; - left: 78px; - z-index: 999; - border: 1px solid grey; - overflow-y: auto; - li{ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - mat-tree-node{ - cursor: pointer; - white-space:pre; - } - mat-tree-node:hover{ - background: rgba(225, 225, 225, 0.8); - } - .closediv{ - z-index: 100; - position: absolute; - right: 0; - top: 0; - width: 30px; - height: 30px; - cursor: pointer; - line-height: 30px; - text-align: center; - } - .closediv:hover{ - background:rgba(225, 225, 225, 0.8); - } -} \ No newline at end of file diff --git a/src/app/ui/usermanagement/usermanagement.component.ts b/src/app/ui/usermanagement/usermanagement.component.ts deleted file mode 100644 index 0c6bd09..0000000 --- a/src/app/ui/usermanagement/usermanagement.component.ts +++ /dev/null @@ -1,549 +0,0 @@ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import {HttpClient} from '@angular/common/http' -import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; -import { FlatTreeControl } from '@angular/cdk/tree'; -import { MatTreeFlattener, MatTreeFlatDataSource } from '@angular/material/tree'; -import { PageEvent } from '@angular/material/paginator'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { TreeService } from '../../http-interceptors/tree.service' -import { FormControl } from '@angular/forms'; - - - -@Component({ - selector: 'app-usermanagement', - templateUrl: './usermanagement.component.html', - styleUrls: ['./usermanagement.component.scss'] -}) -export class UsermanagementComponent implements OnInit { - - constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { } - private _transformer = (node, level: number) => { //初始化tree - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - children: node.children - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - treedataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - myControl = new FormControl(); - hasChild = (_: number, node: any) => node.expandable; - - ngOnInit() { - this.initData() - this.getAllMechanism() - } - - - displayedColumns: string[] = ['loginName', 'realName', 'mechanism','role','time', 'operation']; - dataSource:any; //所有用户 - allMechanism:any; //所有机构 - - userLogin:string; //搜索账号 - userName:string; //搜索名称 - userMechanism:string //搜索机构 - - //分页 - @ViewChild(MatPaginator, {static: true}) - pageEvent: PageEvent; - paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 - - //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 - let data = { - Name: this.userLogin ||'', - RealName:this.userName ||'', - OrganizationId:this.userMechanism ||'', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/Users',{params:data}).subscribe( - (data:any[])=> { - this.length = data['totalCount'] - this.pageSize = data['pageSize'] - this.dataSource = new MatTableDataSource(data['items']); - } - ) - } - - isorganizationbox:any = false - stopclose(e){ - e.stopPropagation(); - } - js:any - // jsId:any - //点击辖区中队树，将选择的辖区中队添加到变量 - add(node) { - this.isorganizationbox = false - this.js = node.name - console.log(this.js) - this.userMechanism = node.id - } - - //打开辖区中队隐藏框 - openorganizationbox() { - this.isorganizationbox = true - } - - //关闭出现的组织机构div - closediv(){ - this.isorganizationbox = false - } - - //页面初始化 + 查询 + 重置 - initData () { - let data = { - Name: this.userLogin ||'', - RealName:this.userName ||'', - OrganizationId:this.userMechanism ||'', - PageNumber: '1', - } - this.http.get('/api/Users',{params:data}).subscribe( - (data:any[])=> { - this.length = data['totalCount'] - this.pageSize = data['pageSize'] - this.pageEvent.pageIndex = 0 - this.dataSource = new MatTableDataSource(data['items']); - } - ) - } - - //更新当前页数据 - getUsers () { - let data = { - Name: this.userLogin ||'', - RealName:this.userName ||'', - OrganizationId:this.userMechanism ||'', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/Users',{params:data}).subscribe( - (data:any[])=> { - this.length = data['totalCount'] - this.pageSize = data['pageSize'] - this.dataSource = new MatTableDataSource(data['items']); - } - ) - - } - - //清空自动搜索 - empty () { - this.userLogin='' - this.userName='' - this.userMechanism='' - this.js = '' - this.isorganizationbox = false - this.initData() - } - allorganizations:any//所有组织机构 - treedata:any//所有组织机构变成树 - newallorganizations:any - - //获取所有机构 - getAllMechanism() { - this.http.get('/api/Organizations').subscribe(data=>{ - this.allorganizations = data - this.treedata = this.tree.toTree(data); - this.treedataSource.data = this.treedata - }) - } - - //打开创建用户窗口 - open() { - let dialogRef = this.dialog.open(CreateNewUser,{ - width: '600px', - }); - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) {this.getUsers()} - } - ); - } - - //打开分配角色窗口 - openuser (e) { - let dialogRef = this.dialog.open(allRoles, - { - width:'600px', - data: {e} - }); - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) {this.getUsers()} - } - ); - } - - //启用 - enable (e) { - this.http.put(`/api/Users/${e.name}`,{ - name: e.name, - realName:e.realName, - post: e.post, - phone: e.phone, - enabled: true, - creationTime:e.creationTime, - organizationId:e.organizationId - }).subscribe( - data=> { - this.getUsers() - } - ) - } - - //禁用 - prohibit (e) { - this.http.put(`/api/Users/${e.name}`,{ - name: e.name, - realName:e.realName, - post: e.post, - phone: e.phone, - enabled: false, - creationTime:e.creationTime, - organizationId:e.organizationId - }).subscribe( - data=> { - this.getUsers() - } - ) - } - - //编辑 - edit (e) { - let allMechanism=this.allMechanism - let dialogRef = this.dialog.open(EditNewUser, - { - data: {e,allMechanism} - }); - - dialogRef.afterClosed().subscribe( - (data)=>{ - if (data) {this.getUsers()} - } - ); - } - - //查看 - see (e) { - this.http.get(`/api/Users/${e}`).subscribe( - data=> { - let dialogRef = this.dialog.open(seeInformation, - { - width:'600px', - data - }); - dialogRef.afterClosed().subscribe(); - } - - ) - } - - //重置密码 - reset (e) { - this.http.put(`/api/Users/${e}/ResetPassword`,{}).subscribe( - data=> { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码成功!','确定',config); - } - ) - } - - //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') - if (isTrue) { - this.http.delete(`/api/Users/${e}`).subscribe( - data=>{ - this.getUsers() - } - ) - } - } - - - -} - -//创建用户组件 -@Component({ - selector: 'app-createUser', - templateUrl: './createUser.html', - styleUrls: ['./usermanagement.component.scss'] -}) -export class CreateNewUser { - - newdata = []; - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - enabled:node.enabled, - order:node.order, - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - - constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef) {} - - organizationId:any=''; //所属机构id - organizationName:any; //所属机构name - - ngOnInit() { - this.tree() - } - - //渲染Tree - tree () { - this.newdata=[] - this.http.get('/api/Organizations').subscribe( - (data:any)=>{ - function getparentNode(parentId){ - return data.find((item)=>{ - return item.id == parentId - }) - } - data.forEach(item => { - var parentNode = getparentNode(item.parentId); - if(parentNode){ - if(!parentNode.children){ - parentNode.children = [] - } - parentNode.children.push(item) - }else{ - if(!item.parentId){ - this.newdata.push(item) - } - } - }); - this.dataSource.data = this.newdata; - } - ) - - } - hasChild = (_: number, node: any) => node.expandable; - - //选择机构 - add (e) { - this.organizationId = e.id - this.organizationName = e.name - } - - errmsg:any; //捕获错误信息 - //新增用户 - onSubmit(e) { - let time =new Date() - if(this.organizationId) { - this.http.post('/api/Users',{ - name:e.name, - realName:e.user, - post:e.post, - phone:e.phone, - enabled:true, - creationTime:time, - organizationId:this.organizationId - }).subscribe(data=> { - this.dialogRef.close('success')}, - error=>{this.errmsg = error} - ) - }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择机构','确定',config); - } - } - - - -} - - - -//编辑用户组件 -@Component({ - selector: 'app-editUser', - templateUrl: './editUser.html', - styleUrls: ['./usermanagement.component.scss'] -}) -export class EditNewUser { - constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit() { - this.getTreeData() - this.name=this.data.e.name - this.realName=this.data.e.realName - this.post=this.data.e.post, - this.phone=this.data.e.phone, - this.affiliate=this.data.e.organizationId - this.affiliateName=this.data.e.organizationName - } - - private _transformer = (node, level: number) => { - return { - expandable: !!node.children && node.children.length > 0, - name: node.name, - level: level, - id: node.id, - parentId: node.parentId, - enabled:node.enabled, - order:node.order, - }; - } - treeControl = new FlatTreeControl(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - hasChild = (_: number, node: any) => node.expandable; - - name:any; //登录账号 - realName:any; //真实姓名 - post:any; //职务 - phone:any; //联系电话 - affiliate:any; //所属机构id - affiliateName:any; //所属机构name - - //获取tree数据 - getTreeData () { - this.http.get('/api/Organizations').subscribe((data:any)=>{ - let treeData = [] - data.forEach(element => { - element.children = [] - data.forEach(item => { if (item.parentId==element.id) {element.children.push(item)} }); - if(!element.parentId) {treeData.push(element)} - }); //forEach - this.dataSource.data = treeData - - }) - } - - //选择组织机构 - add (e) { - this.affiliate = e.id - this.affiliateName = e.name - } - - //编辑 - onSubmit (e) { - this.http.put(`/api/Users/${this.data.e.name}`,{ - name:this.data.e.name, - realName:this.realName, - post:this.post, - phone:this.phone, - roleNames:this.data.e.roleNames, - enabled: this.data.e.enabled, - creationTime:this.data.e.creationTime, - organizationId:this.affiliate - }).subscribe(data=>{ - this.dialogRef.close('success') - }) - - } - - - -} - - - -//分配角色组件 -@Component({ - selector: 'app-allRoles', - templateUrl: './allRoles.html', - styleUrls: ['./usermanagement.component.scss'] -}) -export class allRoles { - - constructor(public http: HttpClient,public snackBar: MatSnackBar, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit() { - this.getUsers() - } - - allRoles:any; //所有角色 - checked:any=[]; //选中的角色 - - //获取所有角色 - getUsers () { - this.http.get('/api/Roles').subscribe( data=>{ - this.allRoles=data - this.allRoles.forEach(element => { //所有角色 - element.checked = false - this.data.e.roleNames.forEach(elements=> { //当前账号已有角色 - if (element.name == elements) { - element.checked = true - this.checked.push(element)} }); - }); - - }) - } - - //check框change事件 - fill (e) { - e.checked = !e.checked - if (e.checked) { - this.checked.push(e) - } else { - this.checked.splice(this.checked.findIndex(item => item==e), 1) - } - } - - //分配角色 - onSubmit () { - if (this.checked.length) { - let data:any=[] - this.checked.forEach(item=>{ - data.push(item.id) - }) - this.http.post(`/api/Users/${this.data.e.name}/Roles`,data).subscribe( data=> { - this.dialogRef.close('success') - }) - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择分配角色','确定',config); - } - } - - - -} - - -//查看用户组件 -@Component({ - selector: 'app-seeInformation', - templateUrl: './seeInformation.html', - styleUrls: ['./usermanagement.component.scss'] -}) -export class seeInformation { - constructor(public http: HttpClient, - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) {} - - ngOnInit() { - } - -} diff --git a/src/index.html b/src/index.html index 36c74e3..0b6bcda 100644 --- a/src/index.html +++ b/src/index.html @@ -15,4 +15,5 @@ +