diff --git a/web/src/components/Home/Alarm.vue b/web/src/components/Home/Alarm.vue index a6af31d..110db43 100644 --- a/web/src/components/Home/Alarm.vue +++ b/web/src/components/Home/Alarm.vue @@ -15,6 +15,10 @@ export default { name: '', props: { + total:{ + type:Object, + default:()=>{} + }, deviceInfo: { type: Array, default: () => [] @@ -27,7 +31,7 @@ export default { name: '日光伏设备告警', key: 'key1', lineColor: '#22E4FF', - value: 0, + value: 1111, d: '' }, { @@ -62,11 +66,28 @@ export default { watch: { deviceInfo: { handler(n) { + let that=this this.$nextTick(() => { + this.drawLineChart() }) } // immediate: true + }, + total:{ + handler(n){ + if(n){ + + let that=this + that.curList.forEach((item)=>{ + item.value=that.total[item.key] + }) + } + + }, + deep: true, // 深度监听 + immediate: true, + } }, mounted() {}, @@ -166,7 +187,6 @@ export default { series: this.lineChartData.ydata } option && faultChart.setOption(option) - console.log(this.lineChartData, 'this.lineChartData') window.addEventListener('resize', this.handleResize) } } diff --git a/web/src/components/Home/Charge.vue b/web/src/components/Home/Charge.vue index 77dd9eb..de75abe 100644 --- a/web/src/components/Home/Charge.vue +++ b/web/src/components/Home/Charge.vue @@ -1,13 +1,10 @@