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

20230228

This commit is contained in:
luoshiwen 2023-02-28 16:08:35 +08:00
parent 12201308ad
commit 1bae6a255c
6 changed files with 234 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/.cache/babel-loader/707c80c5cb9d3ec9ed91511d9d73326f.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

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

@ -46,12 +46,7 @@ export default {
return {}; return {};
} }
}, },
historyData:{
type:Array,
default(){
}
}
}, },
data() { data() {
return { return {
@ -79,12 +74,17 @@ export default {
}, },
methods: { methods: {
drawLine(newVal, title,timeMode) { drawLine(newVal, title, timeMode) {
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);
} }
// var series = [] // var series = []
if (newVal) {
this.xData = newVal.map(val => {
return val.time;
});
}
@ -144,26 +144,24 @@ export default {
} }
} }
], ],
series: this.getMessage(newVal, title,timeMode) series: this.getMessage(newVal, title, timeMode)
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function() { window.addEventListener('resize', function () {
myChart.resize(); myChart.resize();
}); });
// this.$nextTick(() => { // this.$nextTick(() => {
// myChart.setOption(option) // myChart.setOption(option)
// myChart.resize(); // myChart.resize();
// }) // })
}, },
getMessage(newVal, title,timeMode) { getMessage(newVal, title, timeMode) {
if(newVal){ if (newVal) {
this.xData = newVal.map(val => {
return val.time;
});
var series = [ var series = [
{ {
@ -254,9 +252,9 @@ export default {
confine: true confine: true
}; };
series[0].data = newVal.map(val => { series[0].data = newVal.map(val => {
if(timeMode=='周期统计'){ if (timeMode == '周期统计') {
return val.ave_headway; return val.ave_headway;
}else{ } else {
return val.headway; return val.headway;
} }
@ -264,17 +262,17 @@ export default {
} else if (title === '排队数') { } else if (title === '排队数') {
series[0].data = newVal.map(val => { series[0].data = newVal.map(val => {
// return val.n_queue; // return val.n_queue;
if(timeMode=='周期统计'){ if (timeMode == '周期统计') {
return val.ave_queue; return val.ave_queue;
}else{ } else {
return val.n_queue; return val.n_queue;
} }
}); });
} else if (title === '检测数') { } else if (title === '检测数') {
series[0].data = newVal.map(val => { series[0].data = newVal.map(val => {
if(timeMode=='周期统计'){ if (timeMode == '周期统计') {
return val.ave_stay; return val.ave_stay;
}else{ } else {
return val.n_stay; return val.n_stay;
} }
@ -286,7 +284,7 @@ export default {
} else if (title === '拥堵') { } else if (title === '拥堵') {
series[0].data = newVal.map(val => { }); series[0].data = newVal.map(val => { });
} }
series.forEach(ele=>{ series.forEach(ele => {
ele.data.reverse() ele.data.reverse()
}) })
return series return series
@ -295,9 +293,11 @@ export default {
}, },
mounted() { mounted() {
if(this.history){ // if (this.historyData.length != 0) {
this.drawLine(this.historyData,this.title,this.status); // this.drawLine(this.historyData, this.title, this.status);
} // }
// this.getMessage(this.list) // this.getMessage(this.list)
// console.log(this.$parent.dataArr, '父组件的dataArr'); // console.log(this.$parent.dataArr, '父组件的dataArr');

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

@ -88,27 +88,27 @@
<div class="border" v-if="echartArr.includes('曲线图')"> <div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog /> <detailDialog />
<lineChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr" <lineChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr"
:status="triggerType" :title="title" :typeValue="typeValue" ref="lineChartRef" :historyData="historyData"/> :status="triggerType" :title="title" :typeValue="typeValue" ref="lineChartRef" />
</div> </div>
<div class="border" v-if="echartArr.includes('饼状图')"> <div class="border" v-if="echartArr.includes('饼状图')">
<detailDialog /> <detailDialog />
<pieChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr" <pieChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr"
:status="triggerType" :title="title" :typeValue="typeValue" ref="pieChartRef" :historyData="historyData"/> :status="triggerType" :title="title" :typeValue="typeValue" ref="pieChartRef" />
</div> </div>
<div class="border" v-if="echartArr.includes('均值图')"> <div class="border" v-if="echartArr.includes('均值图')">
<detailDialog /> <detailDialog />
<avgChart ref="avgChartRef" :componentName="componentName" :chartName="chartName" :pageType="pageType" <avgChart ref="avgChartRef" :componentName="componentName" :chartName="chartName" :pageType="pageType"
:list="newDataArr" :status="triggerType" :title="title" :typeValue="typeValue" :historyData="historyData"/> :list="newDataArr" :status="triggerType" :title="title" :typeValue="typeValue" />
</div> </div>
<div class="border" v-if="echartArr.includes('直方图')"> <div class="border" v-if="echartArr.includes('直方图')">
<detailDialog /> <detailDialog />
<barChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr" <barChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="newDataArr"
:status="triggerType" :title="title" :typeValue="typeValue" ref="barChartRef" :historyData="historyData"/> :status="triggerType" :title="title" :typeValue="typeValue" ref="barChartRef" />
</div> </div>
<div class="border" v-if="echartArr.includes('矩阵图')"> <div class="border" v-if="echartArr.includes('矩阵图')">
<detailDialog /> <detailDialog />
<thermalChart :componentName="componentName" :pageType="pageType" :list="newDataArr" <thermalChart :componentName="componentName" :pageType="pageType" :list="newDataArr"
:status="triggerType" :title="title" :typeValue="typeValue" ref="ODChartRef" :historyData="historyData"/> :status="triggerType" :title="title" :typeValue="typeValue" ref="ODChartRef" />
</div> </div>
</div> </div>
</template> </template>
@ -124,7 +124,7 @@ import regionTable from '../chart/regionTable.vue';
import thermalChart from '../chart/thermalChart.vue'; import thermalChart from '../chart/thermalChart.vue';
export default { export default {
name: 'typeChart', //类型组件 name: 'typeChart', //类型组件
props: ['historyData','typeValue', 'pageType', 'triggerType', 'dataArr', 'echartArr', 'componentName', 'title', 'chartName','startEndData'], props: ['typeValue', 'pageType', 'triggerType', 'dataArr', 'echartArr', 'componentName', 'title', 'chartName','startEndData'],
components: { components: {
lineChart, lineChart,
barChart, barChart,
@ -152,7 +152,7 @@ export default {
}; };
}, },
created() { created() {
console.log(this.historyData,'周期时刻历史数据');
}, },
@ -180,6 +180,10 @@ export default {
this.newDataArr[0].headway = val[0].headway; this.newDataArr[0].headway = val[0].headway;
} else if (val[0].ave_headway) { } else if (val[0].ave_headway) {
this.newDataArr[0].headway = val[0].ave_headway; this.newDataArr[0].headway = val[0].ave_headway;
}else if (val[0].n_stay) {
this.newDataArr[0].n_stay = val[0].n_stay;
} else if (val[0].ave_stay) {
this.newDataArr[0].n_stay = val[0].ave_stay;
} }
}, },

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

@ -47,7 +47,8 @@
:dataArr="o.cycleStatisticsData" :echartArr="o.presentationForm" :dataArr="o.cycleStatisticsData" :echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName" :title="o.componentName.split('_')[0]" :chartName="o.combinationName"
:typeValue="typeCycleStatistics" :typeValue="typeCycleStatistics"
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }" :historyData="o.cycleStatisticsData"/> :startEndData="{ start: o.startSectionNames, end: o.endSectionNames }"
:historyData="o.cycleStatisticsData" />
</el-collapse-item> </el-collapse-item>
</div> </div>
</el-collapse> </el-collapse>
@ -218,6 +219,33 @@ export default {
// 触发数据的类型数值 // 触发数据的类型数值
//循环方法
getRef(data,timeMode) {
console.log(timeMode);
for (let i = 0; i < data.length; i++) {
let refItem = data[i]
if (data.length != 0 && refItem.dataArr != undefined && refItem.dataArr.length != 0) {
if (refItem.echartArr.includes('时间曲线图')) {
refItem.$refs.lineChartRef.drawLine(refItem.dataArr,refItem.componentName.split('_')[0],timeMode)
}
if (refItem.echartArr.includes('数值')) {
refItem.getDataArr(refItem.dataArr)
}
if (refItem.echartArr.includes('直方图') && refItem.$refs.barChartRef.drawBar) {
// 数据改变重新渲染柱状图
refItem.$refs.barChartRef.drawBar(refItem.dataArr[0])
}
if (refItem.echartArr.includes('饼状图') && refItem.$refs.pieChartRef.drawPie) {
// 数据改变重新渲染饼图
refItem.$refs.pieChartRef.drawPie(refItem.dataArr[0])
}
if (refItem.echartArr.includes('均值图') && refItem.$refs.avgChartRef != undefined) {
refItem.$refs.avgChartRef.drawBar(refItem.dataArr[0])
}
}
}
}
}, },
mounted() { }, mounted() { },
watch: { watch: {
@ -235,104 +263,52 @@ export default {
handler(newVal, oldVal) { }, handler(newVal, oldVal) { },
immediate: true immediate: true
}, },
// componentList:{ componentList: {
// handler(newVal) { handler(newVal) {
// console.log("componentList",newVal) console.log("componentList", newVal)
// if (newVal!= undefined&&newVal.length != 0 ) { if (newVal != undefined && newVal.length != 0) {
// newVal.forEach(ele => { newVal.forEach(ele => {
// if( ele.timeMode == '周期统计'){ if (ele.timeMode == '周期统计') {
this.$nextTick(() => {
// var thatNN = this; // var thatNN = this;
// ele.cycleStatisticsData.forEach(item => { ele.cycleStatisticsData.forEach(item => {
// if (item.type_data != null) { if (item.type_data != null) {
// // 周期时刻的类型数据 this.typeCycleStatistics = item;
// thatNN.typeCycleStatistics = item; }
// } })
// console.log("thatNN.$refs.typeChartRef2",thatNN.$refs.typeChartRef2) if (this.$refs.typeChartRef2 != undefined) {
// // thatN.$nextTick(() => { // // 轮循周期时刻生成的各类组件
// if(thatNN.$refs.typeChartRef2!=undefined){ this.getRef(this.$refs.typeChartRef2,ele.timeMode)
// // // 轮循周期时刻生成的各类组件 }
// for (let i = 0; i < thatNN.$refs.typeChartRef2.length; i++) { })
// let itemTypeChartRef2 = thatNN.$refs.typeChartRef2[i] }
if (ele.timeMode == '周期时刻') {
this.$nextTick(()=>{
ele.cycleStatisticsData.forEach(item => {
if (item.type_data != null) {
this.typeCycleStatistics = item;
}
// thatN.$nextTick(() => {
// if (itemTypeChartRef2.length!=0&&itemTypeChartRef2.dataArr!= undefined && itemTypeChartRef2.dataArr.length != 0) { })
// console.log("itemTypeChartRef2.echartArr",itemTypeChartRef2.echartArr) if (this.$refs.typeChartRef1 != undefined) {
// if (itemTypeChartRef2.echartArr.includes('时间曲线图')) { // // 轮循周期时刻生成的各类组件
// thatNN.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(thatNN.$refs.typeChartRef2[i].dataArr, thatNN.$refs.typeChartRef2[i].componentName.split('_')[0],'周期统计') this.getRef(this.$refs.typeChartRef1,ele.timeMode)
// } }
// if (itemTypeChartRef2.echartArr.includes('数值')) { })
// thatNN.$refs.typeChartRef2[i].getDataArr(thatNN.$refs.typeChartRef2[i].dataArr)
// }
// if (itemTypeChartRef2.echartArr.includes('直方图') &&itemTypeChartRef2.$refs.barChartRef.drawBar) {
// // 数据改变重新渲染柱状图
// itemTypeChartRef2.$refs.barChartRef.drawBar(itemTypeChartRef2.dataArr[0])
// }
// if (itemTypeChartRef2.echartArr.includes('饼状图') &&itemTypeChartRef2.$refs.pieChartRef.drawPie) {
// // 数据改变重新渲染饼图
// itemTypeChartRef2.$refs.pieChartRef.drawPie(itemTypeChartRef2.dataArr[0])
// }
// if (itemTypeChartRef2.echartArr.includes('均值图') && itemTypeChartRef2.$refs.avgChartRef != undefined) {
// itemTypeChartRef2.$refs.avgChartRef.drawBar(itemTypeChartRef2.dataArr[0])
// }
// }
// }
// }
// })
// }
// // if ( ele.timeMode == '周期时刻') {
// // var thatN = this;
// // if (ele.cycleTimeData.length == 10) {
// // ele.cycleTimeData.pop();
// // } else {
// // ele.cycleTimeData.forEach(item => {
// // if (item.type_data != null) {
// // // 周期时刻的类型数据
// // thatN.typeCycleTimeData = item;
// // }
// // ele.cycleTimeData.unshift(item);
// // // thatN.$nextTick(() => {
// // if(thatN.$refs.typeChartRef1!=undefined){
// // // console.log("thatN.$refs.typeChartRef1",thatN.$refs.typeChartRef1)
// // // 轮循周期时刻生成的各类组件
// // for (let i = 0; i < thatN.$refs.typeChartRef1.length; i++) {
// // let itemTypeChartRef1 = thatN.$refs.typeChartRef1[i]
// // if (itemTypeChartRef1.length!=0&&itemTypeChartRef1.dataArr!= undefined && itemTypeChartRef1.dataArr.length != 0) {
// // if (itemTypeChartRef1.echartArr.includes('时间曲线图')) {
// // thatN.$refs.typeChartRef1[i].$refs.lineChartRef.drawLine(thatN.$refs.typeChartRef1[i].dataArr, thatN.$refs.typeChartRef1[i].componentName.split('_')[0],'周期时刻')
// // }
// // if (itemTypeChartRef1.echartArr.includes('数值')) {
// // thatN.$refs.typeChartRef1[i].getDataArr(thatN.$refs.typeChartRef1[i].dataArr)
// // }
// // if (itemTypeChartRef1.echartArr.includes('直方图') &&itemTypeChartRef1.$refs.barChartRef.drawBar) {
// // // 数据改变重新渲染柱状图
// // itemTypeChartRef1.$refs.barChartRef.drawBar(itemTypeChartRef1.dataArr[0])
// // }
// // if (itemTypeChartRef1.echartArr.includes('饼状图') &&itemTypeChartRef1.$refs.pieChartRef.drawPie) {
// // // 数据改变重新渲染饼图
// // itemTypeChartRef1.$refs.pieChartRef.drawPie(itemTypeChartRef1.dataArr[0])
// // }
// // if (itemTypeChartRef1.echartArr.includes('均值图') && itemTypeChartRef1.$refs.avgChartRef != undefined) {
// // itemTypeChartRef1.$refs.avgChartRef.drawBar(itemTypeChartRef1.dataArr[0])
// // }
// // }
// // }
// // }
// // })
// // }
// // } }
});
// }); }
// } },
// }, immediate: true,
// immediate:true deep: true,
// }, },
// activeName:'channge', // activeName:'channge',
// 处理过的触发数据 // 处理过的触发数据
triggerListData: { triggerListData: {
@ -400,11 +376,7 @@ export default {
if (newVal != undefined && newVal.length != 0 && this.sectionData) { if (newVal != undefined && newVal.length != 0 && this.sectionData) {
var thatN = this; var thatN = this;
thatN.classify.forEach((ele, index) => { thatN.classify.forEach((ele, index) => {
// if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') {
// ele.cycleTimeData = [];
// }else{
// }
newVal.forEach(item => { newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') {
if (ele.cycleTimeData.length == 10) { if (ele.cycleTimeData.length == 10) {
@ -457,11 +429,7 @@ export default {
} else { } else {
var _thatN = this var _thatN = this
_thatN.classify.forEach((ele, index) => { _thatN.classify.forEach((ele, index) => {
// if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') {
// ele.cycleTimeData = [];
// }else{
// }
// newVal.forEach(item => { // newVal.forEach(item => {
if (ele.timeMode == '周期时刻') { if (ele.timeMode == '周期时刻') {
if (ele.cycleTimeData.length == 10) { if (ele.cycleTimeData.length == 10) {
@ -522,11 +490,6 @@ export default {
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) => {
// if (ele.cycleStatisticsData == undefined && ele.timeMode == '周期统计') {
// ele.cycleStatisticsData = [];
// }else{
// // ele.cycleStatisticsData =
// }
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) {