Commit c952187c authored by xxx's avatar xxx

添加新的报警类型

parent 5fecb11b
......@@ -78,12 +78,14 @@ export default {
},
noPtz:false,
aiTabPosition:'今天',
echarts1Data:[{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }],
echarts1Data:[{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }],
echarts2Data:{
name:[],
dianhua:[],
jiashi:[],
pengzhuang:[],
pilao:[],
jiejin:[],
},
alarmData:{
total:0,
......@@ -167,11 +169,13 @@ export default {
let that = this;
that.alarmData.total = 0;
that.alarmData.handle = 0;
that.echarts1Data = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
that.echarts1Data = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
that.echarts2Data.name = [];
that.echarts2Data.dianhua = [];
that.echarts2Data.jiashi = [];
that.echarts2Data.pengzhuang = [];
that.echarts2Data.pilao = [];
that.echarts2Data.jiejin = [];
that.aiAnalysisTableData = [];
if(this.aiTabPosition == '今天'){
let start = this.currentTime1(new Date(new Date(new Date().toLocaleDateString()).getTime()));
......@@ -192,7 +196,7 @@ export default {
params: {
jsession:that.jsession,
devIdno:response1.data.devices[0].did,
alarmType:'620,621,624,625,400',
alarmType:'620,621,624,625,400,172,190,430,431,432,433',
begintime:start,
endtime:end,
currentPage:0,
......@@ -221,6 +225,30 @@ export default {
let obj1 = {...item2};
obj1.alarmTypeText = '前向碰撞';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 172){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 190){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 430){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 431){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 432){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 433){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}
})
that.aiAnalysisTableData = allAlarmData1;
......@@ -237,7 +265,7 @@ export default {
vehiIdno:that.allCarDataText,
begintime:start,
endtime:end,
armType:'620,621,624,625,400',
armType:'620,621,624,625,400,172,190,430,431,432,433',
currentPage:0,
pageRecords:9999,
}
......@@ -268,6 +296,30 @@ export default {
let obj1 = {...item1};
obj1.alarmTypeText = '前向碰撞';
arr1.push(obj1);
}else if(item1.atp == 172){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 190){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}
})
that.alarmData.total = arr1.length;
......@@ -279,10 +331,12 @@ export default {
})
that.alarmData.handle = alarmHandleNum;
//圆角环形图
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
let num1 = 0;
let num2 = 0;
let num3 = 0;
let num4 = 0;
let num5 = 0;
arr1.forEach((item3,index3)=>{
if(item3.alarmTypeText == '接打电话'){
num1++;
......@@ -290,11 +344,17 @@ export default {
num2++;
}else if(item3.alarmTypeText == '前向碰撞'){
num3++;
}else if(item3.alarmTypeText == '疲劳驾驶'){
num4++;
}else if(item3.alarmTypeText == '接近报警'){
num5++;
}
})
echarts1Data1[0].value = num1;
echarts1Data1[1].value = num2;
echarts1Data1[2].value = num3;
echarts1Data1[3].value = num4;
echarts1Data1[4].value = num5;
that.echarts1Data = echarts1Data1;
that.echarts1Fn();
//报警车辆排行榜
......@@ -305,10 +365,14 @@ export default {
let aa1 = [];
let aa2 = [];
let aa3 = [];
let aa4 = [];
let aa5 = [];
a1.forEach((itema,indexa)=>{
aa1.push(0);
aa2.push(0);
aa3.push(0);
aa4.push(0);
aa5.push(0);
})
arr1.forEach((item4,index4)=>{
a1.forEach((item5,index5)=>{
......@@ -318,12 +382,18 @@ export default {
aa2[index5] = aa2[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '前向碰撞'){
aa3[index5] = aa3[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '疲劳驾驶'){
aa4[index5] = aa4[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '接近报警'){
aa5[index5] = aa5[index5] + 1;
}
})
})
that.echarts2Data.dianhua = aa1;
that.echarts2Data.jiashi = aa2;
that.echarts2Data.pengzhuang = aa3;
that.echarts2Data.pilao = aa4;
that.echarts2Data.jiejin = aa5;
that.echarts2Fn();
}else{
that.echarts1Fn();
......@@ -351,7 +421,7 @@ export default {
params: {
jsession:that.jsession,
devIdno:response1.data.devices[0].did,
alarmType:'620,621,624,625,400',
alarmType:'620,621,624,625,400,172,190,430,431,432,433',
begintime:start,
endtime:end,
currentPage:0,
......@@ -380,6 +450,30 @@ export default {
let obj1 = {...item2};
obj1.alarmTypeText = '前向碰撞';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 172){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 190){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 430){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 431){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 432){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 433){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}
})
that.aiAnalysisTableData = allAlarmData1;
......@@ -396,7 +490,7 @@ export default {
vehiIdno:that.allCarDataText,
begintime:start,
endtime:end,
armType:'620,621,624,625,400',
armType:'620,621,624,625,400,172,190,430,431,432,433',
currentPage:0,
pageRecords:9999,
}
......@@ -427,6 +521,30 @@ export default {
let obj1 = {...item1};
obj1.alarmTypeText = '前向碰撞';
arr1.push(obj1);
}else if(item1.atp == 172){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 190){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}
})
that.alarmData.total = arr1.length;
......@@ -438,10 +556,12 @@ export default {
})
that.alarmData.handle = alarmHandleNum;
//圆角环形图
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
let num1 = 0;
let num2 = 0;
let num3 = 0;
let num4 = 0;
let num5 = 0;
arr1.forEach((item3,index3)=>{
if(item3.alarmTypeText == '接打电话'){
num1++;
......@@ -449,11 +569,17 @@ export default {
num2++;
}else if(item3.alarmTypeText == '前向碰撞'){
num3++;
}else if(item3.alarmTypeText == '疲劳驾驶'){
num4++;
}else if(item3.alarmTypeText == '接近报警'){
num5++;
}
})
echarts1Data1[0].value = num1;
echarts1Data1[1].value = num2;
echarts1Data1[2].value = num3;
echarts1Data1[3].value = num4;
echarts1Data1[4].value = num5;
that.echarts1Data = echarts1Data1;
that.echarts1Fn();
//报警车辆排行榜
......@@ -464,10 +590,14 @@ export default {
let aa1 = [];
let aa2 = [];
let aa3 = [];
let aa4 = [];
let aa5 = [];
a1.forEach((itema,indexa)=>{
aa1.push(0);
aa2.push(0);
aa3.push(0);
aa4.push(0);
aa5.push(0);
})
arr1.forEach((item4,index4)=>{
a1.forEach((item5,index5)=>{
......@@ -477,12 +607,18 @@ export default {
aa2[index5] = aa2[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '前向碰撞'){
aa3[index5] = aa3[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '疲劳驾驶'){
aa4[index5] = aa4[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '接近报警'){
aa5[index5] = aa5[index5] + 1;
}
})
})
that.echarts2Data.dianhua = aa1;
that.echarts2Data.jiashi = aa2;
that.echarts2Data.pengzhuang = aa3;
that.echarts2Data.pilao = aa4;
that.echarts2Data.jiejin = aa5;
that.echarts2Fn();
}else{
that.echarts1Fn();
......@@ -510,7 +646,7 @@ export default {
params: {
jsession:that.jsession,
devIdno:response1.data.devices[0].did,
alarmType:'620,621,624,625,400',
alarmType:'620,621,624,625,400,172,190,430,431,432,433',
begintime:start,
endtime:end,
currentPage:0,
......@@ -539,6 +675,30 @@ export default {
let obj1 = {...item2};
obj1.alarmTypeText = '前向碰撞';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 172){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 190){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 430){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 431){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 432){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 433){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}
})
that.aiAnalysisTableData = allAlarmData1;
......@@ -555,7 +715,7 @@ export default {
vehiIdno:that.allCarDataText,
begintime:start,
endtime:end,
armType:'620,621,624,625,400',
armType:'620,621,624,625,400,172,190,430,431,432,433',
currentPage:0,
pageRecords:9999,
}
......@@ -586,6 +746,30 @@ export default {
let obj1 = {...item1};
obj1.alarmTypeText = '前向碰撞';
arr1.push(obj1);
}else if(item1.atp == 172){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 190){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}
})
that.alarmData.total = arr1.length;
......@@ -597,10 +781,12 @@ export default {
})
that.alarmData.handle = alarmHandleNum;
//圆角环形图
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
let num1 = 0;
let num2 = 0;
let num3 = 0;
let num4 = 0;
let num5 = 0;
arr1.forEach((item3,index3)=>{
if(item3.alarmTypeText == '接打电话'){
num1++;
......@@ -608,11 +794,17 @@ export default {
num2++;
}else if(item3.alarmTypeText == '前向碰撞'){
num3++;
}else if(item3.alarmTypeText == '疲劳驾驶'){
num4++;
}else if(item3.alarmTypeText == '接近报警'){
num5++;
}
})
echarts1Data1[0].value = num1;
echarts1Data1[1].value = num2;
echarts1Data1[2].value = num3;
echarts1Data1[3].value = num4;
echarts1Data1[4].value = num5;
that.echarts1Data = echarts1Data1;
that.echarts1Fn();
//报警车辆排行榜
......@@ -623,10 +815,14 @@ export default {
let aa1 = [];
let aa2 = [];
let aa3 = [];
let aa4 = [];
let aa5 = [];
a1.forEach((itema,indexa)=>{
aa1.push(0);
aa2.push(0);
aa3.push(0);
aa4.push(0);
aa5.push(0);
})
arr1.forEach((item4,index4)=>{
a1.forEach((item5,index5)=>{
......@@ -636,12 +832,18 @@ export default {
aa2[index5] = aa2[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '前向碰撞'){
aa3[index5] = aa3[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '疲劳驾驶'){
aa4[index5] = aa4[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '接近报警'){
aa5[index5] = aa5[index5] + 1;
}
})
})
that.echarts2Data.dianhua = aa1;
that.echarts2Data.jiashi = aa2;
that.echarts2Data.pengzhuang = aa3;
that.echarts2Data.pilao = aa4;
that.echarts2Data.jiejin = aa5;
that.echarts2Fn();
}else{
that.echarts1Fn();
......@@ -663,7 +865,7 @@ export default {
top: '1%',
left: 'center'
},
color:['rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)',],
color:['rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(255,150,195)', 'rgb(146,119,255)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)',],
series: [
{
type: 'pie',
......@@ -709,11 +911,11 @@ export default {
legend: {
textStyle:{
color: 'black',
fontSize:14,
fontSize:12,
},
},
grid: {
top: '15%',
top: '18%',
left: '1%',
right: '5%',
bottom: '3%',
......@@ -791,7 +993,33 @@ export default {
itemStyle: {
color: 'rgb(250,200,88)'
},
}
},
{
name: '疲劳驾驶',
type: 'bar',
stack: 'total',
label: {
show: true
},
data: this.echarts2Data.pilao,
barWidth: 20,
itemStyle: {
color: 'rgb(255,150,195)'
},
},
{
name: '接近报警',
type: 'bar',
stack: 'total',
label: {
show: true
},
data: this.echarts2Data.jiejin,
barWidth: 20,
itemStyle: {
color: 'rgb(146,119,255)'
},
},
]
};
option && myChart.setOption(option);
......
......@@ -79,12 +79,14 @@ export default {
},
noPtz:false,
aiTabPosition:'今天',
echarts1Data:[{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }],
echarts1Data:[{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }],
echarts2Data:{
name:[],
dianhua:[],
jiashi:[],
pengzhuang:[],
pilao:[],
jiejin:[],
},
alarmData:{
total:0,
......@@ -168,11 +170,13 @@ export default {
let that = this;
that.alarmData.total = 0;
that.alarmData.handle = 0;
that.echarts1Data = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
that.echarts1Data = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
that.echarts2Data.name = [];
that.echarts2Data.dianhua = [];
that.echarts2Data.jiashi = [];
that.echarts2Data.pengzhuang = [];
that.echarts2Data.pilao = [];
that.echarts2Data.jiejin = [];
that.aiAnalysisTableData = [];
if(this.aiTabPosition == '今天'){
let start = this.currentTime1(new Date(new Date(new Date().toLocaleDateString()).getTime()));
......@@ -193,7 +197,7 @@ export default {
params: {
jsession:that.jsession,
devIdno:response1.data.devices[0].did,
alarmType:'620,621,624,625,400',
alarmType:'620,621,624,625,400,172,190,430,431,432,433',
begintime:start,
endtime:end,
currentPage:0,
......@@ -222,6 +226,30 @@ export default {
let obj1 = {...item2};
obj1.alarmTypeText = '前向碰撞';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 172){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 190){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 430){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 431){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 432){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 433){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}
})
that.aiAnalysisTableData = allAlarmData1;
......@@ -238,7 +266,7 @@ export default {
vehiIdno:that.allCarDataText,
begintime:start,
endtime:end,
armType:'620,621,624,625,400',
armType:'620,621,624,625,400,172,190,430,431,432,433',
currentPage:0,
pageRecords:9999,
}
......@@ -269,6 +297,30 @@ export default {
let obj1 = {...item1};
obj1.alarmTypeText = '前向碰撞';
arr1.push(obj1);
}else if(item1.atp == 172){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 190){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}
})
that.alarmData.total = arr1.length;
......@@ -280,10 +332,12 @@ export default {
})
that.alarmData.handle = alarmHandleNum;
//圆角环形图
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
let num1 = 0;
let num2 = 0;
let num3 = 0;
let num4 = 0;
let num5 = 0;
arr1.forEach((item3,index3)=>{
if(item3.alarmTypeText == '接打电话'){
num1++;
......@@ -291,11 +345,17 @@ export default {
num2++;
}else if(item3.alarmTypeText == '前向碰撞'){
num3++;
}else if(item3.alarmTypeText == '疲劳驾驶'){
num4++;
}else if(item3.alarmTypeText == '接近报警'){
num5++;
}
})
echarts1Data1[0].value = num1;
echarts1Data1[1].value = num2;
echarts1Data1[2].value = num3;
echarts1Data1[3].value = num4;
echarts1Data1[4].value = num5;
that.echarts1Data = echarts1Data1;
that.echarts1Fn();
//报警车辆排行榜
......@@ -306,10 +366,14 @@ export default {
let aa1 = [];
let aa2 = [];
let aa3 = [];
let aa4 = [];
let aa5 = [];
a1.forEach((itema,indexa)=>{
aa1.push(0);
aa2.push(0);
aa3.push(0);
aa4.push(0);
aa5.push(0);
})
arr1.forEach((item4,index4)=>{
a1.forEach((item5,index5)=>{
......@@ -319,12 +383,18 @@ export default {
aa2[index5] = aa2[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '前向碰撞'){
aa3[index5] = aa3[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '疲劳驾驶'){
aa4[index5] = aa4[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '接近报警'){
aa5[index5] = aa5[index5] + 1;
}
})
})
that.echarts2Data.dianhua = aa1;
that.echarts2Data.jiashi = aa2;
that.echarts2Data.pengzhuang = aa3;
that.echarts2Data.pilao = aa4;
that.echarts2Data.jiejin = aa5;
that.echarts2Fn();
}else{
that.echarts1Fn();
......@@ -352,7 +422,7 @@ export default {
params: {
jsession:that.jsession,
devIdno:response1.data.devices[0].did,
alarmType:'620,621,624,625,400',
alarmType:'620,621,624,625,400,172,190,430,431,432,433',
begintime:start,
endtime:end,
currentPage:0,
......@@ -381,6 +451,30 @@ export default {
let obj1 = {...item2};
obj1.alarmTypeText = '前向碰撞';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 172){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 190){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 430){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 431){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 432){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 433){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}
})
that.aiAnalysisTableData = allAlarmData1;
......@@ -397,7 +491,7 @@ export default {
vehiIdno:that.allCarDataText,
begintime:start,
endtime:end,
armType:'620,621,624,625,400',
armType:'620,621,624,625,400,172,190,430,431,432,433',
currentPage:0,
pageRecords:9999,
}
......@@ -428,6 +522,30 @@ export default {
let obj1 = {...item1};
obj1.alarmTypeText = '前向碰撞';
arr1.push(obj1);
}else if(item1.atp == 172){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 190){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}
})
that.alarmData.total = arr1.length;
......@@ -439,10 +557,12 @@ export default {
})
that.alarmData.handle = alarmHandleNum;
//圆角环形图
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
let num1 = 0;
let num2 = 0;
let num3 = 0;
let num4 = 0;
let num5 = 0;
arr1.forEach((item3,index3)=>{
if(item3.alarmTypeText == '接打电话'){
num1++;
......@@ -450,11 +570,17 @@ export default {
num2++;
}else if(item3.alarmTypeText == '前向碰撞'){
num3++;
}else if(item3.alarmTypeText == '疲劳驾驶'){
num4++;
}else if(item3.alarmTypeText == '接近报警'){
num5++;
}
})
echarts1Data1[0].value = num1;
echarts1Data1[1].value = num2;
echarts1Data1[2].value = num3;
echarts1Data1[3].value = num4;
echarts1Data1[4].value = num5;
that.echarts1Data = echarts1Data1;
that.echarts1Fn();
//报警车辆排行榜
......@@ -465,10 +591,14 @@ export default {
let aa1 = [];
let aa2 = [];
let aa3 = [];
let aa4 = [];
let aa5 = [];
a1.forEach((itema,indexa)=>{
aa1.push(0);
aa2.push(0);
aa3.push(0);
aa4.push(0);
aa5.push(0);
})
arr1.forEach((item4,index4)=>{
a1.forEach((item5,index5)=>{
......@@ -478,12 +608,18 @@ export default {
aa2[index5] = aa2[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '前向碰撞'){
aa3[index5] = aa3[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '疲劳驾驶'){
aa4[index5] = aa4[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '接近报警'){
aa5[index5] = aa5[index5] + 1;
}
})
})
that.echarts2Data.dianhua = aa1;
that.echarts2Data.jiashi = aa2;
that.echarts2Data.pengzhuang = aa3;
that.echarts2Data.pilao = aa4;
that.echarts2Data.jiejin = aa5;
that.echarts2Fn();
}else{
that.echarts1Fn();
......@@ -511,7 +647,7 @@ export default {
params: {
jsession:that.jsession,
devIdno:response1.data.devices[0].did,
alarmType:'620,621,624,625,400',
alarmType:'620,621,624,625,400,172,190,430,431,432,433',
begintime:start,
endtime:end,
currentPage:0,
......@@ -540,6 +676,30 @@ export default {
let obj1 = {...item2};
obj1.alarmTypeText = '前向碰撞';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 172){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 190){
let obj1 = {...item2};
obj1.alarmTypeText = '疲劳驾驶';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 430){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 431){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 432){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}else if(item2.alarmType == 433){
let obj1 = {...item2};
obj1.alarmTypeText = '接近报警';
allAlarmData1.push(obj1);
}
})
that.aiAnalysisTableData = allAlarmData1;
......@@ -556,7 +716,7 @@ export default {
vehiIdno:that.allCarDataText,
begintime:start,
endtime:end,
armType:'620,621,624,625,400',
armType:'620,621,624,625,400,172,190,430,431,432,433',
currentPage:0,
pageRecords:9999,
}
......@@ -587,6 +747,30 @@ export default {
let obj1 = {...item1};
obj1.alarmTypeText = '前向碰撞';
arr1.push(obj1);
}else if(item1.atp == 172){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 190){
let obj1 = {...item1};
obj1.alarmTypeText = '疲劳驾驶';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}else if(item1.atp == 430){
let obj1 = {...item1};
obj1.alarmTypeText = '接近报警';
arr1.push(obj1);
}
})
that.alarmData.total = arr1.length;
......@@ -598,10 +782,12 @@ export default {
})
that.alarmData.handle = alarmHandleNum;
//圆角环形图
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }];
let echarts1Data1 = [{ value: 0, name: '接打电话' }, { value: 0, name: '分神驾驶' }, { value: 0, name: '前向碰撞' }, { value: 0, name: '疲劳驾驶' }, { value: 0, name: '接近报警' }];
let num1 = 0;
let num2 = 0;
let num3 = 0;
let num4 = 0;
let num5 = 0;
arr1.forEach((item3,index3)=>{
if(item3.alarmTypeText == '接打电话'){
num1++;
......@@ -609,11 +795,17 @@ export default {
num2++;
}else if(item3.alarmTypeText == '前向碰撞'){
num3++;
}else if(item3.alarmTypeText == '疲劳驾驶'){
num4++;
}else if(item3.alarmTypeText == '接近报警'){
num5++;
}
})
echarts1Data1[0].value = num1;
echarts1Data1[1].value = num2;
echarts1Data1[2].value = num3;
echarts1Data1[3].value = num4;
echarts1Data1[4].value = num5;
that.echarts1Data = echarts1Data1;
that.echarts1Fn();
//报警车辆排行榜
......@@ -624,10 +816,14 @@ export default {
let aa1 = [];
let aa2 = [];
let aa3 = [];
let aa4 = [];
let aa5 = [];
a1.forEach((itema,indexa)=>{
aa1.push(0);
aa2.push(0);
aa3.push(0);
aa4.push(0);
aa5.push(0);
})
arr1.forEach((item4,index4)=>{
a1.forEach((item5,index5)=>{
......@@ -637,12 +833,18 @@ export default {
aa2[index5] = aa2[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '前向碰撞'){
aa3[index5] = aa3[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '疲劳驾驶'){
aa4[index5] = aa4[index5] + 1;
}else if(item4.vid == item5 && item4.alarmTypeText == '接近报警'){
aa5[index5] = aa5[index5] + 1;
}
})
})
that.echarts2Data.dianhua = aa1;
that.echarts2Data.jiashi = aa2;
that.echarts2Data.pengzhuang = aa3;
that.echarts2Data.pilao = aa4;
that.echarts2Data.jiejin = aa5;
that.echarts2Fn();
}else{
that.echarts1Fn();
......@@ -664,7 +866,7 @@ export default {
top: '1%',
left: 'center'
},
color:['rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)',],
color:['rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(255,150,195)', 'rgb(146,119,255)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)','rgb(84,112,198)', 'rgb(145,204,117)','rgb(250,200,88)',],
series: [
{
type: 'pie',
......@@ -710,11 +912,11 @@ export default {
legend: {
textStyle:{
color: 'black',
fontSize:14,
fontSize:12,
},
},
grid: {
top: '15%',
top: '18%',
left: '1%',
right: '5%',
bottom: '3%',
......@@ -792,7 +994,33 @@ export default {
itemStyle: {
color: 'rgb(250,200,88)'
},
}
},
{
name: '疲劳驾驶',
type: 'bar',
stack: 'total',
label: {
show: true
},
data: this.echarts2Data.pilao,
barWidth: 20,
itemStyle: {
color: 'rgb(255,150,195)'
},
},
{
name: '接近报警',
type: 'bar',
stack: 'total',
label: {
show: true
},
data: this.echarts2Data.jiejin,
barWidth: 20,
itemStyle: {
color: 'rgb(146,119,255)'
},
},
]
};
option && myChart.setOption(option);
......
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