1

src/views/carManagement/carInformation/index.vue

@@ -152,6 +152,9 @@ export default {
 				equipmentName: [
 					{required: true, message: '请选择终端设备', trigger: 'change' }
 				],
+				road: [
+					{required: true, message: '请选择所属车队名称', trigger: 'change' }
+				],
 			},
 		}
 	},

src/views/carManagement/carTrajectory/index.vue

@@ -57,10 +57,10 @@
 						</div>
 						<div class="trajectoryTableView">
 							<div style="font-size:20px;font-weight: 600;">播放时间列表</div>
-							<div v-for="(obj,index) in trajectoryTableData" :key="index" style="display:flex;justify-content: space-between;margin-top: 1vh;">
-								<div>{{obj.alarmTime}}</div>
-								<div>停止{{obj.time}}分钟</div>
-							</div>
+							<el-table :data="playtimeTableData" border height="58.5vh">
+								<el-table-column prop="date" label="启动时间" align="center"></el-table-column>
+								<el-table-column prop="name" label="停车时间" align="center"></el-table-column>
+							</el-table>
 						</div>
 						<div class="tishiTextStyle" v-if="tishiTextShow">请选择车辆查看轨迹</div>
 					</div>
@@ -181,7 +181,7 @@ export default {
 			HttpReq.truckDispatching.carInformationQuery({number:this.query.number}).then((res) => {
 				if(res.code == 200 && res.data.totalElements != 0){
 					this.tishiTextShow = false;
-					//获取列表
+					//获取停车时间以及地点数据并启动地图
 					HttpReq.truckDispatching.mineAlarmHistoryCountQuery({number:this.query.number,bTime:this.query.bTime,eTime:this.query.eTime}).then((res1) => {
 						if(res1.code == 200){
 							this.measureDistanceDis = false;
@@ -190,6 +190,12 @@ export default {
 							that.$refs.mars3dViewerMapMethod.getCoordinate(res.data.content[0].equipmentName,res.data.content[0].number,that.playSpeedNum,that.query.bTime,that.query.eTime,this.trajectoryTableData,this.leadTime);
 						}
 					})
+					//获取右侧播放时间列表
+					// HttpReq.truckDispatching.mineAlarmHistoryCountQuery({number:this.query.number,bTime:this.query.bTime,eTime:this.query.eTime}).then((res1) => {
+					// 	if(res1.code == 200){
+							
+					// 	}
+					// })
 				}else{
 					this.$notify({
 						title: '暂无该车辆轨迹信息！',
@@ -333,10 +339,7 @@ export default {
 			bottom: 0.1vh;
 			width: 16vw;
 			height: 61vh;
-			padding: 1vh 1vh;
-			box-sizing: border-box;
-			border: 1px gainsboro solid;
-			overflow-y: scroll;
+			overflow: hidden;
 		}
 		
 	}