diff --git a/src/components/chart/lineChart.vue b/src/components/chart/lineChart.vue index 55a3ef27..797d66fe 100644 --- a/src/components/chart/lineChart.vue +++ b/src/components/chart/lineChart.vue @@ -188,6 +188,8 @@ export default { var lineArr = []; // 遍历需要多少条类型折线 if (this.typeValue) { + console.log("this.typeValue.type_data",this.typeValue.type_data) + if (this.typeValue.type_data!=undefined) { this.typeValue.type_data.forEach(ele => { lineArr.push({ name: ele.name, @@ -196,6 +198,7 @@ export default { smooth: true }); }); + } } // 筛选类型的数量 @@ -229,6 +232,7 @@ export default { show: true, confine: true }; + console.log("newVal",newVal) this.series[0].data = newVal.map(val => { return val.speed; }); diff --git a/src/views/AnalysisMain.vue b/src/views/AnalysisMain.vue index 96aef4f5..f899d1aa 100644 --- a/src/views/AnalysisMain.vue +++ b/src/views/AnalysisMain.vue @@ -417,7 +417,7 @@ destroyed: function () { message: res.data.msg, type: 'success' }); - }, 5000); + }, 15000); } }) }, diff --git a/src/views/index.vue b/src/views/index.vue index 9b2cfee6..2bad4be4 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -69,8 +69,8 @@ - - + + @@ -1141,7 +1141,9 @@ export default { } }, closeComponentForm() { + console.log("111") this.component = false; + document.getElementById('mapModule').contentWindow.editComponent(''); }, closeForm(form) {