From 50515a8756093331a34dc4b28d94d6c46a3086ee Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 28 Jun 2023 15:46:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=85=AD=E7=86=9F=E6=82=89?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drill-record/drill-record.component.html | 7 +- .../drill-record/drill-record.component.ts | 2 +- .../entry-plan-look.component.html | 1 + .../entry-plan-look.component.ts | 13 + .../six-familiarize.component.html | 29 +++ .../six-familiarize.component.scss | 118 +++++++++ .../six-familiarize.component.spec.ts | 25 ++ .../six-familiarize.component.ts | 106 ++++++++ .../plan-management/plan-management.module.ts | 2 + .../six-familiarity.component.html | 115 ++++----- .../six-familiarity.component.scss | 148 ++--------- .../six-familiarity.component.ts | 236 +++++++++--------- 12 files changed, 487 insertions(+), 315 deletions(-) create mode 100644 src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.html create mode 100644 src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss create mode 100644 src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.spec.ts create mode 100644 src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.ts diff --git a/src/app/plan-management/drill-record/drill-record.component.html b/src/app/plan-management/drill-record/drill-record.component.html index 06c529f..fe3b830 100644 --- a/src/app/plan-management/drill-record/drill-record.component.html +++ b/src/app/plan-management/drill-record/drill-record.component.html @@ -3,8 +3,8 @@
- 单位名称: - + 预案名称: +
组织机构: @@ -52,8 +52,7 @@ - +
\ No newline at end of file diff --git a/src/app/plan-management/drill-record/drill-record.component.ts b/src/app/plan-management/drill-record/drill-record.component.ts index b4f9718..d1e588a 100644 --- a/src/app/plan-management/drill-record/drill-record.component.ts +++ b/src/app/plan-management/drill-record/drill-record.component.ts @@ -133,7 +133,7 @@ export class DrillRecordComponent implements OnInit { this.http .delete(`/api/DrillRecords/${element.id}`) .subscribe((data: any) => { - alert('删除成功') + alert("删除成功"); this.getTabledataSource(); }); } diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index ef21d13..bcda96a 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -131,6 +131,7 @@ 操作 + 六熟悉 查看 下载 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 84976b4..ed394a0 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -28,6 +28,7 @@ import Swiper from "swiper"; import { resolve } from "dns"; import { DomSanitizer } from "@angular/platform-browser"; import { EditPlanCategoryComponent } from "./edit-plan-category/edit-plan-category.component"; +import { SixFamiliarizeComponent } from "./six-familiarize/six-familiarize.component"; declare var CryptoJS; @Component({ selector: "app-entry-plan-look", @@ -149,6 +150,18 @@ export class EntryPlanLookComponent implements OnInit { this.unittypeId = this.route.snapshot.queryParams.unitTypeId; this.getAllPlanComponents(); } + + sixFamiliarize(element) { + console.log(element); + const dialogRef = this.dialog.open(SixFamiliarizeComponent, { + width: "700px", + data: { planData: element, unitdata: this.unitdata, isEditMode: true }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log("The dialog was closed"); + }); + } //查看预案 lookPlan(e) { if (e.planType == 16 || e.planType == 4 || e.planType == 8) { diff --git a/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.html b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.html new file mode 100644 index 0000000..3d7a77a --- /dev/null +++ b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.html @@ -0,0 +1,29 @@ +

六熟悉

+
+
+
+
+ 熟悉对象: + {{data.unitdata.unitname}} +
+
+ 人员数量: + +
+
+ 熟悉时间: + +
+
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss new file mode 100644 index 0000000..d3a5447 --- /dev/null +++ b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.scss @@ -0,0 +1,118 @@ +.box { + width: 100%; + position: relative; + + .contentItem { + display: flex; + margin: 6px 0; + // border-bottom: 1px dashed rgb(180, 178, 178); + + .title { + width: 75px; + color: #1890ff; + display: flex; + align-items: center; + } + + .content { + flex: 1; + display: flex; + flex-wrap: wrap; + flex-direction: column; + + div { + display: flex; + align-items: center; + + input, + nz-range-picker { + flex: 1; + } + } + + div { + margin-bottom: 8px; + + .name { + display: inline-block; + width: 70px; + margin-right: 3px; + text-align: right; + } + } + } + + + .textbox { + height: 32px; + line-height: 32px; + width: 50%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + + } + + .uploadbox { + position: relative; + display: flex; + align-items: center; + + input { + width: 88px; + height: 32px; + position: absolute; + left: 0; + top: 0; + opacity: 0; + z-index: 2; + cursor: pointer; + } + + button { + z-index: 1; + cursor: pointer; + } + + .imgbox { + height: 100%; + display: flex; + align-items: center; + + li { + display: flex; + align-items: center; + position: relative; + } + + img { + width: 50px; + height: 50px; + margin: 0 5px; + cursor: pointer; + } + + .close { + position: absolute; + right: 0; + top: 0; + font-size: 15px; + cursor: pointer; + } + } + } + } + + .mask { + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + background: rgba(0, 0, 0, 0.2); + display: flex; + justify-content: center; + align-items: center; + z-index: 3; + } +} diff --git a/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.spec.ts b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.spec.ts new file mode 100644 index 0000000..c5ebf28 --- /dev/null +++ b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SixFamiliarizeComponent } from './six-familiarize.component'; + +describe('SixFamiliarizeComponent', () => { + let component: SixFamiliarizeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SixFamiliarizeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SixFamiliarizeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.ts b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.ts new file mode 100644 index 0000000..bc2796b --- /dev/null +++ b/src/app/plan-management/entry-plan-look/six-familiarize/six-familiarize.component.ts @@ -0,0 +1,106 @@ +import { HttpClient } from "@angular/common/http"; +import { Component, OnInit, Inject } from "@angular/core"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; +import { ObjectsService } from "@src/app/services/objects.service"; +import { DatePipe } from "@angular/common"; +import { MatSnackBar } from "@angular/material/snack-bar"; +import Viewer from "viewerjs"; + +@Component({ + selector: "app-six-familiarize", + templateUrl: "./six-familiarize.component.html", + styleUrls: ["./six-familiarize.component.scss"], + providers: [DatePipe], +}) +export class SixFamiliarizeComponent implements OnInit { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + private objectsSer: ObjectsService, + private http: HttpClient, + private datePipe: DatePipe, + public snackBar: MatSnackBar + ) {} + + isEditMode = true; + + ngOnInit(): void { + console.log(this.data); + this.isEditMode = this.data.isEditMode; + this.getData(); + } + + isHttpPost; + getData() { + this.http + .get("/api/SixFamiliars", { + params: { + PlanComponentId: this.data.planData.id, + }, + }) + .subscribe((data: any) => { + console.log("六熟悉记录数据", data); + if (data.totalCount === 0) { + this.isHttpPost = true; + } else { + this.isHttpPost = false; + let item = data.items[0]; + this.familiarizeId = item.id; + this.memberCount = item.memberCount; + this.time = [item.startTime, item.endTime]; + } + }); + } + + isLoading = false; + + memberCount; + time; + familiarizeId; + isLoadingSave = false; + save() { + if (!this.isEditMode) { + this.dialogRef.close(); + return; + } + + if (!this.memberCount || !this.time) { + this.snackBar.open("请输入人员数量和熟悉时间", "确定", { + verticalPosition: "top", + duration: 3000, + }); + return; + } + this.isLoadingSave = true; + let body: any = { + planComponentId: this.data.planData.id, + memberCount: this.memberCount, + startTime: this.datePipe.transform(this.time[0], "yyyy-MM-ddTHH:mm:ss"), + endTime: this.datePipe.transform(this.time[1], "yyyy-MM-ddTHH:mm:ss"), + }; + if (this.isHttpPost) { + this.http.post("/api/SixFamiliars", body).subscribe((data: any) => { + this.familiarizeId = data.id; + this.isHttpPost = false; + this.isLoadingSave = false; + this.snackBar.open("保存成功", "确定", { + verticalPosition: "top", + duration: 3000, + }); + this.dialogRef.close(); + }); + } else { + body.id = this.familiarizeId; + this.http + .put(`/api/SixFamiliars/${this.familiarizeId}`, body) + .subscribe((data: any) => { + this.isLoadingSave = false; + this.snackBar.open("保存成功", "确定", { + verticalPosition: "top", + duration: 3000, + }); + this.dialogRef.close(); + }); + } + } +} diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 668124f..5a4e39d 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -94,6 +94,7 @@ import { NzDatePickerModule } from "ng-zorro-antd/date-picker"; import { NzInputModule } from "ng-zorro-antd/input"; import { NzButtonModule } from "ng-zorro-antd/button"; import { NzTreeSelectModule } from "ng-zorro-antd/tree-select"; +import { SixFamiliarizeComponent } from './entry-plan-look/six-familiarize/six-familiarize.component'; @NgModule({ declarations: [ EntryPlanComponent, @@ -139,6 +140,7 @@ import { NzTreeSelectModule } from "ng-zorro-antd/tree-select"; EditPlanCategoryComponent, SixFamiliarityComponent, DrillRecordComponent, + SixFamiliarizeComponent, ], imports: [ CommonModule, diff --git a/src/app/plan-management/six-familiarity/six-familiarity.component.html b/src/app/plan-management/six-familiarity/six-familiarity.component.html index 9319102..0516ad4 100644 --- a/src/app/plan-management/six-familiarity/six-familiarity.component.html +++ b/src/app/plan-management/six-familiarity/six-familiarity.component.html @@ -1,63 +1,66 @@ - +
- -
- -
- - - - -
-
- - - - -
-
- - -
+ +
+ 预案名称: + +
+
+ 单位名称: + +
+
+ 组织机构: + + +
+
+ 熟悉时间: + +
+
+ +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
熟悉对象{{element.name}}熟悉时间{{element.time}}带队领导{{element.leader}}上传人员{{element.upload}}操作 - 查看 - 详情 -
- - - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
预案名称{{element.planComponent.name}}熟悉对象组织机构人员数量{{element.memberCount}}熟悉时间{{element.startTime | date:'yyyy-MM-dd HH:mm'}} - + {{element.endTime | date:'yyyy-MM-dd HH:mm'}}操作 + 查看 + +
+ +
\ No newline at end of file diff --git a/src/app/plan-management/six-familiarity/six-familiarity.component.scss b/src/app/plan-management/six-familiarity/six-familiarity.component.scss index 06606f0..985135e 100644 --- a/src/app/plan-management/six-familiarity/six-familiarity.component.scss +++ b/src/app/plan-management/six-familiarity/six-familiarity.component.scss @@ -6,153 +6,42 @@ .header { width: 100%; - padding: 12px 10px; box-sizing: border-box; + padding: 20px 30px 8px 30px; .queryBox { - box-sizing: border-box; - padding: 5px 0 0 5px; - // margin-left: 50px; display: flex; - flex-direction: row; flex-wrap: wrap; align-items: center; - // justify-content:center; .queryField { - margin: 0 10px; + display: flex; + align-items: center; + margin-right: 20px; - input { - width: 180px; - height: 22px; - line-height: 22px; - border-radius: 3px; + span { + display: inline-block; + width: 80px; } - - @media screen and (max-device-width:1400px)and (min-device-width:1200px) { - - //margin: 3px 10px; - mat-form-field { - width: 180px; - } - } - - @media screen and (max-device-width:1200px) { - - //margin: 3px 0 3px 10px; - mat-form-field { - width: 110px; - } - } - } - - } - - //queryBox - .butclass { - button { - width: 80px; - height: 36px; - font-size: 16px; } - } - - .ordiv { - position: relative; - - .organizationbox { - width: 450px; - height: 200px; - background: white; - position: absolute; - top: 48px; - left: 77px; - 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); + .btnbox { + button { + margin-right: 12px; } } - } -} -.body { - .buttonbox { - padding-left: 50px; +} - button { - margin: 0 10px - } +.tablebox { + table { + width: 100%; + margin-top: 15px; } - .tablebox { - .add { - cursor: auto; - text-decoration: none; - display: block; - width: 40px; - height: 20px; - background: #1AE2AC; - font-size: 12px; - line-height: 20px; - color: #FFFFFF; - margin-left: 50px; - } - - .weihu { - cursor: auto; - text-decoration: none; - display: block; - width: 64px; - height: 20px; - background: #FFC94B; - font-size: 12px; - color: #FFFFFF; - line-height: 20px; - margin-left: 40px; - } - - table { - width: 100%; - // margin-left: 2%; - margin-top: 15px; - } - - mat-paginator { - width: 100%; - // margin-left: 2%; - // margin-top: 30px; - } + mat-paginator { + width: 100%; } } @@ -164,8 +53,7 @@ .operate { span { - color: blue; - margin: 0 3px; + color: #40a9ff; cursor: pointer; } } diff --git a/src/app/plan-management/six-familiarity/six-familiarity.component.ts b/src/app/plan-management/six-familiarity/six-familiarity.component.ts index f4f88c4..25905ec 100644 --- a/src/app/plan-management/six-familiarity/six-familiarity.component.ts +++ b/src/app/plan-management/six-familiarity/six-familiarity.component.ts @@ -1,166 +1,154 @@ import { Component, OnInit, ViewChild, Inject } from "@angular/core"; import { HttpClient } from "@angular/common/http"; -import { - MatTreeFlatDataSource, - MatTreeFlattener, -} from "@angular/material/tree"; import { MatPaginator } from "@angular/material/paginator"; -import { FlatTreeControl } from "@angular/cdk/tree"; -import { FormControl } from "@angular/forms"; import { Router, ActivatedRoute } from "@angular/router"; import { PageEvent } from "@angular/material/paginator"; import { MatDialog } from "@angular/material/dialog"; import { MatSnackBar } from "@angular/material/snack-bar"; import { TreeService } from "../../http-interceptors/tree.service"; +import { DatePipe } from "@angular/common"; +import { SixFamiliarizeComponent } from "../entry-plan-look/six-familiarize/six-familiarize.component"; + @Component({ selector: "app-six-familiarity", templateUrl: "./six-familiarity.component.html", styleUrls: ["./six-familiarity.component.scss"], + providers: [DatePipe], }) export class SixFamiliarityComponent implements OnInit { constructor( private http: HttpClient, - private router: Router, - private route: ActivatedRoute, - private tree: TreeService, public dialog: MatDialog, - public snackBar: MatSnackBar + public snackBar: MatSnackBar, + private datePipe: DatePipe ) {} - 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 - ); - dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); - myControl = new FormControl(); - hasChild = (_: number, node: any) => node.expandable; //分页 @ViewChild(MatPaginator, { static: true }) pageEvent: PageEvent; paginator: MatPaginator; - length: any = 13; //共多少条数据 - pageSize: any = 10; //每页条数 - pageSizeOptions: number[] = [10]; //设置每页条数 - PageNumber: any = 1; //第几页 + displayedColumns: string[] = [ + "planname", + "name", + "or", + "people", + "time", + "operate", + ]; + tabledataSource: any; //表格数据 - displayedColumns: string[] = ["name", "time", "leader", "upload", "operate"]; + ngOnInit(): void { + this.getOrganizations(); + } + + //获得所有组织机构 allorganizations: any; //所有组织机构 - allunittype: any; //所有单位类型 - tabledataSource: any; //表格数据 - IsNewData = ""; //维护更新活新增 + getOrganizations() { + this.http.get("/api/Organizations").subscribe((data: any) => { + this.allorganizations = data; + this.getpresentOrganization(); + }); + } - preparelevels: any; + //得到当前单位所在组织机构的tree型数据 + expandKeys = []; + nodes = []; + organizationId; + getpresentOrganization() { + this.allorganizations.forEach((item) => { + item.key = item.id; + item.title = item.name; + item.children = []; + this.allorganizations.forEach((element) => { + if (element.parentId == item.id) { + item.children.push(element); + } + if (item.children.length === 0) { + item.isLeaf = true; + } else { + item.isLeaf = false; + } + }); + }); + this.http.get("/api/Account/Profiles").subscribe((data: any) => { + this.allorganizations.forEach((item) => { + if (item.name == data.organizationName) { + this.expandKeys = [item.id]; + this.organizationId = item.id; + this.orId = item.id; + this.nodes = [...[item]]; + this.getTabledataSource(); + } + }); + }); + } - arr1 = [ - { - name: "上海百联物业管理有限公司（福兴大厦）", - time: "2023-5-18 07:19", - leader: "郑子墨", - upload: "赵竹林", - }, - { - name: "未来资产大厦", - time: "2023-5-18 08:59", - leader: "何仙超", - upload: "何晨", - }, - { - name: "星展银行大厦", - time: "2023-5-18 11:22", - leader: "吴洁力", - upload: "赵玉", - }, - { - name: "中国金融信息中心", - time: "2023-5-19 12:29", - leader: "吴易奚", - upload: "赵宵蕙", - }, - { - name: "中保大厦有限公司", - time: "2023-5-20 13:07", - leader: "周伟林", - upload: "李英顺", - }, - { - name: "上海国际航运大厦有限公司海神诺富特大酒店", - time: "2023-5-21 16:16", - leader: "李琳颖", - upload: "吴斯怡", - }, - { - name: "东方绿舟度假村", - time: "2023-5-22 15:50", - leader: "李双秆", - upload: "钱浩宇", - }, - { - name: "上海市金山食品工业学校", - time: "2023-5-22 08:39", - leader: "孙正容", - upload: "孙正云", - }, - ]; - arr2=[ - { - name: "上海汇资百货有限公司", - time: "2023-5-23 05:25", - leader: "王英皓", - upload: "赵竹林", - }, - { - name: "上海良骤兴餐饮有限公司", - time: "2023-5-23 13:14", - leader: "蔡坤", - upload: "何晨", - }, - { - name: "上海红珍娱乐有限公司", - time: "2023-5-23 18:06", - leader: "徐皓", - upload: "赵玉", - }, - ] - ngOnInit(): void { - this.tabledataSource = this.arr1; + length: any; //共多少条数据 + pageSize: any = 10; //每页条数 + PageNumber: any = 1; //第几页 + getTabledataSource() { + let params = { + OrganizationId: this.orId, + PlanComponentName: this.name || "", + StartTime: this.time + ? this.datePipe.transform(this.time[0], "yyyy-MM-ddT00:00:00") + : "2020-01-01T00:00:00", + EndTime: this.time + ? this.datePipe.transform(this.time[1], "yyyy-MM-ddT23:59:59") + : "2030-01-01T00:00:00", + PageNumber: this.PageNumber, + PageSize: this.pageSize, + }; + this.http + .get("/api/SixFamiliars", { params: params }) + .subscribe((data: any) => { + this.tabledataSource = data.items; + this.length = data.totalCount; + }); } //分页事件 chagePage(e) { - console.log(e) - // this.PageNumber = e.pageIndex + 1; - if(e.pageIndex === 1){ - this.tabledataSource = this.arr2; - }else{ - this.tabledataSource = this.arr1; - } + this.PageNumber = e.pageIndex + 1; + this.getTabledataSource(); } name; + companyname; + orId; time; //查询 - onSubmit(e) { + onSubmit() { this.PageNumber = 1; this.pageEvent.pageIndex = 0; + this.getTabledataSource(); } //重置 - reset() {} + reset() { + this.name = ""; + this.orId = this.organizationId; + this.time = null; + this.onSubmit(); + } + + look(element) { + console.log(element); + let unitdata = {}; + this.dialog.open(SixFamiliarizeComponent, { + width: "700px", + data: { planData: element, unitdata: unitdata, isEditMode: false }, + }); + } + + delete(element) { + if (confirm("确认删除此记录吗")) { + this.http + .delete(`/api/SixFamiliars/${element.id}`) + .subscribe((data: any) => { + alert("删除成功"); + this.getTabledataSource(); + }); + } + } }