Browse Source

[完善]修改bug在线转文档建筑类型名字匹配

tangshan
邵佳豪 3 years ago
parent
commit
dcfaea91ce
  1. 18
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  2. 6
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

18
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@ -473,7 +473,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
basicCategoryId basicCategoryId
//获得所有建筑信息 //获得所有建筑信息
async getAllBuildingsInfo() { async getAllBuildingsInfo() {
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData, '单位概况')
const result = await new Promise((resolve) => { const result = await new Promise((resolve) => {
this.http.get("/api/Buildings", { this.http.get("/api/Buildings", {
params: { params: {
@ -994,7 +994,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var orginputCount = 0 var orginputCount = 0
var orgtextAreaCount = 0 var orgtextAreaCount = 0
var orgtreeCount = 0 var orgtreeCount = 0
let index = this.getArrayIndex(this.planTemplateData,'组织指挥') let index = this.getArrayIndex(this.planTemplateData, '组织指挥')
this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => {
if (orgArr[orgi].level == '1') { if (orgArr[orgi].level == '1') {
orgtableCount++ orgtableCount++
@ -1020,7 +1020,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var orginputCount = 0 var orginputCount = 0
var orgtextAreaCount = 0 var orgtextAreaCount = 0
var orgtreeCount = 0 var orgtreeCount = 0
let index = this.getArrayIndex(this.planTemplateData,'社会联动') let index = this.getArrayIndex(this.planTemplateData, '社会联动')
this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => {
if (orgArr[orgi].level == '1') { if (orgArr[orgi].level == '1') {
orgtableCount++ orgtableCount++
@ -1046,7 +1046,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var orginputCount = 0 var orginputCount = 0
var orgtextAreaCount = 0 var orgtextAreaCount = 0
var orgtreeCount = 0 var orgtreeCount = 0
let index = this.getArrayIndex(this.planTemplateData,'勤务保障') let index = this.getArrayIndex(this.planTemplateData, '勤务保障')
this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => {
if (orgArr[orgi].level == '1') { if (orgArr[orgi].level == '1') {
orgtableCount++ orgtableCount++
@ -1072,7 +1072,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var orginputCount = 0 var orginputCount = 0
var orgtextAreaCount = 0 var orgtextAreaCount = 0
var orgtreeCount = 0 var orgtreeCount = 0
let index = this.getArrayIndex(this.planTemplateData,'处置要点') let index = this.getArrayIndex(this.planTemplateData, '处置要点')
this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => { this.planTemplateData[index].attribute.forEach((orgvalue, orgi, orgArr) => {
if (orgArr[orgi].level == '1') { if (orgArr[orgi].level == '1') {
orgtableCount++ orgtableCount++
@ -1463,7 +1463,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
//单位概况增加一行 //单位概况增加一行
unitadd(surveyName, attacki, i, fileNum?: number) { unitadd(surveyName, attacki, i, fileNum?: number) {
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData, '单位概况')
this.addNumber++ this.addNumber++
this.planTemplateData[index].building[attacki].body.forEach((value, bodyi, arr) => { this.planTemplateData[index].building[attacki].body.forEach((value, bodyi, arr) => {
if (surveyName == arr[bodyi].surveyName) { if (surveyName == arr[bodyi].surveyName) {
@ -1549,7 +1549,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
//单位概况删除一行 //单位概况删除一行
unitDel(surveyName, attacki, i, fileNum?: number) { unitDel(surveyName, attacki, i, fileNum?: number) {
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData, '单位概况')
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
@ -1715,7 +1715,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
//打开自定义新增具体内容 //打开自定义新增具体内容
tuTrue = false tuTrue = false
addAttribute(groupName, attacki?: any, bi?: any, fileNum?: any, surveyName?: string) { addAttribute(groupName, attacki?: any, bi?: any, fileNum?: any, surveyName?: string) {
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData, '单位概况')
const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去
width: '340px', width: '340px',
height: '450px', height: '450px',
@ -1914,7 +1914,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
//单位概况自定义新增数据 //单位概况自定义新增数据
unitZdyaaa() { unitZdyaaa() {
let list = [] let list = []
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData, '单位概况')
const dialogRef = this.dialog.open(adddwsurvey, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(adddwsurvey, {//调用open方法打开对话框并且携带参数过去
width: '240px', width: '240px',
height: '420px', height: '420px',

6
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@ -788,8 +788,10 @@ export class EntryPlanLookComponent implements OnInit {
: (this.unitdata.unittype == '商市场' || this.unitdata.unittype == '医院' || this.unitdata.unittype == '学校' : (this.unitdata.unittype == '商市场' || this.unitdata.unittype == '医院' || this.unitdata.unittype == '学校'
|| this.unitdata.unittype == '宾馆' || this.unitdata.unittype == '娱乐场所' || this.unitdata.unittype == '餐饮业' || this.unitdata.unittype == '宾馆' || this.unitdata.unittype == '娱乐场所' || this.unitdata.unittype == '餐饮业'
|| this.unitdata.unittype == '影剧院' || this.unitdata.unittype == '展览建筑' || this.unitdata.unittype == '养老院' || this.unitdata.unittype == '影剧院' || this.unitdata.unittype == '展览建筑' || this.unitdata.unittype == '养老院'
|| this.unitdata.unittype == '会议中心') ? 4 : this.unitdata.unittype == '储罐类' ? 'StorageTankFivePlan' || this.unitdata.unittype == '会议中心') ? 4 : this.unitdata.unittype == '储罐类' ? 'StorageTankFivePlan' :
: this.unitdata.unittype == '化工生产' ? 'ChemicalProductionFivePlan' : this.unitdata.unittype == '农村' ? 'CountrysideFivePlan' : '' this.unitdata.unittype == '化工生产' ? 'ChemicalProductionFivePlan' : this.unitdata.unittype == '轨道交通' ? 'MetroFivePlan' :
this.unitdata.unittype == '地下建筑' ? 'UndergroundBuildingFivePlan' : this.unitdata.unittype == '农村' ? 'CountrysideFivePlan' : ''
let blob = [] let blob = []
/* /*
,blob ,blob

Loading…
Cancel
Save