接口格式修改

src/layout/components/Navbar.vue

@@ -66,7 +66,7 @@ export default {
       newData: '',
       breadList: this.getBreadcrumb(),
       getTimeInterval: null,
-      imgSrc: PLATFROM_CONFIG.baseURLCA + sessionStorage.getItem('appLog'),
+      imgSrc: window.location.origin + sessionStorage.getItem('appLog'),
       pageTitle: sessionStorage.getItem('appName'),
       name: sessionStorage.getItem('userName')
     }

src/views/baggageManagementTemp/components/arrival/index.vue

@@ -280,6 +280,7 @@ import terminalMixin from '../../mixins/terminal'
 import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
+import pf from '@/layout/mixin/publicFunc'
 import { TempQuery } from '@/api/temp'
 import TableHeaderCell from '@/components/TableHeaderCell'
 import { setTableFilters, throttledExportToExcel } from '@/utils/table'
@@ -287,7 +288,7 @@ import { setTableFilters, throttledExportToExcel } from '@/utils/table'
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
-  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
+  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin, pf],
   data() {
     return {
       orderNum: ['0', '0', '0', '0', '0', '0'], // 默认总数
@@ -531,10 +532,11 @@ export default {
     // 选择机场
     async getAirPortData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.arrivalAirId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.arrivalAirId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.arrivalAirId, {}, 1, 9999, 278)
         if (Number(res.code) === 0) {
           this.AirportList = this._.orderBy(res.returnData.listValues, o => o.planLandingApt)
           this.formData.currentAirport = 'PEK'
@@ -587,13 +589,13 @@ export default {
       }
       const arr = [this.formData.currentAirport, this.startDate, this.endDate]
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.arrivalTableId,
-          dataContent: [...arr, ...arr, ...arr]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.arrivalTableId,
+        //   dataContent: [...arr, ...arr, ...arr]
+        // })
+        const res = await this.getQueryList(SERVICE_ID.arrivalTableId, { landingAirport: arr[0], flightDateBegin: arr[1], flightDateEnd: arr[2] }, 1, 9999)
         if (Number(res.code) === 0) {
           this.initTableData(res.returnData.listValues)
-        } else {
         }
         this.loading = false
       } catch (error) {
@@ -619,7 +621,7 @@ export default {
         } else {
           item['hasArrived'] = false
         }
-        this.baggageCount = this.baggageCount + item.projectedLoad
+        this.baggageCount = this.baggageCount + Number(item.projectedLoad)
       })
       this.tableData = this._.orderBy(tableData, ['hasArrived', 'arrivalTime'], ['desc', 'asc'])
       setTableFilters(this.tableData, this.tableDataFilters)

src/views/baggageManagementTemp/components/departure/index.vue

@@ -426,10 +426,9 @@ export default {
         //   id: SERVICE_ID.departureTableMainId,
         //   dataContent: [...arr, ...arr, ...arr]
         // })
-        const res = await this.getQueryListAuth(SERVICE_ID.departureTableMainId, { departureAirport: arr[0], beginDate: arr[1], endDate: arr[2] }, 1, 9999, 276)
+        const res = await this.getQueryList(SERVICE_ID.departureTableMainId, { departureAirport: arr[0], beginDate: arr[1], endDate: arr[2] }, 1, 9999)
         if (Number(res.code) === 0) {
           this.initTableData(res.returnData.listValues)
-        } else {
         }
         this.loading = false
       } catch (error) {
@@ -495,7 +494,7 @@ export default {
             }
           })
         }
-        this.baggageCount = this.baggageCount + item.preLoad
+        this.baggageCount = this.baggageCount + Number(item.preLoad)
       })
       this.tableData = this._.orderBy(tableData, ['hasTakeOff', 'planDepartureTime'], ['desc', 'asc'])
       setTableFilters(this.tableData, this.tableDataFilters)

src/views/baggageManagementTemp/components/transferArrival/index.vue

@@ -325,6 +325,7 @@ import terminalMixin from '../../mixins/terminal'
 import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
+import pf from '@/layout/mixin/publicFunc'
 import { TempQuery } from '@/api/temp'
 import { GeneralDataReception } from '@/api/temp'
 import TableHeaderCell from '@/components/TableHeaderCell'
