chenjun 2 years ago
parent
commit
35b1a8bbcd

+ 6 - 0
src/views/system/securityCheck/views/comprehensiveHome.vue

@@ -82,6 +82,8 @@ export default {
         }
         const result = await emergency(params)
         const resultcopy = await emergency(paramspoy)
+        result.data.sort(this.up)
+        resultcopy.data.sort(this.up)
         if (result.status == 200) {
           let arr = [] //高风险
           let Low = [] //低风险
@@ -151,6 +153,7 @@ export default {
             datas[i] = Number(arr[i]) + Number(Low[i]) + Number(firs[i]) + Number(pt[i])
           }
           // console.log(datas)
+
           this.inits(arr, arrx, Low, firs, pt, datas)
         }
         // console.log(result)
@@ -158,6 +161,9 @@ export default {
         console.log(error)
       }
     },
+    up(x, y) {
+      return Date.parse(x.date)- Date.parse(y.date)
+    },
     //月
     init(arr, arrx, Low, firs, pt, datas) {
       let myChart = this.$echarts.init(document.getElementById('comprehensive-month')) //统计折线

+ 4 - 0
src/views/system/securityCheck/views/securityChannelHome.vue

@@ -57,6 +57,9 @@ export default {
     change() {
       this.$router.push('./agentTable')
     },
+    up(x, y) {
+      return parseInt(x.channel.slice(1)) - parseInt(y.channel.slice(1))
+    },
     async relationDate(data) {
       try {
         let params = {
@@ -67,6 +70,7 @@ export default {
           proxyId: data[2],
         }
         const result = await correlation(params)
+        result.data.sort(this.up)
         if (result.status == 200) {
           let arr = [] //高风险
           let Low = [] //低风险

+ 4 - 4
src/views/system/securityCheck/views/waybillTable.vue

@@ -131,13 +131,13 @@ export default {
           title: '安检通道号',
         },
         {
-          dataIndex: 'securityPcs',
-          key: 'securityPcs',
+          dataIndex: 'goodsPieces',
+          key: 'goodsPieces',
           title: '安检件数',
         },
         {
-          dataIndex: 'weight',
-          key: 'weight',
+          dataIndex: 'goodsWeight',
+          key: 'goodsWeight',
           title: '重量',
           width: 70,
         },