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

src/views/securityCheck/components/securityCheckTable.vue

@@ -17,7 +17,7 @@
       :pagination="pagination"
       @change="handleTableChange"
       :loading="loading"
-      :scroll="{ y: height }"
+      :scroll="{ y: 650 }"
     >
       <template
         v-if="withOperateColumn"

src/views/securityCheck/views/agentTable.vue

@@ -11,8 +11,11 @@
       <SecurityCheckTable
         :table-cols="tableCols"
         :table-data="tableData"
+        row-key="index"
         :height="tableHeight"
         show-summary
+        :pagination="false"
+        :loading="loading"
       />
     </main>
   </div>
@@ -21,41 +24,47 @@
 <script>
 import SecurityCheckHeader from "../components/securityCheckHeader.vue";
 import SecurityCheckTable from "../components/securityCheckTable.vue";
+import { comprehensiveTable } from "@/api/statistics/statistics.js";
 export default {
   components: { SecurityCheckHeader, SecurityCheckTable },
   data() {
     return {
-      tableHeight: "50vh",
+      loading: false,
+      tableHeight: "550",
       tableCols: [
         {
-          dataIndex: "index",
-          key: "index",
+          dataIndex: "no",
+          key: "no",
           title: "序号",
         },
         {
-          dataIndex: "level",
-          key: "level",
+          dataIndex: "risk",
+          key: "risk",
           title: "等级",
         },
         {
-          dataIndex: "cargoCount",
-          key: "cargoCount",
+          dataIndex: "num",
+          key: "num",
           title: "货物件数",
-          clickHandler: () => {
-            this.$router.push({
-              path: "/waybillTable",
-            });
-          },
+          clickHandler: (row, rowIndex) => {
+                this.$router.push({
+                  path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: this.FormData.openResult,
+                  },
+                });
+              },
         },
         {
-          dataIndex: "unpackCount",
-          key: "unpackCount",
+          dataIndex: "kxsNum",
+          key: "kxsNum",
           title: "开箱件数",
-          clickHandler: () => {
-            this.$router.push({
-              path: "/waybillTable",
-            });
-          },
         },
         {
           dataIndex: "unpackResult",
@@ -63,84 +72,122 @@ export default {
           title: "开箱结果",
           children: [
             {
-              dataIndex: "release",
-              key: "release",
+              dataIndex: "fxNum",
+              key: "fxNum",
               title: "放行",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: '放行',
+                  },
                 });
               },
             },
             {
-              dataIndex: "reject",
-              key: "reject",
+              dataIndex: "jyNum",
+              key: "jyNum",
               title: "拒运",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: '拒运',
+                  },
                 });
               },
             },
             {
-              dataIndex: "turnOver",
-              key: "turnOver",
+              dataIndex: "yjNum",
+              key: "yjNum",
               title: "移交",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: '移交',
+                  },
                 });
               },
             },
           ],
         },
       ],
-      tableData: [
-        {
-          index: 1,
-          level: "高风险",
-          cargoCount: 100,
-          unpackCount: 10,
-          release: 5,
-          reject: 3,
-          turnOver: 2,
-        },
-        {
-          index: 1,
-          level: "普通",
-          cargoCount: 300,
-          unpackCount: 30,
-          release: 15,
-          reject: 9,
-          turnOver: 6,
-        },
-        {
-          index: 1,
-          level: "低风险",
-          cargoCount: 100,
-          unpackCount: 10,
-          release: 5,
-          reject: 3,
-          turnOver: 2,
-        },
-      ],
+      tableData: [],
+      FormData: {
+        destination: "", // 目的站
+        agentCode: "", //代理人ID
+        agentLevel: "", //代理人信用等级 A\B\C\D
+        riskRating: "", //综合风险等级评估 低风险\优先\普通\高风险\严控
+        startTime: "", //开始时间
+        endTime: "", //结束时间
+      },
     };
   },
