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

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-07 14:23:56
+ * @LastEditTime: 2022-05-07 15:56:23
  * @LastEditors: your name
  * @Description: 行李视图
 -->
@@ -327,6 +327,10 @@ export default {
         {
           label: '赔偿标记',
           content: 'compensationSign'
+        },
+        {
+          label: '异常状态',
+          content: 'bagExcType'
         }
       ],
       baggageBasicInfo: {},

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zk
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-03-15 16:21:43
+ * @LastEditTime: 2022-05-07 16:04:52
  * @LastEditors: your name
  * @Description: 离港01
 -->
@@ -29,13 +29,17 @@
             filterable
             @change="setCurrentAirport"
           /> -->
-          <el-select v-model="formData.currentAirport"  @change="airPortChange" placeholder="请选择机场">
+          <el-select
+            v-model="formData.currentAirport"
+            @change="airPortChange"
+            placeholder="请选择机场"
+          >
             <el-option
               v-for="(item,index) in AirportList"
               :key="index"
               :label="item.PlanDepartureApt"
               :value="item.PlanDepartureApt"
-             >
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -62,55 +66,55 @@
           />
         </el-form-item>
         <div style="float:right">
-            <el-form-item prop="search">
-          <el-input
-            v-model="formData.search"
-            style="width:240px;margin-left:105px;"
-            size="small"
-            placeholder="请输入内容"
-            prefix-icon="el-icon-search"
-            clearable
-            @clear="inputClear"
-            @keyup.enter="onSubmit"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            size="small"
-            type="primary"
-            @click="onSubmit"
-          >搜索</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-switch
-            v-model="formData.switch"
-            style="margin-left:40px;"
-            active-text="显示中转"
-          />
-        </el-form-item>
-        <el-form-item v-is="['i_timeIcon']">
-          <el-dropdown>
+          <el-form-item prop="search">
+            <el-input
+              v-model="formData.search"
+              style="width:240px;margin-left:105px;"
+              size="small"
+              placeholder="请输入内容"
+              prefix-icon="el-icon-search"
+              clearable
+              @clear="inputClear"
+              @keyup.enter="onSubmit"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              size="small"
+              type="primary"
+              @click="onSubmit"
+            >搜索</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-switch
+              v-model="formData.switch"
+              style="margin-left:40px;"
+              active-text="显示中转"
+            />
+          </el-form-item>
+          <el-form-item v-is="['i_timeIcon']">
+            <el-dropdown>
+              <img
+                class="checkTime msgImg"
+                src="../../../../assets/departure/ic_time.png"
+              >
+              <el-dropdown-menu
+                slot="dropdown"
+                class="time-zone"
+              >
+                <el-dropdown-item>国内Local/国际UTC</el-dropdown-item>
+                <el-dropdown-item>Local</el-dropdown-item>
+                <el-dropdown-item>UTC</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+          <el-form-item v-is="['i_columnSettings']">
             <img
-              class="checkTime msgImg"
-              src="../../../../assets/departure/ic_time.png"
-            >
-            <el-dropdown-menu
-              slot="dropdown"
-              class="time-zone"
+              class="msgImg"
+              src="../../../../assets/departure/ic_setting.png"
+              @click="show"
             >
-              <el-dropdown-item>国内Local/国际UTC</el-dropdown-item>
-              <el-dropdown-item>Local</el-dropdown-item>
-              <el-dropdown-item>UTC</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </el-form-item>
-        <el-form-item v-is="['i_columnSettings']">
-          <img
-            class="msgImg"
-            src="../../../../assets/departure/ic_setting.png"
-            @click="show"
-          >
-        </el-form-item>
+          </el-form-item>
         </div>
 
       </el-form>
