shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[修改]毕升去掉编辑功能

tangshan
chenjingyu 4 years ago
parent
2b48811427
commit
1aabceeff9
6 changed files with 184 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 73
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  3. 2
      src/app/plan-management/meet-plan/meet-plan.component.ts
  4. 2
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  5. 2
      src/app/plan-management/type-plan/type-plan.component.ts
  6. 17
      src/app/ui/plan-template/plan-template.component.ts

33
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
Unescape View File

@ -173,9 +173,8 @@
<span>建筑列表</span> <span>建筑列表</span>
</div> </div>
<div class="buildingBody"> <div class="buildingBody">
<div class="buildName" *ngFor="let item of allBuildings;let i=index" <div class="buildName" *ngFor="let item of planTemplateData[1].building;let i=index" >
[ngClass]="{'selectedTr': i == clicki}" (click)='clickBuilding(item,i)'> <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" (change)='clickBuilding(item,i)'></mat-checkbox>
<mat-checkbox class="example-margin" color='primary'></mat-checkbox>
<span>{{item.name}}</span> <span>{{item.name}}</span>
</div> </div>
</div> </div>
@ -412,18 +411,17 @@
</div> </div>
</div> </div>
<div class="unit" *ngIf="item.groupName == '单位概况'"> <div class="unit" *ngIf="item.groupName == '单位概况'">
<div class="titleItem"> <div *ngFor="let itemunit of planTemplateData[1].building;let uniti=index" style="border-bottom: 3px solid #999;">
<span>单位基本信息</span> <div *ngIf="itemunit.completed">
</div>
<div class="unithead"> <div class="unithead">
<span>{{buildingName}}</span> <span>{{itemunit.name}}</span>
</div> </div>
<div class="unitbody" *ngFor="let element of group;let i=index"> <div class="unitbody" *ngFor="let element of itemunit.body;let elei=index">
<div *ngIf="element.completed"> <div *ngIf="element.completed">
<div class="unitbodyHead"> <div class="unitbodyHead">
<span>{{element.surveyName}}</span> <span>{{element.surveyName}}</span>
<!-- <img src="../../../assets/images/deletered.png" > --> <!-- <img src="../../../assets/images/deletered.png" > -->
<img src="../../../assets/images/addbai.png" (click)='unitadd(element.surveyName,1)' *ngIf="element.surveyName=='功能分区'||element.surveyName=='重点部位'"> <img src="../../../assets/images/addbai.png" (click)='unitadd(element.surveyName,uniti,1)' *ngIf="pattern == 'edit'&&(element.surveyName=='功能分区'||element.surveyName=='重点部位')">
</div> </div>
<div class="body" > <div class="body" >
<!-- 进攻通道 --> <!-- 进攻通道 -->
@ -431,10 +429,10 @@
<div *ngFor="let attack of element.attinf;let attacki=index"> <div *ngFor="let attack of element.attinf;let attacki=index">
<div class="attackhead"> <div class="attackhead">
<span>{{attack.head}}</span> <span>{{attack.head}}</span>
<img src="../../../assets/images/deleteblue.png" <img src="../../../assets/images/deleteblue.png" *ngIf="pattern == 'edit'"
(click)='unitDel(element.surveyName,attacki)'> (click)='unitDel(element.surveyName,uniti,attacki)'>
<img src="../../../assets/images/add.png" <img src="../../../assets/images/add.png" *ngIf="pattern == 'edit'"
(click)='unitadd(element.surveyName,attacki)'> (click)='unitadd(element.surveyName,uniti,attacki)'>
</div> </div>
<div class="attackbody"> <div class="attackbody">
<table> <table>
@ -511,7 +509,7 @@
<div class="onetext" *ngFor="let info of element.attinf;let infoi=index"> <div class="onetext" *ngFor="let info of element.attinf;let infoi=index">
<input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.name"> <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.name">
<input type="text" placeholder="请输入内容" style="width: 67%;background-color: #FFFFFF;" [(ngModel)]="info.value"> <input type="text" placeholder="请输入内容" style="width: 67%;background-color: #FFFFFF;" [(ngModel)]="info.value">
<img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,infoi)'> <img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'">
</div> </div>
</div> </div>
<!-- 重点部位 --> <!-- 重点部位 -->
@ -519,7 +517,7 @@
<div *ngFor="let parts of element.attinf;let infoi=index"> <div *ngFor="let parts of element.attinf;let infoi=index">
<div class="partsHead"> <div class="partsHead">
<input type="text" placeholder="请输入内容" [(ngModel)]="parts.heafName"> <input type="text" placeholder="请输入内容" [(ngModel)]="parts.heafName">
<img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,infoi)'> <img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'">
</div> </div>
<div class="partsBody"> <div class="partsBody">
<div class="duohang"> <div class="duohang">
@ -553,9 +551,14 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
<div class="rightbox"> <div class="rightbox">

