+
\ 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 @@
-
+