1

src/views/securityCheck/views/cargoCharts.vue

@@ -2,7 +2,7 @@
   <div class="content-app">
     <div class="up">
       <SecurityCheckHeader
-        title="航空货物关联统计"
+        title="航线货物关联统计"
         @change="change"
         :withExportButton="false"
         @search="search"

src/views/securityCheck/views/cargoRelevanceTable.vue

@@ -2,7 +2,7 @@
   <div class="table-wrapper">
     <header ref="tableWrapperHeader" class="table-header-wrapper">
       <SecurityCheckHeader
-        title="航空货物关联统计"
+        title="航线货物关联统计"
         @change="changeHandler"
         @search="searchHandler"
         mode="combobox"
@@ -125,7 +125,7 @@ export default {
           dataIndex: "priority",
           key: "priority",
           prop: "priority",
-          title: "高风险",
+          title: "低风险",
           children: [
             {
               dataIndex: "priorityCount",
@@ -191,7 +191,7 @@ export default {
           dataIndex: "strict",
           key: "strict",
           prop: "strict",
-          title: "低风险",
+          title: "高风险",
           children: [
             {
               dataIndex: "strictCount",
@@ -295,29 +295,41 @@ export default {
     async getData() {
       try {
         this.loading = true;
-        // console.log(this.$route.query);
         const result = await agent(this.FormData);
         if (result.status === 200) {
           this.tableData = result.data;
           this.tableData.forEach((item) => {
+            let arr =[{},{},{},{},{}];
             item.datas.forEach((data) => {
               data["mix"] =
-                Math.floor((data.count / item.count).toFixed(2) * 100) + "%";
+                Math.floor((data.count / item.count)* 100) + "%";
+              if(data.level == "普通"){
+                arr[3]=data;
+              }
+              if(data.level == "严控"){
+                arr[1]=data;
+              }
+              if(data.level == "低风险"){
+                arr[2]=data;
+              }
+              if(data.level == "优先"){
+                arr[4]=data;
+              }
+              if(data.level == "高风险"){
+                arr[0]=data;
+              }
             });
+            item.datas = arr;
           });
+          console.log(this.tableData)
           if (this.tableData.length > 0) {
             for (let i = 0; i < this.tableData[0].datas.length; i++) {
               this.tableCols.forEach((item) => {
                 if (item.title == this.tableData[0].datas[i].level) {
-                  // item.dataIndex = "datas";
-                  // item.key = "datas";
                   item.prop = "datas";
                   item.children[0].dataIndex = "datas[" + i + "].count";
-                  console.log("datas[" + i + "].count");
-                  // item.children[0].key  = "datas["+i+"].count";
                   item.children[0].prop = "datas[" + i + "].count";
                   item.children[1].dataIndex = "datas[" + i + "].mix";
-                  // item.children[1].key  = "datas["+i+"].mix";
                 }
               });
             }
@@ -340,12 +352,10 @@ export default {
               } else if (re.level == "优先") {
                 normalCount.push(re.count);
               } else if (re.level == "高风险") {
-                console.log(re.count);
                 strictCount.push(re.count);
               }
             });
           });
-          console.log();
           this.footerDate[0] = {
             count: eval(count.join("+")),
             "datas[0].count": eval(highRiskcount.join("+")),

src/views/securityCheck/views/waybillTable.vue

@@ -54,14 +54,14 @@ export default {
           width: 125,
         },
         {
-          dataIndex: "mainWaybillNo",
-          key: "mainWaybillNo",
+          dataIndex: "mwbNo",
+          key: "mwbNo",
           title: "航空主运单编号",
           width: 125,
         },
         {
-          dataIndex: "subWaybillNo",
-          key: "subWaybillNo",
+          dataIndex: "hwbNo",
+          key: "hwbNo",
           title: "航空分运单编号",
           width: 125,
         },
@@ -109,13 +109,13 @@ export default {
           title: "货物风险等级",
         },
         {
-          dataIndex: "securityChannel",
-          key: "securityChannel",
+          dataIndex: "checkPoint",
+          key: "checkPoint",
           title: "安检通道号",
         },
         {
-          dataIndex: "count",
-          key: "count",
+          dataIndex: "securityPcs",
+          key: "securityPcs",
           title: "安检件数",
         },
         {
@@ -181,7 +181,6 @@ export default {
     async getData() {
       try {
         this.loading = true;
-        console.log(this.FormData);
         const result = await waybill(this.FormData);
         if (result.code === 200) {
           const pagination = { ...this.pagination };