Merge branch 'master' of https://git.lgzn.space/chengdandan/TransFlow
This commit is contained in:
commit
889bd4309c
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -45,7 +45,8 @@ export default {
|
|||
default() {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -79,6 +80,11 @@ export default {
|
|||
myChart = this.$echarts.init(this.$refs.lineChart);
|
||||
}
|
||||
// var series = []
|
||||
if (newVal) {
|
||||
this.xData = newVal.map(val => {
|
||||
return val.time;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -155,9 +161,7 @@ export default {
|
|||
|
||||
getMessage(newVal, title, timeMode) {
|
||||
if (newVal) {
|
||||
this.xData = newVal.map(val => {
|
||||
return val.time;
|
||||
});
|
||||
|
||||
|
||||
var series = [
|
||||
{
|
||||
|
|
@ -289,7 +293,12 @@ export default {
|
|||
|
||||
},
|
||||
mounted() {
|
||||
// this.drawLine();
|
||||
// if (this.historyData.length != 0) {
|
||||
// this.drawLine(this.historyData, this.title, this.status);
|
||||
// }
|
||||
|
||||
|
||||
|
||||
// this.getMessage(this.list)
|
||||
// console.log(this.$parent.dataArr, '父组件的dataArr');
|
||||
// this.$set(this.$parent.dataArr)
|
||||
|
|
|
|||
|
|
@ -152,8 +152,9 @@ export default {
|
|||
};
|
||||
},
|
||||
created() {
|
||||
// console.log(this.title);
|
||||
console.log(this.componentName);
|
||||
|
||||
|
||||
|
||||
},
|
||||
methods: {
|
||||
// 计算类型数量的总和
|
||||
|
|
@ -179,6 +180,10 @@ export default {
|
|||
this.newDataArr[0].headway = val[0].headway;
|
||||
} else if (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;
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@
|
|||
:componentName="o.componentName" :dataArr="o.cycleTimeData"
|
||||
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
|
||||
:chartName="o.combinationName" :typeValue="typeCycleTimeData"
|
||||
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }" />
|
||||
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }"
|
||||
:historyData="o.cycleTimeData
|
||||
" />
|
||||
|
||||
<!-- 周期统计的组件 -->
|
||||
<typeChart ref="typeChartRef2" style="width: 100%;"
|
||||
|
|
@ -45,7 +47,8 @@
|
|||
:dataArr="o.cycleStatisticsData" :echartArr="o.presentationForm"
|
||||
:title="o.componentName.split('_')[0]" :chartName="o.combinationName"
|
||||
:typeValue="typeCycleStatistics"
|
||||
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }" />
|
||||
:startEndData="{ start: o.startSectionNames, end: o.endSectionNames }"
|
||||
:historyData="o.cycleStatisticsData" />
|
||||
</el-collapse-item>
|
||||
</div>
|
||||
</el-collapse>
|
||||
|
|
@ -155,7 +158,7 @@ export default {
|
|||
// this.idVal = ;
|
||||
getComponentSection({ VideoId: this.$route.query.id, Number: 10 }).then(res => {
|
||||
if (res.data.code == 200) {
|
||||
// console.log(res.data.data, '组件的数据');
|
||||
console.log(res.data.data, '组件的数据');
|
||||
this.componentList = res.data.data;
|
||||
this.siftData();
|
||||
}
|
||||
|
|
@ -213,19 +216,36 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
channge(oldVal, newVal) {
|
||||
if (oldVal == 'second') {
|
||||
this.sectionArr = [];
|
||||
this.sectionData = [];
|
||||
this.getNew();
|
||||
} else if (newVal == 'second') {
|
||||
this.sectionArr = [];
|
||||
this.sectionData = [];
|
||||
this.getNew();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 触发数据的类型数值
|
||||
|
||||
//循环方法
|
||||
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() { },
|
||||
watch: {
|
||||
|
|
@ -250,95 +270,44 @@ export default {
|
|||
if (newVal != undefined && newVal.length != 0) {
|
||||
newVal.forEach(ele => {
|
||||
if (ele.timeMode == '周期统计') {
|
||||
var thatNN = this;
|
||||
this.$nextTick(() => {
|
||||
// var thatNN = this;
|
||||
ele.cycleStatisticsData.forEach(item => {
|
||||
if (item.type_data != null) {
|
||||
// 周期时刻的类型数据
|
||||
thatNN.typeCycleStatistics = item;
|
||||
this.typeCycleStatistics = item;
|
||||
}
|
||||
console.log("thatNN.$refs.typeChartRef2",thatNN.$refs.typeChartRef2)
|
||||
// thatN.$nextTick(() => {
|
||||
if(thatNN.$refs.typeChartRef2!=undefined){
|
||||
})
|
||||
if (this.$refs.typeChartRef2 != undefined) {
|
||||
// // 轮循周期时刻生成的各类组件
|
||||
for (let i = 0; i < thatNN.$refs.typeChartRef2.length; i++) {
|
||||
let itemTypeChartRef2 = thatNN.$refs.typeChartRef2[i]
|
||||
|
||||
if (itemTypeChartRef2.length!=0&&itemTypeChartRef2.dataArr!= undefined && itemTypeChartRef2.dataArr.length != 0) {
|
||||
console.log("itemTypeChartRef2.echartArr",itemTypeChartRef2.echartArr)
|
||||
if (itemTypeChartRef2.echartArr.includes('时间曲线图')) {
|
||||
thatNN.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(thatNN.$refs.typeChartRef2[i].dataArr, thatNN.$refs.typeChartRef2[i].componentName.split('_')[0],'周期统计')
|
||||
}
|
||||
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])
|
||||
}
|
||||
}
|
||||
}
|
||||
this.getRef(this.$refs.typeChartRef2,ele.timeMode)
|
||||
}
|
||||
})
|
||||
}
|
||||
// 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)
|
||||
if (ele.timeMode == '周期时刻') {
|
||||
this.$nextTick(()=>{
|
||||
ele.cycleStatisticsData.forEach(item => {
|
||||
if (item.type_data != null) {
|
||||
this.typeCycleStatistics = item;
|
||||
}
|
||||
// thatN.$nextTick(() => {
|
||||
|
||||
})
|
||||
if (this.$refs.typeChartRef1 != undefined) {
|
||||
// // 轮循周期时刻生成的各类组件
|
||||
// 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])
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
this.getRef(this.$refs.typeChartRef1,ele.timeMode)
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
immediate: true,
|
||||
deep: true,
|
||||
},
|
||||
// activeName:'channge',
|
||||
// 处理过的触发数据
|
||||
|
|
@ -407,11 +376,7 @@ export default {
|
|||
if (newVal != undefined && newVal.length != 0 && this.sectionData) {
|
||||
var thatN = this;
|
||||
thatN.classify.forEach((ele, index) => {
|
||||
// if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') {
|
||||
// ele.cycleTimeData = [];
|
||||
// }else{
|
||||
|
||||
// }
|
||||
newVal.forEach(item => {
|
||||
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') {
|
||||
if (ele.cycleTimeData.length == 10) {
|
||||
|
|
@ -464,11 +429,7 @@ export default {
|
|||
} else {
|
||||
var _thatN = this
|
||||
_thatN.classify.forEach((ele, index) => {
|
||||
// if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') {
|
||||
// ele.cycleTimeData = [];
|
||||
// }else{
|
||||
|
||||
// }
|
||||
// newVal.forEach(item => {
|
||||
if (ele.timeMode == '周期时刻') {
|
||||
if (ele.cycleTimeData.length == 10) {
|
||||
|
|
@ -525,15 +486,10 @@ export default {
|
|||
//周期统计
|
||||
cycleStatisticsData: {
|
||||
handler(newVal) {
|
||||
console.log("newVal",newVal)
|
||||
// console.log("newVal", newVal)
|
||||
if (newVal != undefined && newVal.length != 0 && this.sectionData) {
|
||||
var that = this;
|
||||
that.classify.forEach((ele, index) => {
|
||||
// if (ele.cycleStatisticsData == undefined && ele.timeMode == '周期统计') {
|
||||
// ele.cycleStatisticsData = [];
|
||||
// }else{
|
||||
// // ele.cycleStatisticsData =
|
||||
// }
|
||||
newVal.forEach(item => {
|
||||
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期统计') {
|
||||
if (ele.cycleStatisticsData.length == 10) {
|
||||
|
|
@ -636,7 +592,8 @@ export default {
|
|||
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
immediate: true
|
||||
}
|
||||
// activeName: {
|
||||
// handler(newVal) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue