diff --git a/src/components/target/typeChart.vue b/src/components/target/typeChart.vue
index a48d35e0..dc25b933 100644
--- a/src/components/target/typeChart.vue
+++ b/src/components/target/typeChart.vue
@@ -16,6 +16,7 @@
{{ dataArr[0].time ? dataArr[0].time : '' }}
+
@@ -25,29 +26,29 @@
延误
@@ -91,7 +92,7 @@
+ :status="triggerType" :title="title" :typeValue="typeValue" ref="pieChartRef"/>
@@ -101,7 +102,7 @@
+ :status="triggerType" :title="title" :typeValue="typeValue" ref="barChartRef"/>
@@ -138,32 +139,27 @@ export default {
valueShow: { },
//排队数
- queue:'',
- dataArrNew:[{
- //总和
- //速度
- speed:0,
- //流量
- flow:0 ,
- //车头时距
- headway:0,
- //排队数
- queue:0,
- //检测数
- n_stay:0,
- //延误
- ave_delay:0,
- time:'2023-02-24 15:07:14'
- }]
+ queue: '',
};
},
created() {
- console.log(this.title + 'TYPECHARTdataArr', this.dataArr)
+ // console.log(this.title + 'TYPECHARTdataArr', this.dataArr)
},
methods: {
+ getTotal(dataArr) {
+ console.log(dataArr[0], 150);
+ return dataArr[0].type_data.reduce(function(prev, cur) {
+ return cur.quantity + prev
+ }, 0)
+
+ // return dataArr[0].type_data((pre, cur) => {
+ // return pre + cur
+ // }, 0)
+
+ },
// 计算类型的数值
- getNewQueue(dataArr){
- console.log("计算类型的数值",dataArr)
+ getNewQueue(dataArr) {
+ // console.log("计算类型的数值",dataArr)
// if(dataArr[0].timeMode=='触发'){
// this.queue = dataArr[0].n_queue
// }else if(dataArr[0].timeMode=='周期统计'){
@@ -171,11 +167,11 @@ export default {
// }else if(dataArr[0].timeMode=='周期时刻'){
// }
- if(dataArr[0].n_queue){
- this.dataArrNew.queue = dataArr[0].n_queue
- }else if(dataArr[0].ave_queue){
- this.dataArrNew.queue = dataArr[0].ave_queue
- }else if(dataArr[0].timeMode=='周期时刻'){
+ if (dataArr[0].n_queue) {
+ this.queue = dataArr[0].n_queue
+ } else if (dataArr[0].ave_queue) {
+ this.queue = dataArr[0].ave_queue
+ } else if (dataArr[0].timeMode == '周期时刻') {
}
}
@@ -183,39 +179,19 @@ export default {
computed: {
// 获取类型的总数量
- getTotal() {
- return this.dataArr[0].type_data((pre, cur) => {
- return pre + cur
- }, 0)
- }
+
},
mounted() { },
watch: {
// 监听触发数据
dataArr: {
- handler(oldVal,newVal) {
- console.log('oldValdataArr', oldVal);
- console.log('dataArr', newVal);
- this.dataArrNew = newVal
- if(newVal!=undefined&&newVal.length!=0){
- this.getNewQueue(newVal)
- }
-
+ handler(newVal) {
+ // console.log('dataArr', newVal);
+ this.getNewQueue(newVal)
},
immediate: true
},
- typeValue: {
- handler(newVal) {
- this.total = 0;
-
- // if (this.title == '类型') {
- // newVal.type_data.forEach(ele => {
- // this.total += ele.quantity;
- // });
- // }
- }
- }
// cycleTimeData: {
// handler(newVal) {
// console.log(newVal);
diff --git a/src/views/bounced/dataBoard.vue b/src/views/bounced/dataBoard.vue
index 1737ea01..c9772010 100644
--- a/src/views/bounced/dataBoard.vue
+++ b/src/views/bounced/dataBoard.vue
@@ -145,8 +145,6 @@ export default {
if (res.data.code == 200) {
console.log(res.data.data, '组件的数据');
this.componentList = res.data.data;
- this.sectionArr=[]
- this.sectionData=[]
this.siftData();
}
});
@@ -235,12 +233,11 @@ export default {
var _this = this
if (newVal.length != 0 && _this.sectionData) {
_this.classify.forEach((ele, index) => {
- // console.log("classify",ele)
+
if (ele.trigger == undefined && ele.timeMode == '触发') {
ele.trigger = [];
}
newVal.forEach((item) => {
- // console.log("ele",ele)
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '触发') {
if (ele.trigger.length == 10) {
ele.trigger.splice(newVal.length - 1, 1);
@@ -251,7 +248,6 @@ export default {
_this.typeTimeMode = item
}
ele.trigger.unshift(item);
- // console.log("ele.trigger",ele.trigger)
_this.$nextTick(() => {
for (let i = 0; i < _this.$refs.typeChartRef.length; i++) {