Merge branch 'develop-3'

src/app/pages/basic-data/carousel/carousel.component.ts

@@ -46,6 +46,8 @@ export class CarouselComponent implements OnInit {
             data => {
                 this.carousels = data;
                 this.render_data = data;
+                //资源状态列表显示数据转换
+                this.initCarouselStauts();
             }
         );
         this.basicDataService.terminal_area_subject.subscribe(
@@ -57,9 +59,11 @@ export class CarouselComponent implements OnInit {
                 }
             }
         );
-        //航站楼区域数据转换处理
         if(this.render_data){
+            //航站楼区域数据转换处理
             this.basicDataTransHandle();
+            //资源状态列表显示数据转换
+            this.initCarouselStauts();
         }
         /**
          * 固定表头
@@ -99,9 +103,38 @@ export class CarouselComponent implements OnInit {
         }
     }
 
+    //资源状态列表显示数据转换
+    initCarouselStauts(){
+        this.render_data.forEach(item =>{
+            if(item['carouselStatus'] == '0'){
+                item['carouselStatus'] = '可用';
+            }else if(item['carouselStatus'] == '1'){
+                item['carouselStatus'] = '在用';
+            }else if(item['carouselStatus'] == '2'){
+                item['carouselStatus'] = '锁定';
+            }else if(item['carouselStatus'] == '3'){
+                item['carouselStatus'] = '禁用';
+            }else if(item['carouselStatus'] == '4'){
+                item['carouselStatus'] = '预分';
+            }
+            return item['carouselStatus'];
+        })
+    }
+
     //下拉框选择筛选
     selectChange() {
         this.render_data = this.carousels.filter(item => {
+            if(item['carouselStatus'] == '可用'){
+                item['carouselStatus'] = '0';
+            }else if(item['carouselStatus'] == '在用'){
+                item['carouselStatus'] = '1';
+            }else if(item['carouselStatus'] == '锁定'){
+                item['carouselStatus'] = '2';
+            }else if(item['carouselStatus'] == '禁用'){
+                item['carouselStatus'] = '3'
+            }else if(item['carouselStatus'] == '预分'){
+                item['carouselStatus'] = '4'
+            }
             let is_satis = true;
             for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
@@ -116,6 +149,8 @@ export class CarouselComponent implements OnInit {
             }
             return is_satis;
         })
+        //资源状态列表显示数据转换
+        this.initCarouselStauts();
         if (this.FLT_POS === 1) {
             this.inputFilter(this.render_data);
         } else {

src/app/pages/basic-data/gate/gate.component.ts

@@ -45,6 +45,8 @@ export class GateComponent implements OnInit {
             data => {
                 this.gates = data;
                 this.render_data = data;
+                //资源状态列表显示数据转换
+                this.initGateStatus();
             }
         )
         this.basicDataService.terminal_area_subject.subscribe(
@@ -56,9 +58,11 @@ export class GateComponent implements OnInit {
                 }
             }
         )
-        //航站楼区域数据转换处理
         if(this.render_data){
+            //航站楼区域数据转换处理
             this.basicDataTransHandle();
+            //资源状态列表显示数据转换
+            this.initGateStatus();
         }
         /**
          * 固定表头
@@ -98,9 +102,38 @@ export class GateComponent implements OnInit {
         }
     }
 
+    //资源状态列表显示数据转换
+    initGateStatus(){
+        this.render_data.forEach(element => {
+            if (element['gateStatus'] == '0') {
+                element['gateStatus'] = '可用'
+            }else if(element['gateStatus'] == '1'){
+                element['gateStatus'] = '在用'
+            }else if(element['gateStatus'] == '2'){
+                element['gateStatus'] = '锁定'
+            }else if(element['gateStatus'] == '3'){
+                element['gateStatus'] = '禁用'
+            }else if(element['gateStatus'] == '4'){
+                element['gateStatus'] = '预分'
+            }
+            return element['gateStatus'];
+        });
+    }
+
     //下拉框选择筛选
     selectChange() {
         this.render_data = this.gates.filter(item => {
+            if(item['gateStatus'] == '可用'){
+                item['gateStatus'] = '0'
+            }else if(item['gateStatus'] == '在用'){
+                item['gateStatus'] = '1'
+            }else if(item['gateStatus'] == '锁定'){
+                item['gateStatus'] = '2'
+            }else if(item['gateStatus'] == '禁用'){
+                item['gateStatus'] = '3'
+            }else if(item['gateStatus'] == '预分'){
+                item['gateStatus'] = '4'
+            }
             let is_satis = true;
             for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
@@ -114,7 +147,9 @@ export class GateComponent implements OnInit {
                 }
             }
             return is_satis;
-        })
+        });
+        //资源状态列表显示数据转换
+        this.initGateStatus();
         if (this.FLT_POS === 1) {
             this.inputFilter(this.render_data);
         } else {

src/app/pages/basic-data/stand/stand.component.ts

@@ -49,6 +49,7 @@ export class StandComponent implements OnInit {
             data => {
                 this.stands = data;
                 this.render_data = data;
+                this.initStandStatus();//资源状态列表显示数据转换
             }
         )
         this.basicDataService.terminal_area_subject.subscribe(
@@ -74,6 +75,8 @@ export class StandComponent implements OnInit {
             this.terminalAreasHandle();
             //停机位类别数据转换处理
             this.standTypesHandle();
+            //资源状态列表显示数据转换
+            this.initStandStatus();
         }
         /**
          * 固定表头
@@ -122,9 +125,38 @@ export class StandComponent implements OnInit {
         this.row_state = i;
     }
 
+    //资源状态列表显示数据转换
+    initStandStatus(){
+        this.render_data.forEach(element => {
+            if (element['standStatus'] == '0') {
+                element['standStatus'] = '可用'
+            }else if(element['standStatus'] == '1'){
+                element['standStatus'] = '在用'
+            }else if(element['standStatus'] == '2'){
+                element['standStatus'] = '锁定'
+            }else if(element['standStatus'] == '3'){
+                element['standStatus'] = '禁用'
+            }else if(element['standStatus'] == '4'){
+                element['standStatus'] = '预分'
+            }
+            return element['standStatus'];
+        });
+    }
+
     //下拉框选择筛选
     selectChange() {
         this.render_data = this.stands.filter(item => {
+            if (item['standStatus'] == '可用') {
+                item['standStatus'] = '0'
+            }else if(item['standStatus'] == '在用'){
+                item['standStatus'] = '1'
+            }else if(item['standStatus'] == '锁定'){
+                item['standStatus'] = '2'
+            }else if(item['standStatus'] == '禁用'){
+                item['standStatus'] = '3'
+            }else if(item['standStatus'] == '预分'){
+                item['standStatus'] = '4'
+            }
             let is_satis = true;
             for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
@@ -139,6 +171,7 @@ export class StandComponent implements OnInit {
             }
             return is_satis;
         })
+        this.initStandStatus(); //资源状态列表显示数据转换
         if (this.FLT_POS === 1) {
             this.inputFilter(this.render_data);
         } else {