chenrui  2 år sedan
förälder
incheckning
7e5f19dce8

+ 1 - 1
src/router/index.js

@@ -16,7 +16,7 @@ Vue.use(Router)
 // import Layout from '@/layout'
 import routesOne from './routes/routes-file-one'
 import routesTwo from './routes/routes-file-two'
-import routesThree from './routes/routes-file-three'
+// import routesThree from './routes/routes-file-three'
 import routesFileFour from './routes/routes-file-four'
 import routesFive from './routes/routes-file-five'
 import routesFileSix from './routes/routes-file-six'

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 621 - 264
src/views/baggageManagement/components/baggage/index copy.vue


+ 5 - 6
src/views/baggageManagement/components/baggage/index.vue

@@ -663,7 +663,7 @@ export default {
       this.hoveredRow = row
     },
     cellMouseLeaveHandler() {
-      // this.hoveredRow = null
+      this.hoveredRow = null
     },
     exportHandler(refName, tableName) {
       const table = this.$refs[refName].$el.cloneNode(true)
@@ -727,9 +727,10 @@ export default {
           baggageBasicInfo[0].flightNO = flightNO
           this.baggageBasicInfo = baggageBasicInfo[0]
         }
+        const stepData = new Array(9).fill({})
         this.baggageTableData = baggageDetails.map((item, index) => {
           const { hover, tableHover } = this.stepData[index] ?? {}
-          this.stepData.splice(index, 1, {
+          stepData.splice(index, 1, {
             NodeNameEN: item.nodeCode,
             DealTime: item.dealTime?.replace('T', '\n'),
             resourceFile: item.resourceFile,
@@ -755,6 +756,7 @@ export default {
           }
           return item
         })
+        this.stepData = stepData
         this.initTableData(this.baggageTableData)
       } catch (error) {
         console.log('出错了', error.message || error)
@@ -765,10 +767,7 @@ export default {
       const dataContent = [flightNO, flightDate, bagSN]
       try {
         const result = await this.queryMessage(dataContent)
-        this.messageList = result.map(message => {
-          // message.dataContent = JSON.parse(message.dataContent).dataContent
-          return message
-        })
+        this.messageList = this._.sortBy(result, 'date')
       } catch (error) {
         console.log('出错了', error.message || error)
       }

+ 1 - 2
src/views/baggageManagement/components/departure/index.vue

@@ -363,7 +363,7 @@ export default {
           desc: '指已在分拣口装车完成的行李数量,含取消托运的行李数量'
         },
         {
-          prop: 'landingNumber',
+          prop: 'boardID',
           label: '装机',
           desc: '指装机完成的行李数量,不含取消托运的行李数量'
         },
@@ -555,7 +555,6 @@ export default {
         if (item['hasTakeOff'] === 1 && !item['flightCanceled']) {
           this.leaveCount++
         }
-        item['landingNumber'] = item['landingNumber'] ?? 0
         this.baggageCount = this.baggageCount + item.preLoad
       })
       this.tableData = this._.orderBy(tableData, ['hasTakeOff', 'planDepartureTime'], ['desc', 'asc'])

+ 1 - 2
src/views/baggageManagement/components/departureC/index.vue

@@ -356,7 +356,7 @@ export default {
           desc: '指已在分拣口装车完成的行李数量,含取消托运的行李数量'
         },
         {
-          prop: 'landingNumber',
+          prop: 'boardID',
           label: '装机',
           desc: '指装机完成的行李数量,不含取消托运的行李数量'
         },
@@ -577,7 +577,6 @@ export default {
         if (item['hasTakeOff'] === 1 && !item['flightCanceled']) {
           this.leaveCount++
         }
-        item['landingNumber'] = item['landingNumber'] ?? 0
         this.baggageCount = this.baggageCount + item.preLoad
       })
       this.tableData = this._.orderBy(tableData, ['hasTakeOff', 'planDepartureTime'], ['desc', 'asc'])

+ 5 - 5
src/views/baggageManagement/mixins/terminal.js

@@ -131,7 +131,7 @@ export default {
               'security_all',
               'sortNumber',
               'loadNumber',
-              'landingNumber',
+              'boardID',
               'tounLoad',
               'unLoad',
               'delbag',
@@ -214,7 +214,7 @@ export default {
           'checkNumber',
           'sortNumber',
           'loadNumber',
-          'landingNumber',
+          'boardID',
           // 'checkIns',
           'noBSM'
         ].includes(column.property) &&
@@ -256,7 +256,7 @@ export default {
           'checkNumber',
           'sortNumber',
           'loadNumber',
-          'landingNumber',
+          'boardID',
           // 'checkIns',
           'noBSM'
         ].includes(column.property)
@@ -446,12 +446,12 @@ export default {
         case 'checkNumber':
         case 'sortNumber':
         case 'loadNumber':
-        case 'landingNumber': {
+        case 'boardID': {
           const reflect = {
             checkNumber: '安检',
             sortNumber: '分拣',
             loadNumber: '装车',
-            landingNumber: '装机'
+            boardID: '装机'
           }
           this.$router.push({
             path: '/advance',

+ 2 - 3
src/views/statisticsCharts/components/statisticsTabs.vue

@@ -22,7 +22,7 @@
             <el-dropdown-item
               v-for="(childTab, childIndex) in tab.children"
               :key="childIndex"
-              :command="{ path: childTab.path, parentIndex: index }"
+              :command="childTab.path"
               >{{ childTab.title }}</el-dropdown-item
             >
           </el-dropdown-menu>
@@ -151,8 +151,7 @@ export default {
     },
   },
   methods: {
-    commandHandler({ path, parentIndex }) {
-      this.activeIndex = parentIndex;
+    commandHandler(path) {
       this.$router.push({
         path,
       });

Vissa filer visades inte eftersom för många filer har ändrats