能源bug

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

@@ -57,10 +57,14 @@ 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);
+				if (this.timeDim === '3') {
+					let fName = arr[i].time.slice(0, 4);
+					let lName = arr[i].time.slice(4, 6);
+					obj.label = fName + ' 第 ' + lName + ' 周';
+				} else {
+					obj.label = arr[i].time;
+				}
 				obj.prop = arr[i].time;
-				obj.label = fName + ' 第 ' + lName + ' 周';
 				obj.minWidth = 100;
 				tempX.push(obj);
 				listObj[arr[i].time] = arr[i].useNum || null;
@@ -97,10 +101,10 @@ export default {
 	},
 };
 </script>
-<style lang='scss'>
+<style lang="scss">
 .trendAnalysisBox {
 	.trend-out-table {
 		margin-bottom: 15px;
 	}
 }
-</style>
+</style>

src/views/energy/monitoring/energyLimit/index.vue

@@ -266,8 +266,9 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
+			console.log(row);
 			this.$modal
-				.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?')
+				.confirm('是否确认删除第"' + row._pageIndex + '"条数据项?')
 				.then(function () {
 					return deleteEnergyLimit(row.id);
 				})