Эх сурвалжийг харах

init: 表格合计 下载xlxs 航空视图 快捷搜索

鄭蕙奇 2 долоо хоног өмнө
parent
commit
109fc4cad2

+ 1 - 1
src/views/newDemo/index.vue

@@ -80,4 +80,4 @@ export default {
     }
     }
   }
   }
 }
 }
-</style>
+</style>

+ 103 - 70
src/views/newFlightView/index.vue

@@ -9,34 +9,44 @@
           </div>
           </div>
           <div class="newFlightView-left-top-top-status">
           <div class="newFlightView-left-top-top-status">
             <el-scrollbar style="height: 100%">
             <el-scrollbar style="height: 100%">
-              <el-checkbox-group @change="checkChange" class="flex-wrap" v-model="checkList">
-                <Item v-for="(item,index) in checkStates" :key="index" :total="checkStates" :index="index+1" :item="item" />
+              <el-checkbox-group v-model="checkList" class="flex-wrap" @change="checkChange">
+                <Item v-for="(item, index) in checkStates" :key="index" :total="checkStates" :index="index + 1"
+                  :item="item" />
               </el-checkbox-group>
               </el-checkbox-group>
             </el-scrollbar>
             </el-scrollbar>
           </div>
           </div>
         </div>
         </div>
         <div class="newFlightView-left-top-list">
         <div class="newFlightView-left-top-list">
           <el-descriptions :column="2">
           <el-descriptions :column="2">
