Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

public/config.js

@@ -3,7 +3,7 @@
  * @Date: 2022-04-25 14:05:21
  * @LastEditTime: 2022-05-06 09:40:40
  * @LastEditors: your name
- * @Description: 
+ * @Description:
  * have a nice day!
  */
 var PLATFROM_CONFIG = {};

src/layout/components/Dialog/index.vue

@@ -8,25 +8,12 @@
 -->
 <template>
   <div class="dialog">
-    <el-dialog
-      :visible.sync="flag"
-      ref="dialogTk"
-      :top="top"
-      :custom-class="customClass"
-      :lock-scroll="false"
-      :modal="modal"
-      :before-close="close"
-      :width="width"
-      :show-close="showFlag"
-    >
-      <div
-        :style="{
+    <el-dialog :visible.sync="flag" ref="dialogTk" :top="top" :custom-class="customClass" :lock-scroll="false" :modal="modal" :before-close="close" :width="width" :show-close="showFlag">
+      <div :style="{
           height: child
             ? this.$store.state.settings.dialogHeight - 96 + 'px'
             : '',
-        }"
-        class="dialog-content"
-      >
+        }" class="dialog-content">
         <slot />
       </div>
     </el-dialog>
@@ -75,7 +62,7 @@ export default {
   // 监听弹框开关
   watch: {
     flag: {
-      handler(val) {
+      handler (val) {
         if (val) {
           this.$nextTick(() => {
             // 获取弹框高度
@@ -94,7 +81,7 @@ export default {
   },
   methods: {
     // 弹框关闭
-    close() {
+    close () {
       this.$emit("closeDialog", false);
     },
   },
@@ -144,7 +131,22 @@ export default {
       .Delfoot {
         background-color: #fff;
       }
-
+      .DelIcon {
+        width: 26px;
+        height: 26px;
+        background: #eb2f3b;
+        border-radius: 50%;
+        margin-right: 15px;
+        background: url("../../../assets/index/ic_close_hint.png") no-repeat;
+        background-size: 100% 100%;
+        display: inline-block;
+        position: relative;
+        top: 6px;
+      }
+      .DelTxt {
+        color: #eb2f3b;
+        margin: 0 6px;
+      }
       .del-content {
         .error {
           color: #eb2f3b;

src/views/BasicsData/views/deployNode/deployNodeHome.vue

@@ -12,7 +12,7 @@
         <div class="Deltitle">删除源数据</div>
         <div class="content er">
           <div class="log">
-            是否确认删除{{ rmObj.locationCode }}？
+            <span class="DelIcon"></span>您确定是否要删除<span class="DelTxt">{{ rmObj.locationCode }}</span>？
           </div>
         </div>
         <div class="DelFoot right t30">
@@ -277,7 +277,7 @@ export default {
             }
           });
         } else {
-          this.$message.error(message);
+          this.$message.error(message ?? '获取节点信息失败');
         }
       } catch (error) {
         console.log(error);

src/views/advancedQuery/views/advancedHome.vue

@@ -8,6 +8,7 @@
             v-model="timeStart"
             size="small"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择开始日期时间"
           />
         </div>
@@ -16,6 +17,7 @@
             v-model="timeEnd"
             size="small"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择结束日期时间"
           />
         </div>
@@ -60,7 +62,13 @@
         stripe
         height="calc(100vh - 155px)"
         style="width: 100%"
+        show-summary
+        :summary-method="summaryRow(tableData.length)"
       >
+        <el-table-column
+          prop="index"
+          label="序号"
+        />
         <el-table-column
           prop="FlightNO"
           label="航班号"
@@ -133,7 +141,7 @@
         </el-table-column>
         <el-table-column
           label="激活"
-           prop="activated"
+          prop="activated"
           :filters="activatedItem"
           :filter-method="filterHandler"
         >
@@ -586,7 +594,10 @@ export default {
           dataContent
         })
         if (res.code == 0) {
-          this.tableData = res.returnData
+          this.tableData = res.returnData.map((item, index) => {
+            item['index'] = index + 1
+            return item
+          })
           this.getTableFilterItem()
         } else {
           this.$message.error(res.message)
@@ -628,6 +639,20 @@ export default {
         latestStatusItemArr = [],
         bagLocationItemArr = [],
         TransferFlightNOItemArr = []
+
+      this.PassengerNameUpcaseItem.length = 0
+      this.FlightNOItem.length = 0
+      this.FlightDateItem.length = 0
+      this.SourceAirportItem.length = 0
+      this.TargetAirportItem.length = 0
+      this.SpecialTypeItem.length = 0
+      this.checkInItem.length = 0
+      this.deletedItem.length = 0
+      this.activatedItem.length = 0
+      this.latestStatusItem.length = 0
+      this.bagLocationItem.length = 0
+      this.TransferFlightNOItem.length = 0
+
       this.tableData.forEach(item => {
         if (PassengerNameUpcaseItemArr.indexOf(item.PassengerNameUpcase) == -1 && item.PassengerNameUpcase != ''&& item.PassengerNameUpcase != null) {
           PassengerNameUpcaseItemArr.push(item.PassengerNameUpcase)
@@ -716,6 +741,13 @@ export default {
           })
         }
       })
+    },
+
+    // 统计行数
+    summaryRow(num) {
+      return function () {
+        return ['合计', `共${num}件`]
+      }
     }
 
     //   //导航栏筛选开始

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

@@ -142,9 +142,8 @@
           :prop="item.statCode"
           :label="item.statName"
           :width="item.width"
-          :formatter="tableFormat"
-          :filters="item.filters"
-          :filter-method="item.filterMethod"
+          :filters="flightBaggageTableFilters[item.statCode]"
+          :filter-method="flightBaggageTableFilters[item.statCode] && filterHandler"
         />
       </el-table>
     </div>
@@ -205,89 +204,75 @@ export default {
         {
           statCode: 'FlightNO',
           statName: '航班号',
-          width: 132,
-          filters:this.bagLocationItem,
-          filterMethod:this.filterHandler
+          width: 100,
         },
         {
           statCode: 'FlightDate',
           statName: '执飞日期',
           width: 105,
-          filters:this.FlightDateItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'PlanDepartureTime',
           statName: '预计起飞时间',
-          width: 115,
-          filters:this.PlanDepartureTimeItemArr,
-          filterMethod:this.filterHandler
+          width: 135,
         },
         {
-          statCode: 'PlanLandingApt',
+          statCode: 'TargetAirport',
           statName: '目的站',
           width: 71,
-          filters:this.PlanLandingAptItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'DepartureBuild',
           statName: '航站楼',
           width: 65,
-          filters:this.DepartureBuildItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'BordingGate',
           statName: '登机口',
           width: 68,
-          filters:this.BordingGateItemArr,
-          filterMethod:this.filterHandler
         },
         {
           statCode: 'StandForDepartrue',
           statName: '停机位',
           width: 60,
-          filters:this.StandForDepartrueItemArr,
-          filterMethod:this.filterHandler
         },
         {
-          statCode: 'passagernum',
+          statCode: 'checkInTravellerNumber',
           statName: '托运旅客',
           width: 88
         },
         {
-          statCode: 'checkin',
-          statName: '值机',
+          statCode: 'checkInNumber',
+          statName: '值机数',
           width: 72
         },
         {
-          statCode: 'not_actived',
+          statCode: 'unActive',
           statName: '未激活',
           width: 76
         },
         {
-          statCode: 'expect_load',
+          statCode: 'preLoad',
           statName: '预计装载',
           width: 101
         },
         {
-          statCode: 'security_all',
+          statCode: 'checkNumber',
           statName: '安检',
           width: 88
         },
         {
-          statCode: 'fenj',
+          statCode: 'sortNumber',
           statName: '分拣',
           width: 83
         },
         {
-          statCode: 'loadcar',
+          statCode: 'loadNumber',
           statName: '装车',
           width: 83
         },
         {
-          statCode: 'loadflight',
+          statCode: 'loadNumber',
           statName: '装机',
           width: 80
         },
@@ -297,17 +282,17 @@ export default {
           width: 79
         },
         {
-          statCode: 'hasfanj',
+          statCode: 'unLoad',
           statName: '已翻减',
           width: 82
         },
         {
-          statCode: 'delbag',
+          statCode: 'noCheckInNumber',
           statName: '取消托运',
           width: 89
         },
         {
-          statCode: 'no_bsm',
+          statCode: 'noBSM',
           statName: '无BSM',
           width: 68
         },
@@ -322,16 +307,20 @@ export default {
           width: 72
         },
         {
-          statCode: 'transfer_all',
+          statCode: 'midIn',
           statName: '中转进行李'
         }
       ],
       AirportList:[],
-      FlightNOItem: [],
-      PlanDepartureTimeItemArr:[],
-      PlanLandingAptItemArr:[],
-      BordingGateItemArr:[],
-      StandForDepartrueItemArr:[]
+      flightBaggageTableFilters:{
+        FlightNO: [],
+        FlightDate:[],
+        PlanDepartureTime:[],
+        TargetAirport:[],
+        BordingGate:[],
+        StandForDepartrue:[]
+      }
+
     }
   },
   created(){
@@ -384,13 +373,15 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
+      let arr = [this.formData.currentAirport,this.formData.startDate,this.formData.endDate]
       try {
         const res = await getQuery({
           id: 66,
-          dataContent:[this.formData.currentAirport,this.formData.startDate,this.formData.endDate]
+          dataContent:[...arr,...arr,...arr,...arr]
         })
         if (res.code == 0) {
          console.log(res)
+         this.initTableData(res.returnData);
         } else {
           this.$message.error(res.message)
         }
@@ -400,9 +391,23 @@ export default {
     },
     initTableData(tableData) {
       tableData.forEach(item => {
-        item['wantfanj'] = item['delbag'] - item['hasfanj']
+        item['waitfanj'] = item['noCheckInNumber'] - item['unLoad']
       })
       this.tableData = this._.sortBy(tableData, ['FlightDate', 'PlanDepartureTime'])
+      this.setTableFilters()
+    },
+    // 表格添加过滤条件
+    setTableFilters() {
+      this.tableData.forEach(item => {
+        Object.keys(this.flightBaggageTableFilters).forEach(key => {
+          if ((item[key] ?? '') !== '' && this.flightBaggageTableFilters[key].every(obj => obj.value !== item[key])) {
+            this.flightBaggageTableFilters[key].push({
+              text: item[key],
+              value: item[key]
+            })
+          }
+        })
+      })
     },
     filterHandler(value, row, column) {
       const property = column['property']

src/views/baggageManagement/mixins/form.js

@@ -172,7 +172,7 @@ export default {
     },
     // 日期限制
     setStartDate(val) {
-      this.formClear('all')
+      // this.formClear('all')
       if (!val) {
         return
       }
@@ -181,13 +181,13 @@ export default {
         this.$message.error('结束时间不能小于开始时间，请重新选择')
         return false
       } else {
-        // this.getFormData(params)
-        this.currentAirportQuery()
+        this.getTableData()
+        // this.currentAirportQuery()
         return true
       }
     },
     setEndDate(val) {
-      this.formClear('all')
+      // this.formClear('all')
       if (!val) {
         return
       }
@@ -196,8 +196,8 @@ export default {
         this.$message.error('结束时间不能小于开始时间，请重新选择')
         return false
       } else {
-        // this.getFormData(params)
-        this.currentAirportQuery()
+        this.getTableData()
+        // this.currentAirportQuery()
         return true
       }
     },

src/views/baggageManagement/mixins/terminal.js

@@ -98,17 +98,16 @@ export default {
             // 需要计算的列
             [
               'passagernum',
-              'checkin',
+              'checkNumber',
               'not_actived',
               'expect_load',
               'security_all',
-              'fenj',
-              'loadcar',
-              'loadflight',
+              'sortNumber',
+              'loadNumber',
               'waitfanj',
-              'hasfanj',
+              'unLoad',
               'delbag',
-              'no_bsm',
+              'noBSM',
               'transfer_all',
               'reach',
               'did_not_arrive',
@@ -121,7 +120,15 @@ export default {
               'delivered',
               'not_shipped',
               'container',
-              'bulk'
+              'bulk',
+              'checkInTravellerNumber',
+              'checkInNumber',
+              'unActive',
+              'preLoad',
+              'noCheckInNumber',
+              'midIn',
+
+
             ].includes(column.property)
           ) {
             const values = data.map(item => Number(item[column.property]))
@@ -148,9 +155,10 @@ export default {
     // 表格行点击跳转
     rowClick(row, column, event) {
       this.$router.push({
-        path: `/${this.$route.path.split('/').slice(1, -1).join('/')}/flightView`,
+        path: `${this.$route.path}/flightView`,
         query: row
       })
+      // this.$router.push({ path: '/departure/flightView', query: row })
     },
     // 全部机场查询
     async currentAirportQuery() {