@@ -334,7 +335,7 @@ import { mapGetters } from 'vuex'
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
-  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
+  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin, pf],
   data() {
     return {
       optionProps: {
@@ -586,10 +587,11 @@ export default {
   methods: {
     async getWarningData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureWarningId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureWarningId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryList(SERVICE_ID.departureWarningId, {}, 1, 999)
         if (Number(res.code) === 0) {
           const { listValues } = res.returnData
           this.WarningData = listValues
@@ -651,10 +653,11 @@ export default {
     // 选择机场
     async getAirPortData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAirId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAirId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAirId, {}, 1, 9999, 280)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData.listValues
           this.formData.currentAirport = 'PEK'
@@ -671,10 +674,11 @@ export default {
     // 选择航司
     async getAviationData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAviJoinId,
-          dataContent: [this.formData.currentAirport]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAviJoinId,
+        //   dataContent: [this.formData.currentAirport]
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAviJoinId, {}, 1, 9999, 281)
         if (Number(res.code) === 0) {
           this.carrierProps = res.returnData.listValues
         } else {
@@ -687,10 +691,11 @@ export default {
     // 选择航司
     async upAviationData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAviLeaveId,
-          dataContent: [this.formData.currentAirport]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAviLeaveId,
+        //   dataContent: [this.formData.currentAirport]
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAviLeaveId, {}, 1, 9999, 281)
         if (Number(res.code) === 0) {
           this.carrierPropsop = res.returnData.listValues
         } else {
@@ -715,28 +720,29 @@ export default {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
-      const arrs1 = [this.formData.inboundCarrier.length === 0 ? '' : this.formData.inboundCarrier[0]]
-      const arrs2 = [this.formData.outgoingAirline.length === 0 ? '' : this.formData.outgoingAirline[0]]
-      const arr = [
-        this.formData.currentAirport,
-        this.startDate,
-        this.endDate,
-        ...arrs1,
-        ...arrs1,
-        ...arrs1,
-        ...arrs2,
-        ...arrs2,
-        ...arrs2
-        // this.formData.inboundCarrier,
-        // this.formData.outgoingAirline,
-        // JSON.stringify(this.formData.inboundCarrier),
-        // JSON.stringify(this.formData.outgoingAirline),
-      ]
+      // const arrs1 = [this.formData.inboundCarrier.length === 0 ? '' : this.formData.inboundCarrier[0]]
+      // const arrs2 = [this.formData.outgoingAirline.length === 0 ? '' : this.formData.outgoingAirline[0]]
+      // const arr = [
+      //   this.formData.currentAirport,
+      //   this.startDate,
+      //   this.endDate,
+      //   ...arrs1,
+      //   ...arrs1,
+      //   ...arrs1,
+      //   ...arrs2,
+      //   ...arrs2,
+      //   ...arrs2
+      //   // this.formData.inboundCarrier,
+      //   // this.formData.outgoingAirline,
+      //   // JSON.stringify(this.formData.inboundCarrier),
+      //   // JSON.stringify(this.formData.outgoingAirline),
+      // ]
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureTableId,
-          dataContent: [...arr]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureTableId,
+        //   dataContent: [...arr]
+        // })
+        const res = await this.getQueryList(SERVICE_ID.departureTableId, { departureAirport: this.formData.currentAirport, flightDateStart: this.startDate, flightDateEnd: this.endDate, inFlightNO: null, flightNO: null }, 1, 9999)
         if (Number(res.code) === 0) {
           this.initTableData(res.returnData.listValues)
         } else {
@@ -809,7 +815,7 @@ export default {
             }
           })
         }
-        this.baggageCount = this.baggageCount + item.inTransferBaggageCount
+        this.baggageCount = this.baggageCount + Number(item.inTransferBaggageCount)
       })
       this.tableData = this._.sortBy(tableData, ['actualLandingTime', 'preFlightNO', 'actualDepartureTime', 'flightNO'])
       setTableFilters(this.tableData, this.tableDataFilters)

src/views/baggageManagementTemp/components/transferDeparture/index.vue

@@ -324,6 +324,7 @@ import terminalMixin from '../../mixins/terminal'
 import formMixin from '../../mixins/form'
 import tableColsMixin from '../../mixins/tableCols'
 import timeZoneMixin from '../../mixins/timeZone'
+import pf from '@/layout/mixin/publicFunc'
 import { TempQuery } from '@/api/temp'
 import { GeneralDataReception } from '@/api/temp'
 import TableHeaderCell from '@/components/TableHeaderCell'
@@ -333,7 +334,7 @@ import { mapGetters } from 'vuex'
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog, TimeZoneSelector, TableHeaderCell },
-  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin],
+  mixins: [terminalMixin, formMixin, tableColsMixin, timeZoneMixin, pf],
   data() {
     return {
       optionProps: {
@@ -560,10 +561,11 @@ export default {
   methods: {
     async getWarningData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureWarningId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureWarningId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryList(SERVICE_ID.departureWarningId, {}, 1, 999)
         if (Number(res.code) === 0) {
           const { listValues } = res.returnData
           this.WarningData = listValues
@@ -625,10 +627,11 @@ export default {
     // 选择机场
     async getAirPortData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAirLtId,
-          dataContent: []
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAirLtId,
+        //   dataContent: []
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAirLtId, {}, 1, 9999, 280)
         if (Number(res.code) === 0) {
           this.AirportList = res.returnData.listValues
           this.formData.currentAirport = 'PEK'
@@ -645,10 +648,11 @@ export default {
     // 选择航司
     async getAviationData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAviJoinLtId,
-          dataContent: [this.formData.currentAirport]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAviJoinLtId,
+        //   dataContent: [this.formData.currentAirport]
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAviJoinLtId, {}, 1, 9999, 281)
         if (Number(res.code) === 0) {
           this.carrierProps = res.returnData.listValues
         } else {
@@ -661,10 +665,11 @@ export default {
     // 选择航司
     async upAviationData() {
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureAviLeaveLtId,
-          dataContent: [this.formData.currentAirport]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureAviLeaveLtId,
+        //   dataContent: [this.formData.currentAirport]
+        // })
+        const res = await this.getQueryListAuth(SERVICE_ID.departureAviLeaveLtId, {}, 1, 9999, 281)
         if (Number(res.code) === 0) {
           this.carrierPropsop = res.returnData.listValues
         } else {
@@ -689,28 +694,29 @@ export default {
       if (!this.formData.currentAirport || !this.startDate || !this.endDate) {
         return
       }
-      const arrs1 = [this.formData.inboundCarrier.length === 0 ? '' : this.formData.inboundCarrier[0]]
-      const arrs2 = [this.formData.outgoingAirline.length === 0 ? '' : this.formData.outgoingAirline[0]]
-      const arr = [
-        this.formData.currentAirport,
-        this.startDate,
-        this.endDate,
-        ...arrs1,
-        ...arrs1,
-        ...arrs1,
-        ...arrs2,
-        ...arrs2,
-        ...arrs2
-        // this.formData.inboundCarrier,
-        // this.formData.outgoingAirline,
-        // JSON.stringify(this.formData.inboundCarrier),
-        // JSON.stringify(this.formData.outgoingAirline),
-      ]
+      // const arrs1 = [this.formData.inboundCarrier.length === 0 ? '' : this.formData.inboundCarrier[0]]
+      // const arrs2 = [this.formData.outgoingAirline.length === 0 ? '' : this.formData.outgoingAirline[0]]
+      // const arr = [
+      //   this.formData.currentAirport,
+      //   this.startDate,
+      //   this.endDate,
+      //   ...arrs1,
+      //   ...arrs1,
+      //   ...arrs1,
+      //   ...arrs2,
+      //   ...arrs2,
+      //   ...arrs2
+      //   // this.formData.inboundCarrier,
+      //   // this.formData.outgoingAirline,
+      //   // JSON.stringify(this.formData.inboundCarrier),
+      //   // JSON.stringify(this.formData.outgoingAirline),
+      // ]
       try {
-        const res = await TempQuery({
-          id: SERVICE_ID.departureTableLtId,
-          dataContent: [...arr]
-        })
+        // const res = await TempQuery({
+        //   id: SERVICE_ID.departureTableLtId,
+        //   dataContent: [...arr]
+        // })
+        const res = await this.getQueryList(SERVICE_ID.departureTableLtId, { departureAirport: this.formData.currentAirport, flightDateStart: this.startDate, flightDateEnd: this.endDate, inFlightNO: null, flightNO: null }, 1, 9999)
         if (Number(res.code) === 0) {
           this.initTableData(res.returnData.listValues)
         } else {
@@ -779,7 +785,7 @@ export default {
             }
           })
         }
-        this.baggageCount = this.baggageCount + item.outTransferBaggageCount
+        this.baggageCount = this.baggageCount + Number(item.outTransferBaggageCount)
       })
       this.tableData = this._.sortBy(tableData, ['actualDepartureTime', 'flightNO', 'actualLandingTime', 'preFlightNO'])
       setTableFilters(this.tableData, this.tableDataFilters)

src/views/flightViewManagement/components/arrival/index.vue

@@ -478,7 +478,7 @@ export default {
         if (this.hasArrived(item)) {
           this.arrivalCount++;
         }
-        this.baggageCount = this.baggageCount + item.projectedLoad;
+        this.baggageCount = this.baggageCount + Number(item.projectedLoad);
       });
       this.tableData = this._.orderBy(tableData, ["hasArrived", "arrivalTime"], ["desc", "asc"]);
       setTableFilters(this.tableData, this.tableDataFilters);

src/views/flightViewManagement/components/departure/index.vue

@@ -499,7 +499,7 @@ export default {
             }
           });
         }
-        this.baggageCount = this.baggageCount + item.preLoad;
+        this.baggageCount = this.baggageCount + Number(item.preLoad);
       });
       this.tableData = this._.orderBy(tableData, ["hasTakeOff", "planDepartureTime"], ["desc", "asc"]);
       setTableFilters(this.tableData, this.tableDataFilters);

src/views/login/index.vue

@@ -89,7 +89,7 @@ export default {
       })
       if (code == 0 && isValue(returnData)) {
         const { app_log, app_name, app_token, active_duration, app_code_rule } = returnData;
-        this.imgSrc = PLATFROM_CONFIG.baseURLCA + app_log
+        this.imgSrc = window.location.origin + app_log
         this.pageTitle = app_name
         this.isCode = app_code_rule
         setCodeToken(app_token);