diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 305830c..0722c08 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -442,7 +442,7 @@ flex-direction: column;">
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss index 53bf70f..9a7c908 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -468,7 +468,7 @@ .boxBodyHead { width: 100%; height: 40px; - background-color: #ffd91d; + background-color: #FFFBE8; text-align: center; span { font-size: 16px; @@ -731,7 +731,7 @@ .attackhead { width: 100%; height: 40px; - background-color: #ffd91d; + background-color: #FFFBE8; text-align: center; span { font-size: 16px; @@ -833,7 +833,7 @@ .fileHead{ height: 40px; width: 100%; - background-color: #ffd91d; + background-color: #FFFBE8; text-align: center; span { font-size: 16px; @@ -896,14 +896,14 @@ .partsHead{ width: 100%; height: 40px; - background-color: #ffd91d; + background-color: #FFFBE8; text-align: center; input{ height: 40px; font-size: 16px; border: none; outline: none; - background-color: #ffd91d; + background-color: #FFFBE8; color: #b99a00; } img { @@ -1038,9 +1038,9 @@ .attackleftHead { width: 100%; height: 40px; - background-color: #ffd91d; + background-color: #FFFBE8; input { - background-color: #ffd91d; + background-color: #FFFBE8; color: #b99a00; text-align: center; height: 100%; @@ -1202,7 +1202,7 @@ width: 100%; height: 40px; margin-top: 3%; - background-color: #ffd91d; + background-color: #FFFBE8; text-align: center; span { font-size: 16px; diff --git a/src/app/statistic-analysis/home/home.component.ts b/src/app/statistic-analysis/home/home.component.ts index 996420f..ee23787 100644 --- a/src/app/statistic-analysis/home/home.component.ts +++ b/src/app/statistic-analysis/home/home.component.ts @@ -350,8 +350,11 @@ export class HomeComponent implements OnInit { this.addydata = [] this.addtable = JSON.parse(JSON.stringify(this.emitService.allDate)) this.addtable[0].organizationStatistics.organizations.forEach((value, index, array) => { - this.addxdata.push(array[index].organizationName) - this.addydata.push(array[index].count) + if(array[index].organizationId!='5687316efa75479d96c0091a167a3b84'&&array[index].organizationName!='上海总队'){ + this.addxdata.push(array[index].organizationName) + this.addydata.push(array[index].count) + } + }); let chartDwsjcjOptionsZhi = { // 标题 diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index 4d2bb30..6adc72b 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-09-04 11:13:31 + * @LastEditTime: 2021-09-10 10:33:07 -->
@@ -48,20 +48,24 @@
- +
+ {{item.groupName}}
+ +
- + 编辑
- + 删除
@@ -73,7 +77,7 @@
- + @@ -85,6 +89,8 @@ + +
@@ -131,11 +137,14 @@ 操作 - + {{attinf.propertyName}} {{attinf.propertyType==0?'单行文本':attinf.propertyType==1?'多行文本':'数值'}} - + + + 删除 @@ -149,7 +158,7 @@ style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;height: 100%;" [disabled]='groupPanle==true'> + style="background-color: #FFFBE8;">
@@ -162,6 +171,9 @@ + + +
@@ -180,8 +192,10 @@ 文本类型 - - 删除 + + + 删除 + @@ -207,6 +221,8 @@
+ +
- +
diff --git a/src/app/ui/plan-template/plan-template.component.scss b/src/app/ui/plan-template/plan-template.component.scss index 1181a0d..f310b98 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-08-02 09:47:06 + * @LastEditTime: 2021-09-08 14:38:47 */ .box { height: 100%; @@ -157,6 +157,7 @@ .panelhead { background-color: #e1f1ff; height: 50px; + margin-top: 10px; .paneltitle { width: 100%; font-size: 16px; @@ -165,6 +166,9 @@ //justify-content: space-around; .groupName { width: 100px; + span{ + margin-left: 3px; + } } .caozuotwo{ width: 100%; @@ -218,6 +222,7 @@ margin-top: 8px; } img { + cursor: pointer; position: relative; bottom: 2px; } @@ -254,10 +259,12 @@ .attackleftHead { width: 100%; height: 40px; - background-color: #ffd91d; + //background-color: #ffd91d; + background-color: #FFFBE8; + opacity: 0.7; input { - background-color: #ffd91d; - color: #b99a00; + background-color: #FFFBE8; + color: #B99A00; text-align: center; height: 100%; width: 100%; @@ -316,6 +323,7 @@ float: right; margin-top: 20px; margin-right: 8%; + cursor: pointer; //margin-left: 40%; } } diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index 8946103..b64a32d 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -4,16 +4,16 @@ * @Author: sueRimn * @Date: 2021-05-31 10:40:01 * @LastEditors: sueRimn - * @LastEditTime: 2021-09-02 14:06:11 + * @LastEditTime: 2021-09-09 15:09:39 */ -import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core'; +import { Component, Inject, OnInit,ViewEncapsulation,ViewChild } 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'; - +import {MatAccordion} from '@angular/material/expansion'; @Component({ selector: 'app-plan-template', //encapsulation: ViewEncapsulation.None, @@ -21,7 +21,7 @@ import {MatTreeFlatDataSource, MatTreeFlattener, MatTreeNestedDataSource} from ' styleUrls: ['./plan-template.component.scss'] }) export class PlanTemplateComponent implements OnInit { - + @ViewChild(MatAccordion) accordion: MatAccordion; constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { @@ -345,6 +345,8 @@ export class PlanTemplateComponent implements OnInit { console.log(this.newleftTabledata) }); } + this.groupPanle=true + this.accordion.closeAll() } //删除具体属性 delAttribute(groupName,surveyName){ @@ -555,7 +557,169 @@ export class PlanTemplateComponent implements OnInit { //单位基本信息和建筑信息表格 displayedColumns: string[] = ['name','level','default','must', 'danwei','operation']; - + //展开按钮 + openKey=100 + openpan(key){ + this.openKey=key + } + //展开的内容关闭 + closepan(){ + this.openKey=100 + } + //向上排序 + topPai(key){ + var temp + if(key==0){ + /* for(var i=this.group.length;i>0;i--){ + if(this.group[i].completed){ + temp=this.group[i] + this.group[i]=this.group[key] + for(var a=i-1;a<=0;a--){ + var tempa + tempa=this.group[a-1] + this.group[a-1]=this.group[a] + this.group[a-1]=tempa + } + } + + } */ + }else if(key!=0){ + for(var i=key-1;i>=0;i--){ + if(this.group[i].completed){ + temp=this.group[i] + this.group[i]=this.group[key] + this.group[key]=temp + return + } + + } + + } + //this.accordion.openAll() + } + //向下排序 + downPai(key){ + var temp + /* for (let index = this.group.length-1; index > this.group.length; index--) { + if(this.group[index].completed&&key==index){ + return + }else{ + + } + + } */ + if(key!=this.group.length-1){ + for (let index = key+1; index < this.group.length; index++) { + if(this.group[index].completed){ + temp=this.group[index] + this.group[index]=this.group[key] + this.group[key]=temp + return + } + + } + + } + //this.accordion.openAll() + } + //第二层向上排序 + zaiTop(zi,attributei){ + var temp + if(attributei!=0){ + for (let index = attributei-1; index >=0; index--) { + if(this.group[zi].attribute[index].completed){ + temp=this.group[zi].attribute[index] + this.group[zi].attribute[index]=this.group[zi].attribute[attributei] + this.group[zi].attribute[attributei]=temp + return + } + + } + + } + //this.accordion.openAll() + } + //第二层向下排序 + zaiDown(zi,attributei){ + var temp + if (attributei!=this.group[zi].attribute.length-1) { + for (let index = attributei+1; index < this.group[zi].attribute.length; index++) { + if(this.group[zi].attribute[index].completed){ + temp=this.group[zi].attribute[index] + this.group[zi].attribute[index]=this.group[zi].attribute[attributei] + this.group[zi].attribute[attributei]=temp + return + } + + } + + } + //this.accordion.openAll() + } + //单位概况第三层向上排序 + threeTop(zi,attributei,attfi){ + var temp + if(attfi!=0){ + for (let index = attfi-1; index >=0; index--) { + if(this.group[zi].attribute[attributei].attinf[index].completed){ + temp=this.group[zi].attribute[attributei].attinf[index] + this.group[zi].attribute[attributei].attinf[index]=this.group[zi].attribute[attributei].attinf[attfi] + this.group[zi].attribute[attributei].attinf[attfi]=temp + return + } + + } + + } + } + //单位概况第三层向下排序 + threeDown(zi,attributei,attfi){ + var temp + if (attfi!=this.group[zi].attribute[attributei].attinf.length-1) { + for (let index = attfi+1; index < this.group[zi].attribute[attributei].attinf.length; index++) { + if(this.group[zi].attribute[attributei].attinf[index].completed){ + temp=this.group[zi].attribute[attributei].attinf[index] + this.group[zi].attribute[attributei].attinf[index]=this.group[zi].attribute[attributei].attinf[attfi] + this.group[zi].attribute[attributei].attinf[attfi]=temp + return + } + + } + + } + } + //消防设施表格向上排序 + fileTop(zi,attributei,attfi,fi){ + var temp + if(fi!=0){ + for (let index = fi-1; index >=0; index--) { + if(this.group[zi].attribute[attributei].attinf[attfi].facilityItems[index].completed){ + temp=this.group[zi].attribute[attributei].attinf[attfi].facilityItems[index] + this.group[zi].attribute[attributei].attinf[attfi].facilityItems[index]=this.group[zi].attribute[attributei].attinf[attfi].facilityItems[fi] + this.group[zi].attribute[attributei].attinf[attfi].facilityItems[fi]=temp + return + } + + } + + } + } + //消防设施表格向下排序 + fileDown(zi,attributei,attfi,fi){ + var temp + if (attfi!=this.group[zi].attribute[attributei].attinf[attfi].facilityItems.length-1) { + for (let index = fi+1; index < this.group[zi].attribute[attributei].attinf[attfi].facilityItems.length; index++) { + if(this.group[zi].attribute[attributei].attinf[attfi].facilityItems[index].completed){ + temp=this.group[zi].attribute[attributei].attinf[attfi].facilityItems[index] + this.group[zi].attribute[attributei].attinf[attfi].facilityItems[index]=this.group[zi].attribute[attributei].attinf[attfi].facilityItems[fi] + this.group[zi].attribute[attributei].attinf[attfi].facilityItems[fi]=temp + return + } + + } + + } + } } //新建预案 @Component({ diff --git a/src/assets/images/downpaixu.png b/src/assets/images/downpaixu.png new file mode 100644 index 0000000..c6fc2c0 Binary files /dev/null and b/src/assets/images/downpaixu.png differ diff --git a/src/assets/images/routleft.png b/src/assets/images/routleft.png new file mode 100644 index 0000000..5d5f398 Binary files /dev/null and b/src/assets/images/routleft.png differ diff --git a/src/assets/images/toppaixu.png b/src/assets/images/toppaixu.png new file mode 100644 index 0000000..9ae8701 Binary files /dev/null and b/src/assets/images/toppaixu.png differ