lixiaobang
/
TransFlow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: lixiaobang:419dbdd6aa8cf285c2079362b4d7118e1c8e7969
Branches Tags
lixiaobang:master
lixiaobang:20231109
..
compare: lixiaobang:05d2d4672c12d97ceaa890d7dd0ab6e7b6378c9f
Branches Tags
lixiaobang:master
lixiaobang:20231109

No commits in common. "419dbdd6aa8cf285c2079362b4d7118e1c8e7969" and "05d2d4672c12d97ceaa890d7dd0ab6e7b6378c9f" have entirely different histories.
419dbdd6aa ... 05d2d4672c

5 changed files with 26 additions and 65 deletions
Show Stats Expand all files Collapse all files

3
src/components/chart/lineChart.vue
View File

@ -96,7 +96,6 @@ export default {
methods: { methods: {
drawLine(newVal, title, timeMode) { drawLine(newVal, title, timeMode) {
// console.log('newVal == ', newVal)
let myChart = this.$echarts.getInstanceByDom(this.$refs.lineChart); let myChart = this.$echarts.getInstanceByDom(this.$refs.lineChart);
if (myChart == null) { if (myChart == null) {
myChart = this.$echarts.init(this.$refs.lineChart); myChart = this.$echarts.init(this.$refs.lineChart);
@ -278,7 +277,7 @@ export default {
if (val.speed == -1) { if (val.speed == -1) {
return '-'; return '-';
} }
return Math.abs(val.speed); return val.speed;
}); });
} else if (title === '流量') { } else if (title === '流量') {
this.name = '辆'; this.name = '辆';

33
src/components/sensorFusion/meanValue.vue
View File

@ -79,35 +79,10 @@ export default {
this.dataList = this.dataList.slice(-10); this.dataList = this.dataList.slice(-10);
} }
for (let i = 0; i < this.dataList.length; i++) { for (let i = 0; i < this.dataList.length; i++) {
if(this.dataList[i].max) { this.max.push(this.dataList[i].max);
this.max.push(Math.abs(this.dataList[i].max.toFixed(2))); this.min.push(this.dataList[i].min);
}else { this.med.push(this.dataList[i].med);
this.max.push(0); this.avg.push(this.dataList[i].avg);
}
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)));
} }
let maxData = ""; let maxData = "";
let minData = ""; let minData = "";

19
src/components/target/typeChart.vue
View File

@ -52,7 +52,7 @@
</el-card> </el-card>
</div> </div>
</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="cycleAccumulateDataArr && cycleAccumulateDataArr.length > 0">
<div v-if="title == '类型'"> <div v-if="title == '类型'">
<span style="font-size: 15px">类型数量总和</span><br /> <span style="font-size: 15px">类型数量总和</span><br />
@ -208,10 +208,8 @@
<span style="font-size: 20px; font-weight: 200">秒</span> <span style="font-size: 20px; font-weight: 200">秒</span>
</div> </div>
<div> <div>
<div v-if="newDataArr[0].time"> <div>
<!-- {{ newDataArr[0].time ? 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> </div>
</div> </div>
</div> </div>
@ -523,17 +521,6 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
.spacialCard {
width: 150px;
margin-bottom: 20px;
text-align: center;
}
::v-deep.spacialCard .el-card__body{
padding: 10px;
}
.tableTitle { .tableTitle {
background: #f7f8fa; background: #f7f8fa;
margin-bottom: 5px; margin-bottom: 5px;

28
src/views/StateOperation.vue
View File

@ -115,12 +115,12 @@ export default {
totalVirtualMemory: '', totalVirtualMemory: '',
}, },
mountingPointTable: [ mountingPointTable: [
// { {
// mountingPoint: '2016-05-02', mountingPoint: '2016-05-02',
// equipmentName: '王小虎', equipmentName: '王小虎',
// occupancy: '上海市普陀区金沙江路 1518 弄', occupancy: '上海市普陀区金沙江路 1518 弄',
// total: '上海市普陀区金沙江路 1518 弄', total: '上海市普陀区金沙江路 1518 弄',
// }, },
], ],
networkStatus: { networkStatus: {
internetAccess: '', internetAccess: '',
@ -131,14 +131,14 @@ export default {
serverVPNOpen: '', serverVPNOpen: '',
}, },
networkStatus: [ networkStatus: [
// { {
// connect: '2016-05-02', connect: '2016-05-02',
// IP: '王小虎', IP: '王小虎',
// acceptor: '上海市普陀区金沙江路 1518 弄', acceptor: '上海市普陀区金沙江路 1518 弄',
// totalReceived: '上海市普陀区金沙江路 1518 弄', totalReceived: '上海市普陀区金沙江路 1518 弄',
// transmission: '上海市普陀区金沙江路 1518 弄', transmission: '上海市普陀区金沙江路 1518 弄',
// transmissionTotal: '上海市普陀区金沙江路 1518 弄', transmissionTotal: '上海市普陀区金沙江路 1518 弄',
// }, },
] ]
} }
}, },

8
src/views/sensorFusion/index.vue
View File

@ -783,8 +783,8 @@
<span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span> <span v-if="scope.row.type == 'Non_Motor|Person'">非机动车|行人</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column align="center" prop="ave_stay" label="存车数"></el-table-column> <el-table-column align="center" prop="n_stay" label="存车数"></el-table-column>
<el-table-column align="center" prop="ave_queue" label="排队数"></el-table-column> <el-table-column align="center" prop="n_queue" label="排队数"></el-table-column>
<el-table-column align="center" prop="occ" label="占用状态"> <el-table-column align="center" prop="occ" label="占用状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.occ == '1'">占用</span> <span v-if="scope.row.occ == '1'">占用</span>
@ -3355,8 +3355,8 @@ export default {
min: msgN[j].min, min: msgN[j].min,
name: msgN[j].name, name: msgN[j].name,
type: msgN[j].type, type: msgN[j].type,
ave_stay: msgN[j].ave_stay, n_stay: msgN[j].ave_stay,
ave_queue: msgN[j].ave_queue, n_queue: msgN[j].ave_queue,
occ: msgN[j].occ, occ: msgN[j].occ,
speed: newSpeed, speed: newSpeed,
originalSpeed: msgN[j].speed originalSpeed: msgN[j].speed