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

代码提交

This commit is contained in:
luoshiwen 2023-02-22 21:54:40 +08:00
parent 11fea9c69e
commit 6588bf664e
6 changed files with 3 additions and 99 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/d36b985a450343bbaebc7d3929d30d4d.json generated vendored
View File

File diff suppressed because one or more lines are too long

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

@ -151,21 +151,11 @@ export default {
},
mounted() {
this.drawLine();
<<<<<<< HEAD
console.log(this.title);
=======
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
},
watch: {
list: {
handler(newVal) {
<<<<<<< HEAD
if (newVal) {
console.log(this.title);
console.log(newVal, this.title + '折现图的数据');
=======
if (newVal.length != 0) {
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
// x轴的数据
this.xData = newVal.map(val => {
return val.time;
@ -207,7 +197,6 @@ export default {
mapN.push(arr[t][i]);
}
}
<<<<<<< HEAD
var lineArr = [{
name: '机动车',
type: 'line',
@ -234,21 +223,6 @@ export default {
// });
// });
// }
=======
var lineArr = [];
// 遍历需要多少条类型折线
if (newVal[0].type_data != undefined) {
newVal[0].type_data.forEach(ele => {
lineArr.push({
name: ele.name,
type: 'line',
data: [],
smooth: true
});
});
}
// 筛选类型的数量
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
mapN.forEach(ele => {
if (ele.name == '机动车') {
lineArr[0].data.push(ele.quantity);
@ -293,11 +267,7 @@ export default {
return ele.in_flow + ele.out_flow;
});
} else if (this.title == '车头时距') {
<<<<<<< HEAD
console.log("车头时距", newVal)
=======
console.log('车头时距', newVal);
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
this.tooltip = {
formatter: '{a} {b}:{c}/s',
show: true,
@ -330,11 +300,7 @@ export default {
}
},
<<<<<<< HEAD
deep: true
=======
immediate: true
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
}
}
};

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

@ -2,13 +2,8 @@
<div class="setion">
<p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p>
<!-- 触发数据数值渲染 -->
<<<<<<< HEAD
<div class="typeContent">
<div v-if="dataArr && dataArr.length != 0">
=======
<div class="typeContent" v-if="triggerType == '触发' || '周期时刻'">
<div v-if="dataArr && dataArr.length != 0 && dataArr!=undefined">
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
<div v-if="title == '类型'" style="display:flex">
<el-card v-for="(n, i) in typeValue.type_data" :key="i"
style="width: 150px; margin-bottom: 20px; text-align: center">
@ -25,11 +20,7 @@
</div>
</div>
<el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center">
<<<<<<< HEAD
<div v-if="dataArr && dataArr.length != 0">
=======
<div v-if="dataArr&& dataArr.length != 0 && dataArr!=undefined">
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
<div v-if="title == '类型'">
<span style="font-size: 15px;">类型数量总和</span><br />
<span style="font-size: 30px; font-weight: bold">
@ -76,16 +67,9 @@
<div class="tableTitle" v-if="dataArr&& dataArr.length != 0 && dataArr!=undefined">
<div>
<span
<<<<<<< HEAD
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"></span>
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' +
triggerType
}}</span>
=======
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
></span>
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + triggerType }}</span>
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
</div>
<div class="tableTime">
{{ dataArr[0].time ? dataArr[0].time : '' }}
@ -100,10 +84,6 @@
</div>
<div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog />
<<<<<<< HEAD
<lineChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="dataArr"
:status="triggerType" :title="title" :typeValue="typeValue" />
=======
<lineChart
v-if="dataArr && dataArr.length != 0 && dataArr!=undefined"
:componentName="componentName"
@ -114,7 +94,6 @@
:title="title"
:typeValue="typeValue"
/>
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
</div>
<div class="border" v-if="echartArr.includes('饼状图')">
<detailDialog />
@ -180,11 +159,7 @@ export default {
// 监听触发数据
dataArr: {
handler(newVal) {
<<<<<<< HEAD
console.log("dataArr", newVal)
=======
console.log('dataArr', newVal);
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
},
immediate: true

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

@ -20,33 +20,6 @@
</p>
<!-- <span class="downPull1" data-num="1" @click="sectionHandle(i)"></span> -->
</div>
<<<<<<< HEAD
<div v-if="s.children">
<div v-for="o in s.children" :key="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" />
<!--触发的组件 -->
<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="typeValue" />
<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.cycleStatistics" :echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName"
:typeValue="typeCycleStatistics" />
</div>
</div>
<!-- :data="triggerList.length != 0 ? triggerList : tableData" -->
=======
<el-tabs>
<el-collapse v-model="acticveName">
<div v-for="o in s.children" :key="o.analogAreaComponentId">
@ -101,7 +74,6 @@
</div>
</el-collapse>
</el-tabs>
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
</div>
</template>
</div>
@ -151,15 +123,6 @@ export default {
default() {
return [];
}
<<<<<<< HEAD
},
componentList:{
type:Array,
default(){
return []
}
=======
>>>>>>> 1d018c9bfd7d477b50f1c160150339f6011f2622
}
},
data() {