Compare commits
No commits in common. "419dbdd6aa8cf285c2079362b4d7118e1c8e7969" and "05d2d4672c12d97ceaa890d7dd0ab6e7b6378c9f" have entirely different histories.
419dbdd6aa
...
05d2d4672c
|
|
@ -96,7 +96,6 @@ export default {
|
|||
|
||||
methods: {
|
||||
drawLine(newVal, title, timeMode) {
|
||||
// console.log('newVal == ', newVal)
|
||||
let myChart = this.$echarts.getInstanceByDom(this.$refs.lineChart);
|
||||
if (myChart == null) {
|
||||
myChart = this.$echarts.init(this.$refs.lineChart);
|
||||
|
|
@ -278,7 +277,7 @@ export default {
|
|||
if (val.speed == -1) {
|
||||
return '-';
|
||||
}
|
||||
return Math.abs(val.speed);
|
||||
return val.speed;
|
||||
});
|
||||
} else if (title === '流量') {
|
||||
this.name = '辆';
|
||||
|
|
|
|||
|
|
@ -79,35 +79,10 @@ export default {
|
|||
this.dataList = this.dataList.slice(-10);
|
||||
}
|
||||
for (let i = 0; i < this.dataList.length; i++) {
|
||||
if(this.dataList[i].max) {
|
||||
this.max.push(Math.abs(this.dataList[i].max.toFixed(2)));
|
||||
}else {
|
||||
this.max.push(0);
|
||||
}
|
||||
|
||||
if(this.dataList[i].min) {
|
||||
this.min.push(Math.abs(this.dataList[i].min.toFixed(2)));
|
||||
}else {
|
||||
this.min.push(0);
|
||||
}
|
||||
|
||||
if(this.dataList[i].med) {
|
||||
this.med.push(Math.abs(this.dataList[i].med.toFixed(2)));
|
||||
}else {
|
||||
this.med.push(0);
|
||||
}
|
||||
|
||||
if(this.dataList[i].avg) {
|
||||
this.avg.push(Math.abs(this.dataList[i].avg.toFixed(2)));
|
||||
}else {
|
||||
this.avg.push(0);
|
||||
}
|
||||
|
||||
|
||||
// this.max.push(Math.abs(this.dataList[i].max.toFixed(2)));
|
||||
// this.min.push(Math.abs(this.dataList[i].min.toFixed(2)));
|
||||
// this.med.push(Math.abs(this.dataList[i].med.toFixed(2)));
|
||||
// this.avg.push(Math.abs(this.dataList[i].avg.toFixed(2)));
|
||||
this.max.push(this.dataList[i].max);
|
||||
this.min.push(this.dataList[i].min);
|
||||
this.med.push(this.dataList[i].med);
|
||||
this.avg.push(this.dataList[i].avg);
|
||||
}
|
||||
let maxData = "";
|
||||
let minData = "";
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
</el-card>
|
||||
</div>
|
||||
</div>
|
||||
<el-card v-show="echartArr.includes('数值')" class="spacialCard">
|
||||
<el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center">
|
||||
<div v-if="cycleAccumulateDataArr && cycleAccumulateDataArr.length > 0">
|
||||
<div v-if="title == '类型'">
|
||||
<span style="font-size: 15px">类型数量总和</span><br />
|
||||
|
|
@ -208,10 +208,8 @@
|
|||
<span style="font-size: 20px; font-weight: 200">秒</span>
|
||||
</div>
|
||||
<div>
|
||||
<div v-if="newDataArr[0].time">
|
||||
<!-- {{ newDataArr[0].time ? newDataArr[0].time : '' }} -->
|
||||
<div>{{newDataArr[0].time.slice(0, 11)}}</div>
|
||||
<div>{{newDataArr[0].time.slice(11)}}</div>
|
||||
<div>
|
||||
{{ newDataArr[0].time ? newDataArr[0].time : '' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -523,17 +521,6 @@ export default {
|
|||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
|
||||
.spacialCard {
|
||||
width: 150px;
|
||||
margin-bottom: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
::v-deep.spacialCard .el-card__body{
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.tableTitle {
|
||||
background: #f7f8fa;
|
||||
margin-bottom: 5px;
|
||||
|
|
|
|||
|
|
@ -115,12 +115,12 @@ export default {
|
|||
totalVirtualMemory: '',
|
||||
},
|
||||
mountingPointTable: [
|
||||
// {
|
||||
// mountingPoint: '2016-05-02',
|
||||
// equipmentName: '王小虎',
|
||||
// occupancy: '上海市普陀区金沙江路 1518 弄',
|
||||
// total: '上海市普陀区金沙江路 1518 弄',
|
||||
// },
|
||||
{
|
||||
mountingPoint: '2016-05-02',
|
||||
equipmentName: '王小虎',
|
||||
occupancy: '上海市普陀区金沙江路 1518 弄',
|
||||
total: '上海市普陀区金沙江路 1518 弄',
|
||||
},
|
||||
],
|
||||
networkStatus: {
|
||||
internetAccess: '',
|
||||
|
|
@ -131,14 +131,14 @@ export default {
|
|||
serverVPNOpen: '',
|
||||
},
|
||||
networkStatus: [
|
||||
// {
|
||||
// connect: '2016-05-02',
|
||||
// IP: '王小虎',
|
||||
// acceptor: '上海市普陀区金沙江路 1518 弄',
|
||||
// totalReceived: '上海市普陀区金沙江路 1518 弄',
|
||||
// transmission: '上海市普陀区金沙江路 1518 弄',
|
||||
// transmissionTotal: '上海市普陀区金沙江路 1518 弄',
|
||||
// },
|
||||
{
|
||||
connect: '2016-05-02',
|
||||
IP: '王小虎',
|
||||
acceptor: '上海市普陀区金沙江路 1518 弄',
|
||||
totalReceived: '上海市普陀区金沙江路 1518 弄',
|
||||
transmission: '上海市普陀区金沙江路 1518 弄',
|
||||
transmissionTotal: '上海市普陀区金沙江路 1518 弄',
|
||||
},
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -783,8 +783,8 @@
|
|||
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column align="center" prop="ave_stay" label="存车数"></el-table-column>
|
||||
<el-table-column align="center" prop="ave_queue" label="排队数"></el-table-column>
|
||||
<el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
|
||||
<el-table-column align="center" prop="n_queue" label="排队数"></el-table-column>
|
||||
<el-table-column align="center" prop="occ" label="占用状态">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.occ == '1'">占用</span>
|
||||
|
|
@ -3355,8 +3355,8 @@ export default {
|
|||
min: msgN[j].min,
|
||||
name: msgN[j].name,
|
||||
type: msgN[j].type,
|
||||
ave_stay: msgN[j].ave_stay,
|
||||
ave_queue: msgN[j].ave_queue,
|
||||
n_stay: msgN[j].ave_stay,
|
||||
n_queue: msgN[j].ave_queue,
|
||||
occ: msgN[j].occ,
|
||||
speed: newSpeed,
|
||||
originalSpeed: msgN[j].speed
|
||||
|
|
|
|||
Loading…
Reference in New Issue