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

代码提交

This commit is contained in:
luoshiwen 2023-02-23 10:26:06 +08:00
parent 6588bf664e
commit 62ab49775f
8 changed files with 68 additions and 86 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/b84f2eff62cf6f6e1777fdc799b085d7.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

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

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

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

@ -85,7 +85,6 @@
<div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog />
<lineChart
v-if="dataArr && dataArr.length != 0 && dataArr!=undefined"
:componentName="componentName"
:chartName="chartName"
:pageType="pageType"

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

@ -6,12 +6,8 @@
<div class="dataBoard" ref="dataBoard" v-if="activeName == 'second'">
<!-- 断面 -->
<div class="plate1" ref="plate1">
<div
:class="sectionData.length <= 2 ? 'sectionBox' : 'section'"
ref="section"
v-for="(s, i) in sectionData"
:key="s.analogAreaComponentId"
>
<div :class="sectionData.length <= 2 ? 'sectionBox' : 'section'" ref="section"
v-for="(s, i) in sectionData" :key="s.analogAreaComponentId">
<template>
<div ref="sectionContent">
<div>
@ -24,52 +20,27 @@
<el-collapse v-model="acticveName">
<div v-for="o in s.children" :key="o.analogAreaComponentId">
<el-collapse-item :title="o.componentName" :name="o.analogAreaComponentId">
<OD
v-if="o.componentName.includes('OD')"
:pageType="o.graphicType"
triggerType="触发"
:componentName="o.componentName"
:echartArr="o.presentationForm"
:dataArr="o.trigger"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
/>
<OD v-if="o.componentName.includes('OD')" :pageType="o.graphicType"
triggerType="触发" :componentName="o.componentName"
:echartArr="o.presentationForm" :dataArr="o.trigger"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName" />
<!--触发的组件 -->
<typeChart
v-if="o.timeMode === '触发'"
:pageType="o.graphicType"
:triggerType="o.timeMode"
:componentName="o.componentName"
:dataArr="o.trigger"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
:typeValue="typeTimeMode"
/>
<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 v-if="o.timeMode === '触发'" :pageType="o.graphicType"
:triggerType="o.timeMode" :componentName="o.componentName"
:dataArr="o.trigger" :echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName"
:typeValue="typeTimeMode" />
<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
style="width: 100%;"
v-if="o.timeMode === '周期统计'"
:pageType="o.graphicType"
:triggerType="o.timeMode"
:componentName="o.componentName"
:dataArr="o.cycleStatistics"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
:typeValue="typeCycleStatistics"
/>
<typeChart style="width: 100%;" v-if="o.timeMode === '周期统计'"
:pageType="o.graphicType" :triggerType="o.timeMode"
:componentName="o.componentName" :dataArr="o.cycleStatistics"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
:chartName="o.combinationName" :typeValue="typeCycleStatistics" />
</el-collapse-item>
</div>
</el-collapse>
@ -378,14 +349,14 @@ export default {
this.getNew()
},
methods: {
getNew(){
getNew() {
// this.idVal = ;
getComponentSection({ VideoId: this.$route.query.id }).then(res => {
if (res.data.code == 200) {
this.componentList = res.data.data;
this.siftData();
}
});
getComponentSection({ VideoId: this.$route.query.id }).then(res => {
if (res.data.code == 200) {
this.componentList = res.data.data;
this.siftData();
}
});
},
siftData() {
// this.sectionArr=[]
@ -428,30 +399,30 @@ export default {
}
}
},
channge(oldVal, newVal){
console.log("old",oldVal)
console.log("newVal",newVal)
if(oldVal=='second'){
this.sectionArr=[]
this.sectionData=[]
channge(oldVal, newVal) {
console.log("old", oldVal)
console.log("newVal", newVal)
if (oldVal == 'second') {
this.sectionArr = []
this.sectionData = []
this.getNew()
} else if (newVal == 'second') {
this.sectionArr = []
this.sectionData = []
this.getNew()
}else if(newVal=='second'){
this.sectionArr=[]
this.sectionData=[]
this.getNew()
}
}
// 触发数据的类型数值
},
mounted() {},
mounted() { },
watch: {
// 触发的原始数据
triggerData: {
handler(newVal, oldVal) {},
handler(newVal, oldVal) { },
immediate: true
},
activeName:'channge',
// activeName:'channge',
// 处理过的触发数据
triggerListData: {
handler(newVal) {

18
src/views/index.vue
View File

@ -3,7 +3,7 @@
<!-- <div class="container"> -->
<div>
<!-- <el-tabs type="border-card" v-model="activeName" tab-position="left"> -->
<el-tabs type="border-card" v-model="activeName" >
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="titName" name="first">
<div class="mapModuleApp">
<iframe id="mapModule" src="./VideoWeb/index.html" frameborder="0" style="width: 100%; height:100%;"
@ -12,9 +12,9 @@
<el-empty :description="description" v-if="videoAnalysisShow"> </el-empty>
</div>
</el-tab-pane>
<el-tab-pane label="数据看板" name="second">
<el-tab-pane label="数据看板" name="second" >
<dataBoard ref="dataBoardRef" :activeName="activeName" :triggerData="triggerData" :triggerListData="triggerListData"
:cycleTimeData="cycleTimeData" :cycleStatistics="cycleStatistics" v-if="activeName='second'"></dataBoard>
:cycleTimeData="cycleTimeData" :cycleStatistics="cycleStatistics"></dataBoard>
</el-tab-pane>
<el-tab-pane label="分析配置" name="third">
<analysisConfiguration :analysisConfigurationdata="analysisConfigurationdata"></analysisConfiguration>
@ -390,14 +390,14 @@ export default {
},
mounted() { },
methods: {
// 数据看板的标签点击
// handleClick(tab, event) {
// if(tab._props.name=='second'){
// this.$refs.dataBoardRef.getNEW()
// }
handleClick(tab, event) {
console.log(tab,event);
if(tab._props.name=='second'){
this.$refs.dataBoardRef.getNew()
}
// },
},
/** 创建mqtt */
createMqtt() {
//创建链接，接收数据