diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html
index 3014171..efaeb05 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.html
+++ b/src/app/pages/basic-data/carousel/carousel.component.html
@@ -42,9 +42,12 @@
diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts
index 59f4f04..20bd5c2 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.ts
+++ b/src/app/pages/basic-data/carousel/carousel.component.ts
@@ -39,6 +39,28 @@ ngOnInit() {
if(this.terminalAreas && this.terminalAreas.length > 0){//所属航站楼区域数据显示处理
this.terminalAreasHandle();
}
+ this.render_data.forEach(element => {//资源状态列表显示数据转换
+ if (element['carouselStatus'] == '0') {
+ element['carouselStatus'] = '可用'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '1'){
+ element['carouselStatus'] = '在用'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '2'){
+ element['carouselStatus'] = '锁定'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '3'){
+ element['carouselStatus'] = '禁用'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '4'){
+ element['carouselStatus'] = '预分'
+ return element['carouselStatus'];
+ }
+ });
}
)
//所属航站楼区域
@@ -89,9 +111,24 @@ inputEnter() {
selectChange() {
this.return_data = this.carousels.filter(item=>{
let is_satis = true;
+ if (item['carouselStatus'] == '可用') {
+ item['carouselStatus'] = '0'
+ }
+ if(item['carouselStatus'] == '在用'){
+ item['carouselStatus'] = '1'
+ }
+ if(item['carouselStatus'] == '锁定'){
+ item['carouselStatus'] = '2'
+ }
+ if(item['carouselStatus'] == '禁用'){
+ item['carouselStatus'] = '3'
+ }
+ if(item['carouselStatus'] == '预分'){
+ item['carouselStatus'] = '4'
+ }
for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
- if (item[key] === this.filterItems[key]) {
+ if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
is_satis = true;
continue;
} else {
@@ -102,6 +139,28 @@ selectChange() {
}
return is_satis;
})
+ this.return_data.forEach(element => {//资源状态列表显示数据转换
+ if (element['carouselStatus'] == '0') {
+ element['carouselStatus'] = '可用'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '1'){
+ element['carouselStatus'] = '在用'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '2'){
+ element['carouselStatus'] = '锁定'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '3'){
+ element['carouselStatus'] = '禁用'
+ return element['carouselStatus'];
+ }
+ if(element['carouselStatus'] == '4'){
+ element['carouselStatus'] = '预分'
+ return element['carouselStatus'];
+ }
+ });
this.render_data = this.return_data;
}
diff --git a/src/app/pages/basic-data/gate/gate.component.html b/src/app/pages/basic-data/gate/gate.component.html
index 1b21926..287b863 100644
--- a/src/app/pages/basic-data/gate/gate.component.html
+++ b/src/app/pages/basic-data/gate/gate.component.html
@@ -40,7 +40,12 @@
diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts
index 86a53fe..7e38eb3 100644
--- a/src/app/pages/basic-data/gate/gate.component.ts
+++ b/src/app/pages/basic-data/gate/gate.component.ts
@@ -39,6 +39,28 @@ ngOnInit() {
if(this.terminalAreas && this.terminalAreas.length > 0){//所属航站楼区域数据显示处理
this.terminalAreasHandle();
}
+ this.render_data.forEach(element => {//资源状态列表显示数据转换
+ if (element['gateStatus'] == '0') {
+ element['gateStatus'] = '可用'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '1'){
+ element['gateStatus'] = '在用'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '2'){
+ element['gateStatus'] = '锁定'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '3'){
+ element['gateStatus'] = '禁用'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '4'){
+ element['gateStatus'] = '预分'
+ return element['gateStatus'];
+ }
+ });
}
)
//所属航站楼区域
@@ -89,9 +111,24 @@ inputEnter() {
selectChange() {
this.return_data = this.gates.filter(item=>{
let is_satis = true;
+ if (item['gateStatus'] == '可用') {
+ item['gateStatus'] = '0'
+ }
+ if(item['gateStatus'] == '在用'){
+ item['gateStatus'] = '1'
+ }
+ if(item['gateStatus'] == '锁定'){
+ item['gateStatus'] = '2'
+ }
+ if(item['gateStatus'] == '禁用'){
+ item['gateStatus'] = '3'
+ }
+ if(item['gateStatus'] == '预分'){
+ item['gateStatus'] = '4'
+ }
for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
- if (item[key] === this.filterItems[key]) {
+ if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
is_satis = true;
continue;
} else {
@@ -102,6 +139,28 @@ selectChange() {
}
return is_satis;
})
+ this.return_data.forEach(element => {//资源状态列表显示数据转换
+ if (element['gateStatus'] == '0') {
+ element['gateStatus'] = '可用'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '1'){
+ element['gateStatus'] = '在用'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '2'){
+ element['gateStatus'] = '锁定'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] == '3'){
+ element['gateStatus'] = '禁用'
+ return element['gateStatus'];
+ }
+ if(element['gateStatus'] = '4'){
+ element['gateStatus'] = '预分'
+ return element['gateStatus'];
+ }
+ });
this.render_data = this.return_data;
}
diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html
index e2600a4..b934154 100644
--- a/src/app/pages/basic-data/stand/stand.component.html
+++ b/src/app/pages/basic-data/stand/stand.component.html
@@ -54,9 +54,12 @@
diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts
index 98900b7..b362116 100644
--- a/src/app/pages/basic-data/stand/stand.component.ts
+++ b/src/app/pages/basic-data/stand/stand.component.ts
@@ -41,6 +41,28 @@ ngOnInit() {
if(this.terminalAreas && this.terminalAreas.length>0){//所属航站楼区域数据转换处理
this.terminalAreasHandle();
}
+ this.render_data.forEach(element => {//资源状态列表显示数据转换
+ if (element['standStatus'] == '0') {
+ element['standStatus'] = '可用'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '1'){
+ element['standStatus'] = '在用'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '2'){
+ element['standStatus'] = '锁定'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '3'){
+ element['standStatus'] = '禁用'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '4'){
+ element['standStatus'] = '预分'
+ return element['standStatus'];
+ }
+ });
}
)
//所属航站楼区域
@@ -91,9 +113,24 @@ selectRow(i) {
selectChange() {
this.return_data = this.stands.filter(item=>{
let is_satis = true;
+ if (item['standStatus'] == '可用') {
+ item['standStatus'] = '0'
+ }
+ if(item['standStatus'] == '在用'){
+ item['standStatus'] = '1'
+ }
+ if(item['standStatus'] == '锁定'){
+ item['standStatus'] = '2'
+ }
+ if(item['standStatus'] == '禁用'){
+ item['standStatus'] = '3'
+ }
+ if(item['standStatus'] == '预分'){
+ item['standStatus'] = '4'
+ }
for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
- if (item[key] === this.filterItems[key]) {
+ if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
is_satis = true;
continue;
} else {
@@ -104,6 +141,28 @@ selectChange() {
}
return is_satis;
})
+ this.return_data.forEach(element => {//资源状态列表显示数据转换
+ if (element['standStatus'] == '0') {
+ element['standStatus'] = '可用'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '1'){
+ element['standStatus'] = '在用'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '2'){
+ element['standStatus'] = '锁定'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '3'){
+ element['standStatus'] = '禁用'
+ return element['standStatus'];
+ }
+ if(element['standStatus'] == '4'){
+ element['standStatus'] = '预分'
+ return element['standStatus'];
+ }
+ });
this.render_data = this.return_data;
}