1

src/assets/js/common.js

@@ -2488,6 +2488,15 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
+			//大屏组件2司机信息接口
+			apiManmadesRenQuery: function(param){
+				return request({
+					url: '/api/Manmades/Ren',
+					method: 'get',
+					params:param,
+				})
+			},
+			
 
 
 

src/views/MLargeScreen/components/smallComponents/DPcomputer2.vue

@@ -29,7 +29,7 @@
                             <dt>
                                 <div>司机姓名</div>
                                 <div>驾驶车辆</div>
-                                <div>驾驶时长</div>
+                                <div>驾驶时长(H)</div>
                                 <div>计划结束时间</div>
                             </dt>
                             <dd v-for="(item,index) in driverData.driverTableData" :key="index">
@@ -69,19 +69,19 @@ export default {
     methods:{
         loadData(){
             //获取司机信息
-            HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => {
+            HttpReq.truckDispatching.apiManmadesRenQuery({size:9999}).then((res) => {
                 if(res.code == 200){
                     //司机信息处理
                     let workerTemporary = [];
                     let restTemporary = [];
-                    res.data.content.forEach((item) => {
-                        if(item.status == 1){
+                    res.data.forEach((item) => {
+                        if(item.odo != 0){
                             workerTemporary.push(item);
                         }else{
                             restTemporary.push(item);
                         }
                     });
-                    this.driverData.totalNumber = res.data.totalElements;
+                    this.driverData.totalNumber = res.data.length;
                     this.driverData.driverTableData = workerTemporary;
                     this.driverData.workersNumber = workerTemporary.length;
                     this.driverData.restNumber = restTemporary.length;
@@ -90,19 +90,19 @@ export default {
 
             this.DPcomputer2BoxTimer = setInterval(() => {
                 //获取司机信息
-                HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => {
+                HttpReq.truckDispatching.apiManmadesRenQuery({size:9999}).then((res) => {
                     if(res.code == 200){
                         //司机信息处理
                         let workerTemporary = [];
                         let restTemporary = [];
-                        res.data.content.forEach((item) => {
-                            if(item.status == 1){
+                        res.data.forEach((item) => {
+                            if(item.odo != 0){
                                 workerTemporary.push(item);
                             }else{
                                 restTemporary.push(item);
                             }
                         });
-                        this.driverData.totalNumber = res.data.totalElements;
+                        this.driverData.totalNumber = res.data.length;
                         this.driverData.driverTableData = workerTemporary;
                         this.driverData.workersNumber = workerTemporary.length;
                         this.driverData.restNumber = restTemporary.length;