+
+
-->
+
\ No newline at end of file
diff --git a/src/app/plan-management/create-plan-online-five/addgroup.scss b/src/app/plan-management/create-plan-online-five/addgroup.scss
new file mode 100644
index 0000000..ecfba06
--- /dev/null
+++ b/src/app/plan-management/create-plan-online-five/addgroup.scss
@@ -0,0 +1,41 @@
+.box{
+ height: 100%;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ .top{
+ width: 100%;
+ height: 40px;
+ text-align: center;
+ span{
+ font-size: 18px;
+ }
+ }
+ .center{
+ overflow: auto;
+ width: 100%;
+ height: 80%;
+ .group{
+ height: 35px;
+ //margin-left: 20px;
+ .example-margin {
+ margin: 0 10px;
+ }
+ input{
+ top: 2px;
+ }
+ span{
+ margin-left: 8px;
+ }
+ }
+ }
+ .bottom{
+ width: 100%;
+ margin-top: 20px;
+ button{
+ width: 80px;
+ height: 36px;
+ font-size: 16px;
+ }
+ }
+}
\ No newline at end of file
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 4642e56..965a0d2 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
@@ -660,12 +660,7 @@
+ 新增分组
+
+
+
+
+
+ {{item.propertyName}}
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
-
+
{{itemunit.name}}
- 
+
+
{{element.surveyName}}
+ 
+
-
+
-
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index 90442c8..7a34fb3 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -59,7 +59,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
blockyl = true
zaixianDr=false
haveNew=false
+ //index
ngOnInit(): void {
+ //this.index = this.getArrayIndex(this.planTemplateData,'单位概况')
this.haveNew=this.route.snapshot.queryParams.haveNew
console.log(this.route.snapshot.queryParams.wordChange)
this.planLevel = this.route.snapshot.queryParams.planCategory
@@ -446,6 +448,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
buildingsData = []
buildDataName
buildZong
+ basicCategoryId
//获得所有建筑信息
async getAllBuildingsInfo() {
let index = this.getArrayIndex(this.planTemplateData,'单位概况')
@@ -466,6 +469,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}).subscribe((buildingsData: any) => {
//console.log(buildingsData)
this.buildingsData.push(buildingsData[0])
+ //this.basicCategoryId=buildingsData[0].basicCategoryId
resolve(this.buildingsData)
})
}
@@ -1908,6 +1912,28 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
})
}
+ //建筑信息和消防设施模板信息添加
+ addBuildingmb(element){
+ let index = this.getArrayIndex(this.planTemplateData,'单位概况')
+ console.log(element,this.buildingsData)
+ const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去
+ width: '290px',
+ height:'460px',
+ disableClose:true,
+ data:{element:element,buildingID:this.buildingsData[0].basicCategoryId}
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ console.log(result)
+ if(result!=undefined){
+ this.planTemplateData[index].building[this.clicki].body.forEach(item => {
+ if(item.surveyName==element.surveyName){
+ element.attinf=result
+ }
+ });
+ }
+
+ })
+ }
}
@@ -2121,4 +2147,162 @@ export class updataHl{
this.dialogRef.close(result);
}
}
+//建筑跟消防设施添加模板数据
+@Component({
+ selector: 'adddwsurveys',
+ templateUrl: './addattinf.html',
+ styleUrls: ['./addgroup.scss']
+})
+export class adddwsurveys{
+ constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+ addAttinfBuild=[]
+ buildnewDate=[]
+ addAttinfFile
+ filenewDate=[]
+ facilityItems
+ ngOnInit(): void{
+ this.getinf()
+ console.log(this.data)
+
+ }
+
+ async getinf(){
+ if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf==undefined){
+ this.addAttinfBuild=[]
+ let paramsdata:any ={
+ categoryId:this.data.buildingID
+ }
+ this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
+ data.forEach(buildDate => {
+ this.addAttinfBuild.push(...buildDate.propertyInfos)
+
+ });
+ this.addAttinfBuild.forEach(element => {
+ element.completed=false
+ element.olddata=element.propertyValue
+ });
+ console.log(this.addAttinfBuild)
+ })
+ }else if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf!=undefined){
+ this.buildnewDate=[] //接受接口返回的新数据
+ this.addAttinfBuild=this.data.element.attinf //模板传过来的数据
+ this.addAttinfBuild=JSON.parse(JSON.stringify(this.addAttinfBuild))
+ let paramsdata:any ={
+ categoryId:this.data.buildingId
+ }
+ /* 请求接口，做差异化对比 */
+ let restlt=await new Promise((resolve) => {
+ this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
+ data.forEach((buildDate,buildi,buildarr) => {
+ this.buildnewDate.push(...buildarr[buildi].propertyInfos)
+ resolve(data)
+ });
+ this.buildnewDate.forEach(element => {
+ element.completed=false
+ element.olddata=element.propertyValue
+ });
+ })
+ })
+ this.buildnewDate=JSON.parse(JSON.stringify(this.buildnewDate))
+ //差异化比较
+ let temp=0
+ this.buildnewDate.forEach((buildval,buindi,buildarr)=>{
+ temp=0
+ this.addAttinfBuild.forEach((addval,addi,addarr)=>{
+ if(buildval.propertyName==addval.propertyName){
+ temp++
+ }
+ })
+ if(temp==0){
+ //模板数据少于接口数据
+ console.log(buildval)
+ this.addAttinfBuild.push(buildval)
+ }
+ })
+ this.addAttinfBuild.forEach((addval,addi,addarr)=>{
+ temp=0
+ this.buildnewDate.forEach((buildval,buindi,buildarr)=>{
+ if(buildarr[buindi].propertyName==addarr[addi].propertyName){
+ temp++
+ }
+ })
+ if(temp==0){
+ console.log(addarr[addi])
+ //模板数据多了
+ this.addAttinfBuild.splice(addi,1)
+ }
+ })
+ console.log(this.buildnewDate)
+ console.log(this.addAttinfBuild)
+
+ }else if(this.data.surveyName=='消防设施'&&this.data.attinf==undefined){
+ let paramsdata:any ={
+ categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
+ }
+ this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+ console.log(data)
+ this.addAttinfFile=data
+ this.addAttinfFile.forEach(element => {
+ element.completed=false
+ element.value=''
+ });
+ console.log(this.addAttinfFile)
+ })
+ }else if(this.data.surveyName=='消防设施'&&this.data.attinf!=undefined){
+ this.filenewDate=[]
+ this.addAttinfFile=this.data.attinf
+ this.addAttinfFile=JSON.parse(JSON.stringify(this.addAttinfFile))
+ let paramsdata:any ={
+ categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
+ }
+ let restlt=await new Promise((resolve) => {
+ this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+ data.forEach((buildDate,buildi,buildarr) => {
+ this.filenewDate.push(buildDate)
+ resolve(data)
+ });
+ this.filenewDate.forEach(element => {
+ element.completed=false
+ //element.olddata=element.propertyValue
+ });
+ })
+ })
+ this.filenewDate=JSON.parse(JSON.stringify(this.filenewDate))
+ let temp=0
+ this.filenewDate.forEach((buildval,buindi,buildarr)=>{
+ temp=0
+ this.addAttinfFile.forEach((addval,addi,addarr)=>{
+ if(buildval.name==addval.name){
+ temp++
+ }
+ })
+ if(temp==0){
+ console.log(buildval)
+ this.addAttinfFile.push(buildval)
+ }
+ })
+ this.addAttinfFile.forEach((addval,addi,addarr)=>{
+ temp=0
+ this.filenewDate.forEach((buildval,buindi,buildarr)=>{
+ if(buildarr[buindi].name==addarr[addi].name){
+ temp++
+ }
+ })
+ if(temp==0){
+ console.log(addarr[addi])
+ this.addAttinfFile.splice(addi,1)
+ }
+ })
+ }
+
+ }
+ //取消按钮
+close(){
+ this.dialogRef.close(undefined);
+}
+//确定按钮
+defineClick(){
+ this.dialogRef.close(this.data.element.surveyName=='建筑信息'?this.addAttinfBuild:this.data.element.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems)
+}
+}
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index 03f186e..53c8564 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -61,7 +61,7 @@
(已上传)
-
+
模板在线编制
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html
index 3ef9c32..18f506d 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
index 9e99c67..60769df 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
@@ -13,7 +13,7 @@
-
+
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts
index 0d767d5..e4de4a6 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.ts
+++ b/src/app/plan-management/pass-plan/pass-plan.component.ts
@@ -116,6 +116,7 @@ export class PassPlanComponent implements OnInit {
}
allPlanInfo: any //存储所有预案信息
+ IsNewCompanyData=true //单位是新增还是维护更新
//获得所有预案信息
getAllPlanInfo() {
let reservePlanType
@@ -139,6 +140,7 @@ export class PassPlanComponent implements OnInit {
Sort: '',
PlanCategories: this.planCategory,
IsNewData:this.IsNewData,
+ IsNewCompanyData:this.IsNewCompanyData
}
this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount
@@ -451,6 +453,8 @@ export class PassPlanComponent implements OnInit {
planCategory = []//预案级别
//重置
reset() {
+ this.IsNewData=true
+ this.IsNewCompanyData=true
this.companyName = ''
this.js = ''
this.jsId = ''
diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts
index 12a9909..b91230d 100644
--- a/src/app/plan-management/plan-management.module.ts
+++ b/src/app/plan-management/plan-management.module.ts
@@ -74,12 +74,13 @@ import { newTitle } from './create-plan-online-five/create-plan-online-five.comp
import { disaster } from './create-plan-online-five/create-plan-online-five.component'
import { updataHl } from './create-plan-online-five/create-plan-online-five.component'
import {ChangeUrl} from './entry-plan-look/entry-plan-look.component'
+import {adddwsurveys} from './create-plan-online-five/create-plan-online-five.component'
@NgModule({
declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName,
WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult,
typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent,
- OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl],
+ OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl,adddwsurveys],
imports: [
CommonModule,
PlanManagementRoutingModule,
diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html
index e9df805..b19ed9a 100644
--- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html
+++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html
@@ -79,10 +79,22 @@
diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html
index 24eae26..fd4b535 100644
--- a/src/app/plan-management/open-plan/open-plan.component.html
+++ b/src/app/plan-management/open-plan/open-plan.component.html
@@ -47,10 +47,22 @@
-
-
-
-
+
+
+
+ 新增
+ 维护更新
+
+
+
+
+
+
+
+ 新增
+ 维护更新
+
+
diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts
index cb2f62c..73c2ded 100644
--- a/src/app/plan-management/open-plan/open-plan.component.ts
+++ b/src/app/plan-management/open-plan/open-plan.component.ts
@@ -115,6 +115,7 @@ export class OpenPlanComponent implements OnInit {
allPlanInfo: any //存储所有预案信息
//获得所有预案信息
+ IsNewCompanyData=true
getAllPlanInfo() {
let paramsdata: any = {
CompanyName: this.companyName || '',
@@ -129,6 +130,7 @@ export class OpenPlanComponent implements OnInit {
PageSize: this.pageSizeOptions[0],
Sort: '',
IsNewData:this.IsNewData,
+ IsNewCompanyData:this.IsNewCompanyData
}
this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
// console.log(111,data)
@@ -291,6 +293,8 @@ export class OpenPlanComponent implements OnInit {
this.pageEvent.pageIndex = 0
this.PageNumber = 1
this.getAllPlanInfo();
+ this.IsNewCompanyData=true
+ this.IsNewData=true
}
}
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html
index 5a952fa..57bff10 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.html
+++ b/src/app/plan-management/pass-plan/pass-plan.component.html
@@ -110,10 +110,22 @@
-
-
-
-
+
+
+
+ 新增
+ 维护更新
+
+
+
+
+
+
+
+ 新增
+ 维护更新
+
+
-
-
-
-
+
+
+
+ 新增
+ 维护更新
+
+
+
+
+
+
+
+ 新增
+ 维护更新
+
+
diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
index 75cb817..77b9af6 100644
--- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
+++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
@@ -114,6 +114,7 @@ export class ReinforcePlanComponent implements OnInit {
allPlanInfo:any //存储所有预案信息
//获得所有预案信息
+ IsNewCompanyData=true//单位维护更新或者新增
getAllPlanInfo(){
let paramsdata:any = {
CompanyName: this.companyName || '',
@@ -130,6 +131,7 @@ export class ReinforcePlanComponent implements OnInit {
PageSize: this.pageSizeOptions[0],
Sort: '',
IsNewData:this.IsNewData,
+ IsNewCompanyData:this.IsNewCompanyData
}
this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
// console.log('增援预案列表',data)
@@ -215,6 +217,8 @@ export class ReinforcePlanComponent implements OnInit {
plcheck:boolean //编制级别勾选框
//重置
reset(){
+ this.IsNewData=true
+ this.IsNewCompanyData=true
this.companyName = ''
this.js = ''
this.jsId = ''
diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html
index a7dffbb..23e9d31 100644
--- a/src/app/plan-management/type-plan/type-plan.component.html
+++ b/src/app/plan-management/type-plan/type-plan.component.html
@@ -6,7 +6,7 @@
-
+
From 130f8c569c5369e53ed0ef6e4f2ad3b65cff72e8 Mon Sep 17 00:00:00 2001
From: chenjingyu <1148019379@qq.com>
Date: Thu, 30 Dec 2021 11:02:35 +0800
Subject: [PATCH 04/14] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=86=85=E7=BD=91?=
=?UTF-8?q?=E6=89=93=E5=8C=85=E5=9C=A8=E7=BA=BF=E7=BC=96=E5=88=B6=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../create-plan-online-five/addattinf.html | 4 +-
.../create-plan-online-five.component.html | 11 +-
.../create-plan-online-five.component.ts | 156 ++++++++++++++----
.../entry-plan-look/AddPlanone.html | 5 +-
.../entry-plan-look.component.ts | 57 ++-----
5 files changed, 149 insertions(+), 84 deletions(-)
diff --git a/src/app/plan-management/create-plan-online-five/addattinf.html b/src/app/plan-management/create-plan-online-five/addattinf.html
index e188e4f..f25d104 100644
--- a/src/app/plan-management/create-plan-online-five/addattinf.html
+++ b/src/app/plan-management/create-plan-online-five/addattinf.html
@@ -11,12 +11,12 @@
新增分组
-
+
{{item.propertyName}}
-
-
+
{{item.name}}
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 965a0d2..1a3f107 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
@@ -716,7 +716,7 @@
opacity: 1;
height: 40px;
line-height: 40px;">{{itemunit.name}}
-
+
+ *ngIf="pattern == 'edit'"
+ (click)='unitadd(element.surveyName,uniti,attacki,0)'>
+ 
{{element.surveyName}}
-
+ 
@@ -838,11 +838,12 @@
text-align: center;">
{{attack.name}}
-
-
+
+ *ngIf="pattern == 'edit'"
+ (click)='unitadd(element.surveyName,uniti,attacki,0)'>
+
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index 7a34fb3..c22d857 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -59,10 +59,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
blockyl = true
zaixianDr=false
haveNew=false
+ planMode//预案类型
//index
ngOnInit(): void {
//this.index = this.getArrayIndex(this.planTemplateData,'单位概况')
this.haveNew=this.route.snapshot.queryParams.haveNew
+ this.planMode=this.route.snapshot.queryParams.planMode
console.log(this.route.snapshot.queryParams.wordChange)
this.planLevel = this.route.snapshot.queryParams.planCategory
if (this.route.snapshot.queryParams.pattern == 'false') {
@@ -1920,10 +1922,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
width: '290px',
height:'460px',
disableClose:true,
- data:{element:element,buildingID:this.buildingsData[0].basicCategoryId}
+ data:{element:element,buildingID:this.buildingsData[0].basicCategoryId,fid:this.route.snapshot.queryParams.unitTypeId}
});
dialogRef.afterClosed().subscribe(result => {
- console.log(result)
if(result!=undefined){
this.planTemplateData[index].building[this.clicki].body.forEach(item => {
if(item.surveyName==element.surveyName){
@@ -1934,6 +1935,26 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
})
}
+ //消防设施具体属性编辑
+ fileAdd(facilityItems,filei,filename){
+ let index = this.getArrayIndex(this.planTemplateData,'单位概况')
+ if(facilityItems.length!=0){
+ const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去
+ width: '240px',
+ height:'400px',
+ disableClose:true,
+ data:{facilityItems:facilityItems,filename,fid:this.route.snapshot.queryParams.unitTypeId}
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ console.log(result)
+ this.planTemplateData[index].building[this.clicki].body.forEach(element => {
+ if(element.surveyName=='消防设施'){
+ element.attinf[filei].facilityItems=result
+ }
+ });
+ })
+ }
+ }
}
@@ -2160,6 +2181,7 @@ export class adddwsurveys{
addAttinfFile
filenewDate=[]
facilityItems
+ facilityCategoryId//消防设施内容id
ngOnInit(): void{
this.getinf()
console.log(this.data)
@@ -2167,7 +2189,8 @@ export class adddwsurveys{
}
async getinf(){
- if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf==undefined){
+ if(this.data.facilityItems==undefined){
+ if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf==undefined){
this.addAttinfBuild=[]
let paramsdata:any ={
categoryId:this.data.buildingID
@@ -2235,38 +2258,55 @@ export class adddwsurveys{
console.log(this.buildnewDate)
console.log(this.addAttinfBuild)
- }else if(this.data.surveyName=='消防设施'&&this.data.attinf==undefined){
- let paramsdata:any ={
- categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
- }
- this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
- console.log(data)
- this.addAttinfFile=data
- this.addAttinfFile.forEach(element => {
- element.completed=false
- element.value=''
+ }else if(this.data.element.surveyName=='消防设施'&&this.data.element.attinf==undefined){
+ this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{
+ console.log(buildData)
+ buildData.forEach(element => {
+ if(element.id==this.data.fid){
+ this.facilityCategoryId=element.facilityCategoryId
+ let paramsdata:any ={
+ categoryId:this.facilityCategoryId
+ }
+ this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+ console.log(data)
+ this.addAttinfFile=data
+ this.addAttinfFile.forEach(element => {
+ element.completed=false
+ element.value=''
+ });
+ console.log(this.addAttinfFile)
+ })
+ }
});
- console.log(this.addAttinfFile)
})
+
}else if(this.data.surveyName=='消防设施'&&this.data.attinf!=undefined){
this.filenewDate=[]
this.addAttinfFile=this.data.attinf
this.addAttinfFile=JSON.parse(JSON.stringify(this.addAttinfFile))
- let paramsdata:any ={
- categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
- }
- let restlt=await new Promise((resolve) => {
- this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
- data.forEach((buildDate,buildi,buildarr) => {
- this.filenewDate.push(buildDate)
- resolve(data)
- });
- this.filenewDate.forEach(element => {
- element.completed=false
- //element.olddata=element.propertyValue
- });
+ this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{
+ buildData.forEach(async element => {
+ if(element.id==this.data.fid){
+ this.facilityCategoryId=element.facilityCategoryId
+ let paramsdata:any ={
+ categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
+ }
+ let restlt=await new Promise((resolve) => {
+ this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+ data.forEach((buildDate,buildi,buildarr) => {
+ this.filenewDate.push(buildDate)
+ resolve(data)
+ });
+ this.filenewDate.forEach(element => {
+ element.completed=false
+ //element.olddata=element.propertyValue
+ });
+ })
+ })
+ }
})
- })
+ })
+
this.filenewDate=JSON.parse(JSON.stringify(this.filenewDate))
let temp=0
this.filenewDate.forEach((buildval,buindi,buildarr)=>{
@@ -2294,6 +2334,63 @@ export class adddwsurveys{
}
})
}
+ }else{
+ //消防设施最里层数据
+ let apifile
+ this.facilityItems=JSON.parse(JSON.stringify(this.data.facilityItems))
+ console.log(this.facilityItems)
+ //请求接口，看数据是否有变化
+ this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{
+ buildData.forEach(async element => {
+ if(element.id==this.data.fid){
+ this.facilityCategoryId=element.facilityCategoryId
+ let paramsdata:any ={
+ categoryId:this.facilityCategoryId
+ }
+ let fileResult=await new Promise((resolve) => {
+ this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
+ resolve(data)
+ })
+ })
+ apifile=fileResult
+ let apifileData//消防设施最内层数据
+ apifile.forEach(element => {
+ if(element.name==this.data.filename){
+ apifileData=element.facilityItems
+ }
+ });
+ console.log(apifileData)
+ let temp=0
+ apifileData.forEach((buildval,buindi,buildarr)=>{
+ temp=0
+ this.facilityItems.forEach((addval,addi,addarr)=>{
+ if(buildval.name==addval.name){
+ temp++
+ }
+ })
+ if(temp==0){
+ console.log(buildval)
+ this.facilityItems.push(buildval)
+ }
+ })
+ this.facilityItems.forEach((addval,addi,addarr)=>{
+ temp=0
+ apifileData.forEach((buildval,buindi,buildarr)=>{
+ if(buildarr[buindi].name==addarr[addi].name){
+ temp++
+ }
+ })
+ if(temp==0){
+ console.log(addarr[addi])
+ this.facilityItems.splice(addi,1)
+ }
+ })
+ }
+ })
+ })
+
+ }
+
}
//取消按钮
@@ -2302,7 +2399,8 @@ close(){
}
//确定按钮
defineClick(){
- this.dialogRef.close(this.data.element.surveyName=='建筑信息'?this.addAttinfBuild:this.data.element.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems)
+ this.dialogRef.close(this.data.element!=undefined&&this.data.element.surveyName=='建筑信息'?
+ this.addAttinfBuild:this.data.element!=undefined&&this.data.element.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems)
}
}
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index 53c8564..f4ae373 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -61,11 +61,10 @@
(已上传)
-
+
-
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 77c5fbb..37a9eba 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
@@ -191,9 +191,9 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
if(e.planMode==4){
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true&planMode=${e.planMode}`)
}else{
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}
}
@@ -231,16 +231,7 @@ export class EntryPlanLookComponent implements OnInit {
}
}
);
- /* if (e.url.indexOf('app') == 0) {
- window.location.href = e.url
- } else {
- sessionStorage.setItem("url", e.url)
- if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
- window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`)
- } else {
- window.open(`/planManagement/webLook`)
- }
- } */
+
} else {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
}
@@ -259,7 +250,7 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
console.log(this.compantData)
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&planMode=${e.planMode}`)
}
else {
let body = {};
@@ -280,16 +271,7 @@ export class EntryPlanLookComponent implements OnInit {
}
else if (e.planType == 2) { //三维预案
- /* if (e.url.indexOf('app') == 0) {
- window.location.href = e.url
- } else {
- sessionStorage.setItem("url", e.url)
- if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
- window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`)
- } else {
- window.open(`/planManagement/webLook`)
- }
- } */
+
const dialogRef = this.dialog.open(ChangeUrl, {
data: { element: e }
});
@@ -313,7 +295,6 @@ export class EntryPlanLookComponent implements OnInit {
}
}
}else{
- if (e.auditStatus == 8) {
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
@@ -327,9 +308,9 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
if(e.planMode==4){
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true&planMode=${e.planMode}`)
}else{
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}
}
@@ -380,9 +361,7 @@ export class EntryPlanLookComponent implements OnInit {
} else {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
}
- } else {
- let isTrue = confirm('编辑后审核状态会成为未审核状态，您确定要编辑吗')
- if (isTrue) {
+ /* else {
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
@@ -410,23 +389,11 @@ export class EntryPlanLookComponent implements OnInit {
this.http.put(`/api/PlanComponents/${e.id}?resetAudit=${resetAudit}`, body, options).subscribe(data => {
this.getAllPlanComponents()
this.lookPlan(e)
- }/* ,err => {
- this.snackBar.open(err,'确定',config);
- } */)
+ })
}
}
else if (e.planType == 2) { //三维预案
- /* if (e.url.indexOf('app') == 0) {
- window.location.href = e.url
- } else {
- sessionStorage.setItem("url", e.url)
- if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
- window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`)
- } else {
- window.open(`/planManagement/webLook`)
- }
- } */
const dialogRef = this.dialog.open(ChangeUrl, {
data: { element: e }
});
@@ -446,8 +413,8 @@ export class EntryPlanLookComponent implements OnInit {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
}
- }
- }
+
+ } */
}
@@ -1218,7 +1185,7 @@ export class AddPlanone {
this.planData = plandata
this.dialogRef.close(plandata);
//console.log(plandata)
- window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}&planCategory=${this.selectedPLanLevel}&planId=${this.planData.id}&haveNew=${haveNew}`)
+ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}&planCategory=${this.selectedPLanLevel}&planId=${this.planData.id}&haveNew=${haveNew}&planMode=${this.defaultisshow}`)
})
}else{
if (open.length > 0) {
From de1092dc03cbdb2169c9d71361f46656f1246341 Mon Sep 17 00:00:00 2001
From: qq55341701 <55341701@qq.com>
Date: Thu, 30 Dec 2021 11:11:24 +0800
Subject: [PATCH 05/14] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B3=A8=E9=87=8A?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5gis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/ui/collection-tools-plan/addPlaneFigure.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/ui/collection-tools-plan/addPlaneFigure.html b/src/app/ui/collection-tools-plan/addPlaneFigure.html
index 80cbac6..344170b 100644
--- a/src/app/ui/collection-tools-plan/addPlaneFigure.html
+++ b/src/app/ui/collection-tools-plan/addPlaneFigure.html
@@ -12,9 +12,9 @@
+
+
+
+
+ 维护审核
+
+ {{element.maintenanceVerifyState}}
+
+
操作
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 7a33700..5a90430 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -67,7 +67,7 @@ export class KeyUnitManagementComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any //第几页
- displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation'];
+ displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','addstate','weihustate','operation'];
tabledataSource:any
allorganizations:any
oldDataSource:any; //原始表格数据
@@ -384,6 +384,7 @@ export class KeyUnitManagementComponent implements OnInit {
IntegrityScoreMax:this.integrityScoreMax/100||1
}
this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+ console.log(data)
this.length = data.totalCount
this.allKeyUnitInfo = data
// data.items.sort( (a,b) => {
@@ -393,7 +394,7 @@ export class KeyUnitManagementComponent implements OnInit {
item.integrity = this.wanzhengduArr[index]
})
//console.log(789,data.items)
- this.tabledataSource = new MatTableDataSource(data.items);
+ this.tabledataSource = data.items
})
}
//得到当前单位信息
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 4fe374a..059ce23 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
@@ -74,10 +74,16 @@
- 审核状态
+ 新增审核
- {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
- '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}
+ {{element.newVerifyState}}
+
+
+
+ 维护审核
+
+ {{element.maintenanceVerifyState}}
+
是否公开
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 37a9eba..59def5c 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
@@ -40,7 +40,7 @@ export class EntryPlanLookComponent implements OnInit {
myControl = new FormControl();
hasChild = (_: number, node: any) => node.expandable;
IsNewData=true //维护更新活新增
- displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation'];
+ displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'weihustate','isopen', 'preparethelevel', 'operation'];
tabledataSource: any
//分页
@ViewChild(MatPaginator, { static: true })
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html
index 18f506d..a8cbea6 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -117,46 +117,53 @@
| 预案状态 | +预案状态 | 新增 维护更新 | 预案名称 | +预案名称 | {{element.name}} | 预案级别 | +预案级别 | {{element.planCategory=='6'?'国家级':'市级'}} | 添加人 | +添加人 | {{element.creatorName}} | 添加时间 | +添加时间 | {{element.creationTime|date:'yyyy-MM-dd'}} | 预案类型 | +预案类型 | {{element.disasterType}} | 审核状态 | -{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} | +新增审核 | ++ {{element.newVerifyState}} + + | 是否公开 | +是否公开 | {{element.openRange}} | 编制级别 | +编制级别 | {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} | 维护审核 | +{{element.maintenanceVerifyState}} | +操作 |
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss
index 4ec5923..2116c66 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.scss
+++ b/src/app/plan-management/meet-plan/meet-plan.component.scss
@@ -121,7 +121,7 @@
font-size: 12px;
line-height: 20px;
color: #FFFFFF;
- margin-left: 50px;
+ margin-left: 35px;
}
.weihu{
@@ -134,7 +134,7 @@
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
- margin-left: 40px;
+ margin-left: 25px;
}
table{
width: 100%;
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts
index c47024a..943ee8d 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -84,7 +84,7 @@ export class MeetPlanComponent implements OnInit {
preparelevels: any
plcheck: boolean //编制级别勾选框
IsNewData='' //维护更新活新增
- displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation'];
+ displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel','passstate','weihustate', 'operation'];
tabledataSource
typePlan//新预案类型
unitname//预案名称
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
index 60769df..c19b9b9 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
@@ -108,44 +108,47 @@
|
|---|
- 
+ 
-