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

src/api/statistics/statistics.js

@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
-// 航线货物关联统计接口
+// 安检通道综合效率统计接口
 export function correlation(query) {
   return request({
     url: '/risk/report/securityCheck',
     method: 'POST',
-    data:query
+    data: query
   })
 }
 
@@ -36,21 +36,21 @@ export function waybill(query) {
   })
 }
 
-// 获取代理人信息统计接口
+// 航线货物关联统计接口
 export function agent(query) {
   return request({
     url: '/risk/report/airlineCargo',
     method: 'POST',
-    data:query
+    data: query
   })
 }
 
-// 安检通道综合效率统计接口
+// 代理人信用等级视角安检综合效率统计接口
 export function emergency(query) {
   return request({
     url: '/risk/report/agentCredit',
     method: 'get',
     method: 'POST',
-    data:query
+    data: query
   })
 }

src/utils/app-ecahrts.js

@@ -11,6 +11,23 @@ export const eleCake = {
     bottom: '5%',
     containLabel: true
   },
+  dataZoom: [{
+    type: 'slider',//给x轴设置滚动条
+    show: true, //flase直接隐藏图形
+    xAxisIndex: [0],
+    bottom: 0,
+    height: 20,
+    showDetail: false,
+    startValue: 0,//滚动条的起始位置
+    endValue: 15 //滚动条的截止位置（按比例分割你的柱状图x轴长度）
+  },
+  {
+    type: 'inside',//设置鼠标滚轮缩放
+    show: true,
+    xAxisIndex: [0],
+    startValue: 0,
+    endValue: 9
+  }],
   xAxis: {
     axisTick: {
       alignWithLabel: true
@@ -25,27 +42,66 @@ export const eleCake = {
     }
   },
   series: [{
-    name: '',
+    name: '高风险',
     type: 'bar',
-    stack: '业务',
+    stack: '总',
     barWidth: '24px',
     itemStyle: {
       normal: {
         //这里是重点
-        color: "#F3C742"
+        color: "#EE50A6"
       }
     },
     data: [630, 20, 36, 10, 10, 20]
   },
   {
-    name: '',
+    name: '低风险级',
     type: 'bar',
-    stack: '业务',
+    stack: '总',
     barWidth: '24px',
     itemStyle: {
       normal: {
         //这里是重点
-        color: "#EE50A6"
+        color: "#F3C742"
+      }
+    },
+    data: [300, 25, 26, 20, 10, 20]
+  },
+  {
+    name: '优先级',
+    type: 'bar',
+    stack: '总',
+    barWidth: '24px',
+    itemStyle: {
+      normal: {
+        //这里是重点
+        color: "#5AC591"
+      }
+    },
+    data: [300, 25, 26, 20, 10, 20]
+  },
+  {
+    name: '普通级',
+    type: 'bar',
+    stack: '总',
+    barWidth: '24px',
+    itemStyle: {
+      normal: {
+        //这里是重点
+        color: "#70B4D4"
+      }
+    },
+    data: [300, 25, 26, 20, 10, 20]
+  },
+  {
+    name: '严控级',
+    type: 'bar',
+    stack: '总',
+    barWidth: '24px',
+    itemStyle: {
+      normal: {
+        //这里是重点
+        color: "#E64545"
       }
     },
     data: [300, 25, 26, 20, 10, 20]
@@ -88,7 +144,7 @@ export const pillar = {
   },
   series: [
     {
-      name: 'Access From',
+      name: '',
       type: 'pie',
       radius: ['60%', '90%'],
       avoidLabelOverlap: false,
@@ -110,9 +166,9 @@ export const pillar = {
       ]
     },
     {
-      name: '访问来源',
+      name: '总数',
       type: 'pie',
-      silent: 'ture',
+      // silent: 'ture',
       radius: ['0%', '50%'],
       avoidLabelOverlap: false,
       itemStyle: {

src/views/securityCheck/components/graphicHome.vue

@@ -22,16 +22,11 @@ export default {
   data() {
     return {};
   },
-  created() {
+  // created() {
+  //   this.init();
+  // },
+  methods() {
     this.init();
-    // setTimeout(() => {
-    //   this.init();
-    // }, 2000);
-  },
-  mounted() {
-    // setTimeout(() => {
-    //   this.init();
-    // }, 4000);
   },
   methods: {
     init() {
@@ -41,9 +36,14 @@ export default {
       //统计折线
       pillar.series[0].data = this.texter.data;
       pillar.title.text = this.texter.name;
-      pillar.title.subtext = this.texter.cont;
+      pillar.title.subtext = this.texter.kaer
+        ? this.texter.cont + "%"
+        : this.texter.cont;
       pillar.title.top = this.texter.top;
       pillar.series[0].color = this.texter.color;
+      pillar.series[0].name = this.texter.name2;
+      pillar.series[1].name = this.texter.name2;
+      pillar.series[1].data = [this.texter.cont];
       myChart.clear();
       myChart.setOption(pillar, true);
       window.onresize = () => {

src/views/securityCheck/components/securityCheckHeader.vue

@@ -27,6 +27,7 @@
             type="date"
             size="small"
             format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD"
           />
         </a-form-item>
         <a-form-item prop="endDate" style="margin-right: 36px">
@@ -35,6 +36,7 @@
             type="date"
             size="small"
             format="YYYY-MM-DD"
+            valueFormat="YYYY-MM-DD"
           />
         </a-form-item>
         <a-form-item
@@ -65,9 +67,14 @@
       </template>
       <template v-if="withSelect">
         <a-form-item prop="selection" style="margin-right: 16px">
-          <a-select :default-value="optionLists[0]" @change="handleChange">
-            <a-select-option v-for="province in optionLists" :key="province">
-              {{ province }}
+          <a-select :placeholder="selectPlaceholder" @change="handleChange">
+            <a-select-option
+              v-for="item in optionLists"
+              :key="item.name"
+              :value="item.name"
+              :title="item.label"
+            >
+              {{ item.name }}
             </a-select-option>
           </a-select>
           <!-- <a-select
@@ -172,7 +179,29 @@ export default {
   data() {
     return {
       changeButtonLoading: false,
-      optionLists: ["低风险", "优先", "普通", "高风险", "严控"],
+      optionLists: [
+        {
+          name: "全部",
+          lable: "",
+        },
+        {
+          name: "A",
+          lable: "A",
+        },
+        {
+          name: "B",
+          lable: "B",
+        },
+        {
+          name: "C",
+          lable: "C",
+        },
+        {
+          name: "D",
+          lable: "D",
+        },
+      ],
+      // optionLists: ["", "A", "B", "C", "D"],
       formData: {
         beginDate: null,
         endDate: null,
@@ -239,6 +268,20 @@ export default {
         this.search();
       },
     },
+    "formData.beginDate": {
+      handler(val, oldVal) {
+        if (oldVal) {
+          this.search();
+        }
+      },
+    },
+    "formData.endDate": {
+      handler(val, oldVal) {
+        if (oldVal) {
+          this.search();
+        }
+      },
+    },
     selectOptions: {
       handler(val) {
         if (val.length) {
@@ -259,7 +302,7 @@ export default {
     },
   },
   mounted() {
-    this.formData.selection = this.optionLists[0];
+    this.formData.selection = this.optionLists[0].lable;
     this.formData.dateRangeRadio = "当日";
   },
   methods: {

src/views/securityCheck/views/agentHome.vue

@@ -17,7 +17,7 @@
             </div>
             <div class="chart_cont">
               <div class="chart_left">
-                <GraphicEchart :id="1" :texter="dataall" />
+                <GraphicEchart :texter="dataall" />
               </div>
               <div class="chart_right pt90">
                 <div class="child">
@@ -235,10 +235,12 @@
 <script>
 import GraphicEchart from "../components/graphicHome.vue";
 import SecurityCheckHeader from "../components/securityCheckHeader.vue";
+import { emergency } from "@/api/statistics/statistics.js";
 export default {
   data() {
     return {
       dataall: {
+        id: 13,
         name: "总件数",
         cont: "500",
         data: [
@@ -280,10 +282,33 @@ export default {
       },
     };
   },
+  created() {
+    this.getData();
+  },
   methods: {
     change() {
       this.$router.push("./agentTable");
     },
+    async getData() {
+      try {
+        const result = await emergency({});
+        let count = 0;
+        let counts = 0;
+        let arr = [];
+        //获取总件数：
+        result.data.forEach((item) => {
+          count += item.num;
+          let obj = { value: item.num, name: item.risk };
+          arr.push(obj);
+        });
+        this.dataall.cont = count;
+        this.dataall.data = arr;
+        this.dataall.color = [];
+        console.log(result);
+      } catch (error) {
+        console.log(error);
+      }
+    },
   },
   components: {
     GraphicEchart,

src/views/securityCheck/views/cargoCharts.vue

@@ -40,7 +40,7 @@
 import { eleCake } from "@/utils/app-ecahrts";
 import GraphicEchart from "../components/graphicHome.vue";
 import SecurityCheckHeader from "../components/securityCheckHeader.vue";
-import { correlation } from "@/api/statistics/statistics.js";
+import { agent } from "@/api/statistics/statistics.js";
 export default {
   data() {
     return {
@@ -55,7 +55,7 @@ export default {
         },
         data: [
           { value: 335, name: "1" },
-          { value: 310, name: "2" },
+          { value: 0, name: "2" },
         ],
         subtextStyle: {
           fontSize: "28",
@@ -66,7 +66,8 @@ export default {
       },
       datarisk: {
         id: 8,
-        name: "高风险货物级",
+        kaer: 1,
+        name: "高风险",
         cont: "70%",
         top: "35%",
         textStyle: {
@@ -86,7 +87,8 @@ export default {
       },
       dataLowrisk: {
         id: 9,
-        name: "低风险货物级",
+        kaer: 1,
+        name: "低风险",
         cont: "70%",
         top: "35%",
         data: [
@@ -106,6 +108,7 @@ export default {
       },
       datafirst: {
         id: 10,
+        kaer: 1,
         name: "优先级",
         cont: "10%",
         top: "35%",
@@ -126,6 +129,7 @@ export default {
       },
       dataordinary: {
         id: 11,
+        kaer: 1,
         name: "普通级",
         cont: "10%",
         top: "35%",
@@ -146,6 +150,7 @@ export default {
       },
       datastrictly: {
         id: 12,
+        kaer: 1,
         name: "严控级",
         cont: "10%",
         top: "35%",
@@ -188,18 +193,114 @@ export default {
           proxyId: data[2],
         };
         // console.log(params);
-        const result = await correlation(params);
+        const result = await agent(params);
         if (result.status == 200) {
           console.log(result);
-          let arr = [];
-          let arrx = [];
+          let arr = []; //高风险
+          let Low = []; //低风险
+          let firs = []; //优先级
+          let pt = [];
+          let strictly = [];
+          let arrx = []; //x轴
           this.dataall.data = result.data;
           result.data.forEach((element) => {
-            arr.push(element.count);
-            arrx.push(element.channel);
+            arrx.push(element.flightLine);
+            element.datas.forEach((res) => {
+              if (res.level === "高风险级") {
+                arr.push(res.count);
+              } else if (res.level == "低风险级") {
+                Low.push(res.count);
+              } else if (res.level == "优先级") {
+                firs.push(res.count);
+              } else if (res.level == "普通级") {
+                pt.push(res.count);
+              } else if (res.level == "严控级") {
+                strictly.push(res.count);
+              }
+            });
+            // console.log(arr);
           });
-          this.init(arr, arrx);
-          this.datarisk.data = result.data;
+          let arrall = eval(arr.join("+")); //高风险总和
+          let Lowall = eval(Low.join("+")); //低风险级总和
+          let firsall = eval(firs.join("+")); //优先级总和
+          let ptall = eval(pt.join("+")); //普通级总和
+          let strictlyall = eval(strictly.join("+")); //严控级总和
+          let alldata = arrall + Lowall + firsall + ptall + strictlyall; // 总数
+          this.init(arr, arrx, Low, firs, pt, strictly);
+          this.dataall.cont = alldata;
+          this.dataall.data = [
+            {
+              value: 0,
+              name: "",
+            },
+            {
+              value: alldata,
+              name: "总数",
+            },
+          ];
+          this.datarisk.cont = Math.floor((arrall / alldata).toFixed(2) * 100);
+          this.datarisk.data = [
+            {
+              value: alldata,
+              name: "总数",
+            },
+            {
+              value: arrall,
+              name: "高风险",
+            },
+          ];
+          this.dataLowrisk.cont = Math.floor(
+            (Lowall / alldata).toFixed(2) * 100
+          );
+          this.dataLowrisk.data = [
+            {
+              value: alldata,
+              name: "总数",
+            },
+            {
+              value: Lowall,
+              name: "低风险",
+            },
+          ];
+          this.datafirst.cont = Math.floor(
+            (firsall / alldata).toFixed(2) * 100
+          );
+          this.datafirst.data = [
+            {
+              value: alldata,
+              name: "总数",
+            },
+            {
+              value: firsall,
+              name: "优先级",
+            },
+          ];
+          this.dataordinary.cont = Math.floor(
+            (ptall / alldata).toFixed(2) * 100
+          );
+          this.dataordinary.data = [
+            {
+              value: alldata,
+              name: "总数",
+            },
+            {
+              value: ptall,
+              name: "普通",
+            },
+          ];
+          this.datastrictly.cont = Math.floor(
+            (strictlyall / alldata).toFixed(2) * 100
+          );
+          this.datastrictly.data = [
+            {
+              value: alldata,
+              name: "总数",
+            },
+            {
+              value: strictlyall,
+              name: "严控级",
+            },
+          ];
         }
         console.log(result);
       } catch (error) {
@@ -209,11 +310,15 @@ export default {
     change() {
       this.$router.push("./cargoRelevanceTable");
     },
-    init(arr, arrx) {
+    init(arr, arrx, Low, firs, pt, strictly) {
       let myChart = this.$echarts.init(
         document.getElementById("echarts-proportion")
       ); //统计折线
       eleCake.series[0].data = arr;
+      eleCake.series[1].data = Low;
+      eleCake.series[2].data = firs;
+      eleCake.series[3].data = pt;
+      eleCake.series[4].data = strictly;
       eleCake.xAxis.data = arrx;
       myChart.setOption(eleCake, true);
       window.onresize = () => {

src/views/securityCheck/views/cargoStatisticsHome.vue

@@ -28,10 +28,12 @@
                 >
                   <div class="top">
                     <div class="log" :style="{ background: item.color }"></div>
-                    <div class="name">{{ item.name }}</div>
+                    <div class="name" @click="echar">{{ item.name }}</div>
                   </div>
                   <div class="boot">
-                    <div class="child">件数：{{ item.value }}</div>
+                    <div class="child" @click="echar">
+                      件数：{{ item.value }}
+                    </div>
                     <div class="child">占比：{{ item.proportion }}</div>
                   </div>
                 </div>
@@ -50,11 +52,11 @@
               </div>
               <div class="chart_right">
                 <div class="analysis">
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>总件数</p>
                     <span>{{ dataLow.num }}</span>
                   </div>
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>开包数</p>
                     <span>{{ dataLow.kxsNum }}</span>
                   </div>
@@ -73,7 +75,9 @@
                     <div class="name">{{ item.name }}</div>
                   </div>
                   <div class="boot">
-                    <div class="child">件数：{{ item.value }}</div>
+                    <div class="child" @click="echar">
+                      件数：{{ item.value }}
+                    </div>
                     <div class="child">占比：{{ item.prot }}</div>
                   </div>
                 </div>
@@ -134,11 +138,11 @@
               </div>
               <div class="chart_right">
                 <div class="analysis">
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>总件数</p>
                     <span>{{ dataLowpt.num }}</span>
                   </div>
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>开包数</p>
                     <span>{{ dataLowpt.kxsNum }}</span>
                   </div>
@@ -157,7 +161,9 @@
                     <div class="name">{{ item.name }}</div>
                   </div>
                   <div class="boot">
-                    <div class="child">件数：{{ item.value }}</div>
+                    <div class="child" @click="echar">
+                      件数：{{ item.value }}
+                    </div>
                     <div class="child">占比：{{ item.prot }}</div>
                   </div>
                 </div>
@@ -176,11 +182,11 @@
               </div>
               <div class="chart_right">
                 <div class="analysis">
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>总件数</p>
                     <span>{{ dataLowyk.num }}</span>
                   </div>
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>开包数</p>
                     <span>{{ dataLowyk.kxsNum }}</span>
                   </div>
@@ -199,7 +205,9 @@
                     <div class="name">{{ item.name }}</div>
                   </div>
                   <div class="boot">
-                    <div class="child">件数：{{ item.value }}</div>
+                    <div class="child" @click="echar">
+                      件数：{{ item.value }}
+                    </div>
                     <div class="child">占比：{{ item.prot }}</div>
                   </div>
                 </div>
@@ -218,11 +226,11 @@
               </div>
               <div class="chart_right">
                 <div class="analysis">
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>总件数</p>
                     <span>{{ dataLowgf.num }}</span>
                   </div>
-                  <div class="analysis_cont">
+                  <div class="analysis_cont" @click="echar">
                     <p>开包数</p>
                     <span>{{ dataLowgf.kxsNum }}</span>
                   </div>
@@ -241,7 +249,9 @@
                     <div class="name">{{ item.name }}</div>
                   </div>
                   <div class="boot">
-                    <div class="child">件数：{{ item.value }}</div>
+                    <div class="child" @click="echar">
+                      件数：{{ item.value }}
+                    </div>
                     <div class="child">占比：{{ item.prot }}</div>
                   </div>
                 </div>
@@ -264,6 +274,7 @@ export default {
       dataall: {
         id: 1,
         name: "总件数",
+        name2: "申报件数",
         cont: "",
         data: [
           { value: 335, name: "1" },
@@ -323,6 +334,7 @@ export default {
       dataLow: {
         id: 2,
         name: "总件数",
+        name2: "低风险货物级",
         cont: "500",
         data: [],
         top: "41%",
@@ -340,6 +352,7 @@ export default {
       dataLowcp: {
         id: 3,
         name: "总件数",
+        name2: "优先级",
         cont: "500",
         data: [],
         top: "41%",
@@ -357,6 +370,7 @@ export default {
       dataLowpt: {
         id: 4,
         name: "总件数",
+        name2: "普通级",
         cont: "500",
         data: [],
         top: "41%",
@@ -374,6 +388,7 @@ export default {
       dataLowyk: {
         id: 5,
         name: "总件数",
+        name2: "严控级",
         cont: "500",
         data: [],
         top: "41%",
@@ -391,6 +406,7 @@ export default {
       dataLowgf: {
         id: 6,
         name: "总件数",
+        name2: "高风险货物级",
         cont: "500",
         data: [],
         top: "38%",
@@ -413,7 +429,7 @@ export default {
     SecurityCheckHeader,
   },
   created() {
-    this.getData();
+    // this.getData();
   },
   methods: {
     search(data) {
@@ -423,6 +439,7 @@ export default {
         riskRating: data[1],
         agentCode: data[2],
       };
+      this.getData();
     },
     //点击跳转
     echar() {
@@ -436,7 +453,7 @@ export default {
     },
     async getData() {
       try {
-        const result = await comprehensive({});
+        const result = await comprehensive(this.queryData);
         let count = 0;
         let counts = 0;
         let arr = [];
@@ -466,7 +483,8 @@ export default {
         });
         this.dataall.data.forEach((element) => {
           element.proportion = element.value / counts;
-          element.proportion = element.proportion.toFixed(2) * 100 + "%";
+          element.proportion =
+            Math.floor(element.proportion.toFixed(2) * 100) + "%";
         });
         result.data.forEach((res) => {
           if (res.risk == "低风险") {
@@ -476,26 +494,33 @@ export default {
                 name: "移交",
                 value: res.yjNum,
                 prot:
-                  arr == 0 ? "0%" : (res.yjNum / arr.toFixed(2)) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.yjNum / arr.toFixed(2)) * 100) + "%",
               },
               {
                 name: "拒运",
                 value: res.jyNum,
                 prot:
-                  arr == 0 ? "0%" : (res.jyNum / arr.toFixed(2)) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.jyNum / arr.toFixed(2)) * 100) + "%",
               },
               {
                 name: "放行",
                 value: res.fxNum,
                 prot:
-                  arr == 0 ? "0%" : (res.fxNum / arr.toFixed(2)) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.fxNum / arr.toFixed(2)) * 100) + "%",
               },
             ];
             this.dataLow.color = ["#FAD153", "#DC5594", "#6161BD"];
             this.dataLow.num = res.num;
             this.dataLow.kxsNum = res.kxsNum;
             this.dataLow.proportion =
-              (res.kxsNum / res.num).toFixed(2) * 100 + "%";
+              Math.floor((res.kxsNum / res.num).toFixed(2) * 100) + "%";
+            this.dataLow.cont = arr;
           } else if (res.risk == "优先") {
             let arr = res.yjNum + res.jyNum + res.fxNum;
             this.dataLowcp.data = [
@@ -503,26 +528,33 @@ export default {
                 name: "移交",
                 value: res.yjNum,
                 prot:
-                  arr == 0 ? "0%" : (res.yjNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.yjNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "拒运",
                 value: res.jyNum,
                 prot:
-                  arr == 0 ? "0%" : (res.jyNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.jyNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "放行",
                 value: res.fxNum,
                 prot:
-                  arr == 0 ? "0%" : (res.fxNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.fxNum / arr).toFixed(2) * 100) + "%",
               },
             ];
             this.dataLowcp.color = ["#FAD153", "#DC5594", "#6161BD"];
             this.dataLowcp.num = res.num;
             this.dataLowcp.kxsNum = res.kxsNum;
             this.dataLowcp.proportion =
-              (res.kxsNum / res.num).toFixed(2) * 100 + "%";
+              Math.floor((res.kxsNum / res.num).toFixed(2) * 100) + "%";
+            this.dataLowcp.cont = arr;
           } else if (res.risk == "普通") {
             let arr = res.yjNum + res.jyNum + res.fxNum;
             this.dataLowpt.data = [
@@ -530,26 +562,33 @@ export default {
                 name: "移交",
                 value: res.yjNum,
                 prot:
-                  arr == 0 ? "0%" : (res.yjNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.yjNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "拒运",
                 value: res.jyNum,
                 prot:
-                  arr == 0 ? "0%" : (res.jyNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.jyNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "放行",
                 value: res.fxNum,
                 prot:
-                  arr == 0 ? "0%" : (res.fxNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.fxNum / arr).toFixed(2) * 100) + "%",
               },
             ];
             this.dataLowpt.color = ["#FAD153", "#DC5594", "#6161BD"];
             this.dataLowpt.num = res.num;
             this.dataLowpt.kxsNum = res.kxsNum;
             this.dataLowpt.proportion =
-              (res.kxsNum / res.num).toFixed(2) * 100 + "%";
+              Math.floor((res.kxsNum / res.num).toFixed(2) * 100) + "%";
+            this.dataLowpt.cont = arr;
           } else if (res.risk == "严控") {
             let arr = res.yjNum + res.jyNum + res.fxNum;
             this.dataLowyk.data = [
@@ -557,26 +596,33 @@ export default {
                 name: "移交",
                 value: res.yjNum,
                 prot:
-                  arr == 0 ? "0%" : (res.yjNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.yjNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "拒运",
                 value: res.jyNum,
                 prot:
-                  arr == 0 ? "0%" : (res.jyNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.jyNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "放行",
                 value: res.fxNum,
                 prot:
-                  arr == 0 ? "0%" : (res.fxNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.fxNum / arr).toFixed(2) * 100) + "%",
               },
             ];
             this.dataLowyk.color = ["#FAD153", "#DC5594", "#6161BD"];
             this.dataLowyk.num = res.num;
             this.dataLowyk.kxsNum = res.kxsNum;
             this.dataLowyk.proportion =
-              (res.kxsNum / res.num).toFixed(2) * 100 + "%";
+              Math.floor((res.kxsNum / res.num).toFixed(2) * 100) + "%";
+            this.dataLowyk.cont = arr;
           } else if (res.risk == "高风险") {
             let arr = res.yjNum + res.jyNum + res.fxNum;
             this.dataLowgf.data = [
@@ -584,7 +630,9 @@ export default {
                 name: "移交",
                 value: res.yjNum,
                 prot:
-                  arr == 0 ? "0%" : (res.yjNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.yjNum / arr).toFixed(2) * 100) + "%",
               },
               {
                 name: "拒运",
@@ -598,18 +646,19 @@ export default {
                 name: "放行",
                 value: res.fxNum,
                 prot:
-                  arr == 0 ? "0%" : (res.fxNum / arr).toFixed(2) * 100 + "%",
+                  arr == 0
+                    ? "0%"
+                    : Math.floor((res.fxNum / arr).toFixed(2) * 100) + "%",
               },
             ];
             this.dataLowgf.color = ["#FAD153", "#DC5594", "#6161BD"];
             this.dataLowgf.num = res.num;
             this.dataLowgf.kxsNum = res.kxsNum;
             this.dataLowgf.proportion =
-              (res.kxsNum / res.num).toFixed(2) * 100 + "%";
+              Math.floor((res.kxsNum / res.num).toFixed(2) * 100) + "%";
+            this.dataLowgf.cont = arr;
           }
         });
-        console.log(result.data, "11");
-        console.log(this.dataLowgf.data, "222");
         this.$refs.chart.init();
       } catch (error) {
         console.log(error);

src/views/securityCheck/views/cargoTable.vue

@@ -24,7 +24,7 @@
 <script>
 import SecurityCheckHeader from "../components/securityCheckHeader.vue";
 import SecurityCheckTable from "../components/securityCheckTable.vue";
-import { comprehensiveTable } from "@/api/statistics/statistics.js";
+import { comprehensive } from "@/api/statistics/statistics.js";
 export default {
   components: { SecurityCheckHeader, SecurityCheckTable },
   data() {
@@ -112,6 +112,9 @@ export default {
       }
     };
   },
+  created(){
+    this.formatDate()
+  },
   mounted() {
     this.setTableHeight();
     window.addEventListener("resize", this.setTableHeight);
@@ -121,12 +124,21 @@ export default {
     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;
-        console.log(this.FormData);
-        const result = await comprehensiveTable();
+        const result = await comprehensive(this.FormData);
         if (result.code === 200) {
           this.tableData = result.data;
           this.loading = false;