73
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2021-06-16 13:56:54 * @Date: 2021-06-16 13:56:54
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-06-29 17:00:09 * @LastEditTime: 2021-06-30 14:01:35
*/ */
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@ -77,12 +77,13 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.getRealPicture() this.getRealPicture()
}else if(this.selectedItem == '单位概况'){ }else if(this.selectedItem == '单位概况'){
this.getAllBuildings() this.getAllBuildings()
this.planTemplateData[0].attribute[0].attinf[0].value=this.unitData.usci console.log(this.planTemplateData)
this.planTemplateData[0].attribute[0].attinf[1].value=this.unitData.buildingTypes[0].name this.planTemplateData[1].attribute[0].attinf[0].value=this.unitData.usci
this.planTemplateData[0].attribute[0].attinf[2].value=this.unitData.contacts this.planTemplateData[1].attribute[0].attinf[1].value=this.unitData.buildingTypes[0].name
this.planTemplateData[0].attribute[0].attinf[3].value=this.unitData.phone this.planTemplateData[1].attribute[0].attinf[2].value=this.unitData.contacts
this.planTemplateData[0].attribute[0].attinf[4].value=this.unitData.organizationName this.planTemplateData[1].attribute[0].attinf[3].value=this.unitData.phone
this.planTemplateData[0].attribute[0].attinf[5].value=this.unitData.address this.planTemplateData[1].attribute[0].attinf[4].value=this.unitData.organizationName
this.planTemplateData[1].attribute[0].attinf[5].value=this.unitData.address
} /* else if (this.selectedItem == '单位概况') { } /* else if (this.selectedItem == '单位概况') {
//this.getAllBuildings() //this.getAllBuildings()
} */ else if (this.selectedItem == '预案附件') { } */ else if (this.selectedItem == '预案附件') {
@ -302,16 +303,23 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}) })
}) })
this.allBuildings = data this.allBuildings = data
if(this.planTemplateData[0].building==undefined){ if(this.planTemplateData[1].building==undefined){
this.planTemplateData[0].building=[] this.planTemplateData[1].building=[]
}
for(var i=0;i<this.allBuildings.length;i++){ for(var i=0;i<this.allBuildings.length;i++){
this.planTemplateData[0].building.push({name:this.allBuildings[i].name,body:this.planTemplateData[0].attribute}) if(i==0){
this.planTemplateData[1].building.push({name:this.allBuildings[i].name,body:this.planTemplateData[1].attribute,completed:true})
}else{
this.planTemplateData[1].building.push({name:this.allBuildings[i].name,body:this.planTemplateData[1].attribute,completed:false})
} }
this.buildingName=this.planTemplateData[0].building[this.clicki].name
this.group=this.planTemplateData[0].building[this.clicki].body }
//delete this.planTemplateData[0].attribute }
console.log(this.planTemplateData) console.log(this.planTemplateData)
//this.buildingName=this.planTemplateData[1].building[0].name
this.group=this.planTemplateData[1].building
//delete this.planTemplateData[0].attribute
}) })
} }
//获取总平面图 //获取总平面图
@ -405,47 +413,48 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
clickBuilding(item,i){ clickBuilding(item,i){
this.buildingName=item.name this.buildingName=item.name
this.clicki=i this.clicki=i
this.group=this.planTemplateData[0].building[this.clicki].body console.log(item,this.clicki)
//this.group=this.planTemplateData[1].building[this.clicki].body
} }
//单位概况增加一行 //单位概况增加一行
unitadd(surveyName, attacki) { unitadd(surveyName, attacki,i) {
this.addNumber++ this.addNumber++
if (surveyName == '进攻通道') { if (surveyName == '进攻通道') {
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr == undefined) { if (this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr == undefined) {
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr = [] this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr = []
} }
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.push({ tabletd: [] }) this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr.push({ tabletd: [] })
for (var j = 0; j < this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tableth.length; j++) { for (var j = 0; j < this.planTemplateData[1].building[attacki].body[4].attinf[i].tableth.length; j++) {
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr != undefined) { if (this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr != undefined) {
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr[this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length - 1].tabletd.push('') this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr[this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr.length - 1].tabletd.push('')
} }
else { else {
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr[this.addNumber].tabletd.push('') this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr[this.addNumber].tabletd.push('')
} }
} }
// console.log(this.planTemplateData) // console.log(this.planTemplateData)
} }
else if(surveyName=='功能分区'){ else if(surveyName=='功能分区'){
console.log(this.clicki) console.log(attacki)
this.planTemplateData[0].building[this.clicki].body[6].attinf.push({name:'',value:''}) this.planTemplateData[1].building[attacki].body[6].attinf.push({name:'',value:''})
}else if(surveyName=='重点部位'){ }else if(surveyName=='重点部位'){
this.planTemplateData[0].building[this.clicki].body[5].attinf.push({heafName:'',body:[{name:'重点部位名称',value:''},{name:'重点部位所在位置',value:''},{name:'建筑结构',value:''},{name:'使用性质',value:''},{name:'主要危险性',value:''}]}) this.planTemplateData[1].building[attacki].body[5].attinf.push({heafName:'',body:[{name:'重点部位名称',value:''},{name:'重点部位所在位置',value:''},{name:'建筑结构',value:''},{name:'使用性质',value:''},{name:'主要危险性',value:''}]})
} }
} }
//单位概况删除一行 //单位概况删除一行
unitDel(surveyName, attacki) { unitDel(surveyName, attacki,i) {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
let isTrue = confirm('您确定要删除该条信息吗') let isTrue = confirm('您确定要删除该条信息吗')
if(surveyName=='进攻通道'){ if(surveyName=='进攻通道'){
if(isTrue){ if(isTrue){
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr != undefined) { if (this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr != undefined) {
this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.splice(this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length - 1, 1) this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr.splice(this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr.length - 1, 1)
this.addNumber-- this.addNumber--
if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr.length == 0) { if (this.planTemplateData[1].building[attacki].body[4].attinf[i].tabletr.length == 0) {
this.addNumber = -1 this.addNumber = -1
} }
} else { } else {
@ -454,11 +463,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
}else if(surveyName=='功能分区'){ }else if(surveyName=='功能分区'){
if(isTrue){ if(isTrue){
this.planTemplateData[0].building[this.clicki].body[6].attinf.splice(attacki,1) this.planTemplateData[1].building[attacki].body[6].attinf.splice(i,1)
} }
}else if(surveyName=='重点部位'){ }else if(surveyName=='重点部位'){
if(isTrue){ if(isTrue){
this.planTemplateData[0].building[this.clicki].body[5].attinf.splice(attacki,1) this.planTemplateData[1].building[attacki].body[5].attinf.splice(i,1)
} }
} }
} }

2
src/app/plan-management/meet-plan/meet-plan.component.ts
Unescape View File

@ -239,7 +239,7 @@ export class MeetPlanComponent implements OnInit {
nickName: identityJsonparse.name, nickName: identityJsonparse.name,
avatar: "", avatar: "",
privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[ privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[
'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
]:[ ]:[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
], ],

2
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
Unescape View File

@ -248,7 +248,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
nickName: identityJsonparse.name, nickName: identityJsonparse.name,
avatar: "", avatar: "",
privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[ privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[
'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
]:[ ]:[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
], ],

2
src/app/plan-management/type-plan/type-plan.component.ts
Unescape View File

@ -229,7 +229,7 @@ export class TypePlanComponent implements OnInit {
nickName: identityJsonparse.name, nickName: identityJsonparse.name,
avatar: "", avatar: "",
privilege: element.auditStatus!='1'&&element.auditStatus!='16'?[ privilege: element.auditStatus!='1'&&element.auditStatus!='16'?[
'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
]:[ ]:[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
], ],

17
src/app/ui/plan-template/plan-template.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2021-05-31 10:40:01 * @Date: 2021-05-31 10:40:01
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-06-29 16:51:56 * @LastEditTime: 2021-06-30 14:45:53
*/ */
import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core'; import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core';
@ -139,6 +139,7 @@ export class PlanTemplateComponent implements OnInit {
data:{item:item,plandata:this.newleftTabledata} data:{item:item,plandata:this.newleftTabledata}
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
console.log(result)
if(result!=undefined){ if(result!=undefined){
//this.newleftTabledata[i].name=result.name //this.newleftTabledata[i].name=result.name
if(operation=='edit'){ if(operation=='edit'){
@ -202,13 +203,13 @@ export class PlanTemplateComponent implements OnInit {
data:this.newleftTabledata[this.leftclicki].data==null?null:this.newleftTabledata[this.leftclicki].data==0?null:this.newleftTabledata[this.leftclicki].data data:this.newleftTabledata[this.leftclicki].data==null?null:this.newleftTabledata[this.leftclicki].data==0?null:this.newleftTabledata[this.leftclicki].data
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
//console.log(result,this.newleftTabledata) console.log(result,this.newleftTabledata)
this.newleftTabledata.forEach((value,index,array)=>{ this.newleftTabledata.forEach((value,index,array)=>{
if(array[index].buildingTypeId==this.buildingTypeId&&array[index].planCategory==this.planCategory){ if(array[index].buildingTypeId==this.buildingTypeId&&array[index].planCategory==this.planCategory){
if(result!=undefined){ if(result!=undefined){
result.forEach((valuer,i,rarr) => { result.forEach((valuer,i,rarr) => {
//添加分组名称 //添加分组名称
if(array[index].data==null){ if(array[index].data==null||array[index].data.length==0){
array[index].data=result array[index].data=result
}else{ }else{
array[index].data[i].completed=rarr[i].completed array[index].data[i].completed=rarr[i].completed
@ -246,7 +247,7 @@ export class PlanTemplateComponent implements OnInit {
if(groupName=='单位概况'){ if(groupName=='单位概况'){
const dialogRef = this.dialog.open(adddwsurvey, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(adddwsurvey, {//调用open方法打开对话框并且携带参数过去
width: '240px', width: '240px',
height:'510px', height:'420px',
disableClose:true, disableClose:true,
data:this.group data:this.group
}); });
@ -528,6 +529,7 @@ export class addPlanname{
unitname//单位类型名称 unitname//单位类型名称
allunittype//所有单位信息 allunittype//所有单位信息
basicCategoryId basicCategoryId
facilityCategoryId//消防设施id
ngOnInit(): void { ngOnInit(): void {
this.getUnittype() this.getUnittype()
} }
@ -566,6 +568,7 @@ export class addPlanname{
this.allunittype.forEach(element => { this.allunittype.forEach(element => {
if(element.id==this.unitid){ if(element.id==this.unitid){
this.basicCategoryId=element.basicCategoryId this.basicCategoryId=element.basicCategoryId
this.facilityCategoryId=element.facilityCategoryId
} }
}); });
let planData={ let planData={
@ -574,6 +577,7 @@ export class addPlanname{
buildingTypeId:this.unitid, buildingTypeId:this.unitid,
unitname:this.unitname, unitname:this.unitname,
basicCategoryId:this.basicCategoryId, basicCategoryId:this.basicCategoryId,
facilityCategoryId:this.facilityCategoryId,
data:[] data:[]
} }
this.dialogRef.close(planData) this.dialogRef.close(planData)
@ -733,8 +737,7 @@ export class adddwsurvey{
{surveyName:'四周毗邻',completed:false,attinf:[{name:'东',value:''},{name:'西',value:''},{name:'南',value:''},{name:'北',value:''}]}, {surveyName:'四周毗邻',completed:false,attinf:[{name:'东',value:''},{name:'西',value:''},{name:'南',value:''},{name:'北',value:''}]},
{surveyName:'消防设施',completed:false},{surveyName:'进攻通道',completed:false}, {surveyName:'消防设施',completed:false},{surveyName:'进攻通道',completed:false},
{surveyName:'重点部位',completed:false,attinf:[{heafName:'',body:[{name:'重点部位名称',value:''},{name:'重点部位所在位置',value:''},{name:'建筑结构',value:''},{name:'使用性质',value:''},{name:'主要危险性',value:''}]}]}, {surveyName:'重点部位',completed:false,attinf:[{heafName:'',body:[{name:'重点部位名称',value:''},{name:'重点部位所在位置',value:''},{name:'建筑结构',value:''},{name:'使用性质',value:''},{name:'主要危险性',value:''}]}]},
{surveyName:'功能分区',completed:false,attinf:[{name:'',value:''}]},{surveyName:'行车路线',completed:false},{surveyName:'千米水源',completed:false}, {surveyName:'功能分区',completed:false,attinf:[{name:'',value:''}]}
{surveyName:'实景图',completed:false}
] ]
ngOnInit(): void{ ngOnInit(): void{
console.log(this.data) console.log(this.data)
@ -831,11 +834,13 @@ getattinf(){
categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId categoryId:this.data.newleftTabledata[this.data.leftclicki].facilityCategoryId
} }
this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{ this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
console.log(data)
this.addAttinfFile=data this.addAttinfFile=data
this.addAttinfFile.forEach(element => { this.addAttinfFile.forEach(element => {
element.completed=false element.completed=false
element.value='' element.value=''
}); });
console.log(this.addAttinfFile)
}) })
}else if(value.surveyName=='消防设施'&&value.attinf!=undefined){ }else if(value.surveyName=='消防设施'&&value.attinf!=undefined){
this.addAttinfFile=value.attinf this.addAttinfFile=value.attinf

Write Preview
Loading…
Cancel
Save