This commit is contained in:
chengdandan 2023-02-24 10:43:12 +08:00
commit 835e76796e
7 changed files with 43 additions and 61 deletions

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

View File

@ -61,7 +61,10 @@ export default {
tooltip: { tooltip: {
show: true show: true
}, },
series: [] series: [],
//
listArr: []
}; };
}, },
created() { created() {
@ -151,6 +154,12 @@ export default {
}, },
mounted() { mounted() {
this.drawLine(); this.drawLine();
console.log(this.$parent.dataArr, '父组件的dataArr');
},
computed: {
listTotal() {
return JSON.parse(JSON.stringify(this.$parent.dataArr))
}
}, },
watch: { watch: {
list: { list: {
@ -250,6 +259,7 @@ export default {
// console.log("mapNR1", mapNR1) // console.log("mapNR1", mapNR1)
this.series[0].data = mapNR1; this.series[0].data = mapNR1;
} else if (this.title == '速度') { } else if (this.title == '速度') {
console.log('速度的折线图');
this.tooltip = { this.tooltip = {
formatter: '{a} {b}:{c}km/h', formatter: '{a} {b}:{c}km/h',
show: true, show: true,
@ -309,7 +319,9 @@ export default {
} }
}, },
deep: true deep: true
} },
} }
}; };
</script> </script>

View File

@ -6,12 +6,8 @@
<div class="dataBoard" ref="dataBoard" v-if="activeName == 'second'"> <div class="dataBoard" ref="dataBoard" v-if="activeName == 'second'">
<!-- 断面 --> <!-- 断面 -->
<div class="plate1" ref="plate1"> <div class="plate1" ref="plate1">
<div <div :class="sectionData.length <= 2 ? 'sectionBox' : 'section'" ref="section"
:class="sectionData.length <= 2 ? 'sectionBox' : 'section'" v-for="(s, i) in sectionData" :key="s.analogAreaComponentId">
ref="section"
v-for="(s, i) in sectionData"
:key="s.analogAreaComponentId"
>
<template> <template>
<div ref="sectionContent"> <div ref="sectionContent">
<div> <div>
@ -24,52 +20,27 @@
<el-collapse v-model="acticveName"> <el-collapse v-model="acticveName">
<div v-for="o in s.children" :key="o.analogAreaComponentId"> <div v-for="o in s.children" :key="o.analogAreaComponentId">
<el-collapse-item :title="o.componentName" :name="o.analogAreaComponentId"> <el-collapse-item :title="o.componentName" :name="o.analogAreaComponentId">
<OD <OD v-if="o.componentName.includes('OD')" :pageType="o.graphicType"
v-if="o.componentName.includes('OD')" triggerType="触发" :componentName="o.componentName"
:pageType="o.graphicType" :echartArr="o.presentationForm" :dataArr="o.trigger"
triggerType="触发" :title="o.componentName.split('_')[0]" :chartName="o.combinationName" />
:componentName="o.componentName"
:echartArr="o.presentationForm"
:dataArr="o.trigger"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
/>
<!--触发的组件 --> <!--触发的组件 -->
<typeChart <typeChart v-if="o.timeMode === '触发'" :pageType="o.graphicType"
v-if="o.timeMode === '触发'" :triggerType="o.timeMode" :componentName="o.componentName"
:pageType="o.graphicType" :dataArr="o.trigger" :echartArr="o.presentationForm"
:triggerType="o.timeMode" :title="o.componentName.split('_')[0]" :chartName="o.combinationName"
:componentName="o.componentName" :typeValue="typeTimeMode" />
:dataArr="o.trigger" <typeChart v-if="o.timeMode === '周期时刻'" :pageType="o.graphicType"
:echartArr="o.presentationForm" :triggerType="o.timeMode" :componentName="o.componentName"
:title="o.componentName.split('_')[0]" :dataArr="o.cycleTimeData" :echartArr="o.presentationForm"
:chartName="o.combinationName" :title="o.componentName.split('_')[0]" :chartName="o.combinationName"
:typeValue="typeTimeMode" :typeValue="typeCycleTimeData" />
/>
<typeChart
v-if="o.timeMode === '周期时刻'"
:pageType="o.graphicType"
:triggerType="o.timeMode"
:componentName="o.componentName"
:dataArr="o.cycleTimeData"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
:typeValue="typeCycleTimeData"
/>
<!-- 周期统计的组件 --> <!-- 周期统计的组件 -->
<typeChart <typeChart style="width: 100%;" v-if="o.timeMode === '周期统计'"
style="width: 100%;" :pageType="o.graphicType" :triggerType="o.timeMode"
v-if="o.timeMode === '周期统计'" :componentName="o.componentName" :dataArr="o.cycleStatistics"
:pageType="o.graphicType" :echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
:triggerType="o.timeMode" :chartName="o.combinationName" :typeValue="typeCycleStatistics" />
:componentName="o.componentName"
:dataArr="o.cycleStatisticsData"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
:typeValue="typeCycleStatistics"
/>
</el-collapse-item> </el-collapse-item>
</div> </div>
</el-collapse> </el-collapse>
@ -378,7 +349,7 @@ export default {
// this.getNew() // this.getNew()
}, },
methods: { methods: {
getNew(){ getNew() {
// this.idVal = ; // this.idVal = ;
getComponentSection({ VideoId: this.$route.query.id ,Number:10}).then(res => { getComponentSection({ VideoId: this.$route.query.id ,Number:10}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
@ -450,11 +421,11 @@ export default {
// //
}, },
mounted() {}, mounted() { },
watch: { watch: {
// //
triggerData: { triggerData: {
handler(newVal, oldVal) {}, handler(newVal, oldVal) { },
immediate: true immediate: true
}, },
// activeName:'channge', // activeName:'channge',

View File

@ -12,7 +12,7 @@
<el-empty :description="description" v-if="videoAnalysisShow"> </el-empty> <el-empty :description="description" v-if="videoAnalysisShow"> </el-empty>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="数据看板" name="second"> <el-tab-pane label="数据看板" name="second" >
<dataBoard ref="dataBoardRef" :activeName="activeName" :triggerData="triggerData" :triggerListData="triggerListData" <dataBoard ref="dataBoardRef" :activeName="activeName" :triggerData="triggerData" :triggerListData="triggerListData"
:cycleTimeData="cycleTimeData" :cycleStatisticsData="cycleStatisticsData" ></dataBoard> :cycleTimeData="cycleTimeData" :cycleStatisticsData="cycleStatisticsData" ></dataBoard>
</el-tab-pane> </el-tab-pane>
@ -401,7 +401,6 @@ export default {
}, },
mounted() { }, mounted() { },
methods: { methods: {
// //
handleClick: function(tab, event) { handleClick: function(tab, event) {
var that = this var that = this