1.0高级查询-查询传参修改

src/utils/table.js

@@ -243,7 +243,7 @@ export function exportToExcel(table, tableName, fileName, headerRowNumber = 1) {
         } else {
           cellStyle.alignment.horizontal = 'left'
           
-          const isNumber = !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
+          const isNumber = /^[^0]/.test(cellValue) && !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
           if (isNumber) {
             xlsxDatas[cellName] = {
               ...xlsxDatas[cellName],

src/views/advancedQuery/views/advancedHome.vue

@@ -1004,15 +1004,15 @@ export default {
         'checkInSequence',
         'transferArrival',
         'transferDeparture',
+        'loadType',
         'U_Device_ID',
-        'unLoad',
         'checkIn',
         'active',
         'transferIn',
         'canceled',
         'status',
         'noBSM',
-        'loadType'
+        'unLoad',
       )
       const azNum = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$/
       // const top2 = /^[a-zA-Z]{2}\w*$/
@@ -1074,11 +1074,11 @@ export default {
         if (key === 'baggageNO') {
           dataContent[key] = baggageFormat(this.form[key]) || null
         } else if (key === 'specialType') {
-          dataContent[key] = this.form[key].join() || null
+          dataContent[key] = this.form[key].join('/') || null
         } else if (key === 'checkInSequence') {
           dataContent[key] = digitFormat(this.form[key]) || null
         } else {
-          dataContent[key] = this.form[key] || null
+          dataContent[key] = (this.form[key] ?? '') !== '' ? this.form[key] : null
         }
       })
       this.dataContent[0] = {
@@ -1098,7 +1098,7 @@ export default {
           // needPage: ++this.page,
           serviceId: SERVICE_ID.advancedQueryId,
           page: ++this.page,
-          size: 50,
+          pageSize: 50,
           dataContent,
         })
         if (Number(code) !== 0) {
@@ -1143,7 +1143,6 @@ export default {
               }
             }
           }
-          console.log(result)
           this.tableData = [...this.tableData, ...result]
           setTableFilters(this.tableData, this.tableDataFilters)
         } else {

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

@@ -351,7 +351,7 @@ export default {
       const classes = []
       if (row['isDEL'] === 'DEL') {
         classes.push('bgl-deleted')
-        if (row['waitOFF'] === 1) {
+        if (String(row['waitOFF']) === '1') {
           classes.push('bgl-toUnload')
         }
       }
@@ -456,7 +456,7 @@ export default {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
         case 'activeState':
-          return Number(cellValue) === 1 ? '激活' : '未激活'
+          return String(cellValue) === '1' ? '激活' : '未激活'
         default:
           return cellValue ?? ''
       }

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

@@ -368,7 +368,7 @@ export default {
         case 'isDEL':
           return cellValue === 'DEL' ? '删除' : ''
         case 'activeState':
-          return Number(cellValue) === 1 ? '激活' : '未激活'
+          return String(cellValue) === '1' ? '激活' : '未激活'
         default:
           return cellValue ?? ''
       }

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

@@ -568,7 +568,7 @@ export default {
           case 'arrivedID':
           case 'unloadID':
           case 'NOBSM':
-            return row[key] === 1
+            return String(row[key]) === '1'
           case 'unActive':
             return row['STATUS'] === 'I'
           case 'preLoad':
@@ -576,15 +576,15 @@ export default {
           case 'loaded':
             return row['loadTime'] && row['isDEL'] !== 'DEL'
           case 'destination':
-            return row['arrivedID'] === 1 && !row['transferFlightNO']
+            return String(row['arrivedID']) === '1' && !row['transferFlightNO']
           case 'inContainer':
             return row['U_Device_ID'] && row['U_Device_ID'] !== 'FBULK'
           case 'FBULK':
             return row['U_Device_ID'] === 'FBULK'
           case 'toUnload':
-            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && row['waitOFF'] === 1
+            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && String(row['waitOFF']) === '1'
           case 'unloaded':
-            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && row['waitOFF'] !== 1
+            return (row['loadTime'] || row['inflTime']) && row['isDEL'] === 'DEL' && String(row['waitOFF']) !== '1'
           case 'canceled':
             return row['isDEL'] === 'DEL'
           case 'inFlightNO':
@@ -1102,7 +1102,7 @@ export default {
         this.containerTableData = containerTableDataData
         this.warningContainers = []
         this.flightBaggageTableData = flightBaggageTableData.map(item => {
-          if ((item['loadTime'] || item['inflTime']) && item['isDEL'] === 'DEL' && item['waitOFF'] === 1) {
+          if ((item['loadTime'] || item['inflTime']) && item['isDEL'] === 'DEL' && String(item['waitOFF']) === '1') {
             this.warningContainers.push(item['U_Device_ID'])
           }
           return item

src/views/newQuery/components/table.vue

@@ -58,7 +58,7 @@
 import pf from '@/layout/mixin/publicFunc'
 import { getToken } from '@/utils/auth'
 import { getAuthData, formatOrder } from '@/utils/validate'
-import { throttledExportToExcel } from '@/utils/table'
+import { exportToExcel } from '@/utils/table'
 import tableColsMixin from '../mix/tableCols'
 import Dialog from '@/layout/components/Dialog/index.vue'
 import TableHeaderCell from '@/components/TableHeaderCell/index.vue'
@@ -564,7 +564,7 @@ export default {
     exportHandler () {
       const table = this.$refs['table'].$el.cloneNode(true)
       const fileName = `${this.downName || this.AqueryParams.auth_name}.xlsx`
-      throttledExportToExcel(table, `${this.downName || this.AqueryParams.auth_name}`, fileName)
+      exportToExcel(table, `${this.downName || this.AqueryParams.auth_name}`, fileName)
     },
     formatter (row, column, cellValue, index) {
       const sameColumn = this.tableCols.find(

src/views/statisticsCharts/components/commonBarStatisticsCharts.vue

@@ -535,7 +535,7 @@ export default {
             cellStyle.alignment.horizontal = 'left'
           }
           const cellValue = sheet[key].v
-          const isNumber = !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
+          const isNumber = /^[^0]/.test(cellValue) && !isNaN(parseFloat(cellValue)) && isFinite(cellValue)
           const isPercentage = /^[0-9]+(\.[0-9]+){0,1}\%$/.test(cellValue)
           if (isNumber) {
             sheet[key] = {