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

[修改]预案模板人员密集五级适配

tangshan
陈敬瑜 3 years ago
parent
87d47efbd0
commit
6a3408c554
7 changed files with 259 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 10
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
  3. 12
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 2
      src/app/statistic-analysis/combined-query/combined-query.component.ts
  5. 2
      src/app/ui/plan-template/plan-template.component.html
  6. 237
      src/app/ui/plan-template/plan-template.component.ts

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

@ -738,7 +738,7 @@
color: #ffffff;">{{element.surveyName}}</span>
<!-- <img src="../../../assets/images/deletered.png" > -->
<img src="../../../assets/images/addbai.png"
(click)='unitadd(element.surveyName,uniti,elei)' *ngIf="element.surveyName!='进攻通道'">
(click)='unitadd(element.surveyName,uniti,elei)' *ngIf="pattern == 'edit'&&element.surveyName!='进攻通道'">
</div>
<div class="body">
<!-- 进攻通道 -->
@ -823,7 +823,7 @@
height: 40px;
width: 60%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
text-align: center;">{{info.propertyValue}}</td>
</tr>
</table>
</div>

10
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
Unescape View File

@ -874,7 +874,7 @@
width: 100%;
height: 100%;
.fileHead{
height: 40px;
height: 42px;
width: 100%;
background-color: #FFFBE8;
@ -928,9 +928,9 @@
}
}
.fourTexttwo{
height: 40px;
height: 42px;
width: 50%;
border-bottom: 1px solid #F2F4F5;
border-bottom: 1px solid #E8E9E9;
input{
height: 40px;
//width: 60%;
@ -973,9 +973,9 @@
flex-direction: column;
.duohang{
width: 100%;
height: 40px;
height: 42px;
display: flex;
//border-bottom: 1px solid #FFFFFF;
border-bottom: 1px solid #E8E9E9;
.duohangHalf{
height: 40px;
width: 50%;

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

@ -159,7 +159,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
data.items.forEach(element => {
if (element.id == this.route.snapshot.queryParams.companyId) {
this.unitData = element
if((this.unitData.buildingTypes[0].name=='高层建筑'||this.unitData.buildingTypes[0].name=='居民楼')&&this.planLevel=='5'){
if((this.unitData.buildingTypes[0].name=='高层建筑'||this.unitData.buildingTypes[0].name=='居民小区'||this.unitData.buildingTypes[0].name=='厂房'
||this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校'
||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业'
||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院'
||this.unitData.buildingTypes[0].name=='会议中心')&&this.planLevel=='5'){
this.zaixianDr=true
}
//console.log('单位列表信息', this.unitData)
@ -1701,7 +1705,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
config.duration = 3000
let formData = new FormData()
formData.append("file", e.target.files[0])
let type=this.unitData.buildingTypes[0].name=='高层建筑'?1:2
let type=this.unitData.buildingTypes[0].name=='高层建筑'?1:this.unitData.buildingTypes[0].name=='居民小区'?2:this.unitData.buildingTypes[0].name=='厂房'?3
:(this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校'
||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业'
||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院'
||this.unitData.buildingTypes[0].name=='会议中心')?4:5
let fileData={
type:this.unitData.buildingTypes[0].name=='高层建筑'?1:2,
file:formData

2
src/app/statistic-analysis/combined-query/combined-query.component.ts
Unescape View File

@ -104,7 +104,7 @@ export class CombinedQueryComponent implements OnInit {
TimeIntervalStart:this.dwaddtime||'',
TimeIntervalEnd:this.dwendtime||'',
BuildingTypeIds:this.unittype||[],
CompanyStatus:this.preparelevel||[],
CompanyStatuses:this.preparelevel||[],
SortBy:'totalCount',
SortType:this.integritySort
}

2
src/app/ui/plan-template/plan-template.component.html
Unescape View File

@ -93,6 +93,8 @@
<button mat-raised-button color="#ECF6FF" (click)='delAttribute(item.groupName,element.surveyName)'><img src="../../../assets/images/deletehui.png"> 删除</button>
<button mat-raised-button color="primary" style="margin-right: 10px;" (click)='addAttInfo(element.surveyName,suri)'
*ngIf="item.groupName=='单位概况'&&(element.surveyName!='四周毗邻'&&element.surveyName!='重点部位'&&element.surveyName!='功能分区')"><img src="../../../assets/images/updatabai.png"> 编辑</button>
<button mat-raised-button color="primary" style="margin-right: 10px;" (click)='addAttInfo(element.surveyName,suri)'
*ngIf="element.zdy!=undefined"><img src="../../../assets/images/addbai.png"> 新建</button>
<img src="../../../assets/images/downpaixu.png" alt="" style="height: 15px;position: relative;top: 15px;left: 1px;margin-right: 5px;float: right;" (click)='zaiDown(zi,suri)'>
<img src="../../../assets/images/toppaixu.png" alt="" style="height: 15px;position: relative;top: 15px;float: right;" (click)='zaiTop(zi,suri)'>
</div>

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

@ -652,6 +652,243 @@ export class PlanTemplateComponent implements OnInit {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
let linshi=[
{
"attribute": [
{
"attinf": [
{
"value": "",
"olddata": "",
"completed": false,
"propertyName": "统一社会信用代码",
"propertyType": 0
},
{
"value": "",
"olddata": "",
"completed": false,
"propertyName": "单位类型",
"propertyType": 0
},
{
"value": "",
"olddata": "",
"completed": true,
"propertyName": "单位地址",
"propertyType": 0,
"analysisWord": {
"valueAxis": [ 1, 1 ],
"tableIndex": 0,
"valueField": "propertyValue"
}
},
{
"value": "",
"olddata": "",
"completed": true,
"propertyName": "联系人",
"propertyType": 0,
"analysisWord": {
"valueAxis": [ 1, 5 ],
"tableIndex": 0,
"valueField": "propertyValue"
}
},
{
"value": "",
"olddata": "",
"completed": false,
"propertyName": "辖区中队",
"propertyType": 0
},
{
"value": "",
"olddata": "",
"completed": true,
"propertyName": "联系电话",
"propertyType": 0,
"analysisWord": {
"valueAxis": [ 1, 5 ],
"tableIndex": 0,
"valueField": "propertyValue"
}
}
],
"completed": true,
"surveyName": "单位基本信息"
},
{
"completed": false,
"surveyName": "建筑信息"
},
{
"attinf": [
{
"name": "东",
"value": "",
"analysisWord": {
"valueAxis": [ 2, 2 ],
"tableIndex": 0,
"valueField": "value"
}
},
{
"name": "西",
"value": "",
"analysisWord": {
"valueAxis": [ 2, 4 ],
"tableIndex": 0,
"valueField": "value"
}
},
{
"name": "南",
"value": "",
"analysisWord": {
"valueAxis": [ 3, 2 ],
"tableIndex": 0,
"valueField": "value"
}
},
{
"name": "北",
"value": "",
"analysisWord": {
"valueAxis": [ 3, 4 ],
"tableIndex": 0,
"valueField": "value"
}
}
],
"completed": true,
"surveyName": "四周毗邻"
},
{
"completed": false,
"surveyName": "消防设施"
},
{
"completed": false,
"surveyName": "进攻通道"
},
{
"attinf": [
{
"body": [
{
"name": "重点部位名称",
"value": ""
},
{
"name": "重点部位所在位置",
"value": ""
},
{
"name": "建筑结构",
"value": ""
},
{
"name": "使用性质",
"value": ""
},
{
"name": "主要危险性",
"value": ""
}
],
"heafName": ""
}
],
"completed": false,
"surveyName": "重点部位"
},
{
"attinf": [
{
"name": "",
"value": ""
}
],
"completed": false,
"surveyName": "功能分区"
},
{
"zdy": true,
"attinf": [
{
"level": "3",
"tableth": "",
"headName": "备注详情",
"analysisWord": {
"valueAxis": [ 4, 1 ],
"tableIndex": 0,
"valueField": "tableth"
}
}
],
"completed": true,
"surveyName": "备注"
}
],
"completed": true,
"groupName": "单位概况"
},
{
"completed": false,
"groupName": "灾情设定"
},
{
"completed": false,
"groupName": "力量调集"
},
{
"completed": false,
"groupName": "组织指挥"
},
{
"completed": false,
"groupName": "作战行动"
},
{
"completed": false,
"groupName": "社会联动"
},
{
"completed": false,
"groupName": "勤务保障"
},
{
"completed": false,
"groupName": "特别警示"
},
{
"completed": false,
"groupName": "辅助决策"
},
{
"completed": true,
"groupName": "交通水源",
"manualWord": {
"valueAxis": [ 1, 6 ],
"KeyAxis": [ 0, 6 ],
"tableIndex": 0
}
},
{
"completed": true,
"groupName": "重点图示"
},
{
"completed": false,
"groupName": "处置要点"
},
{
"completed": false,
"groupName": "预案附件"
}
]
let body={
id:this.Id,
basicCategoryId:this.newleftTabledata[this.leftclicki].basicCategoryId,

Write Preview
Loading…
Cancel
Save