From 64dfd2f26f8baed28e147f348bfe921bc7ac8c69 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Fri, 21 May 2021 17:24:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=B7=A6=E4=BE=A7=E9=A2=84?= =?UTF-8?q?=E6=A1=88=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E7=BA=A7=E5=88=AB=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-template.component.html | 20 +++- .../plan-template.component.scss | 55 +++++++++-- .../plan-template/plan-template.component.ts | 97 ++++++++++++++++++- src/app/ui/plan-template/upPlan.html | 43 ++++++++ src/app/ui/ui.module.ts | 3 +- 5 files changed, 199 insertions(+), 19 deletions(-) create mode 100644 src/app/ui/plan-template/upPlan.html diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index 5dfda59..1e6fd5d 100644 --- a/src/app/ui/plan-template/plan-template.component.html +++ b/src/app/ui/plan-template/plan-template.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-19 15:50:20 * @LastEditors: sueRimn - * @LastEditTime: 2021-05-20 17:03:52 + * @LastEditTime: 2021-05-21 16:56:26 -->
@@ -18,17 +18,27 @@
-
+
{{item.name}}
{{item.level}} - - + +
-
+
+
+
+ {{planName}} +
+
+ +
+
+
+
diff --git a/src/app/ui/plan-template/plan-template.component.scss b/src/app/ui/plan-template/plan-template.component.scss index a10162d..ed27896 100644 --- a/src/app/ui/plan-template/plan-template.component.scss +++ b/src/app/ui/plan-template/plan-template.component.scss @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-19 15:50:20 * @LastEditors: sueRimn - * @LastEditTime: 2021-05-20 15:46:44 + * @LastEditTime: 2021-05-21 16:55:49 */ .box{ height: 97%; @@ -22,12 +22,13 @@ height: 50px; width: 100%; display: flex; + justify-content: space-between; border-bottom: 1px solid #F7F8FA; span{ font-size: 16px; } .leftheadone{ - width: 40%; + width: 60%; height: 100%; span{ margin: 10px 10px; @@ -36,19 +37,19 @@ } } .leftheadtwo{ - width: 20%; + width: 30%; height: 100%; - margin-left: 50%; cursor: pointer; img{ position: relative; top: 2px; } span{ - //margin-left: 70%; + margin-left: 2px; //margin: 10px 10px; height: 50px; line-height: 50px; + color: #2196F3; } } } @@ -57,13 +58,21 @@ width: 100%; display: flex; flex-direction: column; + .selectedTr{ + background-color: #E1F1FF; + span{ + color: #2196F3; + } + } .leftbody{ width: 100%; height: 40px; display: flex; + justify-content: space-between; + cursor: pointer; .bodyname{ height: 40px; - width: 60%; + width: 70%; span{ font-size: 16px; height: 40px; @@ -73,16 +82,17 @@ } .bodycz{ height: 40px; - width: 40%; + width: 30%; img{ margin-left: 10px; + cursor: pointer; } span{ color: #B2BEC7; font-size: 16px; height: 40px; line-height: 40px; - margin-left: 30%; + //margin-left: 30%; } } } @@ -93,5 +103,34 @@ height: 100%; width: 78%; background-color: #FFFFFF; + display: flex; + flex-direction: column; + .righthead{ + height: 50px; + width: 100%; + display: flex; + justify-content: space-between; + border-bottom: 1px solid #F7F8FA; + span{ + font-size: 16px; + } + .rightheadone{ + width: 50%; + height: 100%; + span{ + margin: 10px 10px; + height: 50px; + line-height: 50px; + } + } + .rightheadtwo{ + width: 50%; + height: 100%; + button{ + margin-left: 80%; + margin-top: 5px; + } + } + } } } \ No newline at end of file diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index 3067ad3..8d8e95e 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-05-19 15:50:20 * @LastEditors: sueRimn - * @LastEditTime: 2021-05-20 17:02:03 + * @LastEditTime: 2021-05-21 16:27:07 */ import { Component, Inject, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -34,17 +34,57 @@ export class PlanTemplateComponent implements OnInit { } //新建预案弹窗 addKeyunit(){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 const dialogRef = this.dialog.open(addPlanname, {//调用open方法打开对话框并且携带参数过去 width: '340px', height:'330px', - disableClose:true - + disableClose:true, + data:{plandata:this.newleftTabledata} + }); + dialogRef.afterClosed().subscribe(result => { + console.log(result) + if(result!=undefined){ + this.newleftTabledata.push(result) + for(var i=0;i { - this.newleftTabledata.push(result) - console.log(this.newleftTabledata); + console.log(result) + if(result!=undefined){ + this.newleftTabledata[i].name=result.name + this.newleftTabledata[i].level=result.level + } }); } + //左侧预案模板点击事件 + planName + planClick(item){ + console.log(item) + this.planName=item.name + } } //新建预案 @@ -57,11 +97,58 @@ export class addPlanname{ constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} unitname//预案名称 level//预案级别 + ngOnInit(): void { + console.log(this.data) + } //取消按钮 close(){ this.dialogRef.close(); } newplan(){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + if(this.unitname==undefined||this.unitname==''){ + this.snackBar.open('请输入预案名称!','确定',config); + } + else if(this.level==undefined||this.level==''){ + this.snackBar.open('请输入预案级别!','确定',config); + }else{ + for(var i=0;i,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} + unitname=this.data.item.name//预案名称 + level=this.data.item.level//预案级别 + ngOnInit(): void{ + /* this.unitname=this.data.name + this.level=this.data.level */ + } + //取消按钮 + close(){ + this.dialogRef.close(); + } + //确定按钮 + upplan(){ const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 diff --git a/src/app/ui/plan-template/upPlan.html b/src/app/ui/plan-template/upPlan.html new file mode 100644 index 0000000..749206b --- /dev/null +++ b/src/app/ui/plan-template/upPlan.html @@ -0,0 +1,43 @@ + + +
+
+ 修改预案名称和级别 +
+
+ + + + +
+ + +
+ + + + Ⅲ级 + Ⅳ级 + Ⅴ级 + + +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 0b8a357..74adbff 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -86,6 +86,7 @@ import {CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuil import {leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent} from './collection-tools-building/leftFunctionalDomain'; import { PlanTemplateComponent } from './plan-template/plan-template.component' import { addPlanname } from './plan-template/plan-template.component' +import { upPlanname } from './plan-template/plan-template.component' @NgModule({ declarations: [UiComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent, IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization, @@ -96,7 +97,7 @@ import { addPlanname } from './plan-template/plan-template.component' addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent, CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent, CreateBuildingPlan,EditBuildingPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addOffices,editOffices,addBGCDisposalNodeComponent,CollectionToolsBuildingComponent,CreateBuildingBuilding, - EditBuildingBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,Organization, PlanTemplateComponent,addPlanname], + EditBuildingBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,Organization, PlanTemplateComponent,addPlanname,upPlanname], imports: [ CommonModule,