Merge branch 'ZHNY_WW' into ZHNY_DCF

src/views/Map3d/components/nhtbtj.vue

@@ -10,12 +10,26 @@
 	export default {
 		data() {
 			return {
+				xData: ["一月", "二月", "三月", "四月", "五月", "六月"], //横坐标
+				yData: [1000, 1500, 1300, 1700, 1600, 1200],
+				y2Data: [1200, 1800, 1400, 1350, 1100, 1500],
 				option: {}
 			}
 		},
 		created() {},
 		mounted() {
 			this.typeCharts0()
+			let _this = this
+			var t1=setTimeout(function() {
+				_this.option.series = [{
+						data: _this.yData
+					},
+					{
+						data: _this.y2Data
+					}
+				]
+			
+			}, 1000);
 		},
 		methods: {
 
@@ -76,7 +90,7 @@
 					xAxis: {
 						type: 'category',
 						boundaryGap: false,
-						data: ['一月', '二月', '三月', '四月', '五月', '六月'],
+						data: this.xData,
 						axisLabel: {
 							//x轴文字的配置
 							show: true,
@@ -102,13 +116,13 @@
 							name: '上年(kw/h)',
 							type: 'line',
 							// stack: 'Total',
-							data: [1000, 1500, 1300, 1700, 1600, 1200]
+							data: this.yData
 						},
 						{
 							name: '本年(kw/h)',
 							type: 'line',
 							// stack: 'Total',
-							data: [1200, 1800, 1400, 1350, 1100, 1500]
+							data: this.y2Data
 						},
 					],