@@ -24,7 +24,8 @@
{{item.planCategory==3?'Ⅲ级':item.planCategory==4?'Ⅳ级':'Ⅴ级'}}
- ![]()
+ 复制
+ ![]()
![]()
@@ -64,7 +65,7 @@
-
+
@@ -200,18 +201,29 @@
@@ -182,7 +183,7 @@
-
+
-
+
-
+
+
diff --git a/src/app/ui/plan-template/plan-template.component.scss b/src/app/ui/plan-template/plan-template.component.scss
index 5848e9f..3f3de2f 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-06-03 16:57:21
+ * @LastEditTime: 2021-06-08 15:03:02
*/
.box{
height: 97%;
@@ -72,7 +72,7 @@
cursor: pointer;
.bodyname{
height: 40px;
- width: 70%;
+ width: 60%;
span{
font-size: 16px;
height: 40px;
@@ -82,7 +82,7 @@
}
.bodycz{
height: 40px;
- width: 30%;
+ width: 40%;
img{
margin-left: 10px;
cursor: pointer;
@@ -148,6 +148,7 @@
width: 100px;
}
.addinfo{
+ cursor: pointer;
height: 100%;
width: 75px;
margin-left: 75%;
@@ -157,6 +158,7 @@
}
}
.delinfo{
+ cursor: pointer;
height: 100%;
width: 75px;
span{
@@ -262,6 +264,24 @@
textarea{
width: 100%;
}
+ .inputtext{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ input{
+ //width: 100%;
+ height: 40px;
+ font-size: 16px;
+ border: none;
+ outline: none;
+ }
+ .inputj{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ }
+ }
}
}
.attackRight{
@@ -282,4 +302,28 @@
}
::-webkit-scrollbar-thumb {
background-color: #2196f3;
-}
\ No newline at end of file
+}
+
+.example-tree-invisible {
+ display: none;
+ }
+ .example-tree ul,
+ .example-tree li {
+ margin-top: 0;
+ margin-bottom: 0;
+ list-style-type: none;
+ }
+ /*
+ * This padding sets alignment of the nested nodes.
+ */
+ .example-tree .mat-nested-tree-node div[role=group] {
+ padding-left: 40px;
+ }
+ /*
+ * Padding for leaf nodes.
+ * Leaf nodes need to have padding so as to align with other non-leaf nodes
+ * under the same parent.
+ */
+ .example-tree div[role=group] > .mat-tree-node {
+ padding-left: 40px;
+ }
\ 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 5c28b50..3f093d0 100644
--- a/src/app/ui/plan-template/plan-template.component.ts
+++ b/src/app/ui/plan-template/plan-template.component.ts
@@ -4,29 +4,46 @@
* @Author: sueRimn
* @Date: 2021-05-31 10:40:01
* @LastEditors: sueRimn
- * @LastEditTime: 2021-06-03 17:08:37
- */
-/*
- * @Descripttion:
- * @version:
- * @Author: sueRimn
- * @Date: 2021-05-31 10:40:01
- * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-02 09:22:24
- */
-/*
- * @Descripttion:
- * @version:
- * @Author: sueRimn
- * @Date: 2021-05-19 15:50:20
- * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-02 09:18:05
+ * @LastEditTime: 2021-06-08 15:33:13
*/
+
import { Component, Inject, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http'
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
-
+import {FlatTreeControl, NestedTreeControl} from '@angular/cdk/tree';
+import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeNestedDataSource} from '@angular/material/tree';
+interface FoodNode {
+ name: string;
+ children?: FoodNode[];
+ }
+ const TREE_DATA: FoodNode[] = [
+ {
+ name: 'Fruit',
+ children: [
+ {name: 'Apple'},
+ {name: 'Banana'},
+ {name: 'Fruit loops'},
+ ]
+ }, {
+ name: 'Vegetables',
+ children: [
+ {
+ name: 'Green',
+ children: [
+ {name: 'Broccoli'},
+ {name: 'Brussels sprouts'},
+ ]
+ }, {
+ name: 'Orange',
+ children: [
+ {name: 'Pumpkins'},
+ {name: 'Carrots'},
+ ]
+ },
+ ]
+ },
+ ];
@Component({
selector: 'app-plan-template',
templateUrl: './plan-template.component.html',
@@ -34,7 +51,11 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
})
export class PlanTemplateComponent implements OnInit {
- constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
+ treeControl = new NestedTreeControl(node => node.children);
+ dataSource = new MatTreeNestedDataSource();
+ constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) {
+ this.dataSource.data = TREE_DATA;
+ }
ngOnInit(): void {
this.getLeftdata()
@@ -115,7 +136,7 @@ export class PlanTemplateComponent implements OnInit {
}
//修改模板
- upPlan(item,i){
+ upPlan(item,i,operation){
const dialogRef = this.dialog.open(upPlanname, {//调用open方法打开对话框并且携带参数过去
width: '340px',
height:'340px',
@@ -125,11 +146,25 @@ export class PlanTemplateComponent implements OnInit {
dialogRef.afterClosed().subscribe(result => {
if(result!=undefined){
//this.newleftTabledata[i].name=result.name
- this.newleftTabledata[i].basicCategoryId=result.basicCategoryId
- this.newleftTabledata[i].planCategory=result.planCategory
- this.newleftTabledata[i].buildingTypeId=result.buildingTypeId
- this.newleftTabledata[i].unitname=result.unitname
+ if(operation=='edit'){
+ this.newleftTabledata[i].basicCategoryId=result.basicCategoryId
+ this.newleftTabledata[i].planCategory=result.planCategory
+ this.newleftTabledata[i].buildingTypeId=result.buildingTypeId
+ this.newleftTabledata[i].unitname=result.unitname
+ }else{
+ let newdata={
+ basicCategoryId:result.basicCategoryId,
+ buildingTypeId:result.buildingTypeId,
+ data:item.data,
+ planCategory:result.planCategory,
+ unitname:result.unitname
+ }
+ this.newleftTabledata.push(newdata)
+ this.save()
+ }
+
}
+ console.log(this.newleftTabledata)
});
}
//左侧预案模板点击事件
@@ -230,7 +265,7 @@ export class PlanTemplateComponent implements OnInit {
}else if(groupName=='灾情设定'){
const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去
width: '340px',
- height:'400px',
+ height:'450px',
disableClose:true,
data:this.group
});
@@ -245,7 +280,14 @@ export class PlanTemplateComponent implements OnInit {
}else{
array[index].attribute.push(result)
}
-
+ if(result.level==2){
+ for(var i=0;i {
- console.log(result)
- if(result!=undefined){
- this.newleftTabledata[this,this.leftclicki].data.forEach((value,index,array)=>{
- if(value.groupName=='单位概况'){
- array[index].attribute.forEach((element,i,attary) => {
- if(element.surveyName=='消防设施'){
- attary[i].attinf[filei].facilityItems=result
- }
- });
- }
- })
- this.group=this.newleftTabledata[this,this.leftclicki].data
- }
- console.log(this.newleftTabledata)
- });
+ if(facilityItems.length!=0){
+ const dialogRef = this.dialog.open(addattinf, {//调用open方法打开对话框并且携带参数过去
+ width: '240px',
+ height:'400px',
+ disableClose:true,
+ data:{facilityItems:facilityItems}
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ console.log(result)
+ if(result!=undefined){
+ this.newleftTabledata[this,this.leftclicki].data.forEach((value,index,array)=>{
+ if(value.groupName=='单位概况'){
+ array[index].attribute.forEach((element,i,attary) => {
+ if(element.surveyName=='消防设施'){
+ attary[i].attinf[filei].facilityItems=result
+ }
+ });
+ }
+ })
+ this.group=this.newleftTabledata[this,this.leftclicki].data
+ }
+ console.log(this.newleftTabledata)
+ });
+ }
+
}
//消防设施表格具体属性删除
fileDel(i,f){
@@ -368,12 +413,17 @@ export class PlanTemplateComponent implements OnInit {
//进攻通道
//进攻通道,灾情设定增加表格数据
- attackAdd(name,i){
+ attackAdd(name,i,level){
//console.log(name,i)
if(name=='进攻通道'){
this.group[0].attribute[4].attinf[i].tableth.push('')
}else if(name=='灾情设定'){
- this.group[1].attribute[i].tableth.push('')
+ if(level==1){
+ this.group[1].attribute[i].tableth.push('')
+ }else if(level==2){
+ this.group[1].attribute[i].tableth.push({head:'',body:''})
+ }
+
}
console.log(this.newleftTabledata)
}
@@ -437,6 +487,9 @@ export class PlanTemplateComponent implements OnInit {
}
}
+ //树形结构
+ hasChild = (_: number, node: FoodNode) => !!node.children && node.children.length > 0;
+
//单位基本信息和建筑信息表格
displayedColumns: string[] = ['name','level','default','must', 'danwei','operation'];
@@ -591,7 +644,7 @@ export class addGroup{
groupName=[]
ngOnInit(): void{
console.log(this.data)
- if(this.data!=null){
+ if(this.data!=null||this.data.length>0){
this.addgtoup=this.data
}
@@ -635,6 +688,7 @@ export class addGroup{
}
this.dialogRef.close(this.addgtoup)
}
+
}
//单位概况新增弹窗
@Component({
@@ -730,9 +784,9 @@ getattinf(){
}else{
this.facilityItems=this.data.facilityItems
console.log(this.facilityItems)
- this.facilityItems.forEach(element => {
+ /* this.facilityItems.forEach(element => {
element.completed=false
- });
+ }); */
}
}
@@ -761,6 +815,7 @@ export class disaster{
level//类型
headName//表头名称
lieNumber//列数
+ hNumber//行数
//取消按钮
close(){
this.dialogRef.close();
@@ -778,8 +833,9 @@ export class disaster{
let attrubute={
headName:this.headName,
level:this.level,
- tableth:[]
- //lieNumber:this.lieNumber,
+ tableth:this.level==1||this.level==2?[]:this.level==3?'':'',
+ lieNumber:this.lieNumber,
+ hNumber:this.hNumber
}
this.dialogRef.close(attrubute);
}
+
+
+
+
+
+
+
+
+
+
-
-
+
+