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

bug修改

This commit is contained in:
qiudan 2023-11-04 16:47:45 +08:00
parent 5a424d5409
commit 53b7083f9a
7 changed files with 178 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chart/avgChart.vue
View File

@ -44,7 +44,7 @@ export default {
}, },
methods: { methods: {
drawBar(arr) { drawBar(arr) {
console.log("均值图",arr) // console.log("均值图",arr)
let myChart = this.$echarts.getInstanceByDom(this.$refs.barChart); let myChart = this.$echarts.getInstanceByDom(this.$refs.barChart);
if (myChart == null) { if (myChart == null) {
myChart = this.$echarts.init(this.$refs.barChart); myChart = this.$echarts.init(this.$refs.barChart);

4
src/components/chart/thermalChart.vue
View File

@ -36,7 +36,7 @@ export default {
methods: { methods: {
//处理od组件数据 //处理od组件数据
ODhanlde(odData) { ODhanlde(odData) {
console.log(odData,'oddata'); // console.log(odData,'oddata');
// var odData = this.odData // var odData = this.odData
var chartData = [] var chartData = []
var start = [] var start = []
@ -52,7 +52,7 @@ export default {
} }
} }
// this.thermalChartData = chartData // this.thermalChartData = chartData
console.log(chartData,'处理过后的odssssssssssssss'); // console.log(chartData,'处理过后的odssssssssssssss');
return chartData return chartData
// console.log(chartData, this.unique(start), 'od图的数据'); // console.log(chartData, this.unique(start), 'od图的数据');
}, },

14
src/components/sensorFusion/echartsLine.vue
View File

@ -126,15 +126,19 @@ export default {
} else if (this.componentType == '类型') { } else if (this.componentType == '类型') {
this.chartData.xData = this.extractKeyValues(val, 'time'); this.chartData.xData = this.extractKeyValues(val, 'time');
let seriesArr = this.extractKeyValues(val, 'type_data'); let seriesArr = this.extractKeyValues(val, 'type_data');
console.log('seriesArr-固定时刻',seriesArr)
const transformedData = []; const transformedData = [];
for (let i = 0; i < seriesArr[0].length; i++) { for (let i = 0; i < seriesArr[0].length; i++) {
const item = seriesArr[0][i]; const item = seriesArr[0][i];
const valueList = seriesArr.map((arr) => arr[i].quantity); //固定间隔主题-类型组件type_data取value字段和固定时刻不一样，固定时刻取quantity字段
// const valueList = seriesArr.map((arr) => arr[i].quantity);
const valueList = seriesArr.map((arr) => arr[i].value);
transformedData.push({ transformedData.push({
name: item.name, name: item.name,
value: valueList value: valueList
}); });
} }
// console.log('transformedData-1',transformedData)
const totalCountList = transformedData[0].value.map((_, i) => { const totalCountList = transformedData[0].value.map((_, i) => {
return transformedData.reduce((sum, curr) => sum + curr.value[i], 0); return transformedData.reduce((sum, curr) => sum + curr.value[i], 0);
}); });
@ -168,15 +172,18 @@ export default {
} else if (this.componentType == '类型') { } else if (this.componentType == '类型') {
this.chartData.xData = this.extractKeyValues(val, 'time'); this.chartData.xData = this.extractKeyValues(val, 'time');
let seriesArr = this.extractKeyValues(val, 'type_data'); let seriesArr = this.extractKeyValues(val, 'type_data');
// console.log('seriesArr-固定间隔',seriesArr)
const transformedData = []; const transformedData = [];
for (let i = 0; i < seriesArr[0].length; i++) { for (let i = 0; i < seriesArr[0].length; i++) {
const item = seriesArr[0][i]; const item = seriesArr[0][i];
const valueList = seriesArr.map((arr) => arr[i].quantity); //固定间隔主题-类型组件type_data取value字段和固定时刻不一样，固定时刻取quantity字段
const valueList = seriesArr.map((arr) => arr[i].value);
transformedData.push({ transformedData.push({
name: item.name, name: item.name,
value: valueList value: valueList
}); });
} }
// console.log('transformedData-2',transformedData)
const totalCountList = transformedData[0].value.map((_, i) => { const totalCountList = transformedData[0].value.map((_, i) => {
return transformedData.reduce((sum, curr) => sum + curr.value[i], 0); return transformedData.reduce((sum, curr) => sum + curr.value[i], 0);
}); });
@ -242,7 +249,9 @@ export default {
// slicedData = data; // 如果数据不足 10 条，则保留全部数据 // slicedData = data; // 如果数据不足 10 条，则保留全部数据
// } // }
if (this.componentType == '类型') { if (this.componentType == '类型') {
console.log('类型-dataList',this.dataList)
this.typeData.push({ type_data: this.dataList[0].type_data, time: this.dataList[0].time }); this.typeData.push({ type_data: this.dataList[0].type_data, time: this.dataList[0].time });
console.log('类型-typeData',this.typeData)
this.dataProcessing(this.typeData); this.dataProcessing(this.typeData);
} else { } else {
this.dataProcessing(this.dataList); this.dataProcessing(this.dataList);
@ -257,6 +266,7 @@ export default {
var seriesList = []; var seriesList = [];
var color = ['#0CD2E6', '#3751E6', '#FFC722', 'rgb(255,115,38)']; var color = ['#0CD2E6', '#3751E6', '#FFC722', 'rgb(255,115,38)'];
if (this.componentType == '类型') { if (this.componentType == '类型') {
console.log('类型-seriesList',this.seriesList)
for (let i = 0; i < this.seriesList.length; i++) { for (let i = 0; i < this.seriesList.length; i++) {
seriesList.push({ seriesList.push({
name: this.seriesList[i].name, name: this.seriesList[i].name,

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

@ -4,7 +4,31 @@
<!-- <p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p> --> <!-- <p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p> -->
<!-- 触发数据数值渲染 --> <!-- 触发数据数值渲染 -->
<div class="typeContent"> <div class="typeContent">
<div v-if="newDataArr && newDataArr.length != 0 && newDataArr != undefined"> <div v-if="cycleAccumulateDataArr && cycleAccumulateDataArr.length > 0 ">
<div v-if="title == '类型'" style="display: flex; flex-wrap: wrap">
<el-card
v-for="(n, i) in cycleAccumulateDataArr[0].type_data"
:key="i"
style="width: 150px; margin-bottom: 20px; text-align: center"
>
<div>
<span style="font-size: 15px">{{ n.name }}</span
><br />
<span style="font-size: 30px; font-weight: bold">{{
n.quantity || n.quantity === 0 ? n.quantity : ' - '
}}</span>
<span style="font-size: 15px;" v-if="n.quantity || n.quantity === 0 "> 个</span>
<!-- <span v-if="n.name=='速度'">km/h</span> -->
</div>
<div>
<div>
{{ cycleAccumulateDataArr[0].time ? cycleAccumulateDataArr[0].time : '' }}
</div>
</div>
</el-card>
</div>
</div>
<div v-else-if="newDataArr && newDataArr.length != 0 && newDataArr != undefined">
<div v-if="title == '类型'" style="display: flex; flex-wrap: wrap"> <div v-if="title == '类型'" style="display: flex; flex-wrap: wrap">
<el-card <el-card
v-for="(n, i) in newDataArr[0].type_data" v-for="(n, i) in newDataArr[0].type_data"
@ -17,6 +41,7 @@
<span style="font-size: 30px; font-weight: bold">{{ <span style="font-size: 30px; font-weight: bold">{{
n.quantity || n.quantity === 0 ? n.quantity : ' - ' n.quantity || n.quantity === 0 ? n.quantity : ' - '
}}</span> }}</span>
<span style="font-size: 15px;" v-if="n.quantity || n.quantity === 0 "> 个</span>
<!-- <span v-if="n.name=='速度'">km/h</span> --> <!-- <span v-if="n.name=='速度'">km/h</span> -->
</div> </div>
<div> <div>
@ -34,6 +59,7 @@
<span style="font-size: 30px; font-weight: bold"> <span style="font-size: 30px; font-weight: bold">
{{ getTotal(cycleAccumulateDataArr) }} {{ getTotal(cycleAccumulateDataArr) }}
</span> </span>
<span style="font-size: 15px;">个</span>
</div> </div>
<div <div
style="font-size: 30px; font-weight: bold" style="font-size: 30px; font-weight: bold"
@ -129,6 +155,7 @@
<span style="font-size: 30px; font-weight: bold"> <span style="font-size: 30px; font-weight: bold">
{{ getTotal(newDataArr) }} {{ getTotal(newDataArr) }}
</span> </span>
<span style="font-size: 15px;">个</span>
</div> </div>
<div <div
style="font-size: 30px; font-weight: bold" style="font-size: 30px; font-weight: bold"

17
src/views/bounced/dataBoard.vue
View File

@ -830,15 +830,15 @@ export default {
//周期统计实时累计数据主题 //周期统计实时累计数据主题
cycleAccumulateData: { cycleAccumulateData: {
handler(newVal) { handler(newVal) {
//console.log('周期统计实时累计数据主题', newVal); // console.log('周期统计实时累计数据主题', newVal);
if (newVal != undefined && newVal.length != 0 && this.sectionData) { if (newVal != undefined && newVal.length != 0 && this.sectionData) {
var that = this; var that = this;
that.classify.forEach((ele, index) => { that.classify.forEach((ele, index) => {
newVal.forEach((item) => { newVal.forEach((item) => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '固定间隔') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '固定间隔') {
if (ele.cycleStatisticsData.length == 10) { // if (ele.cycleStatisticsData.length == 10) {
ele.cycleStatisticsData.pop(); // ele.cycleStatisticsData.pop();
} // }
if (this.$route.query.type == '离线视频') { if (this.$route.query.type == '离线视频') {
var timeNew = item.time.split('.')[0]; var timeNew = item.time.split('.')[0];
@ -862,9 +862,12 @@ export default {
itemTypeChartRef2.dataArr.length != 0 itemTypeChartRef2.dataArr.length != 0
) { ) {
//console.log('itemTypeChartRef2.echartArr',itemTypeChartRef2.echartArr) //console.log('itemTypeChartRef2.echartArr',itemTypeChartRef2.echartArr)
if (itemTypeChartRef2.echartArr.includes('数值')) { if (
//只需要修改数值组件 itemTypeChartRef2.echartArr.includes('数值') &&
that.$refs.typeChartRef2[i].getcycleAccumulateDataArr([item]); itemTypeChartRef2.itemData.analogAreaComponentId == item.component_id
) {
//只需要修改数值组件,逻辑存在问题
itemTypeChartRef2.getcycleAccumulateDataArr([item]);
} }
} }
} }

5
src/views/index.vue
View File

@ -1530,7 +1530,10 @@ export default {
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
var detId = []; var detId = [];
const msgN = JSON.parse(temp); const msgN = JSON.parse(temp);
// console.log('cycle_accumulate-周期统计实时累计数据主题', msgN); console.log('cycle_accumulate-周期统计实时累计数据主题', msgN);
for (const t of msgN) {
console.log(JSON.stringify(t.type_data))
}
this.cycleAccumulateData = msgN; this.cycleAccumulateData = msgN;
} catch (error) {} } catch (error) {}
break; break;

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

@ -124,10 +124,11 @@
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
v-if="i.componentType == '类型'" v-if="i.componentType == '类型'"
> >
<span v-if="Number(i.triggerData.type_data[0].quantity)">{{ <!-- <span v-if="Number(i.triggerData.type_data[0].quantity)">{{
i.triggerData.type_data[0].quantity i.triggerData.type_data[0].quantity
}}</span> }}</span> -->
<span v-else>0</span> <!-- <span v-else>0</span> -->
<span>{{ getTotal(i.triggerData.type_data, 'quantity') }}</span>
</span> </span>
<span <span
@ -146,7 +147,7 @@
: '-' : '-'
}}</span }}</span
> >
<span style="font-size: 14px" v-if="i.componentType == '车头时距'"></span> <span style="font-size: 14px" v-if="i.componentType == '车头时距'">秒</span>
<span style="font-size: 13px" v-if="i.componentType == '速度'"> <span style="font-size: 13px" v-if="i.componentType == '速度'">
<span <span
v-if=" v-if="
@ -157,7 +158,7 @@
{{ i.triggerData.speed > 0 || i.triggerData.speed === 0 ? 'km/h' : 'pix/s' }} {{ i.triggerData.speed > 0 || i.triggerData.speed === 0 ? 'km/h' : 'pix/s' }}
</span> </span>
</span> </span>
<span style="font-size: 14px" v-if="i.componentType == '类型'"></span> <span style="font-size: 14px" v-if="i.componentType == '类型'">个</span>
<span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span> <span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span>
<span <span
style="font-size: 14px" style="font-size: 14px"
@ -252,11 +253,12 @@
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
v-if="i.componentType == '类型' && i.triggerData == null" v-if="i.componentType == '类型' && i.triggerData == null"
> >
{{ <!-- {{
i.cycleTimeData[0].type_data[0].quantity + i.cycleTimeData[0].type_data[0].quantity +
i.cycleTimeData[0].type_data[1].quantity + i.cycleTimeData[0].type_data[1].quantity +
i.cycleTimeData[0].type_data[2].quantity i.cycleTimeData[0].type_data[2].quantity
}} }} -->
{{ getTotal(i.cycleTimeData[0].type_data, 'quantity') }}
</span> </span>
<span <span
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
@ -266,7 +268,8 @@
i.triggerData.type_data[0].quantity != undefined i.triggerData.type_data[0].quantity != undefined
" "
> >
<span {{ getTotal(i.triggerData.type_data, 'quantity') }}
<!-- <span
v-if=" v-if="
!Number.isNaN( !Number.isNaN(
Number( Number(
@ -282,7 +285,7 @@
i.triggerData.type_data[2].quantity i.triggerData.type_data[2].quantity
}}</span }}</span
> >
<span v-else>0</span> <span v-else>0</span> -->
</span> </span>
<span <span
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
@ -291,8 +294,8 @@
i.triggerData != null && i.triggerData != null &&
i.triggerData.type_data[0].quantity == undefined i.triggerData.type_data[0].quantity == undefined
" "
> >{{ getTotal(i.triggerData.type_data, 'value') }}
<span <!-- <span
v-if=" v-if="
!Number.isNaN( !Number.isNaN(
Number( Number(
@ -308,7 +311,7 @@
i.triggerData.type_data[2].value i.triggerData.type_data[2].value
}}</span }}</span
> >
<span v-else>0</span> <span v-else>0</span> -->
</span> </span>
<span <span
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
@ -329,8 +332,37 @@
}}</span }}</span
> >
<span style="font-size: 14px" v-if="i.componentType == '车头时距'">秒</span> <span style="font-size: 14px" v-if="i.componentType == '车头时距'">秒</span>
<span style="font-size: 14px" v-if="i.componentType == '速度'">秒</span> <span style="font-size: 13px" v-if="i.componentType == '速度'">
<span style="font-size: 14px" v-if="i.componentType == '类型'"></span> <span v-if="i.triggerData == null">
<span
v-if="
(i.cycleTimeData[0].speed && i.cycleTimeData[0].speed != -1) ||
i.cycleTimeData[0].speed === 0
"
>
{{
i.cycleTimeData[0].speed > 0 || i.cycleTimeData[0].speed === 0
? 'km/h'
: 'pix/s'
}}
</span>
</span>
<span v-else>
<span
v-if="
(i.triggerData.speed && i.triggerData.speed != -1) ||
i.triggerData.speed === 0
"
>
{{
i.triggerData.speed > 0 || i.triggerData.speed === 0
? 'km/h'
: 'pix/s'
}}
</span>
</span>
</span>
<span style="font-size: 14px" v-if="i.componentType == '类型'">个</span>
<span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span> <span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span>
<span <span
style="font-size: 14px" style="font-size: 14px"
@ -439,11 +471,12 @@
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
v-if="i.componentType == '类型' && i.triggerData == null" v-if="i.componentType == '类型' && i.triggerData == null"
> >
{{ <!-- {{
i.cycleStatisticsData[0].type_data[0].quantity + i.cycleStatisticsData[0].type_data[0].quantity +
i.cycleStatisticsData[0].type_data[1].quantity + i.cycleStatisticsData[0].type_data[1].quantity +
i.cycleStatisticsData[0].type_data[2].quantity i.cycleStatisticsData[0].type_data[2].quantity
}} }} -->
{{ getTotal(i.cycleStatisticsData[0].type_data, 'quantity') }}
</span> </span>
<span <span
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
@ -454,7 +487,7 @@
" "
> >
<!-- {{i.triggerData[0].quantity + i.triggerData[1].quantity + i.triggerData[2].quantity}} --> <!-- {{i.triggerData[0].quantity + i.triggerData[1].quantity + i.triggerData[2].quantity}} -->
<span <!-- <span
v-if=" v-if="
!Number.isNaN( !Number.isNaN(
Number( Number(
@ -470,7 +503,8 @@
i.triggerData.type_data[2].quantity i.triggerData.type_data[2].quantity
}}</span }}</span
> >
<span v-else>0</span> <span v-else>0</span> -->
{{ getTotal(i.triggerData.type_data, 'quantity') }}
</span> </span>
<span <span
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
@ -481,7 +515,7 @@
" "
> >
<!-- {{i.triggerData[0].quantity + i.triggerData[1].quantity + i.triggerData[2].quantity}} --> <!-- {{i.triggerData[0].quantity + i.triggerData[1].quantity + i.triggerData[2].quantity}} -->
<span <!-- <span
v-if=" v-if="
!Number.isNaN( !Number.isNaN(
Number( Number(
@ -497,7 +531,8 @@
i.triggerData.type_data[2].value i.triggerData.type_data[2].value
}}</span }}</span
> >
<span v-else>0</span> <span v-else>0</span> -->
{{ getTotal(i.triggerData.type_data, 'value') }}
</span> </span>
<span <span
style="color: rgb(71, 161, 255); font-size: 23px" style="color: rgb(71, 161, 255); font-size: 23px"
@ -553,18 +588,42 @@
: '-' : '-'
}}</span }}</span
> >
<span style="font-size: 14px" v-if="i.componentType == '车头时距'">秒</span> <span
<span style="font-size: 14px" v-if="i.componentType == '速度'"> style="font-size: 14px"
<span v-if="i.componentType == '车头时距' || i.componentType == '延误'"
v-if=" >秒</span
(i.triggerData.speed && i.triggerData.speed != -1) || >
i.triggerData.speed === 0 <span style="font-size: 13px" v-if="i.componentType == '速度'">
" <span v-if="i.triggerData == null">
> <span
{{ i.triggerData.speed > 0 || i.triggerData.speed === 0 ? 'km/h' : 'pix/s' }} v-if="
(i.cycleStatisticsData[0].speed && i.cycleStatisticsData[0].speed != -1) ||
i.cycleTimeData[0].speed === 0
"
>
{{
i.cycleStatisticsData[0].speed > 0 || i.cycleStatisticsData[0].speed === 0
? 'km/h'
: 'pix/s'
}}
</span>
</span>
<span v-else>
<span
v-if="
(i.triggerData.speed && i.triggerData.speed != -1) ||
i.triggerData.speed === 0
"
>
{{
i.triggerData.speed > 0 || i.triggerData.speed === 0
? 'km/h'
: 'pix/s'
}}
</span>
</span> </span>
</span> </span>
<span style="font-size: 14px" v-if="i.componentType == '类型'"></span> <span style="font-size: 14px" v-if="i.componentType == '类型'">个</span>
<span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span> <span style="font-size: 14px" v-if="i.componentType == '流量'">辆</span>
<span <span
style="font-size: 14px" style="font-size: 14px"
@ -1304,7 +1363,11 @@
<span v-if="node.level != 4"> {{ node.label }}</span> <span v-if="node.level != 4"> {{ node.label }}</span>
<el-checkbox-group <el-checkbox-group
v-model="checkList" v-model="checkList"
:disabled="disabledCheckList.includes(`${node.label},${node.parent.data.componentId},${node.parent.parent.parent.data.videoId}`)" :disabled="
disabledCheckList.includes(
`${node.label},${node.parent.data.componentId},${node.parent.parent.parent.data.videoId}`
)
"
v-else v-else
@change="changeChild(data, node)" @change="changeChild(data, node)"
> >
@ -1789,6 +1852,19 @@ export default {
this.getSensorFusionData(); this.getSensorFusionData();
}, },
methods: { methods: {
//类型数据累计
getTotal(arr, field) {
const total = arr.reduce((accumulator, item) => {
if (item[field] || item[field] === 0) {
const fieldValue = parseFloat(item[field]);
if (!isNaN(fieldValue)) {
return accumulator + fieldValue;
}
}
return accumulator; // 如果无效则不累加
}, 0);
return total;
},
//获取视频列表接口 //获取视频列表接口
getRealTimeShipjk() { getRealTimeShipjk() {
getRealTimeShipjk().then((res) => { getRealTimeShipjk().then((res) => {
@ -1805,7 +1881,10 @@ export default {
this.addSelectOptionField(this.intersectionList); this.addSelectOptionField(this.intersectionList);
// this.addTriggerDataField(this.intersectionList); // this.addTriggerDataField(this.intersectionList);
//mqtt订阅 //mqtt订阅
this.getMqtt(); this.$nextTick(() => {
this.getMqtt();
});
//console.log(this.intersectionList, 'this.intersectionList'); //console.log(this.intersectionList, 'this.intersectionList');
//开发路口默认展开第一个 //开发路口默认展开第一个
if (this.intersectionList.length > 0) { if (this.intersectionList.length > 0) {
@ -3134,7 +3213,7 @@ export default {
const u8arr = new Uint8Array(message); const u8arr = new Uint8Array(message);
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
const msgN = JSON.parse(temp); const msgN = JSON.parse(temp);
//console.log('固定时刻', msgN); console.log('固定时刻', msgN);
for (let j = 0; j < msgN.length; j++) { for (let j = 0; j < msgN.length; j++) {
const locations = this.findLocationById(this.intersectionList, msgN[j].component_id); const locations = this.findLocationById(this.intersectionList, msgN[j].component_id);
//处理speed正负值和-1，卡片区在html上处理了，数据源不做处理 //处理speed正负值和-1，卡片区在html上处理了，数据源不做处理
@ -3208,7 +3287,6 @@ export default {
n_stay: msgN[j].n_stay, n_stay: msgN[j].n_stay,
n_queue: msgN[j].n_queue, n_queue: msgN[j].n_queue,
occ: msgN[j].occ, occ: msgN[j].occ,
speed: newSpeed,
originalSpeed: msgN[j].speed originalSpeed: msgN[j].speed
}; };
this.$nextTick(() => { this.$nextTick(() => {
@ -3245,8 +3323,8 @@ export default {
type: msgN[j].type, type: msgN[j].type,
n_stay: msgN[j].n_stay, n_stay: msgN[j].n_stay,
n_queue: msgN[j].n_queue, n_queue: msgN[j].n_queue,
type_data: msgN[j].type_data,
occ: msgN[j].occ, occ: msgN[j].occ,
speed: newSpeed,
originalSpeed: msgN[j].speed originalSpeed: msgN[j].speed
}; };
this.$nextTick(() => { this.$nextTick(() => {
@ -3289,6 +3367,7 @@ export default {
const msgN = JSON.parse(temp); const msgN = JSON.parse(temp);
//console.log('固定间隔', msgN, this.topicVideoIdList[i].videoId); //console.log('固定间隔', msgN, this.topicVideoIdList[i].videoId);
// this.cycleStatisticsData = msgN; // this.cycleStatisticsData = msgN;
// console.log('固定间隔', msgN)
for (let j = 0; j < msgN.length; j++) { for (let j = 0; j < msgN.length; j++) {
//处理speed正负值和-1，卡片区在html上处理了，数据源不做处理 //处理speed正负值和-1，卡片区在html上处理了，数据源不做处理
let newSpeed = '-'; let newSpeed = '-';
@ -3299,7 +3378,7 @@ export default {
//图表区数组加表格数据 //图表区数组加表格数据
let carTou = { let carTou = {
time: msgN[j].time, time: msgN[j].time,
headway: msgN[j].ave_headway, ave_headway: msgN[j].ave_headway,
avg: msgN[j].avg, avg: msgN[j].avg,
max: msgN[j].max, max: msgN[j].max,
med: msgN[j].med, med: msgN[j].med,
@ -3360,7 +3439,6 @@ export default {
ave_stay: msgN[j].ave_stay, ave_stay: msgN[j].ave_stay,
ave_queue: msgN[j].ave_queue, ave_queue: msgN[j].ave_queue,
occ: msgN[j].occ, occ: msgN[j].occ,
speed: newSpeed,
originalSpeed: msgN[j].speed originalSpeed: msgN[j].speed
}; };
this.$nextTick(() => { this.$nextTick(() => {
@ -3395,10 +3473,10 @@ 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,
type_data: msgN[j].type_data,
ave_stay: msgN[j].ave_stay, ave_stay: msgN[j].ave_stay,
ave_queue: msgN[j].ave_queue, ave_queue: msgN[j].ave_queue,
occ: msgN[j].occ, occ: msgN[j].occ,
speed: newSpeed,
originalSpeed: msgN[j].speed originalSpeed: msgN[j].speed
}; };
this.$nextTick(() => { this.$nextTick(() => {
@ -3470,7 +3548,6 @@ 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,
ave_queue: msgN[j].ave_queue, ave_queue: msgN[j].ave_queue,
occ: msgN[j].occ, occ: msgN[j].occ,
speed: newSpeed, speed: newSpeed,
@ -3504,7 +3581,6 @@ export default {
name: msgN[j].name, name: msgN[j].name,
type: msgN[j].type, type: msgN[j].type,
ave_stay: msgN[j].ave_stay, ave_stay: msgN[j].ave_stay,
ave_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
@ -3522,6 +3598,7 @@ export default {
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
time: msgN[j].time time: msgN[j].time
}; };
this.$nextTick(() => { this.$nextTick(() => {
this.updateValueByVideoIdAndCommentId( this.updateValueByVideoIdAndCommentId(
this.intersectionList, this.intersectionList,
@ -3533,7 +3610,7 @@ export default {
//图表 //图表
let table = { let table = {
time: msgN[j].time, time: msgN[j].time,
n_queue: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
name: msgN[j].name, name: msgN[j].name,
type: msgN[j].type, type: msgN[j].type,
ave_stay: msgN[j].ave_stay, ave_stay: msgN[j].ave_stay,
@ -3578,7 +3655,7 @@ export default {
const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串 const temp = utf8decoder.decode(u8arr); // 将二进制数据转为字符串
var detId = []; var detId = [];
const msgN = JSON.parse(temp); const msgN = JSON.parse(temp);
// //console.log('固定间隔cycle_accumulate', msgN); //console.log('周期', msgN, this.topicVideoIdList[i].videoId);
// this.cycleStatisticsData = msgN; // this.cycleStatisticsData = msgN;
for (let j = 0; j < msgN.length; j++) { for (let j = 0; j < msgN.length; j++) {
//处理speed正负值和-1，卡片区在html上处理了，数据源不做处理 //处理speed正负值和-1，卡片区在html上处理了，数据源不做处理
@ -3674,6 +3751,7 @@ export default {
ave_delay: msgN[j].ave_delay, ave_delay: msgN[j].ave_delay,
time: msgN[j].time time: msgN[j].time
}; };
this.$nextTick(() => { this.$nextTick(() => {
this.updateValueByVideoIdAndCommentId( this.updateValueByVideoIdAndCommentId(
this.intersectionList, this.intersectionList,
@ -3682,6 +3760,7 @@ export default {
map map
); );
}); });
} else if (msgN[j].component_type == 'OD') {
} }
} }
} catch (error) {} } catch (error) {}