+  created() {
+    this.formatDate();
+  },
   mounted() {
     this.setTableHeight();
     window.addEventListener("resize", this.setTableHeight);
+    this.getData();
   },
   beforeDestroy() {
     window.removeEventListener("resize", this.setTableHeight);
   },
   methods: {
+    formatDate() {
+      let date = new Date();
+      let myyear = date.getFullYear();
+      let mymonth = date.getMonth() + 1;
+      let myweekday = date.getDate();
+      mymonth < 10 ? (mymonth = "0" + mymonth) : mymonth;
+      myweekday < 10 ? (myweekday = "0" + myweekday) : myweekday;
+      this.FormData.startTime = `${myyear}-${mymonth}-${myweekday}`;
+      this.FormData.endTime = `${myyear}-${mymonth}-${myweekday}`;
+    },
+    //接口数据
+    async getData() {
+      try {
+        this.loading = true;
+        const result = await comprehensiveTable(this.FormData);
+        if (result.code === 200) {
+          this.tableData = result.data;
+          this.loading = false;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
     changeHandler() {
       this.$router.push({
         path: "./agent",
       });
     },
     searchHandler(arr) {
-      console.log(arr);
+      this.FormData.startTime = arr[0][0];
+      this.FormData.endTime = arr[0][1];
+      this.FormData.agentLevel = arr[1];
+      this.FormData.agentCode = arr[2];
+      this.getData();
     },
     setTableHeight() {
       const topBarHeight = 80;
@@ -157,6 +204,7 @@ export default {
 <style lang="scss" scoped>
 .table-wrapper {
   padding: 0 24px;
+  background: #dfe3ea;
   .table-header-wrapper {
     padding-top: 24px;
   }

src/views/securityCheck/views/cargoRelevanceTable.vue

@@ -11,9 +11,11 @@
       <SecurityCheckTable
         :table-cols="tableCols"
         :table-data="tableData"
-        row-key="destination"
+        row-key="index"
         :height="tableHeight"
         show-summary
+        :pagination="false"
+        :loading="loading"
       />
     </main>
   </div>
@@ -22,117 +24,165 @@
 <script>
 import SecurityCheckHeader from "../components/securityCheckHeader.vue";
 import SecurityCheckTable from "../components/securityCheckTable.vue";
+import { agent } from "@/api/statistics/statistics.js";
 export default {
   components: { SecurityCheckHeader, SecurityCheckTable },
   data() {
     return {
-      tableHeight: "50vh",
+      loading: false,
+      tableHeight: "550",
       tableCols: [
         {
           title: "目的地",
-          dataIndex: "destination",
-          key: "destination",
+          dataIndex: "flightLine",
+          key: "flightLine",
         },
         {
-          dataIndex: "totalCount",
-          key: "totalCount",
+          dataIndex: "count",
+          key: "count",
           title: "总件数",
-          clickHandler: () => {
+          clickHandler: (row, rowIndex) => {
+            console.log(row);
             this.$router.push({
               path: "/waybillTable",
+              query: {
+                startTime: this.FormData.startTime,
+                endTime: this.FormData.endTime,
+                destination: row.flightLine,
+                agentCode: this.FormData.agentCode,
+                agentLevel: this.FormData.agentLevel,
+                riskRating: "",
+                openResult: this.FormData.openResult,
+              },
             });
           },
         },
         {
-          dataIndex: "highRisk",
-          key: "highRisk",
-          title: "高风险货物等级",
+          dataIndex: "datas",
+          key: "datas",
+          title: "高风险级",
           children: [
             {
-              dataIndex: "highRiskCount",
-              key: "highRiskCount",
+              dataIndex: "datas[0].count",
+              key: "datas[0].count",
               title: "件数",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
+                console.log(row);
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: row.flightLine,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: "高风险级",
+                    openResult: this.FormData.openResult,
+                  },
                 });
               },
             },
             {
-              dataIndex: "highRiskRatio",
-              key: "highRiskRatio",
+              dataIndex: "datas[0].mix",
+              key: "datas[0].mix",
               title: "占比",
             },
           ],
         },
         {
-          dataIndex: "lowRisk",
-          key: "lowRisk",
-          title: "低风险货物等级",
+          dataIndex: "datas",
+          key: "datas",
+          title: "低风险级",
           children: [
             {
-              dataIndex: "lowRiskCount",
-              key: "lowRiskCount",
+              dataIndex: "datas[4].count",
+              key: "datas[4].count",
               title: "件数",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
+                console.log(row);
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: row.flightLine,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: "低风险级",
+                    openResult: this.FormData.openResult,
+                  },
                 });
               },
             },
             {
-              dataIndex: "lowRiskRatio",
-              key: "lowRiskRatio",
+              dataIndex: "datas[4].mix",
+              key: "datas[4].mix",
               title: "占比",
             },
           ],
         },
         {
-          dataIndex: "priority",
-          key: "priority",
+          dataIndex: "datas",
+          key: "datas",
           prop: "priority",
           title: "优先级",
           children: [
             {
-              dataIndex: "priorityCount",
-              key: "priorityCount",
-              prop: "priorityCount",
+              dataIndex: "datas[3].count",
+              key: "datas[3].count",
               title: "件数",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
+                console.log(row);
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: row.flightLine,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: "优先级",
+                    openResult: this.FormData.openResult,
+                  },
                 });
               },
             },
             {
-              dataIndex: "priorityRatio",
-              key: "priorityRatio",
-              prop: "priorityRatio",
+              dataIndex: "datas[3].mix",
+              key: "datas[3].mix",
               title: "占比",
             },
           ],
         },
         {
-          dataIndex: "normal",
-          key: "normal",
+          dataIndex: "datas",
+          key: "datas",
           prop: "normal",
           title: "普通级",
           children: [
             {
-              dataIndex: "normalCount",
-              key: "normalCount",
-              prop: "normalCount",
+              dataIndex: "datas[2].count",
+              key: "datas[2].count",
               title: "件数",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
+                console.log(row);
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: row.flightLine,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: "普通级",
+                    openResult: this.FormData.openResult,
+                  },
                 });
               },
             },
             {
-              dataIndex: "normalRatio",
-              key: "normalRatio",
-              prop: "normalRatio",
+              dataIndex: "datas[2].mix",
+              key: "datas[2].mix",
               title: "占比",
             },
           ],
