Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/landTransportation/bulkCargo.js

@@ -99,10 +99,11 @@ export function saveFile(data) {
     })
 }
 //获取总数
-export function totalList() {
+export function totalList(data) {
     return request({
         url: '/api/blade-land/order/BulkLoadCount',
-        method: 'get'
+        method: 'get',
+        params:data
     })
 }
 //修改状态

src/api/landTransportation/index.js

@@ -192,17 +192,19 @@ export function addressList(name) {
     })
 }
 //获取总数
-export function totalList(name) {
+export function totalList(data) {
     return request({
-        url: '/api/blade-land/order/count?kind='+name,
-        method: 'get'
+        url: '/api/blade-land/order/count',
+        method: 'get',
+        params:data
     })
 }
 //获取车队司机总数
-export function motorcadeDriver(name) {
+export function motorcadeDriver(data) {
     return request({
-        url: '/api/blade-land/order-item/count?tag='+name,
-        method: 'get'
+        url: '/api/blade-land/order-item/count',
+        method: 'get',
+        params:data
     })
 }
 //保存车队司机

src/views/landTransportation/bulkCargo/index.vue

@@ -1207,9 +1207,6 @@ export default {
       this.onLoad(this.page)
     },
     onLoad(page, params = {}) {
-      totalList().then(res => {
-        this.totalData = res.data.data
-      })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
@@ -1222,6 +1219,9 @@ export default {
         queryParams.endArrivalTime = queryParams.arrivalTime[1]
       }
       delete queryParams.arrivalTime
+      totalList(queryParams).then(res => {
+        this.totalData = res.data.data
+      })
       this.loading = true;
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records

src/views/landTransportation/dispatchingCars/index.vue

@@ -297,7 +297,8 @@ export default {
           }]
       },
       home: false,
-      dispatchTimer: null
+      dispatchTimer: null,
+      screen:{}
     }
   },
   activated() {
@@ -331,7 +332,10 @@ export default {
       let this_ = this;
       this_.dispatchTimer = setInterval(function () {
         if (JSON.parse(localStorage.getItem("saber-token")).content) {
-          totalList(2).then(res => {
+          totalList({
+            kind:2,
+            ...this_.screen
+          }).then(res => {
             this_.totalData = res.data.data
           })
         }
@@ -375,9 +379,6 @@ export default {
       this.$refs.crud.getTableHeight()
     },
     onLoad(page, params = {}) {
-      totalList(2).then(res => {
-        this.totalData = res.data.data
-      })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
@@ -392,6 +393,13 @@ export default {
         queryParams.endArrivalTime = queryParams.arrivalTime[1]
       }
       delete queryParams.arrivalTime
+      this.screen = queryParams
+      totalList({
+        kind:2,
+        ...this.screen
+      }).then(res => {
+        this.totalData = res.data.data
+      })
       this.loading = true;
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records

src/views/landTransportation/driver/index.vue

@@ -194,6 +194,7 @@ export default {
       loadingTwo: false,
       loading: false,
       activeName:'2',
+      screen:{},
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -583,7 +584,10 @@ export default {
     businessStatisticsFrequency().then(res=> {
       let this_ = this
       this_.driverTimer = setInterval(function () {
-        motorcadeDriver(4).then(res => {
+        motorcadeDriver({
+          tag:4,
+          ...this_.screen
+        }).then(res => {
           this_.totalData = res.data.data
         })
       }, Number(res.data.data[0].dictKey) * 1000)
@@ -657,9 +661,6 @@ export default {
     },
     //查询
     onLoad(page, params={}) {
-      motorcadeDriver(4).then(res=>{
-        this.totalData = res.data.data
-      })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
@@ -673,6 +674,13 @@ export default {
         queryParams.endArrivalTime = queryParams.arrivalTime[1]
       }
       delete queryParams.arrivalTime
+      this.screen = queryParams
+      motorcadeDriver({
+        tag:4,
+        ...queryParams
+      }).then(res=>{
+        this.totalData = res.data.data
+      })
       this.loading = true;
       driverQueryCollection(queryParams).then(res => {
         this.goodsList = res.data.data.records

src/views/landTransportation/motorcadeDriver/index.vue

@@ -229,6 +229,7 @@ export default {
     return {
       key: 0,
       query:{},
+      screen:{},
       dialogVisibleTwo:false,
       loadingDialog:false,
       map: null,
@@ -762,7 +763,10 @@ export default {
     businessStatisticsFrequency().then(res=>{
       let this_ = this
       this_.dispatchACarTimer = setInterval(function(){
-        motorcadeDriver(3).then(res=>{
+        motorcadeDriver({
+          tag:3,
+          ...this_.screen
+        }).then(res=>{
           this_.totalData = res.data.data
         })
       },  Number(res.data.data[0].dictKey)*1000)
@@ -879,9 +883,6 @@ export default {
     },
     //查询
     onLoad(page, params={}) {
-      motorcadeDriver(3).then(res => {
-        this.totalData = res.data.data
-      })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
@@ -895,6 +896,13 @@ export default {
         queryParams.endArrivalTime = queryParams.arrivalTime[1]
       }
       delete queryParams.arrivalTime
+      this.screen = queryParams
+      motorcadeDriver({
+        tag:3,
+        ...this.screen
+      }).then(res => {
+        this.totalData = res.data.data
+      })
       this.loading = true;
       driverQueryCollection(queryParams).then(res => {
         this.goodsList = res.data.data.records

src/views/landTransportation/placeAnOrder/index.vue

@@ -207,6 +207,7 @@ export default {
         pageSizes: [10, 50, 100, 200, 300]
       },
       key: 0,
+      screen:{},
       totalData: {},
       option: {},
       optionList: {
@@ -422,7 +423,10 @@ export default {
       let this_ = this
       this_.entrustTimer = setInterval(function () {
         if (JSON.parse(localStorage.getItem("saber-token")).content) {
-          totalList(1).then(res => {
+          totalList({
+            kind:1,
+            ...this_.screen
+          }).then(res => {
             this_.totalData = res.data.data
           })
         }
@@ -479,9 +483,6 @@ export default {
       this.onLoad(this.page)
     },
     onLoad(page, params = {}) {
-      totalList(1).then(res => {
-        this.totalData = res.data.data
-      })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
@@ -495,6 +496,13 @@ export default {
         queryParams.endArrivalTime = queryParams.arrivalTime[1]
       }
       delete queryParams.arrivalTime
+      this.screen = queryParams
+      totalList({
+        kind:1,
+        ...this.screen
+      }).then(res => {
+        this.totalData = res.data.data
+      })
       this.loading = true;
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records