@@ -197,7 +201,7 @@ import { getQuery } from '@/api/flight'
 export default {
   name: 'DepartureTerminalView',
   components: { Dialog },
-  mixins: [terminalMixin,formMixin, tableColsMixin],
+  mixins: [terminalMixin, formMixin, tableColsMixin],
   data() {
     return {
       // 初始表头
@@ -205,145 +209,126 @@ export default {
         {
           statCode: 'FlightNO',
           statName: '航班号',
-          width: 100,
+          width: 80
         },
         {
           statCode: 'FlightDate',
           statName: '执飞日期',
-          width: 105,
+          width: 105
         },
         {
           statCode: 'PlanDepartureTime',
           statName: '预计起飞时间',
-          width: 135,
+          width: 150
         },
         {
           statCode: 'TargetAirport',
-          statName: '目的站',
-          width: 71,
+          statName: '目的站'
         },
         {
           statCode: 'DepartureBuild',
-          statName: '航站楼',
-          width: 65,
+          statName: '航站楼'
         },
         {
           statCode: 'BordingGate',
-          statName: '登机口',
-          width: 68,
+          statName: '登机口'
         },
         {
           statCode: 'StandForDepartrue',
-          statName: '停机位',
-          width: 60,
+          statName: '停机位'
         },
         {
           statCode: 'checkInTravellerNumber',
-          statName: '托运旅客',
-          width: 88
+          statName: '托运旅客'
         },
         {
           statCode: 'checkInNumber',
-          statName: '值机数',
-          width: 72
+          statName: '值机数'
         },
         {
           statCode: 'unActive',
-          statName: '未激活',
-          width: 76
+          statName: '未激活'
         },
         {
           statCode: 'preLoad',
-          statName: '预计装载',
-          width: 101
+          statName: '预计装载'
         },
         {
           statCode: 'checkNumber',
-          statName: '安检',
-          width: 88
+          statName: '安检'
         },
         {
           statCode: 'sortNumber',
-          statName: '分拣',
-          width: 83
+          statName: '分拣'
         },
         {
           statCode: 'loadNumber',
-          statName: '装车',
-          width: 83
+          statName: '装车'
         },
         {
           statCode: 'loadNumber',
-          statName: '装机',
-          width: 80
+          statName: '装机'
         },
         {
           statCode: 'waitfanj',
-          statName: '待翻减',
-          width: 79
+          statName: '待翻减'
         },
         {
           statCode: 'unLoad',
-          statName: '已翻减',
-          width: 82
+          statName: '已翻减'
         },
         {
           statCode: 'noCheckInNumber',
-          statName: '取消托运',
-          width: 89
+          statName: '取消托运'
         },
         {
           statCode: 'noBSM',
-          statName: '无BSM',
-          width: 68
+          statName: '无BSM'
         },
         {
           statCode: 'riskWarning',
-          statName: '风险预警',
-          width: 75
+          statName: '风险预警'
         },
         {
           statCode: 'departureAnomaly',
-          statName: '离港异常',
-          width: 72
+          statName: '离港异常'
         },
         {
           statCode: 'midIn',
           statName: '中转进行李'
         }
       ],
-      AirportList:[],
-      flightBaggageTableFilters:{
+      AirportList: [],
+      flightBaggageTableFilters: {
         FlightNO: [],
-        FlightDate:[],
-        PlanDepartureTime:[],
-        TargetAirport:[],
-        BordingGate:[],
-        StandForDepartrue:[],
-        DepartureBuild:[]
+        FlightDate: [],
+        PlanDepartureTime: [],
+        TargetAirport: [],
+        BordingGate: [],
+        StandForDepartrue: [],
+        DepartureBuild: []
       },
-      loopEvent:null,
-      leaveCount:0,
-
+      loopEvent: null,
+      leaveCount: 0
     }
   },
-  created(){
-    this.getAirPortData();
+  created() {
+    this.getAirPortData()
   },
   methods: {
-    airPortChange(){
+    airPortChange() {
       this.getTableData()
     },
-    async getAirPortData(){
+    async getAirPortData() {
       try {
         const res = await getQuery({
           id: 65,
-          dataContent:[]
+          dataContent: []
         })
         if (res.code == 0) {
-         this.AirportList = res.returnData
-         this.formData.currentAirport = "PEK"
-         this.getTableData()
+          this.AirportList = res.returnData
+          this.formData.currentAirport = 'PEK'
+          this.getTableData()
         } else {
           this.$message.error(res.message)
         }
@@ -382,24 +367,24 @@ export default {
     // },
     // 获取表格数据
     async getTableData() {
-      let arr = [this.formData.currentAirport,this.formData.startDate,this.formData.endDate]
+      let arr = [this.formData.currentAirport, this.formData.startDate, this.formData.endDate]
       try {
         const res = await getQuery({
           id: 66,
-          dataContent:[...arr,...arr,...arr]
+          dataContent: [...arr, ...arr, ...arr]
         })
         if (res.code == 0) {
-         this.initTableData(res.returnData);
+          this.initTableData(res.returnData)
         } else {
-         console.log(res.message)
+          console.log(res.message)
         }
       } catch (error) {
-        clearInterval(this.loopEvent);
+        clearInterval(this.loopEvent)
         console.log('出错了', error)
       }
     },
     initTableData(tableData) {
-      this.leaveCount = 0;
+      this.leaveCount = 0
       tableData.forEach(item => {
         if(item.hasTakenOff == 0){
           this.leaveCount++
@@ -419,23 +404,23 @@ export default {
               value: item[key]
             })
           }
-          this.flightBaggageTableFilters[key] = this._.sortBy(this.flightBaggageTableFilters[key],['value'])
+          this.flightBaggageTableFilters[key] = this._.sortBy(this.flightBaggageTableFilters[key], ['value'])
         })
       })
     },
     filterHandler(value, row, column) {
       const property = column['property']
       return row[property] === value
-    },
+    }
   },
-  mounted(){
-    let that = this;
-    this.loopEvent = setInterval(function(){
-      that.getTableData();
-    },3000)
+  mounted() {
+    let that = this
+    this.loopEvent = setInterval(function () {
+      that.getTableData()
+    }, 3000)
   },
-  beforeDestroy(){
-    clearInterval(this.loopEvent);
+  beforeDestroy() {
+    clearInterval(this.loopEvent)
   }
 }
 </script>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-07 15:30:59
+ * @LastEditTime: 2022-05-07 15:57:55
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -661,7 +661,7 @@ export default {
         })
         this.flightBaggageTableData = flightBaggageTableData.map((item, index) => {
           item['checkIn'] = `${item['checkIn'] ?? ''}\n${item['checkInTime'] ? item['checkInTime'].split('T')[1] : ''}`
-          item['status'] = item['status'] === 'DEL' ? '删除' : ''
+          item['status'] = item['Status'] === 'DEL' ? '删除' : ''
           item['security'] = `${item['DealInfo'] ?? ''}\n${item['DealTime'] ? item['DealTime'].split('T')[1] : ''}`
           item['sorting'] = `${item['sortLocationMark'] ?? ''}\n${
             item['sortDealTime'] ? item['sortDealTime'].split('T')[1] : ''

src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-05 17:57:24
+ * @LastEditTime: 2022-05-07 16:01:26
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -126,9 +126,7 @@ export default {
               'unActive',
               'preLoad',
               'noCheckInNumber',
-              'midIn',
-
-
+              'midIn'
             ].includes(column.property)
           ) {
             const values = data.map(item => Number(item[column.property]))
@@ -153,10 +151,13 @@ export default {
       return sums
     },
     // 表格行点击跳转
-    rowClick(row, column, event) {
+    rowClick({ FlightNO, FlightDate }) {
       this.$router.push({
         path: `${this.$route.path}/flightView`,
-        query: row
+        query: {
+          FlightNO,
+          FlightDate
+        }
       })
       // this.$router.push({ path: '/departure/flightView', query: row })
     },