chenrui  2 years ago
parent
commit
141d446725

+ 0 - 4
public/config.js

@@ -83,10 +83,6 @@ window.DATACONTENT_ID = {
   baggageDetails: 44, // 行李-详情列表
   baggageMessage: 3066, // 行李-原始报文
 
-  /***-----容器视图------***/
-  containerHistory: 18026,
-  containerBaggage: 18027,
-
   /***-----基础数据------***/
   deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
   deployNodeteoId: 60, //基础数据-节点信息维护-二级页面-id

+ 19 - 16
src/views/statisticsCharts/components/tableformbrs.vue

@@ -10,23 +10,26 @@
     >
       <template v-if="tableData.length">
         <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="A" label="航站"> </el-table-column>
-          <el-table-column label="出港航班量">
-            <el-table-column prop="flightno" label="航班(架次)" width="240">
+          <el-table-column label="PEK国航行李BRS扫描数据统计表">
+            <el-table-column prop="A" label="航站"> </el-table-column>
+            <el-table-column label="出港航班量">
+              <el-table-column prop="flightno" label="航班(架次)" width="240">
+              </el-table-column>
+              <el-table-column prop="bagsno" label="行李(件数)" width="240">
+              </el-table-column>
             </el-table-column>
-            <el-table-column prop="bagsno" label="行李(件数)" width="240">
+            <el-table-column label="扫描航班量">
+              <el-table-column prop="loadflightno" label="航班(架次)">
+              </el-table-column>
+              <el-table-column prop="loadbagsno" label="行李(件数)">
+              </el-table-column>
             </el-table-column>
-          </el-table-column>
-          <el-table-column label="扫描航班量">
-            <el-table-column prop="loadflightno" label="航班(架次)">
-            </el-table-column>
-            <el-table-column prop="loadbagsno" label="行李(件数)">
+            <el-table-column label="扫描率">
+              <el-table-column prop="flightscan" label="航班">
+              </el-table-column>
+              <el-table-column prop="bagsscan" label="行李"> </el-table-column>
             </el-table-column>
           </el-table-column>
-          <el-table-column label="扫描率">
-            <el-table-column prop="flightscan" label="航班"> </el-table-column>
-            <el-table-column prop="bagsscan" label="行李"> </el-table-column>
-          </el-table-column>
         </el-table>
       </template>
       <template v-else>
@@ -46,7 +49,7 @@ export default {
       default: "",
     },
     dataContent: {
-      type: Object,
+      type: Array,
       default: () => [],
     },
   },
@@ -96,7 +99,7 @@ export default {
     },
   },
   mounted() {
-    this.getQuery();
+    // this.getQuery();
   },
   methods: {
     //获取表格数据
@@ -106,7 +109,7 @@ export default {
         const { code, returnData } = await Query({
           id: this.dataId,
           needPage: ++this.page,
-          dataContent: Object.values(this.dataContent),
+          dataContent: this.dataContent,
         });
         if (code == 0) {
           if (returnData.listValues.length === 0) {

+ 2 - 2
src/views/statisticsCharts/views/report/scanningStatistics.vue

@@ -92,8 +92,8 @@ export default {
       this.dataContent.push(
         data.interval,
         data.airport,
-        data.dateTime[0],
-        data.dateTime[1]
+        data.dateTime[0] ? data.dateTime[0] : "",
+        data.dateTime[1] ? data.dateTime[1] : ""
       );
     },
   },