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

Merge branch 'master' of http://git.lgzn.space/chengdandan/TransFlow

This commit is contained in:
chengdandan 2023-02-22 09:18:47 +08:00
parent 31a79b2b8b e42ece6210
commit 6721611832
12 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/.cache/babel-loader/0924cbfe194dd0a750a1a5020402cf84.json generated vendored
View File

File diff suppressed because one or more lines are too long

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/a507232cf13cbb82086a709c7289c3b0.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

2
node_modules/.cache/babel-loader/dcdec649eb6903897f53b0c176bcab6d.json generated vendored
View File

File diff suppressed because one or more lines are too long

14
src/components/chart/barChart.vue
View File

@ -125,13 +125,13 @@ export default {
}
},
mounted() {
this.xData = this.typeValue.type_data.map(ele => {
return ele.name;
});
this.yData = this.typeValue.type_data.map(ele => {
return ele.quantity;
});
this.drawBar();
// this.xData = this.typeValue.type_data.map(ele => {
// return ele.name;
// });
// this.yData = this.typeValue.type_data.map(ele => {
// return ele.quantity;
// });
// this.drawBar();
},
watch: {
typeValue: {

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

@ -152,7 +152,7 @@ export default {
watch: {
list: {
handler(newVal) {
if ((newVal && this.status == '触发') || this.status == '周期时刻') {
if (newVal ) {
// x轴的数据
this.xData = newVal.map(val => {
return val.time;

18
src/components/chart/pieChart.vue
View File

@ -121,15 +121,15 @@ export default {
}
},
mounted() {
if (this.typeValue) {
this.typeValue.type_data.forEach(ele => {
this.seriesData.push({
name: ele.name,
value: ele.quantity
});
});
this.drawPie();
}
// if (this.typeValue) {
// this.typeValue.type_data.forEach(ele => {
// this.seriesData.push({
// name: ele.name,
// value: ele.quantity
// });
// });
// this.drawPie();
// }
},
watch: {
// 监听单个的数据

20
src/components/chart/thermalChart.vue
View File

@ -145,16 +145,16 @@ export default {
watch: {
list: {
handler(newVal) {
this.odData = []
console.log(newVal ,'1111111111');
if (newVal) {
newVal[newVal.length - 1].ob_data.forEach(ele => {
ele.forEach(item => {
this.odData.push([])
})
})
}
console.log(this.odData,'155');
// this.odData = []
// console.log(newVal ,'1111111111');
// if (newVal) {
// newVal[newVal.length - 1].ob_data.forEach(ele => {
// ele.forEach(item => {
// this.odData.push([])
// })
// })
// }
// console.log(this.odData,'155');
this.drawThermalChart();
},
// immediate:true

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

@ -21,7 +21,7 @@
</div>
</div>
<el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center">
<div v-if="dataArr && dataArr.length != 0">
<div v-if="dataArr">
<div v-if="title == '类型'">
<span style="font-size: 15px;">类型数量总和</span><br />
<span style="font-size: 30px; font-weight: bold">
@ -42,15 +42,15 @@
<span style="font-size: 30px; font-weight: bold">{{ dataArr[0].headway}}</span>
</div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '排队数'">
<span style="font-size: 15px;">排队数</span>
<span style="font-size: 15px;">排队数</span><br />
<span style="font-size: 30px; font-weight: bold">{{ dataArr[0].n_queue }}</span>
</div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '检测数'">
<span style="font-size: 15px;">检测数</span>
<span style="font-size: 15px;">检测数</span><br />
<span style="font-size: 30px; font-weight: bold">{{ dataArr[0].n_stay }}</span>
</div>
<div style="font-size: 30px; font-weight: bold" v-if="title == '延误'">
<span style="font-size: 15px;">延误</span>
<span style="font-size: 15px;">延误</span><br />
<span style="font-size: 30px; font-weight: bold">{{ dataArr[0].ave_delay }}</span>
</div>
<div>
@ -65,7 +65,7 @@
</el-card>
</div>
<div v-show="echartArr.includes('表格')">
<div class="tableTitle">
<div class="tableTitle" v-if="dataArr">
<div>
<span
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"

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

@ -443,7 +443,7 @@ export default {
handler(newVal) {
this.triggerList = newVal
// 触发数据
console.log(newVal, 'triggerlistData');
// console.log(newVal, 'triggerlistData');
this.componentList.forEach(ele => {
if (ele.trigger == undefined && ele.timeMode == '触发') {
@ -466,6 +466,7 @@ export default {
}
})
})
console.log(this.sectionData,'触发的筛选数据');
},
immediate: true
},