修改

src/views/newFlightView/index.vue

@@ -13,18 +13,8 @@
           </div>
           <div class="newFlightView-left-top-top-status">
             <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 @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>
             </el-scrollbar>
           </div>
@@ -41,8 +31,7 @@
               infoObj.gateCd
             }}</el-descriptions-item>
             <el-descriptions-item label="停机位">
-              {{ infoObj.depstandCd }}</el-descriptions-item
-            >
+              {{ infoObj.depstandCd }}</el-descriptions-item>
             <el-descriptions-item :span="2" label="计划起飞时间">{{
               formatTime(infoObj.scheduleTakeOffTime)
             }}</el-descriptions-item>
@@ -63,8 +52,7 @@
               infoObj.arrcarouselCd
             }}</el-descriptions-item>
             <el-descriptions-item label="停机位">
-              {{ infoObj.arrstandCd }}</el-descriptions-item
-            >
+              {{ infoObj.arrstandCd }}</el-descriptions-item>
             <el-descriptions-item :span="2" label="计划降落时间">{{
               formatTime(infoObj.scheduleLandInTime)
             }}</el-descriptions-item>
@@ -81,7 +69,7 @@
             <el-descriptions-item label="托运旅客数">{{
               infoObj.checked_passengers_number
             }}</el-descriptions-item>
-            <el-descriptions-item label="中转行李数">{{
+            <el-descriptions-item label="中转进行李数">{{
               infoObj.transfer_baggage_number
             }}</el-descriptions-item>
             <el-descriptions-item label="终点行李数">{{
@@ -100,37 +88,16 @@
           <div class="manageTitle">航班行李列表</div>
           <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 class="newFlightView-right-top-right">
           <!-- <TimeZoneSelector /> -->
-          <img
-            class="btn-img btn-shadow"
-            src="@/assets/baggage/ic_export.png"
-            title="导出"
-            @click="exportHandler('table', '航班行李列表')"
-          />
+          <img class="btn-img btn-shadow" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '航班行李列表')" />
         </div>
       </div>
       <div class="newFlightView-right-bottom">
-        <Table
-          :tableTag="table2"
-          ref="table"
-          :fast-filter="fastFilter"
-          :btnStyle="{ top: '-52px' }"
-          :istableCol="true"
-          tableName="航班行李列表"
-          :pageSize="999"
-          @tableLoad="tableLoad"
-        />
+        <Table :tableTag="table2" ref="table" :fast-filter="fastFilter" :btnStyle="{ top: '-52px' }" :istableCol="true" tableName="航班行李列表" :pageSize="999" @tableLoad="tableLoad" />
       </div>
     </div>
   </div>
@@ -146,7 +113,7 @@ import Item from "./item.vue";
 export default {
   components: { Table, TimeZoneSelector, Item },
   mixins: [pf],
-  data() {
+  data () {
     return {
       radio: "1",
       options: [],
@@ -227,7 +194,7 @@ export default {
     };
   },
   computed: {
-    fastFilter() {
+    fastFilter () {
       const [key, value] = this.selectedFilter;
       // console.log(this.selectedFilter)
       if (!key) {
@@ -275,7 +242,7 @@ export default {
       };
     },
   },
-  async created() {
+  async created () {
     const checkDatas = [];
     const query = this.$route.query;
     const np = [
@@ -371,13 +338,13 @@ export default {
       }
     }
   },
-  mounted() {
+  mounted () {
     this.table1 = this.dataContent;
     this.table2 = this.dataContent;
   },
   methods: {
     //格式化参数-航班号
-    formatParams(arr = [], query = {}) {
+    formatParams (arr = [], query = {}) {
       if (arr && arr.length) {
         for (let index = 0; index < arr.length; index++) {
           const { k1, k2 } = arr[index];
@@ -392,7 +359,7 @@ export default {
       return query;
     },
     // 获取基本信息
-    async getViewInfo(dataContent = this.dataContent) {
+    async getViewInfo (dataContent = this.dataContent) {
       const { code, returnData } = await this.getQueryList(
         SERVICE_ID.bagViewId,
         dataContent
@@ -404,11 +371,11 @@ export default {
       }
     },
     // 显示日期
-    formatTime(datetime) {
+    formatTime (datetime) {
       return datetime?.replace("T", " ") ?? "";
     },
     // 导出
-    exportHandler(refName, tableName) {
+    exportHandler (refName, tableName) {
       const { carrierFlights, carrierFlightsDate, outAirport, landAirport } =
         this.flightObj;
       const table = this.$refs[refName].$el.cloneNode(true);
@@ -416,7 +383,7 @@ export default {
       exportToExcel(table, tableName, fileName);
     },
     // 选中
-    async checkChange(arr) {
+    async checkChange (arr) {
       const datas = [];
       const result = [...arr];
       if (result && result.length) {
@@ -449,10 +416,10 @@ export default {
       }
     },
     // 获取行李列表后设置快捷筛选
-    tableLoad(tableData) {
+    tableLoad (tableData) {
       this.setFastFilterOptions(tableData);
     },
-    setFastFilterOptions(tableData) {
+    setFastFilterOptions (tableData) {
       const viewDatas = [];
       const inFlightNOList = new Set();
       const transferFlightNOList = new Set();

src/views/newQuery/components/table.vue

@@ -469,6 +469,10 @@ export default {
         })
         this.tableData = _.orderBy(nTableData, ['departure_flights_leave_date', 'normalState'], ['asc', 'desc'])
       }
+      if (this.$route.path == '/newBagDetails') {
+        const nTableData = [...tableData]
+        this.tableData = _.orderBy(nTableData, ['readTime'], ['asc', 'desc'])
+      }
       const filters = this.setTableFilters(this.tableData, this.tableDataFilters)
       this.tableDataFilters = _.cloneDeep(filters)
       this.tableGroup(this.tableData)
@@ -515,9 +519,9 @@ export default {
       this.spanArr = spanArr
       this.pos = pos
     },
-    setTableScroll() {
+    setTableScroll () {
       const count = Math.max(this.leaveCount, this.arriveCount)
-      if ( this.hasSetTableScroll || count === 0) {
+      if (this.hasSetTableScroll || count === 0) {
         return
       }
       const table = this.$refs['table'].$el

src/views/table/index.vue

@@ -938,7 +938,12 @@ export default {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.tableType == "add") {
-            this.generalDataReception(1, this.tableForm);
+            if (this.$route.path == '/alarmstrategySetting') {
+              const newObj = Object.assign(this.tableForm, this.urlParams)
+              this.generalDataReception(1, newObj);
+            } else {
+              this.generalDataReception(1, this.tableForm);
+            }
           } else {
             this.generalDataReception(2, this.tableForm, this.tableKey);
           }