1234

src/views/newBagDetails/index.vue

@@ -198,6 +198,8 @@ export default {
           this.PNRNO = datasObj['PNRNO']
           const { luggageNum, PNRNO, carrierFlightsDate, ID } = datasObj
           this.bagID = ID
+          let bagColsMapOld = JSON.parse(localStorage.getItem('bagColsMap')) || {}
+          let bagColsMapNew = {}
           for (const key in datasObj) {
             this.msgs1.map(item => {
               if (item.columnName == key) {
@@ -207,7 +209,19 @@ export default {
                 item.value = datasObj[key] == 0 ? 'Y' : 'N'
               }
             })
+            if(bagColsMapOld.bagColsLists && bagColsMapOld.bagColsLists.length){
+              bagColsMapOld.bagColsLists.map(item => {
+                if (item.columnName == key) {
+                  item.value = datasObj[key] != 0 && datasObj[key] != 1 ? datasObj[key] : datasObj[key] == 0 ? 'N' : 'Y'
+                }
+                if (item.columnName == 'activeState' && key == 'activeState') {
+                  item.value = datasObj[key] == 0 ? 'Y' : 'N'
+                }
+                localStorage.setItem('bagColsMap', JSON.stringify(bagColsMapOld))
+              })
+            }
           }
+
           this.setBagInfo()
           if (!checkParams) {
             this.getLuggageNums()
@@ -461,4 +475,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/statisticsCharts/components/newPieStatisticsCharts.vue

@@ -354,7 +354,7 @@ export default {
           dataContentList = [dataContent]
           break
         case '基地分公司':
-          serviceId = SERVICE_ID.flightClassificationAll
+          serviceId = SERVICE_ID.flightClassificationByAirline
           dataContentList = [
             {
               ...dataContent,
@@ -425,6 +425,7 @@ export default {
       this.getMultipleChartsData(serviceId, dataContentList)
     },
     async getMultipleChartsData(serviceId, dataContentList) {
+      console.log(dataContentList)
       try {
         const listValuesArray = await Promise.all(
           dataContentList.map(dataContent =>

src/views/statisticsCharts/components/newStatisticsHeader.vue

@@ -97,10 +97,10 @@ export default {
               value: '全部',
               label: '全部',
             },
-            {
-              value: '航线',
-              label: '航线',
-            },
+            // {
+            //   value: '航线',
+            //   label: '航线',
+            // },
             {
               value: '基地分公司',
               label: '基地分公司',
@@ -117,7 +117,7 @@ export default {
           changeHandler (value) {
             this.setInOrOutOptions(value)
             const rangeMap = {
-              航线: 'airline',
+              // 航线: 'airline',
               基地分公司: 'area',
               航站: 'airport',
               航站楼: 'terminal',
@@ -133,14 +133,14 @@ export default {
             })
           },
         },
-        {
-          prop: 'inOrOut',
-          inputType: 'select',
-          placeholder: '进离港',
-          requiredWarning: '请先选择进离港',
-          // clearable: true,
-          options: [],
-        },
+        // {
+        //   prop: 'inOrOut',
+        //   inputType: 'select',
+        //   placeholder: '进离港',
+        //   requiredWarning: '请先选择进离港',
+        //   // clearable: true,
+        //   options: [],
+        // },
         {
           prop: 'interval',
           inputType: 'select',
@@ -173,19 +173,19 @@ export default {
           width: '240px',
           requiredWarning: '请先选择统计时间范围',
         },
-        {
-          prop: 'airline',
-          inputType: 'select',
-          placeholder: '航线',
-          width: '180px',
-          filterable: true,
-          // clearable: true,
-          multiple: true,
-          disabled: true,
-          queryId: SERVICE_ID.airlineOptionsNew,
-          setKey: 'air_line',
-          options: [],
-        },
+        // {
+        //   prop: 'airline',
+        //   inputType: 'select',
+        //   placeholder: '航线',
+        //   width: '180px',
+        //   filterable: true,
+        //   // clearable: true,
+        //   multiple: true,
+        //   disabled: true,
+        //   queryId: SERVICE_ID.airlineOptionsNew,
+        //   setKey: 'air_line',
+        //   options: [],
+        // },
         {
           prop: 'area',
           inputType: 'select',