-            <el-descriptions-item label="起飞机场简称">{{ infoObj.takeoff_airport_name || takeoffName }}</el-descriptions-item>
+            <el-descriptions-item label="起飞机场简称">{{ infoObj.takeoff_airport_name || takeoffName
+              }}</el-descriptions-item>
             <el-descriptions-item label="起飞机场三字码">{{ infoObj.outAirport }}</el-descriptions-item>
             <el-descriptions-item label="起飞机场三字码">{{ infoObj.outAirport }}</el-descriptions-item>
             <el-descriptions-item label="登机口">{{ infoObj.gateCd }}</el-descriptions-item>
             <el-descriptions-item label="登机口">{{ infoObj.gateCd }}</el-descriptions-item>
             <el-descriptions-item label="停机位"> {{ infoObj.depstandCd }}</el-descriptions-item>
             <el-descriptions-item label="停机位"> {{ infoObj.depstandCd }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="!UTCvalue" :label="'计划'+infoObj.outAirport+'起飞时间'">{{ formatTime(infoObj.scheduleTakeOffTimeLocalOut) }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="!UTCvalue" :label="'实际'+infoObj.outAirport+'起飞时间'">{{ formatTime(infoObj.actualTakeOffTimeLocalOut) }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="UTCvalue" :label="'计划'+infoObj.outAirport+'起飞UTC时间'">{{ formatTime(infoObj.scheduleTakeOffTimeUTC) }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="UTCvalue" :label="'实际'+infoObj.outAirport+'起飞UTC时间'">{{ formatTime(infoObj.actualTakeOffTimeUTC) }}</el-descriptions-item>
+            <el-descriptions-item v-if="!UTCvalue" :span="2" :label="'计划' + infoObj.outAirport + '起飞时间'">{{
+              formatTime(infoObj.scheduleTakeOffTimeLocalOut) }}</el-descriptions-item>
+            <el-descriptions-item v-if="!UTCvalue" :span="2" :label="'实际' + infoObj.outAirport + '起飞时间'">{{
+              formatTime(infoObj.actualTakeOffTimeLocalOut) }}</el-descriptions-item>
+            <el-descriptions-item v-if="UTCvalue" :span="2" :label="'计划' + infoObj.outAirport + '起飞UTC时间'">{{
+              formatTime(infoObj.scheduleTakeOffTimeUTC) }}</el-descriptions-item>
+            <el-descriptions-item v-if="UTCvalue" :span="2" :label="'实际' + infoObj.outAirport + '起飞UTC时间'">{{
+              formatTime(infoObj.actualTakeOffTimeUTC) }}</el-descriptions-item>
           </el-descriptions>
           </el-descriptions>
         </div>
         </div>
         <div class="newFlightView-left-top-list">
         <div class="newFlightView-left-top-list">
           <el-descriptions :column="2">
           <el-descriptions :column="2">
             <el-descriptions-item label="降落机场简称">{{ infoObj.target_airport_name || targetName }}</el-descriptions-item>
             <el-descriptions-item label="降落机场简称">{{ infoObj.target_airport_name || targetName }}</el-descriptions-item>
             <el-descriptions-item label="降落机场三字码">{{ infoObj.landAirport }}</el-descriptions-item>
             <el-descriptions-item label="降落机场三字码">{{ infoObj.landAirport }}</el-descriptions-item>
-            <el-descriptions-item label="提取转盘">{{infoObj.arrcarouselCd}}</el-descriptions-item>
+            <el-descriptions-item label="提取转盘">{{ infoObj.arrcarouselCd }}</el-descriptions-item>
             <el-descriptions-item label="停机位"> {{ infoObj.arrstandCd }}</el-descriptions-item>
             <el-descriptions-item label="停机位"> {{ infoObj.arrstandCd }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="!UTCvalue" :label="'计划'+infoObj.landAirport+'降落时间'">{{ formatTime(infoObj.scheduleLandInTimeLocalIn) }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="!UTCvalue" :label="'实际'+infoObj.landAirport+'降落时间'">{{ formatTime(infoObj.actualLandInTimeLocalIn) }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="UTCvalue" :label="'计划'+infoObj.landAirport+'降落UTC时间'">{{ formatTime(infoObj.scheduleLandInTimeUTC) }}</el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="UTCvalue" :label="'实际'+infoObj.landAirport+'降落UTC时间'">{{ formatTime(infoObj.actualLandInTimeUTC) }}</el-descriptions-item>
+            <el-descriptions-item v-if="!UTCvalue" :span="2" :label="'计划' + infoObj.landAirport + '降落时间'">{{
+              formatTime(infoObj.scheduleLandInTimeLocalIn) }}</el-descriptions-item>
+            <el-descriptions-item v-if="!UTCvalue" :span="2" :label="'实际' + infoObj.landAirport + '降落时间'">{{
+              formatTime(infoObj.actualLandInTimeLocalIn) }}</el-descriptions-item>
+            <el-descriptions-item v-if="UTCvalue" :span="2" :label="'计划' + infoObj.landAirport + '降落UTC时间'">{{
+              formatTime(infoObj.scheduleLandInTimeUTC) }}</el-descriptions-item>
+            <el-descriptions-item v-if="UTCvalue" :span="2" :label="'实际' + infoObj.landAirport + '降落UTC时间'">{{
+              formatTime(infoObj.actualLandInTimeUTC) }}</el-descriptions-item>
           </el-descriptions>
           </el-descriptions>
         </div>
         </div>
         <div class="newFlightView-left-top-list">
         <div class="newFlightView-left-top-list">
@@ -49,7 +59,7 @@
         </div>
         </div>
       </div>
       </div>
       <div class="newFlightView-left-bottom">
       <div class="newFlightView-left-bottom">
-        <Table :tableTag="table1" tableName="容器列表" />
+        <Table :table-tag="table1" table-name="容器列表" />
       </div>
       </div>
     </div>
     </div>
     <div class="newFlightView-right">
     <div class="newFlightView-right">
@@ -57,21 +67,20 @@
         <div class="newFlightView-right-top-left flex-wrap">
         <div class="newFlightView-right-top-left flex-wrap">
           <div class="manageTitle">航班行李列表</div>
           <div class="manageTitle">航班行李列表</div>
           <div class="newFlightView-right-top-left-select">快捷筛选
           <div class="newFlightView-right-top-left-select">快捷筛选
-            <el-cascader v-model="selectedFilter" :options="fastFilterOptions" :props="{ expandTrigger: 'hover', checkStrictly: true }" size="small" placeholder="无" clearable />
+            <el-cascader v-model="selectedFilter" :options="fastFilterOptions"
+              :props="{ expandTrigger: 'hover', checkStrictly: true }" size="small" placeholder="无" clearable />
           </div>
           </div>
         </div>
         </div>
         <div class="newFlightView-right-top-right flex-wrap">
         <div class="newFlightView-right-top-right flex-wrap">
           <!-- <TimeZoneSelector /> -->
           <!-- <TimeZoneSelector /> -->
-          <el-switch
-            v-model="UTCvalue"
-            inactive-text="UTC"
-            @change="UTCchange">
-          </el-switch>
-          <img class="btn-img btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '航班行李列表')" />
+          <el-switch v-model="UTCvalue" inactive-text="UTC" @change="UTCchange" />
+          <img class="btn-img btn-shadow" src="@/assets/baggage/ic_export.png" title="导出"
+            @click="exportHandler('table', '航班行李列表')">
         </div>
         </div>
       </div>
       </div>
       <div class="newFlightView-right-bottom">
       <div class="newFlightView-right-bottom">
-        <Table :tableTag="table2" ref="table" :fast-filter="fastFilter" :btnStyle="{top:'-52px'}" :istableCol="true" tableName="航班行李列表" :pageSize="999" @tableLoad="tableLoad" />
+        <Table ref="table" :table-tag="table2" :btn-style="{ top: '-52px' }" :istable-col="true"
+          table-name="航班行李列表" :page-size="999" @tableLoad="tableLoad" />
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
@@ -79,17 +88,17 @@
 
 
 <script>
 <script>
 import Table from '@/views/newQuery/components/table.vue'
 import Table from '@/views/newQuery/components/table.vue'
-import TimeZoneSelector from "@/components/TimeZoneSelector"
-import { exportToExcel } from "@/utils/table"
+import TimeZoneSelector from '@/components/TimeZoneSelector'
+import { exportToExcel } from '@/utils/table'
 import { combine } from '@/utils'
 import { combine } from '@/utils'
 import pf from '@/layout/mixin/publicFunc'
 import pf from '@/layout/mixin/publicFunc'
 import Item from './item.vue'
 import Item from './item.vue'
 export default {
 export default {
   components: { Table, TimeZoneSelector, Item },
   components: { Table, TimeZoneSelector, Item },
   mixins: [pf],
   mixins: [pf],
-  data () {
+  data() {
     return {
     return {
-      UTCvalue:false,
+      UTCvalue: false,
       radio: '1',
       radio: '1',
       options: [],
       options: [],
       value: '',
       value: '',
@@ -197,6 +206,10 @@ export default {
           label: '装机T',
           label: '装机T',
           value: 'onaiecraft_T',
           value: 'onaiecraft_T',
         },
         },
+        {
+          label: '需要翻减',
+          value: 'unloaded_status'
+        },
         {
         {
           label: '待翻检',
           label: '待翻检',
           value: 'NO_check_number'
           value: 'NO_check_number'
@@ -272,7 +285,7 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
-    fastFilter () {
+    fastFilter() {
       const [key, value] = this.selectedFilter
       const [key, value] = this.selectedFilter
       // console.log(this.selectedFilter)
       // console.log(this.selectedFilter)
       if (!key) {
       if (!key) {
@@ -286,9 +299,9 @@ export default {
           case 'check_in_baggage_number':
           case 'check_in_baggage_number':
             return row['No_BSM'] != 1
             return row['No_BSM'] != 1
           case 'check_in_L':
           case 'check_in_L':
-            return row['No_BSM'] != 1 && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == "")
+            return row['No_BSM'] != 1 && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == '')
           case 'check_in_T':
           case 'check_in_T':
-            return row['No_BSM'] != 1 && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != "")
+            return row['No_BSM'] != 1 && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != '')
           case 'NO_activate_number':
           case 'NO_activate_number':
             return row['activeState'] == 1
             return row['activeState'] == 1
           case 'estimated_load_number':
           case 'estimated_load_number':
@@ -296,33 +309,35 @@ export default {
           case 'screened_number':
           case 'screened_number':
             return row['securityInspectionResults']
             return row['securityInspectionResults']
           case 'security_L':
           case 'security_L':
-            return row['securityInspectionResults'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == "")
+            return row['securityInspectionResults'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == '')
           case 'security_T':
           case 'security_T':
-            return row['securityInspectionResults'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != "")
+            return row['securityInspectionResults'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != '')
           case 'B_security_check_number':
           case 'B_security_check_number':
             return row['B_security_check_time']
             return row['B_security_check_time']
           case 'B_security_check_number_L':
           case 'B_security_check_number_L':
-            return row['B_security_check_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == "")
+            return row['B_security_check_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == '')
           case 'B_security_check_number_T':
           case 'B_security_check_number_T':
-            return row['B_security_check_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != "")
+            return row['B_security_check_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != '')
           case 'sorted_number':
           case 'sorted_number':
             return row['sorting_time']
             return row['sorting_time']
           case 'sort_L':
           case 'sort_L':
-            return row['sorting_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == "")
+            return row['sorting_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == '')
           case 'sort_T':
           case 'sort_T':
-            return row['sorting_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != "")
+            return row['sorting_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != '')
           case 'loaded_number':
           case 'loaded_number':
             return row['loading_time'] && (row['abnormalType'] == 'OFF' || !row['abnormalType'])
             return row['loading_time'] && (row['abnormalType'] == 'OFF' || !row['abnormalType'])
           case 'load_L':
           case 'load_L':
-            return row['loading_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == "")
+            return row['loading_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == '')
           case 'load_T':
           case 'load_T':
-            return row['loading_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != "")
+            return row['loading_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != '')
           case 'onaiecraft_number':
           case 'onaiecraft_number':
             return row['installation_time']
             return row['installation_time']
           case 'onaiecraft_L':
           case 'onaiecraft_L':
-            return row['installation_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == "")
+            return row['installation_time'] && (row['inflightNo'] == row['carrierFlights'] || row['inflightNo'] == null || row['inflightNo'] == '')
           case 'onaiecraft_T':
           case 'onaiecraft_T':
-            return row['installation_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != "")
+            return row['installation_time'] && (row['inflightNo'] != row['carrierFlights'] && row['inflightNo'] != null && row['inflightNo'] != '')
+          case 'unloaded_status':
+            return row['unloaded_status'] !== 0
           case 'NO_check_number':
           case 'NO_check_number':
             return row['dataState'] == 'DEL' && row['loading_time'] && (row['abnormalType'] != 'OFF' || !row['abnormalType'])
             return row['dataState'] == 'DEL' && row['loading_time'] && (row['abnormalType'] != 'OFF' || !row['abnormalType'])
           case 'checked_number':
           case 'checked_number':
@@ -338,9 +353,9 @@ export default {
           case 'arrive_number':
           case 'arrive_number':
             return row['dataState'] != 'DEL' && row['arrivedtime']
             return row['dataState'] != 'DEL' && row['arrivedtime']
           case 'arrive_X':
           case 'arrive_X':
-            return row['dataState'] != 'DEL' && row['arrivedtime'] && (row['transferFlightNO'] == row['carrierFlights'] || row['transferFlightNO'] == null || row['transferFlightNO'] == "")
+            return row['dataState'] != 'DEL' && row['arrivedtime'] && (row['transferFlightNO'] == row['carrierFlights'] || row['transferFlightNO'] == null || row['transferFlightNO'] == '')
           case 'arrive_L':
           case 'arrive_L':
-            return row['dataState'] != 'DEL' && row['arrivedtime'] && (row['transferFlightNO'] != row['carrierFlights'] && row['transferFlightNO'] != null && row['transferFlightNO'] != "")
+            return row['dataState'] != 'DEL' && row['arrivedtime'] && (row['transferFlightNO'] != row['carrierFlights'] && row['transferFlightNO'] != null && row['transferFlightNO'] != '')
           case 'special_number':
           case 'special_number':
             return row['specialType']
             return row['specialType']
           case 'uninstalled_number':
           case 'uninstalled_number':
@@ -353,18 +368,18 @@ export default {
             return row['dataState'] == 'DEL' || !row['arrivedtime'] || row['transferFlightNO']
             return row['dataState'] == 'DEL' || !row['arrivedtime'] || row['transferFlightNO']
           case 'scon_number':
           case 'scon_number':
             return row['specialType'] && row['specialType'].includes('SCON')
             return row['specialType'] && row['specialType'].includes('SCON')
+
           default:
           default:
             return (row[key] ?? '') !== ''
             return (row[key] ?? '') !== ''
         }
         }
       }
       }
     }
     }
   },
   },
-  async created () {
-    let UTClocal = sessionStorage.getItem('UTCvalue');
-    if(UTClocal && UTClocal =="true"){
+  async created() {
+    const UTClocal = sessionStorage.getItem('UTCvalue')
+    if (UTClocal && UTClocal == 'true') {
       this.UTCvalue = true
       this.UTCvalue = true
-    }
-    else{
+    } else {
       this.UTCvalue = false
       this.UTCvalue = false
     }
     }
     const checkDatas = []
     const checkDatas = []
@@ -422,7 +437,7 @@ export default {
     // this.flightObj = nq
     // this.flightObj = nq
     // this.dataContent = nq
     // this.dataContent = nq
     const res = await this.getViewInfo(nq)
     const res = await this.getViewInfo(nq)
-    //2023-9-19新增
+    // 2023-9-19新增
     if (nq.landAirport && nq.outAirport) {
     if (nq.landAirport && nq.outAirport) {
       this.flightObj = nq
       this.flightObj = nq
       this.dataContent = nq
       this.dataContent = nq
@@ -435,7 +450,7 @@ export default {
       this.flightObj = Object.assign(nq, nqObj)
       this.flightObj = Object.assign(nq, nqObj)
       this.dataContent = Object.assign(nq, nqObj)
       this.dataContent = Object.assign(nq, nqObj)
     }
     }
-    //2023-9-19新增结束
+    // 2023-9-19新增结束
     this.infoObj = res[0]
     this.infoObj = res[0]
     const sts = await this.getViewInfo({ carrierFlights, carrierFlightsDate })
     const sts = await this.getViewInfo({ carrierFlights, carrierFlightsDate })
     if (sts && sts.length) {
     if (sts && sts.length) {
@@ -477,19 +492,19 @@ export default {
         this.checkList = [`${outAirport}-${landAirport}`]
         this.checkList = [`${outAirport}-${landAirport}`]
       }
       }
     }
     }
-    //2023-9-19新增
+    // 2023-9-19新增
     this.table1 = this.dataContent
     this.table1 = this.dataContent
     this.table2 = this.dataContent
     this.table2 = this.dataContent
   },
   },
-  mounted () {
+  mounted() {
     this.getAirPortData()
     this.getAirPortData()
   },
   },
   methods: {
   methods: {
-    UTCchange(){
-      sessionStorage.setItem("UTCvalue",this.UTCvalue)
-      this.$refs["table"].setTableColsXT(sessionStorage.getItem("Totalvalue"))
+    UTCchange() {
+      sessionStorage.setItem('UTCvalue', this.UTCvalue)
+      this.$refs['table'].setTableColsXT(sessionStorage.getItem('Totalvalue'))
     },
     },
-    async getAirPortData () {
+    async getAirPortData() {
       try {
       try {
         const res = await this.getQueryList(SERVICE_ID.getAirpotId, {}, 1, 9999)
         const res = await this.getQueryList(SERVICE_ID.getAirpotId, {}, 1, 9999)
         if (Number(res.code) === 0) {
         if (Number(res.code) === 0) {
@@ -499,11 +514,11 @@ export default {
           this.$message.error(res.message)
           this.$message.error(res.message)
         }
         }
       } catch (error) {
       } catch (error) {
-        this.$message.error("失败");
+        this.$message.error('失败')
       }
       }
     },
     },
-    setAirPortName (result, query = this.$route.query) {
-      let [outAirport, landAirport] = ['', ''];
+    setAirPortName(result, query = this.$route.query) {
+      let [outAirport, landAirport] = ['', '']
       if (query?.outAirport && query?.landAirport) {
       if (query?.outAirport && query?.landAirport) {
         outAirport = query.outAirport
         outAirport = query.outAirport
         landAirport = query.landAirport
         landAirport = query.landAirport
@@ -521,11 +536,11 @@ export default {
         }
         }
       })
       })
     },
     },
-    //格式化参数-航班号
-    formatParams (arr = [], query = {}) {
+    // 格式化参数-航班号
+    formatParams(arr = [], query = {}) {
       if (arr && arr.length) {
       if (arr && arr.length) {
         for (let index = 0; index < arr.length; index++) {
         for (let index = 0; index < arr.length; index++) {
-          const { k1, k2 } = arr[index];
+          const { k1, k2 } = arr[index]
           if (query[k2]) {
           if (query[k2]) {
             query.carrierFlights = query[k1]
             query.carrierFlights = query[k1]
             query.carrierFlightsDate = query[k2]
             query.carrierFlightsDate = query[k2]
@@ -537,7 +552,7 @@ export default {
       return query
       return query
     },
     },
     // 获取基本信息
     // 获取基本信息
-    async getViewInfo (dataContent = this.dataContent) {
+    async getViewInfo(dataContent = this.dataContent) {
       const { code, returnData } = await this.getQueryList(SERVICE_ID.bagViewId, dataContent)
       const { code, returnData } = await this.getQueryList(SERVICE_ID.bagViewId, dataContent)
       if (code == 0) {
       if (code == 0) {
         return returnData
         return returnData
@@ -546,18 +561,18 @@ export default {
       }
       }
     },
     },
     // 显示日期
     // 显示日期
-    formatTime (datetime) {
+    formatTime(datetime) {
       return datetime?.replace('T', ' ') ?? ''
       return datetime?.replace('T', ' ') ?? ''
     },
     },
     // 导出
     // 导出
-    exportHandler (refName, tableName) {
+    exportHandler(refName, tableName) {
       const { carrierFlights, carrierFlightsDate, outAirport, landAirport } = this.flightObj
       const { carrierFlights, carrierFlightsDate, outAirport, landAirport } = this.flightObj
-      const table = this.$refs[refName].$el.cloneNode(true);
-      const fileName = `${tableName}-${carrierFlights}-${carrierFlightsDate}-${outAirport}-${landAirport}.xlsx`;
-      exportToExcel(table, tableName, fileName);
+      const table = this.$refs[refName].$el.cloneNode(true)
+      const fileName = `${tableName}-${carrierFlights}-${carrierFlightsDate}-${outAirport}-${landAirport}.xlsx`
+      exportToExcel(table, tableName, fileName)
     },
     },
     // 选中
     // 选中
-    async checkChange (arr) {
+    async checkChange(arr) {
       const datas = []
       const datas = []
       const result = [...arr]
       const result = [...arr]
       if (result && result.length) {
       if (result && result.length) {
@@ -576,8 +591,8 @@ export default {
           })
           })
         })
         })
         const caps = datas.sort((a, b) => a.index - b.index)
         const caps = datas.sort((a, b) => a.index - b.index)
-        const c4 = caps[0].name //起飞
-        const c5 = caps[caps.length - 1].name //降落
+        const c4 = caps[0].name // 起飞
+        const c5 = caps[caps.length - 1].name // 降落
         const newPrams = _.cloneDeep(this.dataContent)
         const newPrams = _.cloneDeep(this.dataContent)
         newPrams.outAirport = c4
         newPrams.outAirport = c4
         newPrams.landAirport = c5
         newPrams.landAirport = c5
@@ -593,10 +608,10 @@ export default {
       }
       }
     },
     },
     // 获取行李列表后设置快捷筛选
     // 获取行李列表后设置快捷筛选
-    tableLoad (tableData) {
+    tableLoad(tableData) {
       this.setFastFilterOptions(tableData)
       this.setFastFilterOptions(tableData)
     },
     },
-    setFastFilterOptions (tableData) {
+    setFastFilterOptions(tableData) {
       const viewDatas = []
       const viewDatas = []
       const inFlightNOList = new Set()
       const inFlightNOList = new Set()
       const transferFlightNOList = new Set()
       const transferFlightNOList = new Set()
@@ -642,15 +657,19 @@ export default {
   padding: 8px;
   padding: 8px;
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
+
   &-left {
   &-left {
     width: 408px;
     width: 408px;
     margin-right: 8px;
     margin-right: 8px;
+
     &-top {
     &-top {
       height: 575px;
       height: 575px;
       background-color: #fff;
       background-color: #fff;
+
       &-top {
       &-top {
         padding: 25px 16px;
         padding: 25px 16px;
         border-bottom: 1px solid #c8cfdb;
         border-bottom: 1px solid #c8cfdb;
+
         &-title {
         &-title {
           line-height: 23px;
           line-height: 23px;
           font-size: 20px;
           font-size: 20px;
@@ -658,58 +677,72 @@ export default {
           font-weight: bold;
           font-weight: bold;
           color: #101116;
           color: #101116;
           margin-bottom: 25px;
           margin-bottom: 25px;
+
           &-info {
           &-info {
             margin-right: 16px;
             margin-right: 16px;
           }
           }
         }
         }
+
         &-status {
         &-status {
           font-size: 18px;
           font-size: 18px;
           font-family: Microsoft YaHei;
           font-family: Microsoft YaHei;
           font-weight: bold;
           font-weight: bold;
           color: #101116;
           color: #101116;
+
           ::v-deep .el-checkbox-group {
           ::v-deep .el-checkbox-group {
             font-size: initial;
             font-size: initial;
+
             .el-checkbox__inner {
             .el-checkbox__inner {
               border-radius: 50%;
               border-radius: 50%;
             }
             }
+
             .el-checkbox__label {
             .el-checkbox__label {
               display: none;
               display: none;
             }
             }
           }
           }
         }
         }
       }
       }
+
       &-list {
       &-list {
         padding: 25px 16px 13px 16px;
         padding: 25px 16px 13px 16px;
         border-bottom: 1px solid #c8cfdb;
         border-bottom: 1px solid #c8cfdb;
+
         &:last-child {
         &:last-child {
           border-bottom: none;
           border-bottom: none;
         }
         }
       }
       }
     }
     }
+
     &-bottom {
     &-bottom {
       height: calc(100% - 575px - 10px);
       height: calc(100% - 575px - 10px);
       margin-top: 8px;
       margin-top: 8px;
     }
     }
   }
   }
+
   &-right {
   &-right {
     flex: 1;
     flex: 1;
     height: 100%;
     height: 100%;
     width: calc(100% - 416px);
     width: calc(100% - 416px);
+
     &-top {
     &-top {
       padding: 18px 0;
       padding: 18px 0;
+
       &-left {
       &-left {
         line-height: 30px;
         line-height: 30px;
       }
       }
+
       &-right {
       &-right {
         display: flex;
         display: flex;
         flex-direction: row;
         flex-direction: row;
         align-items: center;
         align-items: center;
         padding-right: 70px;
         padding-right: 70px;
+
         .btn-img {
         .btn-img {
           margin-left: 10px;
           margin-left: 10px;
         }
         }
       }
       }
     }
     }
+
     &-bottom {
     &-bottom {
       height: calc(100% - 68px);
       height: calc(100% - 68px);
     }
     }

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 322 - 252
src/views/newQuery/components/table.vue


+ 60 - 36
src/views/statisticsCharts/components/statisticsHeaderNew.vue

@@ -5,31 +5,37 @@
     </template>
     </template>
     <el-form ref="form" class="form" :model="formData">
     <el-form ref="form" class="form" :model="formData">
       <el-form-item v-for="item in formItems" :key="item.prop" :prop="item.prop" :label="item.label" :style="{
       <el-form-item v-for="item in formItems" :key="item.prop" :prop="item.prop" :label="item.label" :style="{
-          width: item.width || '120px'
-        }">
+        width: item.width || '120px'
+      }">
         <template v-if="item.inputType === 'input'">
         <template v-if="item.inputType === 'input'">
-          <el-input v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请输入'" :clearable="item.clearable" />
+          <el-input v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请输入'"
+            :clearable="item.clearable" />
         </template>
         </template>
         <template v-if="item.inputType === 'select'">
         <template v-if="item.inputType === 'select'">
-          <el-select @change="change()" v-model="formData[item.prop]" :filterable="item.filterable" :default-first-option="item.filterable" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :multiple="item.multiple" :collapse-tags="item.multiple" :clearable="item.clearable" :disabled="item.disabled">
+          <el-select v-model="formData[item.prop]" :filterable="item.filterable" :default-first-option="item.filterable"
+            :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :multiple="item.multiple"
+            :collapse-tags="item.multiple" :clearable="item.clearable" :disabled="item.disabled" @change="change()">
             <el-option v-for="option in item.options" :key="option.value" :value="option.value" :label="option.label" />
             <el-option v-for="option in item.options" :key="option.value" :value="option.value" :label="option.label" />
           </el-select>
           </el-select>
         </template>
         </template>
         <template v-if="item.inputType === 'datePicker'">
         <template v-if="item.inputType === 'datePicker'">
-          <el-date-picker v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+          <el-date-picker v-model="formData[item.prop]" :size="item.size || 'small'" type="daterange"
+            value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         </template>
         </template>
         <template v-if="item.inputType === 'cascader'">
         <template v-if="item.inputType === 'cascader'">
-          <el-cascader v-model="formData[item.prop]" :size="item.size || 'small'" :placeholder="item.placeholder || '请选择'" :options="item.options" :props="item.props" :clearable="item.clearable" :disabled="item.disabled" />
+          <el-cascader v-model="formData[item.prop]" :size="item.size || 'small'"
+            :placeholder="item.placeholder || '请选择'" :options="item.options" :props="item.props"
+            :clearable="item.clearable" :disabled="item.disabled" />
         </template>
         </template>
       </el-form-item>
       </el-form-item>
       <el-form-item v-if="formItems.length">
       <el-form-item v-if="formItems.length">
         <el-button type="primary" size="small" @click="getData">{{ buttonText }}</el-button>
         <el-button type="primary" size="small" @click="getData">{{ buttonText }}</el-button>
       </el-form-item>
       </el-form-item>
       <el-form-item v-if="withExport">
       <el-form-item v-if="withExport">
-        <img src="../../../assets/nav/ic_export.png" title="导出" class="btn-icon-only" @click="exportClickHandler" />
+        <img src="../../../assets/nav/ic_export.png" title="导出" class="btn-icon-only" @click="exportClickHandler">
       </el-form-item>
       </el-form-item>
       <el-form-item v-if="withSetting">
       <el-form-item v-if="withSetting">
-        <img src="../../../assets/nav/ic_setting.png" title="节点设置" class="btn-icon-only" @click="settingClickHandler" />
+        <img src="../../../assets/nav/ic_setting.png" title="节点设置" class="btn-icon-only" @click="settingClickHandler">
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
   </div>
   </div>
@@ -70,7 +76,7 @@ export default {
       default: false
       default: false
     }
     }
   },
   },
-  data () {
+  data() {
     return {
     return {
       formData: {
       formData: {
       },
       },
@@ -79,27 +85,27 @@ export default {
   },
   },
   computed: {
   computed: {
     ...mapGetters(['savedFormDataMap']),
     ...mapGetters(['savedFormDataMap']),
-    formDataObj () {
+    formDataObj() {
       return JSON.parse(JSON.stringify(this.formData))
       return JSON.parse(JSON.stringify(this.formData))
     }
     }
   },
   },
   watch: {
   watch: {
     items: {
     items: {
-      handler (val) {
+      handler(val) {
         val && (this.formItems = val)
         val && (this.formItems = val)
       },
       },
       deep: true,
       deep: true,
       immediate: true
       immediate: true
     },
     },
     data: {
     data: {
-      handler (val) {
+      handler(val) {
         val && (this.formData = val)
         val && (this.formData = val)
       },
       },
       deep: true,
       deep: true,
       immediate: true
       immediate: true
     },
     },
     formDataObj: {
     formDataObj: {
-      handler (val, oldVal) {
+      handler(val, oldVal) {
         this.formItems.forEach(item => {
         this.formItems.forEach(item => {
           if (item.changeHandler && String(val[item.prop]) !== String(oldVal[item.prop])) {
           if (item.changeHandler && String(val[item.prop]) !== String(oldVal[item.prop])) {
             item.changeHandler.call(this, val[item.prop])
             item.changeHandler.call(this, val[item.prop])
@@ -109,7 +115,7 @@ export default {
       deep: true
       deep: true
     }
     }
   },
   },
-  created () {
+  created() {
     this.customItems.forEach(item => {
     this.customItems.forEach(item => {
       if (typeof item.itemIndex === 'number') {
       if (typeof item.itemIndex === 'number') {
         if (item.prop) {
         if (item.prop) {
@@ -122,10 +128,10 @@ export default {
       }
       }
     })
     })
     const savedFormData = this.savedFormDataMap[this.$route.name]
     const savedFormData = this.savedFormDataMap[this.$route.name]
-    let obj = {}
+    const obj = {}
     this.formItems.forEach(item => {
     this.formItems.forEach(item => {
       if (item.queryId && item.setKey) {
       if (item.queryId && item.setKey) {
-        this.getOptions(item.queryId, item.setKey, item.prop,item.authId)
+        this.getOptions(item.queryId, item.setKey, item.prop, item.authId)
       }
       }
       // if (savedFormData?.[item.prop]) {
       // if (savedFormData?.[item.prop]) {
       //   obj[item.prop] = savedFormData[item.prop]
       //   obj[item.prop] = savedFormData[item.prop]
@@ -136,19 +142,18 @@ export default {
       //   obj['fd1,fd2'] = [savedFormData['fd1'],savedFormData['fd2']]
       //   obj['fd1,fd2'] = [savedFormData['fd1'],savedFormData['fd2']]
       // }
       // }
       // console.log(obj)
       // console.log(obj)
-
     })
     })
-    if(savedFormData){
+    if (savedFormData) {
       this.formData = savedFormData
       this.formData = savedFormData
       this.getData()
       this.getData()
     }
     }
     // this.$emit('update:data', this.formData)
     // this.$emit('update:data', this.formData)
   },
   },
   methods: {
   methods: {
-    change(){
+    change() {
       // console.log(this.formData)
       // console.log(this.formData)
     },
     },
-    getData () {
+    getData() {
       try {
       try {
         this.formItems.forEach(item => {
         this.formItems.forEach(item => {
           if (item.requiredWarning && (!this.formData[item.prop] || this.formData[item.prop].length === 0)) {
           if (item.requiredWarning && (!this.formData[item.prop] || this.formData[item.prop].length === 0)) {
@@ -175,13 +180,13 @@ export default {
         formData: _.cloneDeep(this.formData)
         formData: _.cloneDeep(this.formData)
       })
       })
     },
     },
-    exportClickHandler () {
+    exportClickHandler() {
       this.$emit('export')
       this.$emit('export')
     },
     },
-    settingClickHandler () {
+    settingClickHandler() {
       this.$emit('setting')
       this.$emit('setting')
     },
     },
-    setInOrOutOptions (range) {
+    setInOrOutOptions(range) {
       const theInOrOutItem = this.formItems.find(item => item.prop === 'inOrOut')
       const theInOrOutItem = this.formItems.find(item => item.prop === 'inOrOut')
       switch (range) {
       switch (range) {
         case '全部':
         case '全部':
@@ -226,15 +231,15 @@ export default {
           break
           break
       }
       }
     },
     },
-    async getOptions (queryId, setKey, prop,authId) {
+    async getOptions(queryId, setKey, prop, authId) {
       console.log(queryId)
       console.log(queryId)
-      let p = {
-          serviceId: queryId,
-          dataContent: [],
-          event:"0",
-          pageSize:"9999",
-        }
-      if(queryId != '8200233'){
+      const p = {
+        serviceId: queryId,
+        dataContent: [],
+        event: '0',
+        pageSize: '9999',
+      }
+      if (queryId != '8200233') {
         p['authId'] = authId
         p['authId'] = authId
       }
       }
       try {
       try {
@@ -257,16 +262,14 @@ export default {
 }
 }
 </script>
 </script>
 
 
-<style
-  lang="scss"
-  scoped
->
+<style lang="scss" scoped>
 .flight-statistics-header {
 .flight-statistics-header {
   padding-top: 24px;
   padding-top: 24px;
   min-height: 80px;
   min-height: 80px;
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
   align-items: flex-start;
   align-items: flex-start;
+
   .title {
   .title {
     margin-right: 24px;
     margin-right: 24px;
     padding-left: 16px;
     padding-left: 16px;
@@ -278,6 +281,7 @@ export default {
     font-weight: bold;
     font-weight: bold;
     white-space: nowrap;
     white-space: nowrap;
     position: relative;
     position: relative;
+
     &::before {
     &::before {
       content: "";
       content: "";
       width: 4px;
       width: 4px;
@@ -290,39 +294,49 @@ export default {
       margin: auto;
       margin: auto;
     }
     }
   }
   }
+
   ::v-deep .form {
   ::v-deep .form {
     display: flex;
     display: flex;
     flex-wrap: wrap;
     flex-wrap: wrap;
-    > .el-form-item {
+
+    >.el-form-item {
       margin-bottom: 24px;
       margin-bottom: 24px;
+
       // width: 185px;
       // width: 185px;
       &:not(:last-child) {
       &:not(:last-child) {
         margin-right: 8px;
         margin-right: 8px;
       }
       }
+
       &:nth-last-child(2),
       &:nth-last-child(2),
       &:nth-last-child(3) {
       &:nth-last-child(3) {
         margin-right: 16px;
         margin-right: 16px;
       }
       }
+
       .el-form-item__content {
       .el-form-item__content {
         height: 32px;
         height: 32px;
         line-height: 30px;
         line-height: 30px;
+
         .el-input {
         .el-input {
           &.is-disabled .el-input__inner {
           &.is-disabled .el-input__inner {
             border: none;
             border: none;
           }
           }
+
           .el-input__inner {
           .el-input__inner {
             border-radius: 4px;
             border-radius: 4px;
             font-family: Helvetica, "Microsoft YaHei";
             font-family: Helvetica, "Microsoft YaHei";
             color: #303133;
             color: #303133;
             border-color: #ffffff;
             border-color: #ffffff;
+
             &:hover {
             &:hover {
               border-color: #c0c4cc;
               border-color: #c0c4cc;
             }
             }
+
             &:focus {
             &:focus {
               border-color: #409eff;
               border-color: #409eff;
             }
             }
           }
           }
         }
         }
+
         .el-date-editor--daterange.el-input,
         .el-date-editor--daterange.el-input,
         .el-date-editor--daterange.el-input__inner,
         .el-date-editor--daterange.el-input__inner,
         .el-date-editor--timerange.el-input,
         .el-date-editor--timerange.el-input,
@@ -332,29 +346,37 @@ export default {
           border-color: #ffffff;
           border-color: #ffffff;
           color: #303133;
           color: #303133;
           font-family: Helvetica, "Microsoft YaHei";
           font-family: Helvetica, "Microsoft YaHei";
+
           &:hover {
           &:hover {
             border-color: #c0c4cc;
             border-color: #c0c4cc;
           }
           }
+
           &.is-active {
           &.is-active {
             border-color: #409eff;
             border-color: #409eff;
           }
           }
+
           .el-input__icon {
           .el-input__icon {
             color: #303133;
             color: #303133;
           }
           }
+
           .el-range-separator {
           .el-range-separator {
             line-height: 28px;
             line-height: 28px;
           }
           }
         }
         }
+
         .el-select,
         .el-select,
         .el-cascader {
         .el-cascader {
           .el-input {
           .el-input {
             .el-icon-arrow-up::before {
             .el-icon-arrow-up::before {
               content: "\e78f";
               content: "\e78f";
             }
             }
+
             .el-icon-arrow-down::before {
             .el-icon-arrow-down::before {
               content: "\e790";
               content: "\e790";
             }
             }
+
             &:not(.is-disabled) {
             &:not(.is-disabled) {
+
               .el-input__icon,
               .el-input__icon,
               .el-input__inner::-webkit-input-placeholder {
               .el-input__inner::-webkit-input-placeholder {
                 color: #303133;
                 color: #303133;
@@ -362,10 +384,12 @@ export default {
             }
             }
           }
           }
         }
         }
+
         .el-button {
         .el-button {
           border-radius: 4px;
           border-radius: 4px;
           font-family: Helvetica, "Microsoft YaHei";
           font-family: Helvetica, "Microsoft YaHei";
         }
         }
+
         .btn-icon-only {
         .btn-icon-only {
           width: 32px;
           width: 32px;
           height: 32px;
           height: 32px;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 360 - 498
src/views/statisticsCharts/components/tableformbrsNew.vue


+ 32 - 49
src/views/statisticsCharts/views/report/scanningStatisticsNew.vue

@@ -1,34 +1,22 @@
 <template>
 <template>
   <!-- 航站BRS扫描统计 -->
   <!-- 航站BRS扫描统计 -->
   <div class="statstics-wrapper">
   <div class="statstics-wrapper">
-    <StatisticsHeader
-      title="航站BRS扫描统计"
-      :items="formItems"
-      :data="formData"
-      with-setting
-      :withSetting="false"
-      @getFormData="getFormData"
-      @export="exportup"
-    />
-    <Tableformbrs
-      upid="1"
-      :data-id="dataId"
-      :isloadings="isloadings"
-      :data-content="dataContent"
-      :rows="12"
-      label-width="140px"
-      :min-height="70"
-      width="800px"
-      tableHeight="780"
-    />
+    <StatisticsHeader title="航站BRS扫描统计" :items="formItems" :data="formData" with-setting :with-setting="false"
+      @getFormData="getFormData" @export="exportup" />
+    <Tableformbrs upid="1" :data-id="dataId" :isloadings="isloadings" :data-content="dataContent" :rows="12"
+      label-width="140px" :min-height="70" width="800px" table-height="780" />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
 import StatisticsHeader from '../../components/statisticsHeaderNew.vue'
 import StatisticsHeader from '../../components/statisticsHeaderNew.vue'
 import Tableformbrs from '../../components/tableformbrsNew'
 import Tableformbrs from '../../components/tableformbrsNew'
-import { Format,getAuthData } from '@/utils/validate'
+import { Format, getAuthData } from '@/utils/validate'
 export default {
 export default {
   name: 'ReportStatistics',
   name: 'ReportStatistics',
+  components: {
+    StatisticsHeader,
+    Tableformbrs,
+  },
   data() {
   data() {
     return {
     return {
       formData: {},
       formData: {},
@@ -38,33 +26,28 @@ export default {
       isloadings: 1,
       isloadings: 1,
     }
     }
   },
   },
-  components: {
-    StatisticsHeader,
-    Tableformbrs,
-  },
-  created () {
-      const {auth_id } = this.$route.meta
-      const { arrs } = getAuthData(auth_id)
-      const items = arrs.filter(item => item.auth_type == 5)
-      this.formItems = []
-      items.map(v => {
-        let item = {
-          prop: v.auth_ident,
-          inputType: v.show_type,
-          placeholder: v.auth_name,
-          filterable: true,
-          clearable: true,
-          // multiple: true,
-          // disabled: true,
-          queryId: v.serviceID,
-          width: '200px',
-          setKey: v.auth_comment,
-          options: [],
-          authId:v.auth_id
-        }
-        this.formItems.push(item)
-      })
-
+  created() {
+    const { auth_id } = this.$route.meta
+    const { arrs } = getAuthData(auth_id)
+    const items = arrs.filter(item => item.auth_type == 5)
+    this.formItems = []
+    items.map(v => {
+      const item = {
+        prop: v.auth_ident,
+        inputType: v.show_type,
+        placeholder: v.auth_name,
+        filterable: true,
+        clearable: true,
+        // multiple: true,
+        // disabled: true,
+        queryId: v.serviceID,
+        width: '200px',
+        setKey: v.auth_comment,
+        options: [],
+        authId: v.auth_id
+      }
+      this.formItems.push(item)
+    })
   },
   },
   mounted() {
   mounted() {
   },
   },
@@ -79,7 +62,7 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-.statstics-wrapper{
+.statstics-wrapper {
   padding: 0 20px;
   padding: 0 20px;
 }
 }
 </style>
 </style>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 445 - 236
src/views/table/index.vue


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно