1.4

src/views/databoard/components/GasChart.vue

@@ -51,27 +51,34 @@ export default {
 		}
 	},
 	watch: {
-		energyWeekTrend: {// 监听时间变化，更新图
+		energyWeekTrend: {// 监听周电能，更新图
 			handler(newVal, oldVal) {
 				if (this.chartTime === '周' && this.chartType === '电耗能') {
 					this.updateChart()
 				}
 			}
 		},
-		energyMonthTrend: {// 监听时间变化，更新图
+		energyMonthTrend: {// 监听月电能，更新图
 			handler(newVal, oldVal) {
 				if (this.chartTime === '月' && this.chartType === '电耗能') {
 					this.updateChart()
 				}
 			}
 		},
-		energyYearTrend: {// 监听时间变化，更新图
+		energyYearTrend: {// 监听年电能，更新图
 			handler(newVal, oldVal) {
 				if (this.chartTime === '年' && this.chartType === '电耗能') {
 					this.updateChart()
 				}
 			}
 		},
+		gasChartMsg: {// 监听天然气，更新图
+			handler(newVal, oldVal) {
+				if (this.chartType === '天然气I' || this.chartType === '天然气II') {
+					this.updateChart()
+				}
+			}
+		},
 		chartTime: {// 监听时间变化，更新图
 			handler(newVal, oldVal) {
 				this.updateChart()
@@ -114,33 +121,27 @@ export default {
 					break;
 				}
 				case '天然气I':{
-					yData = this.gasChartMsg.hisSumGas1 || []
+					if (this.chartTime === '周') {
+						yData = this.gasChartMsg.hisSumGas1For7Day || []
+					}else if(this.chartTime === '月') {
+						yData = this.gasChartMsg.sumGas1ForMonth || []
+					}else{
+						yData = this.gasChartMsg.sumGas1ForYear || []
+					}
 					gasName = '天然气I'
-					xData = Array(7)
-						.fill(1)
-						.map((_, index) => {
-							const today = new Date();
-							const dtimestamp = today - (index+1) * 24 * 60 * 60 * 1000;
-							return `${new Date(dtimestamp).getMonth() + 1}.${new Date(
-								dtimestamp
-							).getDate()}`;
-						})
-						.reverse()
+					xData = this.getXdata()
 					break;
 				}
 				default:
 				gasName = '天然气II'
-				yData = this.gasChartMsg.hisSumGas2 || []
-				xData = Array(7)
-						.fill(1)
-						.map((_, index) => {
-							const today = new Date();
-							const dtimestamp = today - (index+1) * 24 * 60 * 60 * 1000;
-							return `${new Date(dtimestamp).getMonth() + 1}.${new Date(
-								dtimestamp
-							).getDate()}`;
-						})
-						.reverse()
+				if (this.chartTime === '周') {
+						yData = this.gasChartMsg.hisSumGas2For7Day || []
+					}else if(this.chartTime === '月') {
+						yData = this.gasChartMsg.sumGas2ForMonth || []
+					}else{
+						yData = this.gasChartMsg.sumGas2ForYear || []
+					}
+				xData = this.getXdata()
 			}
 			if (yData.length == 0) {
 				seriesData = []
@@ -177,7 +178,7 @@ export default {
 			this.chart = echarts.init(this.$el);
 			var option = {
 				color: colors,
-				grid: { top: 32, right: 12, bottom: 20, left: 48 },
+				grid: { top: 32, right: 12, bottom: 20, left: 60 },
 				xAxis: {
 					type: 'category',
 					data: xData,
@@ -223,6 +224,40 @@ export default {
 				},
 			}
 			option && this.chart.setOption(option)
+		},
+		getXdata() {
+			const today = new Date();
+			const currentYear = today.getFullYear();
+			const currentMonth = today.getMonth() + 1;
+			let days = 30;
+			if (this.chartTime === '周') {
+				return Array(7)
+						.fill(1)
+						.map((_, index) => {
+							const today = new Date();
+							const dtimestamp = today - (index+1) * 24 * 60 * 60 * 1000;
+							return `${new Date(dtimestamp).getMonth() + 1}.${new Date(
+								dtimestamp
+							).getDate()}`;}).reverse()
+			}else if (this.chartTime == "月") {
+				if (currentMonth in [1, 3, 5, 7, 8, 10, 12]) {
+					days = 31;
+				} else if (currentMonth == 2) {
+					days = this.isLeapYear(currentYear) ? 29 : 28;
+				}
+				return Array(days)
+						.fill(1)
+						.map((_, index) => {
+							return `${currentMonth}.${days - index}`;}).reverse()
+			} else {
+				return Array(12)
+						.fill(1)
+						.map((_, index) => {
+							return `${currentYear}.${12 - index}`;}).reverse()
+			}
+		},
+		isLeapYear(year) {
+			return year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
 		}
 	},
 };