@@ -144,89 +194,95 @@ export default {
           title: "严控级",
           children: [
             {
-              dataIndex: "strictCount",
-              key: "strictCount",
-              prop: "strictCount",
+              dataIndex: "datas[1].count",
+              key: "datas[1].count",
               title: "件数",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
+                console.log(row);
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: row.flightLine,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: "严控级",
+                    openResult: this.FormData.openResult,
+                  },
                 });
               },
             },
             {
-              dataIndex: "strictRatio",
-              key: "strictRatio",
-              prop: "strictRatio",
+              dataIndex: "datas[1].mix",
+              key: "datas[1].mix",
               title: "占比",
             },
           ],
         },
       ],
-      tableData: [
-        {
-          destination: "CTU",
-          totalCount: 20000,
-          highRiskCount: 14000,
-          highRiskRatio: "70%",
-          lowRiskCount: 1000,
-          lowRiskRatio: "5%",
-          priorityCount: 2000,
-          priorityRatio: "10%",
-          normalCount: 2000,
-          normalRatio: "10%",
-          strictCount: 1000,
-          strictRatio: "5%",
-          index: 1,
-        },
-        {
-          destination: "PEK",
-          totalCount: 20000,
-          highRiskCount: 14000,
-          highRiskRatio: "70%",
-          lowRiskCount: 1000,
-          lowRiskRatio: "5%",
-          priorityCount: 2000,
-          priorityRatio: "10%",
-          normalCount: 2000,
-          normalRatio: "10%",
-          strictCount: 1000,
-          strictRatio: "5%",
-          index: 2,
-        },
-        {
-          destination: "NZH",
-          totalCount: 20000,
-          highRiskCount: 14000,
-          highRiskRatio: "70%",
-          lowRiskCount: 1000,
-          lowRiskRatio: "5%",
-          priorityCount: 2000,
-          priorityRatio: "10%",
-          normalCount: 2000,
-          normalRatio: "10%",
-          strictCount: 1000,
-          strictRatio: "5%",
-          index: 3,
-        },
-      ],
+      tableData: [],
+      FormData: {
+        destination: "", // 目的站
+        agentCode: "", //代理人ID
+        agentLevel: "", //代理人信用等级 A\B\C\D
+        riskRating: "", //综合风险等级评估 低风险\优先\普通\高风险\严控
+        startTime: "", //开始时间
+        endTime: "", //结束时间
+      },
     };
   },
