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

代码提交

This commit is contained in:
luoshiwen 2023-02-26 09:55:00 +08:00
parent 260d7fe8ef
commit 13b85abd71
6 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/.cache/babel-loader/0a9a6e42027ba3575cac91989cfa8a8c.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/5c43de7bdc03729c450c3b426ceb462e.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/c90a7db1294db9fc3e3360c0ce4029f4.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/d36b985a450343bbaebc7d3929d30d4d.json generated vendored
View File

File diff suppressed because one or more lines are too long

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

@ -17,7 +17,7 @@
<!-- <el-table-column align="center" prop="steam_id" label="视频路"></el-table-column>
<el-table-column align="center" prop="zone_id" label="区域编号"></el-table-column> -->
<el-table-column align="center" prop="name" label="区域名称"></el-table-column>
<el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column>
<!-- <el-table-column align="center" prop="" label="视频帧"></el-table-column> -->
<el-table-column align="center" label="目标类型">
<template slot-scope="scope">
@ -51,7 +51,7 @@
<el-table :data="msg" style="width: 100%" v-if="triggerType == '周期统计'">
<el-table-column align="center" prop="gate_id" label="断面编号"></el-table-column>
<el-table-column align="center" prop="name" label="断面名称"></el-table-column>
<el-table-column align="center" prop="timestamp" label="时间戳"></el-table-column>
<el-table-column align="center" prop="time" label="时间戳"></el-table-column>
<el-table-column align="center" prop="interval" label="时间序号"></el-table-column>
<el-table-column align="center" prop="type" label="目标类型">
<template slot-scope="scope">

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

@ -231,6 +231,7 @@ export default {
handler(newVal) {
this.triggerList = newVal;
// 触发数据
console.log(newVal, '触发数据');
var _this = this
if (newVal.length != 0 && _this.sectionData) {
_this.classify.forEach((ele, index) => {
@ -241,7 +242,7 @@ export default {
newVal.forEach((item) => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '触发') {
if (ele.trigger.length == 10) {
ele.trigger.splice(newVal.length - 1, 1);
ele.trigger.pop();
} else {
item.time = item.time.split('.')[0];
// 该时间的触发数据
@ -254,22 +255,21 @@ export default {
for (let i = 0; i < _this.$refs.typeChartRef.length; i++) {
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
let item = _this.$refs.typeChartRef[i]
_this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr, _this.$refs.typeChartRef[i].componentName.split('_')[0])
if (item.componentName.split('_')[0] == "类型") {
if(item.echartArr.includes('直方图')){
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
if (item.dataArr.length != 0) {
_this.$refs.typeChartRef[i].$refs.lineChartRef.drawLine(_this.$refs.typeChartRef[i].dataArr, _this.$refs.typeChartRef[i].componentName.split('_')[0])
if (item.echartArr.includes('直方图') && item.componentName.split('_')[0]) {
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}
if(item.echartArr.includes('饼状图')){
if (item.echartArr.includes('饼状图') && item.componentName.split('_')[0]) {
console.log(item, '饼图组件');
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
}
}
})
}
}
@ -299,7 +299,7 @@ export default {
ele.timeMode == '周期时刻'
) {
if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.splice(newVal.length - 1, 1);
ele.cycleTimeData.pop();
} else {
item.time = item.time.split('.')[0];
if (item.type_data != null) {
@ -311,17 +311,17 @@ export default {
// 轮循周期时刻生成的各类组件
for (let i = 0; i < that.$refs.typeChartRef1.length; i++) {
item = that.$refs.typeChartRef1[i]
that.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(that.$refs.typeChartRef1[i].dataArr, that.$refs.typeChartRef[i].componentName.split('_')[0])
if (item.componentName.split('_')[0] == "类型") {
if (item.echartArr.includes('直方图')){
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
}
if (item.echartArr.includes('饼状图')){
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
if (item.dataArr.length != 0) {
that.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(that.$refs.typeChartRef1[i].dataArr, that.$refs.typeChartRef[i].componentName.split('_')[0])
// if (item.$refs.barChartRef.drawBar) {
// // 数据改变重新渲染柱状图
// item.$refs.barChartRef.drawBar(item.dataArr[0])
// } else if (item.$refs.pieChartRef.drawPie) {
// // 数据改变重新渲染饼图
// item.$refs.pieChartRef.drawPie(item.dataArr[0])
// }
}
}
})
@ -335,7 +335,6 @@ export default {
},
cycleStatistics: {
handler(newVal) {
console.log(newVal, '周期统计数据');
if (newVal.length != 0 && this.sectionData) {
this.componentList.forEach(ele => {
if (ele.cycleStatistics == undefined && ele.timeMode == '周期统计') {
@ -344,7 +343,7 @@ export default {
newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期统计') {
if (ele.cycleStatistics.length == 10) {
ele.cycleStatistics.splice(newVal.length - 1, 1);
ele.cycleStatistics.pop();
} else {
item.time = item.time.split('.')[0];
if (item.type_data != null) {
@ -354,18 +353,21 @@ export default {
for (let i = 0; i < this.$refs.typeChartRef2.length; i++) {
item = that.$refs.typeChartRef2[i]
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0])
if (item.componentName.split('_')[0] == "类型") {
if (item.echartArr.includes('直方图')) {
// 数据改变重新渲染柱状图
item.$refs.barChartRef.drawBar(item.dataArr[0])
if (item.dataArr.length != 0) {
this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0])
if (item.componentName.split('_')[0] == "类型") {
// console.log(item,'组件数据');
if (item.echartArr.includes('直方图')) {
// 数据改变重新渲染柱状图
console.log(item, '组件');
item.$refs.barChartRef.drawBar(item.dataArr[0])
} else if (item.echartArr.includes('饼状图')) {
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
}
if (item.echartArr.includes('饼状图')) {
// 数据改变重新渲染饼图
item.$refs.pieChartRef.drawPie(item.dataArr[0])
}
}
}
}
}