Skip to content

卡
卡车调度系统
Commit 5b9b2c40 authored by xxx's avatar xxx
Browse files
Options

1

parent b84db947
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 395 additions and 148 deletions
src/assets/js/common.js
View file @ 5b9b2c40
...@@ -2534,6 +2534,22 @@ var HttpReq = function(){ ...@@ -2534,6 +2534,22 @@ var HttpReq = function(){
params:param, params:param,
}) })
}, },
//大屏组件27接口
apiAlarmBlQuery: function(param){
return request({
url: '/api/Alarm/Bl',
method: 'get',
params:param,
})
},
//大屏组件9接口
apiAlarmBjQuery: function(param){
return request({
url: '/api/Alarm/Bj',
method: 'get',
params:param,
})
},
......
src/views/MLargeScreen/components/smallComponents/DPcomputer27.vue
View file @ 5b9b2c40
...@@ -27,114 +27,74 @@ export default { ...@@ -27,114 +27,74 @@ export default {
methods:{ methods:{
loadData(){ loadData(){
//报警路障申报统计 //报警路障申报统计
HttpReq.truckDispatching.breakDownQueryDay({size:9999}).then((res) => { HttpReq.truckDispatching.apiAlarmBlQuery({size:9999}).then((res) => {
let that = this; let that = this;
if(res.code == 200){ let arr1 = [];
//报警路障申报统计过度数组 let obj1 = {};
let alarmBreakArray = []; obj1.name = '超速';
let breakObj1 = {}; obj1.value = res[0].cs;
breakObj1.name = '车辆故障'; let obj2 = {};
breakObj1.value = res.data.totalElements; obj2.name = '车辆故障';
alarmBreakArray.push(breakObj1); obj2.value = res[0].gz;
let obj3 = {};
//获取报警信息 obj3.name = '路障申报';
HttpReq.truckDispatching.callPoliceQuery({size:9999,}).then((res) => { obj3.value = res[0].lz;
if(res.code == 200){ let obj4 = {};
let alarmObj1 = {}; obj4.name = '无故停车';
let alarmArray1 = []; obj4.value = res[0].wg;
let alarmObj2 = {}; let obj5 = {};
let alarmArray2 = []; obj5.name = '驶入电子围栏';
let alarmObj3 = {}; obj5.value = res[0].xr;
let alarmArray3 = []; let obj6 = {};
let alarmObj4 = {}; obj6.name = '驶离电子围栏';
let alarmArray4 = []; obj6.value = res[0].xc;
res.data.content.forEach((item,index)=>{ arr1.push(obj1);
if(item.alarmclass == '超速'){ arr1.push(obj2);
alarmArray1.push(item); arr1.push(obj3);
}else if(item.alarmclass == '无故停车'){ arr1.push(obj4);
alarmArray2.push(item); arr1.push(obj5);
}else if(item.alarmclass == '驾离电子围栏'){ arr1.push(obj6);
alarmArray3.push(item); that.echarts6Data = arr1;
}else if(item.alarmclass == '驶入电子围栏'){ this.$nextTick(()=>{
alarmArray4.push(item); that.echarts6Fn();
} })
})
alarmObj1.name = '超速';
alarmObj1.value = alarmArray1.length;
alarmObj2.name = '无故停车';
alarmObj2.value = alarmArray2.length;
alarmObj3.name = '驾离电子围栏';
alarmObj3.value = alarmArray3.length;
alarmObj4.name = '驶入电子围栏';
alarmObj4.value = alarmArray4.length;
alarmBreakArray.push(alarmObj1);
alarmBreakArray.push(alarmObj2);
alarmBreakArray.push(alarmObj3);
alarmBreakArray.push(alarmObj4);
that.echarts6Data = alarmBreakArray;
this.$nextTick(()=>{
that.echarts6Fn();
})
}
})
}
}) })
this.DPcomputer27BoxTimer = setInterval(() => { this.DPcomputer27BoxTimer = setInterval(() => {
//报警路障申报统计 //报警路障申报统计
HttpReq.truckDispatching.breakDownQueryDay({size:9999}).then((res) => { HttpReq.truckDispatching.apiAlarmBlQuery({size:9999}).then((res) => {
let that = this; let that = this;
if(res.code == 200){ let arr1 = [];
//报警路障申报统计过度数组 let obj1 = {};
let alarmBreakArray = []; obj1.name = '超速';
let breakObj1 = {}; obj1.value = res[0].cs;
breakObj1.name = '车辆故障'; let obj2 = {};
breakObj1.value = res.data.totalElements; obj2.name = '车辆故障';
alarmBreakArray.push(breakObj1); obj2.value = res[0].gz;
let obj3 = {};
//获取报警信息 obj3.name = '路障申报';
HttpReq.truckDispatching.callPoliceQuery({size:9999,}).then((res) => { obj3.value = res[0].lz;
if(res.code == 200){ let obj4 = {};
let alarmObj1 = {}; obj4.name = '无故停车';
let alarmArray1 = []; obj4.value = res[0].wg;
let alarmObj2 = {}; let obj5 = {};
let alarmArray2 = []; obj5.name = '驶入电子围栏';
let alarmObj3 = {}; obj5.value = res[0].xr;
let alarmArray3 = []; let obj6 = {};
let alarmObj4 = {}; obj6.name = '驶离电子围栏';
let alarmArray4 = []; obj6.value = res[0].xc;
res.data.content.forEach((item,index)=>{ arr1.push(obj1);
if(item.alarmclass == '超速'){ arr1.push(obj2);
alarmArray1.push(item); arr1.push(obj3);
}else if(item.alarmclass == '无故停车'){ arr1.push(obj4);
alarmArray2.push(item); arr1.push(obj5);
}else if(item.alarmclass == '驾离电子围栏'){ arr1.push(obj6);
alarmArray3.push(item); that.echarts6Data = arr1;
}else if(item.alarmclass == '驶入电子围栏'){ this.$nextTick(()=>{
alarmArray4.push(item); that.echarts6Fn();
} })
})
alarmObj1.name = '超速';
alarmObj1.value = alarmArray1.length;
alarmObj2.name = '无故停车';
alarmObj2.value = alarmArray2.length;
alarmObj3.name = '驾离电子围栏';
alarmObj3.value = alarmArray3.length;
alarmObj4.name = '驶入电子围栏';
alarmObj4.value = alarmArray4.length;
alarmBreakArray.push(alarmObj1);
alarmBreakArray.push(alarmObj2);
alarmBreakArray.push(alarmObj3);
alarmBreakArray.push(alarmObj4);
that.echarts6Data = alarmBreakArray;
this.$nextTick(()=>{
that.echarts6Fn();
})
}
})
}
}) })
},20000) },60000)
}, },
//报警路障申报统计 //报警路障申报统计
...@@ -158,7 +118,7 @@ export default { ...@@ -158,7 +118,7 @@ export default {
{ {
name: '次数', name: '次数',
type: 'pie', type: 'pie',
radius: ['40%', '85%'], radius: ['40%', '80%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
label: { label: {
show: true, show: true,
...@@ -218,6 +178,7 @@ export default { ...@@ -218,6 +178,7 @@ export default {
.DPcomputer27Box #echarts6View{ .DPcomputer27Box #echarts6View{
position: absolute; position: absolute;
left: -6vw; left: -6vw;
top: -1vh;
width: 125%; width: 125%;
height: 20vh; height: 20vh;
} }
......
src/views/MLargeScreen/components/smallComponents/DPcomputer9.vue
View file @ 5b9b2c40
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<img v-else-if="index % 2 == 0" src="../../../../assets/images/cutGraph/jingshikaobei3.png"> <img v-else-if="index % 2 == 0" src="../../../../assets/images/cutGraph/jingshikaobei3.png">
<img v-else src="../../../../assets/images/cutGraph/jingshikaobei4.png"> <img v-else src="../../../../assets/images/cutGraph/jingshikaobei4.png">
<div style="color:#A6F6F9;margin-left:10px;"> <div style="color:#A6F6F9;margin-left:10px;">
<div>{{item.alarmexplain ? item.alarmexplain : item.number + item.carbreak}}</div> <div>{{item.num + (item.type == 1 ? '驶入电子围栏' : item.type == 2 ? '驶出电子围栏' : item.type)}}报警</div>
<div>{{item.createTime}}</div> <div>{{item.time}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -39,26 +39,12 @@ export default { ...@@ -39,26 +39,12 @@ export default {
methods:{ methods:{
loadData(){ loadData(){
//实时报警 //实时报警
HttpReq.truckDispatching.callPoliceQuery({status:1,size:9999}).then((res) => { HttpReq.truckDispatching.apiAlarmBjQuery({size:9999}).then((res) => {
if(res.code == 200){ this.realAlarmStyleData.listData = res;
HttpReq.truckDispatching.carFaultQuery({status:1,size:9999,sort:'createTime,desc'}).then((res1) => {
if(res1.code == 200){
this.realAlarmStyleData.listData = res.data.content.concat(res1.data.content);
}
})
}
}) })
this.DPcomputer9BoxTimer = setInterval(() => { this.DPcomputer9BoxTimer = setInterval(() => {
//实时报警 HttpReq.truckDispatching.apiAlarmBjQuery({size:9999}).then((res) => {
HttpReq.truckDispatching.callPoliceQuery({status:1,size:9999}).then((res) => { this.realAlarmStyleData.listData = res;
if(res.code == 200){
HttpReq.truckDispatching.carFaultQuery({status:1,size:9999,sort:'createTime,desc'}).then((res1) => {
if(res1.code == 200){
this.realAlarmStyleData.listData = res.data.content.concat(res1.data.content);
}
})
}
}) })
},10000) },10000)
}, },
......
src/views/carManagement/carTrajectory/index.vue
View file @ 5b9b2c40
...@@ -26,17 +26,11 @@ ...@@ -26,17 +26,11 @@
<br> <br>
<el-form-item label="轨迹时间点" style="display: inline-block;"> <el-form-item label="轨迹时间点" style="display: inline-block;">
<el-date-picker <el-time-picker
v-model="trajectoryTimePoint" v-model="trajectoryTimePoint"
type="datetime"
@change="trajectoryTimePointFn" @change="trajectoryTimePointFn"
:placeholder="trajectoryTimePointPlaceholder" :placeholder="trajectoryTimePointPlaceholder">
:picker-options="{ </el-time-picker>
disabledDate (time) {
return time.getTime() >= query.eTime || time.getTime() < query.bTime//选当前时间之前的时间
}
}"
></el-date-picker>
</el-form-item> </el-form-item>
<el-button style="display: inline-block;" @click="pauseResume()">{{pauseResumeBoolean ? '暂停' : '继续'}}</el-button> <el-button style="display: inline-block;" @click="pauseResume()">{{pauseResumeBoolean ? '暂停' : '继续'}}</el-button>
...@@ -339,20 +333,22 @@ export default { ...@@ -339,20 +333,22 @@ export default {
}, },
//接收当前进度时间 //接收当前进度时间
progressTimeFn(time){ progressTimeFn(time){
this.trajectoryTimePointPlaceholder = time; let text1 = time.split(' ')[1];
this.trajectoryTimePointPlaceholder = text1;
}, },
//轨迹时间点跳转 //轨迹时间点跳转
trajectoryTimePointFn(){ trajectoryTimePointFn(){
if(this.query.number == '' || !this.query.bTime || !this.query.eTime){ console.log(this.trajectoryTimePoint);
return; // if(this.query.number == '' || !this.query.bTime || !this.query.eTime){
}else{ // return;
if(!this.trajectoryTimePoint){ // }else{
return // if(!this.trajectoryTimePoint){
}else{ // return
this.$refs.mars3dViewerMapMethod.changeTime(this.trajectoryTimePoint); // }else{
this.trajectoryTimePoint = ''; // this.$refs.mars3dViewerMapMethod.changeTime(this.trajectoryTimePoint);
} // this.trajectoryTimePoint = '';
} // }
// }
}, },
// 地图构造完成回调 // 地图构造完成回调
onMapload(map) { onMapload(map) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment