1

src/views/MLargeScreen/components/performanceStatistics/index.vue

@@ -23,7 +23,7 @@
 					<div class="checkFrom_input">{{checkFromData.startTime ? checkFromData.startTime : '无'}}</div>
 				</div>
 				<div class="checkFrom_content">
-					<div>今日车数：</div>
+					<div>{{carclass != '铲车' ? '今日车数：' : '今日装车数：'}}</div>
 					<div class="checkFrom_input">{{checkFromData.carnum ? checkFromData.carnum : '无'}}</div>
 				</div>
 				<div class="checkFrom_content">
@@ -42,7 +42,7 @@
 					<div>已完成单数：</div>
 					<div class="checkFrom_input">{{checkFromData.finish ? checkFromData.finish : '无'}}</div>
 				</div>
-				<div class="checkFrom_content">
+				<div class="checkFrom_content" v-if="carclass != '铲车'">
 					<div>今日里程数：</div>
 					<div class="checkFrom_input">{{checkFromData.odo ? checkFromData.odo : '无'}}</div>
 				</div>
@@ -63,24 +63,50 @@
 				<img src="../../../../assets/images/truckTuPian/fuxiaobiaotititle.png">
 				<span>智能派单：</span>
 			</div>
-			<div class="co-table">
+			<!-- 卡车列表 -->
+			<div class="co-table" v-if="carclass != '铲车'">
 				<div class="rolling">
 					<div class="table-box">
 						<dl>
 							<dt>
 								<div>单号</div>
+								<div>起点</div>
 								<div>目的地</div>
+								<div>里程(km)</div>
+								<div>开始时间</div>
 								<div>完成时间</div>
 							</dt>
 							<dd v-for="(item,index) in intelligentDispatchData" :key="index">
 								<div>{{item.odd}}</div>
+								<div>{{item.qidian}}</div>
 								<div>{{item.destination}}</div>
+								<div>{{parseFloat(item.mil).toFixed(2)}}</div>
+								<div>{{item.createTime}}</div>
 								<div>{{item.endTime}}</div>
 							</dd>
 						</dl>
 					</div>
 				</div>
 			</div>
+			<!-- 铲车列表 -->
+			<div class="co-table" v-if="carclass == '铲车'">
+				<div class="rolling">
+					<div class="table-box">
+						<dl>
+							<dt>
+								<div>单号</div>
+								<div>卡车车牌号</div>
+								<div>装车时间</div>
+							</dt>
+							<dd v-for="(item,index) in intelligentDispatchData" :key="index">
+								<div>{{item.odd}}</div>
+								<div>{{item.carcode}}</div>
+								<div>{{item.createTime}}</div>
+							</dd>
+						</dl>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
@@ -92,6 +118,7 @@ import {achievementStatisticsQuery,intelligentDispatchQuery,apiManmadesJXQuery}
 export default {
 	data() {
 		return {
+			carclass:'',
 			showDecide:false,
 			from:{selectModel:'司机日派单'},
 			personalName:'',
@@ -103,10 +130,11 @@ export default {
 		}
 	},
 	methods: {
-		loadData(value,chepaihao) {
+		loadData(value,chepaihao,carclass) {
 			this.showDecide = true;
 			this.personalName = value;
 			this.carNumber = chepaihao;
+			this.carclass = carclass;
 			this.startTime = '';
 			this.endTime = '';
 			httpGet(apiManmadesJXQuery,{number:this.carNumber}).then((res) => {
@@ -119,7 +147,7 @@ export default {
 		//获取智能派单
 		getintelligentDisData(){
 			let query1 = {};
-			query1.size = 20;
+			query1.size = 50;
 			query1.page = 0;
 			query1.sort = 'createTime,desc';
 			query1.startTime = this.currentTime(this.startTime);
@@ -324,7 +352,7 @@ export default {
 	dt>div{
 		display:table-cell;
 		padding: 1px;
-		font-size: 13px;
+		font-size: 12px;
 		font-weight: 500;
 		color: rgb(24,228,240);
 	}
@@ -333,8 +361,8 @@ export default {
 	}
 	dd>div{
 		display:table-cell;
-		padding: 1px;
-		font-size: 13px;
+		padding: 1px 0px;
+		font-size: 12px;
 		color: rgb(24,228,240);
 	}
 	.rolling{

src/views/MLargeScreen/index.vue

@@ -413,7 +413,7 @@ export default {
 				this.$refs.personalCenterMethod.personalCenCloseFn();
 				this.$refs.smallWindowMethod.carInCloseFn();
 				let byValue = this.personalName;
-				this.$refs.performanceStatisticsMethod.loadData(byValue,this.carnumber);
+				this.$refs.performanceStatisticsMethod.loadData(byValue,this.carnumber,this.carclass);
 			}else{
 				this.selectFunction = 0;
 				this.$refs.voiceApplicationMethod.voiceAppCloseFn();