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: { 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: {
@ -248,6 +257,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,
@ -301,7 +311,9 @@ export default {
} }
}, },
deep: true deep: true
} },
} }
}; };
</script> </script>

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

@ -85,7 +85,6 @@
<div class="border" v-if="echartArr.includes('曲线图')"> <div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog /> <detailDialog />
<lineChart <lineChart
v-if="dataArr && dataArr.length != 0 && dataArr!=undefined"
:componentName="componentName" :componentName="componentName"
:chartName="chartName" :chartName="chartName"
:pageType="pageType" :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="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.cycleStatistics"
: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,14 +349,14 @@ export default {
this.getNew() this.getNew()
}, },
methods: { methods: {
getNew(){ getNew() {
// this.idVal = ; // this.idVal = ;
getComponentSection({ VideoId: this.$route.query.id }).then(res => { getComponentSection({ VideoId: this.$route.query.id }).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.componentList = res.data.data; this.componentList = res.data.data;
this.siftData(); this.siftData();
} }
}); });
}, },
siftData() { siftData() {
// this.sectionArr=[] // this.sectionArr=[]
@ -428,30 +399,30 @@ export default {
} }
} }
}, },
channge(oldVal, newVal){ channge(oldVal, newVal) {
console.log("old",oldVal) console.log("old", oldVal)
console.log("newVal",newVal) console.log("newVal", newVal)
if(oldVal=='second'){ if (oldVal == 'second') {
this.sectionArr=[] this.sectionArr = []
this.sectionData=[] this.sectionData = []
this.getNew()
} else if (newVal == 'second') {
this.sectionArr = []
this.sectionData = []
this.getNew() this.getNew()
}else if(newVal=='second'){
this.sectionArr=[]
this.sectionData=[]
this.getNew()
} }
} }
// 触发数据的类型数值 // 触发数据的类型数值
}, },
mounted() {}, mounted() { },
watch: { watch: {
// 触发的原始数据 // 触发的原始数据
triggerData: { triggerData: {
handler(newVal, oldVal) {}, handler(newVal, oldVal) { },
immediate: true immediate: true
}, },
activeName:'channge', // activeName:'channge',
// 处理过的触发数据 // 处理过的触发数据
triggerListData: { triggerListData: {
handler(newVal) { handler(newVal) {

18
src/views/index.vue
View File

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