diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html index 8939725..5808c56 100644 --- a/src/app/pages/main/main.component.html +++ b/src/app/pages/main/main.component.html @@ -65,7 +65,7 @@
@@ -111,10 +111,10 @@
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index 91895ad..2c749a2 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -246,8 +246,8 @@ export class MainComponent implements OnInit { */ doSequence(combined_data) { this.raw_data.forEach(element => { - if (this.airlinesSelections.findIndex(airline => airline.airlineCodeIata === element['ALCD']) === -1) { - let index = this.airlines.findIndex(val => val.airlineCodeIata === element['ALCD']); + if (this.airlinesSelections.findIndex(airline => airline['airlineCodeIata'] === element['ALCD']) === -1) { + let index = this.airlines.findIndex(val => val['airlineCodeIata'] === element['ALCD']); this.airlinesSelections.push(this.airlines[index]); } if (this.flightTypeSelections.findIndex(flightType => flightType.flightTypeCode === element['FLTY']) === -1) { @@ -630,7 +630,7 @@ export class MainComponent implements OnInit { groupCode: 'userSettingSelected', settingContent: settingContent, }).subscribe(() => { - console.log('保存UIsetting成功！'); + }) } else if (type === 'time') { this.positionedArray = []; @@ -651,7 +651,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['preFlight'][filterItems[key]] && item['preFlight'][filterItems[key]].length > 0) { + if(item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1){ is_satis = true; continue; } else { @@ -687,7 +687,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['reaFlight'][filterItems[key]] && item['reaFlight'][filterItems[key]].length > 0) { + if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { is_satis = true; continue; } else { @@ -724,7 +724,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['preFlight'][filterItems[key]] && item['preFlight'][filterItems[key]].length > 0) { + if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { pre_satis = true; continue; } else { @@ -757,7 +757,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['reaFlight'][filterItems[key]] && item['reaFlight'][filterItems[key]].length > 0) { + if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { rea_satis = true; continue; } else { @@ -812,7 +812,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['preFlight'][filterItems[key]] && item['preFlight'][filterItems[key]].length > 0) { + if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { is_satis = true; continue; } else { @@ -837,7 +837,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['reaFlight'][filterItems[key]] && item['reaFlight'][filterItems[key]].length > 0) { + if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { is_satis = true; continue; } else { @@ -863,7 +863,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['preFlight'][filterItems[key]] && item['preFlight'][filterItems[key]].length > 0) { + if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { pre_satis = true; continue; } else { @@ -885,7 +885,7 @@ export class MainComponent implements OnInit { for (const key in filterItems) { if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (key === 'Abnormal_state') { - if (item['reaFlight'][filterItems[key]] && item['reaFlight'][filterItems[key]].length > 0) { + if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { rea_satis = true; continue; } else { diff --git a/src/app/pages/pages.component.html b/src/app/pages/pages.component.html index ed3295b..e13df21 100644 --- a/src/app/pages/pages.component.html +++ b/src/app/pages/pages.component.html @@ -23,40 +23,33 @@ {{role_type}} - -
  • - + + + + + 设置 + + + + + + + +
    • @@ -115,7 +115,8 @@ 机构编码 - + 请输入机构编码 机构编码最长10个字符 该编码已存在 @@ -126,7 +127,7 @@ 联系人 - + 联系人名称最长10个字符 @@ -135,8 +136,8 @@ 联系方式 - - 请输入联系方式 + + 联系方式最长20个字符
    @@ -145,6 +146,7 @@ 机构地址 + 机构地址最长30个字符 @@ -171,7 +173,7 @@ -
    +
    diff --git a/src/app/pages/system-management/department-management/department-management.component.ts b/src/app/pages/system-management/department-management/department-management.component.ts index b712b47..3640b62 100644 --- a/src/app/pages/system-management/department-management/department-management.component.ts +++ b/src/app/pages/system-management/department-management/department-management.component.ts @@ -33,6 +33,7 @@ export class DepartmentManagementComponent implements OnInit { real_name: '', } public orgDetail: any = ''; //左侧机构目录当前选中项机构的详情信息 + public sekOrgDetail: any = ''; public orgSeleted: any = ''; //新增或者修改时，当前选中的所属机构的机构详情信息 public modifyType: any = '3'; //操作状态 1新增 2修改 3详情 public parentName: any = ''; @@ -73,10 +74,9 @@ export class DepartmentManagementComponent implements OnInit { shortName: ['', [Validators.maxLength(10)]], code: ['', [Validators.required, Validators.maxLength(10)]], contact_person: ['', [Validators.maxLength(10)]], - contact_method: [''], + contact_method: ['', [Validators.maxLength(20)]], organization_type: [''], - address: [''], - + address: ['', [Validators.maxLength(30)]], }); this.initTree(); this.queryTable(); @@ -85,23 +85,35 @@ export class DepartmentManagementComponent implements OnInit { addModify(type) { //数据清空重置 this.modifyType = type; - this.validateForm.reset(); + // this.validateForm.reset(); this.userSelecteds = []; this.orgSeleted = ''; this.checkNameStatus = ''; this.nameOnly = true; - this.validateForm.patchValue({ organization_type: 1, }); + // this.validateForm.patchValue({ organization_type: 1, }); if (type == 1) { - + this.sekOrgDetail = true; + this.zNodesChild = this.zNodes.concat(); + $.fn.zTree.init($("#treeDemoChild"), this.settingChild, this.zNodesChild); + this.validateForm.patchValue({ + organization: '', + shortName: '', + code: '', + contact_person: '', + contact_method: '', + organization_type: 1, + address: '', + }); } else if (type == 2) { + this.sekOrgDetail = false; let item = this.orgDetail; this.zNodesChild = this.zNodes.concat(); - for (let i = 0; i < this.zNodesChild.length; i++) { - if (this.zNodesChild[i].id === item.id) { - this.zNodesChild.splice(i, 1); - break; - } - } + // for (let i = 0; i < this.zNodesChild.length; i++) { + // if (this.zNodesChild[i].id === item.id) { + // this.zNodesChild.splice(i, 1); + // break; + // } + // } $.fn.zTree.init($("#treeDemoChild"), this.settingChild, this.zNodesChild); this.validateForm.patchValue({ organization: item.organization, @@ -190,6 +202,18 @@ export class DepartmentManagementComponent implements OnInit { //保存选择机构 treeSave() { if (this.treeSelectedChild) { + if (this.sekOrgDetail) { + //新增 + } else { + //修改 + if (this.orgDetail && this.orgDetail.id === this.treeSelectedChild.id) { + this.message.create('warning', '不能选择自己作为所属机构！'); + this.close(); + return; + } + } + + this.orgSeleted = this.treeSelectedChild; this.close(); // this.visible = false; @@ -354,7 +378,7 @@ export class DepartmentManagementComponent implements OnInit { if (node[0].children && node[0].children.length > 0) { zTree.selectNode(node[0].children[0]) zTree.setting.callback.onClick(null, zTree.setting.treeId, node[0].children[0]) - }else{ + } else { zTree.selectNode(node[0]) zTree.setting.callback.onClick(null, zTree.setting.treeId, node[0]) } diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html index 87ac9f4..12e55b0 100644 --- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html @@ -24,7 +24,7 @@ nzPlaceHolder="请选择所属角色"> - 请选择所属角色 + 请选择所属角色
    @@ -67,6 +67,7 @@ 描述 + 描述最长20个字符
    @@ -75,6 +76,7 @@ 身份证号 + 身份证号最长20个字符 @@ -83,6 +85,7 @@ 邮箱 + 邮箱最长20个字符 @@ -91,6 +94,7 @@ 电话 + 电话最长12个字符 diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts index 5467f33..9f2484e 100644 --- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts @@ -54,16 +54,16 @@ export class UserManagementModifyComponent implements OnInit { // $('#main-container').height('height',(document.documentElement.clientHeight-106+'px')); this.queryRole(); this.validateForm = this.fb.group({ - real_name: ['', [Validators.required,Validators.maxLength(20)]], - login_name: ['', [Validators.required,Validators.maxLength(20)]], - password: ['', [Validators.required,Validators.maxLength(20)]], - identify_num: [''], - email: [''], - mobile: [''], + real_name: ['', [Validators.required, Validators.maxLength(20)]], + login_name: ['', [Validators.required, Validators.maxLength(20)]], + password: ['', [Validators.required, Validators.maxLength(20)]], + identify_num: ['', [Validators.maxLength(18)]], + email: ['', [Validators.maxLength(20)]], + mobile: ['', [Validators.maxLength(12)]], sex: ['m'], status: ['1'], - roleList: ['', [Validators.required]], - remark: [''] + roleList: [[], [Validators.required]], + remark: ['', [Validators.maxLength(20)]] }); //取路由参数 this.route.queryParams.subscribe(routeParams => { diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts index 1496ae3..1a5a77f 100644 --- a/src/app/utils/flights-data-handle.ts +++ b/src/app/utils/flights-data-handle.ts @@ -217,76 +217,101 @@ export class FlightsDataHandle { } public basicDataTransHandle(item, airports, citys, airlines, flightStatus, flightTypes) { - try { - if (this.orderHandle.isArriFlight(item) || this.orderHandle.isDeptFlight(item)) { - //航线处理 + if (this.orderHandle.isArriFlight(item) || this.orderHandle.isDeptFlight(item)) { + //航线处理 + try { let erutCodeArray = item['renderFlight']['ERUT'].split(' - '); let erutChnArray = [] for (let i = 0; i < erutCodeArray.length; i++) { - try { - let airportIndex = airports.findIndex(val => val.airportCodeIata === erutCodeArray[i]); - if (airportIndex > -1) { - if (airports[airportIndex].briefNameChn) { - erutChnArray.push(airports[airportIndex].briefNameChn); - } else { - erutChnArray.push(airports[airportIndex].airportNameChn); - } + let airportIndex = airports.findIndex(val => val.airportCodeIata === erutCodeArray[i]); + if (airportIndex > -1) { + if (airports[airportIndex].briefNameChn) { + erutChnArray.push(airports[airportIndex].briefNameChn); } else { - erutChnArray.push(erutCodeArray[i]); + erutChnArray.push(airports[airportIndex].airportNameChn); } - } catch (error) { + } else { erutChnArray.push(erutCodeArray[i]); } } item['renderFlight']['ERUT'] = erutChnArray.join(' - '); - //航空公司处理 + } catch (error) { + console.log("基础数据航线错误，处理失败，请检查数据 -- 纯到港或纯离港") + } + //航空公司处理 + try { let airlineIndex = airlines.findIndex(val => val.airlineCode === item['renderFlight']['ALCD']); item['renderFlight']['ALCD'] = airlines[airlineIndex].airlineName; - //运营状态处理 + } catch (error) { + console.log("基础数据航空公司错误，处理失败，请检查数据 -- 纯到港或纯离港") + } + //运营状态处理 + try { item['renderFlight']['FTSS'] = flightStatus.find(val => val.sttc === item['renderFlight']['FTSS']).stdc; - //航班类型处理 + } catch (error) { + console.log("基础数据运营状态错误，处理失败，请检查数据 -- 纯到港或纯离港") + } + //航班类型处理 + try { item['renderFlight']['FLTY'] = flightTypes.find(val => val.flightTypeCode === item['renderFlight']['FLTY']).flightTypeNameCn; - } else { - //航线处理 + } catch (error) { + console.log("基础数据航班类型错误，处理失败，请检查数据 -- 纯到港或纯离港") + } + } else { + //航线处理 + try { let erutLinkCodeArray = item['renderFlight']['ERUT'].split(' - '); let erutLinkChnArray = [] for (let i = 0; i < erutLinkCodeArray.length; i++) { - try { - let airportIndex = airports.findIndex(val => val.airportCodeIata === erutLinkCodeArray[i]); - if (airportIndex > -1) { - if (airports[airportIndex].briefNameChn) { - erutLinkChnArray.push(airports[airportIndex].briefNameChn); - } else { - erutLinkChnArray.push(airports[airportIndex].airportNameChn); - } + let airportIndex = airports.findIndex(val => val.airportCodeIata === erutLinkCodeArray[i]); + if (airportIndex > -1) { + if (airports[airportIndex].briefNameChn) { + erutLinkChnArray.push(airports[airportIndex].briefNameChn); } else { - erutLinkChnArray.push(erutLinkCodeArray[i]); + erutLinkChnArray.push(airports[airportIndex].airportNameChn); } - } catch (error) { + } else { erutLinkChnArray.push(erutLinkCodeArray[i]); } + } item['renderFlight']['ERUT'] = erutLinkChnArray.join(' - '); - //航空公司处理 + } catch (error) { + console.log("基础数据航线错误，处理失败，请检查数据 -- 链接航班") + } + //航空公司处理 + try { let airlineLinkIndex = airlines.findIndex(val => val.airlineCode === item['renderFlight']['ALCD']); item['renderFlight']['ALCD'] = airlines[airlineLinkIndex].airlineName; - //运营状态处理 + } catch (error) { + console.log("基础数据航空公司错误，处理失败，请检查数据 -- 链接航班") + } + //运营状态处理 + try { let ftssLinkCodeArray = item['renderFlight']['FTSS'].split(' / '); let ftssLinkChnArray = []; for (let i = 0; i < ftssLinkCodeArray.length; i++) { ftssLinkChnArray.push(flightStatus.find(val => val.sttc === ftssLinkCodeArray[i]).stdc) } item['renderFlight']['FTSS'] = ftssLinkChnArray.join(' / '); + } catch (error) { + console.log("基础数据运营状态错误，处理失败，请检查数据 -- 链接航班") + } - //航班类型处理 + //航班类型处理 + try { let fltyLinkCodeArray = item['renderFlight']['FLTY'].split(' / '); let fltyLinkChnArray = []; for (let i = 0; i < fltyLinkCodeArray.length; i++) { fltyLinkChnArray.push(flightTypes.find(val => val.flightTypeCode === fltyLinkCodeArray[i]).flightTypeNameCn) } item['renderFlight']['FLTY'] = fltyLinkChnArray.join(' / '); + } catch (error) { + console.log("基础数据航班类型错误，处理失败，请检查数据 -- 链接航班") + } - //航线处理 + //航线处理 + try { let erutPreCodeArray = item['renderPreFlight']['ERUT'].split(' - '); let erutPreChnArray = [] for (let i = 0; i < erutPreCodeArray.length; i++) { @@ -306,16 +331,32 @@ export class FlightsDataHandle { } } item['renderPreFlight']['ERUT'] = erutPreChnArray.join(' - '); - //航空公司处理 + } catch (error) { + console.log("基础数据航线错误，处理失败，请检查数据 -- 链接航班-到港航班") + } + //航空公司处理 + try { let airlinePreIndex = airlines.findIndex(val => val.airlineCode === item['renderPreFlight']['ALCD']); item['renderPreFlight']['ALCD'] = airlines[airlinePreIndex].airlineName; - //运营状态处理 + } catch (error) { + console.log("基础数据航空公司错误，处理失败，请检查数据 -- 链接航班-到港航班") + } + //运营状态处理 + try { item['renderPreFlight']['FTSS'] = flightStatus.find(val => val.sttc === item['renderPreFlight']['FTSS']).stdc - //航班类型处理 + } catch (error) { + console.log("基础数据运营状态错误，处理失败，请检查数据 -- 链接航班-到港航班") + } + //航班类型处理 + try { item['renderPreFlight']['FLTY'] = flightTypes.find(val => val.flightTypeCode === item['renderPreFlight']['FLTY']).flightTypeNameCn; + } catch (error) { + console.log("基础数据航班类型错误，处理失败，请检查数据 -- 链接航班-到港航班") + } - //航线处理 + //航线处理 + try { let erutReaCodeArray = item['renderReaFlight']['ERUT'].split(' - '); let erutReaChnArray = [] for (let i = 0; i < erutReaCodeArray.length; i++) { @@ -335,19 +376,31 @@ export class FlightsDataHandle { } } item['renderReaFlight']['ERUT'] = erutReaChnArray.join(' - '); - //航空公司处理 + } catch (error) { + console.log("基础数据航线错误，处理失败，请检查数据 -- 链接航班-离港航班") + } + //航空公司处理 + try { let airlineReaIndex = airlines.findIndex(val => val.airlineCode === item['renderReaFlight']['ALCD']); item['renderReaFlight']['ALCD'] = airlines[airlineReaIndex].airlineName; - //运营状态处理 + } catch (error) { + console.log("基础数据航空公司错误，处理失败，请检查数据 -- 链接航班-离港航班") + } + //运营状态处理 + try { item['renderReaFlight']['FTSS'] = flightStatus.find(val => val.sttc === item['renderReaFlight']['FTSS']).stdc - //航班类型处理 + } catch (error) { + console.log("基础数据运营状态错误，处理失败，请检查数据 -- 链接航班-离港航班") + } + //航班类型处理 + try { item['renderReaFlight']['FLTY'] = flightTypes.find(val => val.flightTypeCode === item['renderReaFlight']['FLTY']).flightTypeNameCn; + } catch (error) { + console.log("基础数据航班类型错误，处理失败，请检查数据 -- 链接航班-离港航班") } - } catch (error) { - console.log('基础数据转换有误，处理失败，请检查数据'); - throw error; - } finally { - return item; } + + return item; + } } \ No newline at end of file