4.11

src/views/energy/analysis/contrastAnalysis/components/barChart.vue

@@ -76,10 +76,6 @@ export default {
 					name: this.chartData[i].objName + this.chartData[i].objCode,
 					type: 'bar',
 					barMaxWidth: 20,
-					label: {
-						show: true,
-						position: 'top',
-					},
 					data: [],
 				};
 				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);

src/views/energy/analysis/trendAnalysis/components/lineChart.vue

@@ -68,9 +68,9 @@ export default {
 
 			var option = {
 				color: ['#288AFF'],
-				// tooltip: {
-				//   trigger: 'axis'
-				// },
+				tooltip: {
+					trigger: 'axis',
+				},
 				grid: {
 					left: '4%',
 					right: '1%',

src/views/energy/analysis/trendAnalysis/index.vue

@@ -57,8 +57,10 @@ export default {
 			let listObj = { useNum: '消耗量' }; // 数据
 			for (let i = 0; i < arr.length; i++) {
 				let obj = {};
+				let fName = arr[i].time.slice(0, 4);
+				let lName = arr[i].time.slice(4, 6);
 				obj.prop = arr[i].time;
-				obj.label = arr[i].time;
+				obj.label = fName + ' 第 ' + lName + ' 周';
 				obj.minWidth = 100;
 				tempX.push(obj);
 				listObj[arr[i].time] = arr[i].useNum || null;