+  created() {
+    this.formatDate();
+  },
   mounted() {
     this.setTableHeight();
     window.addEventListener("resize", this.setTableHeight);
+    this.getData();
   },
   beforeDestroy() {
     window.removeEventListener("resize", this.setTableHeight);
   },
   methods: {
+    formatDate() {
+      let date = new Date();
+      let myyear = date.getFullYear();
+      let mymonth = date.getMonth() + 1;
+      let myweekday = date.getDate();
+      mymonth < 10 ? (mymonth = "0" + mymonth) : mymonth;
+      myweekday < 10 ? (myweekday = "0" + myweekday) : myweekday;
+      this.FormData.startTime = `${myyear}-${mymonth}-${myweekday}`;
+      this.FormData.endTime = `${myyear}-${mymonth}-${myweekday}`;
+    },
+    //接口数据
+    async getData() {
+      try {
+        this.loading = true;
+        const result = await agent(this.FormData);
+        if (result.status === 200) {
+          this.tableData = result.data;
+          this.tableData.forEach((item) => {
+            item.datas.forEach((data) => {
+              data["mix"] = (data.count / item.count).toFixed(2) * 100 + "%";
+            });
+          });
+          this.loading = false;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
     changeHandler() {
       this.$router.push({
         path: "./cargoCharts",
       });
     },
     searchHandler(arr) {
-      console.log(arr);
+      this.FormData.startTime = arr[0][0];
+      this.FormData.endTime = arr[0][1];
+      this.FormData.agentLevel = arr[1];
+      this.FormData.agentCode = arr[2];
+      this.getData();
     },
     setTableHeight() {
       const topBarHeight = 80;

src/views/securityCheck/views/cargoTable.vue

@@ -46,22 +46,25 @@ export default {
           dataIndex: "num",
           key: "num",
           title: "货物件数",
-          clickHandler: (row) => {
-            console.log(row)
-            // this.$router.push({
-            //   path: "/waybillTable",
-            // });
-          },
+          clickHandler: (row, rowIndex) => {
+                this.$router.push({
+                  path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: this.FormData.openResult,
+                  },
+                });
+              },
         },
         {
           dataIndex: "kxsNum",
           key: "kxsNum",
           title: "开箱件数",
-          clickHandler: () => {
-            this.$router.push({
-              path: "/waybillTable",
-            });
-          },
         },
         {
           dataIndex: "unpackResult",
@@ -72,9 +75,18 @@ export default {
               dataIndex: "fxNum",
               key: "fxNum",
               title: "放行",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: '放行',
+                  },
                 });
               },
             },
@@ -82,9 +94,18 @@ export default {
               dataIndex: "jyNum",
               key: "jyNum",
               title: "拒运",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: '拒运',
+                  },
                 });
               },
             },
@@ -92,9 +113,18 @@ export default {
               dataIndex: "yjNum",
               key: "yjNum",
               title: "移交",
-              clickHandler: () => {
+              clickHandler: (row, rowIndex) => {
                 this.$router.push({
                   path: "/waybillTable",
+                  query: {
+                    startTime: this.FormData.startTime,
+                    endTime: this.FormData.endTime,
+                    destination: this.FormData.destination,
+                    agentCode: this.FormData.agentCode,
+                    agentLevel: this.FormData.agentLevel,
+                    riskRating: row.risk,
+                    openResult: '移交',
+                  },
                 });
               },
             },
@@ -153,7 +183,11 @@ export default {
       });
     },
     searchHandler(arr) {
-      console.log(arr);
+      this.FormData.startTime=arr[0][0];
+      this.FormData.endTime=arr[0][1];
+      this.FormData.agentLevel=arr[1];
+      this.FormData.agentCode=arr[2];
+      this.getData()
     },
     setTableHeight() {
       const topBarHeight = 80;