From 574431ccb5d0a447f832c2ca53c202f3296f3732 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Mon, 30 Dec 2024 14:07:03 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=B0=B4=20?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E7=A9=BA=E6=B0=94=EF=BC=8C=E7=94=B5=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue       |  2 +-
 src/views/enm_energy/air_consume.vue    | 43 ++++++++------
 src/views/enm_energy/electric_total.vue | 27 ++++-----
 src/views/enm_energy/water.vue          | 75 ++++++++++++++-----------
 4 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 311f1f55..c1fbd0df 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -160,7 +160,7 @@
 			<div class="flexItem">
 				<div class="itemTitle">
 					<div class="itemTitleIcon"></div>
-					<div>本月主机设备电耗</div>
+					<div>本月工序电量</div>
 				</div>
 				<div class="itemBody itemBodyFlex">
 					<div id="radar" style="height: 100%"></div>
diff --git a/src/views/enm_energy/air_consume.vue b/src/views/enm_energy/air_consume.vue
index ed1aaeb3..65bde809 100644
--- a/src/views/enm_energy/air_consume.vue
+++ b/src/views/enm_energy/air_consume.vue
@@ -17,19 +17,18 @@
                     :value="item.id"
                     ></el-option>
 				</el-select>
-				<el-date-picker
-					v-model="daterange"
-					type="datetimerange"
-					:shortcuts="shortcuts"
-					range-separator="To"
-      				start-placeholder="Start date"
-					end-placeholder="End date"
-					placeholder="时间范围"
-					value-format="YYYY-MM-DD hh:mm:ss"
+				<el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
 					v-if="query.type==3"
-					style="margin-right: 6px"
-					@change="changeDate"
-				/>
+					@change="changeDate"/>
+					
 				<el-date-picker
 					v-model="query.day"
 					type="date"
@@ -397,7 +396,7 @@ export default {
 			bar_option: {
 			legend: {
 					top: "2%",
-					data: ["烧成车间压缩空气", "原料车间压缩空气", "水泥磨压缩空气"]
+					data: ["烧成车间压缩空气(m3)", "原料车间压缩空气(m3)", "水泥磨压缩空气(m3)"]
 				},
 			tooltip: {
 				trigger: 'axis',
@@ -411,11 +410,11 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '压缩空气'
+				name: ''
 			},
 			series: [
 				{
-				name: '烧成车间压缩空气', // 此处修改为对应分类的名称
+				name: '烧成车间压缩空气(m3)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: [], 
 				itemStyle: {
@@ -424,7 +423,7 @@ export default {
 				
 			},
 			{
-				name: '原料车间压缩空气', // 此处修改为对应分类的名称
+				name: '原料车间压缩空气(m3)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: [], 
 				itemStyle: {
@@ -433,7 +432,7 @@ export default {
 				
 			},
 			{
-				name: '水泥磨压缩空气', // 此处修改为对应分类的名称
+				name: '水泥磨压缩空气(m3)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: [], 
 				itemStyle: {
@@ -869,13 +868,23 @@ export default {
 		},
 	}
 };
+
 </script>
 <style scoped>
 .printWrap {
 	width: 100%;
 	overflow-x: scroll;
 }
+.chartWrap {
+	width: 1500px;
+	margin-top: 20px;
+	border: 1px solid #eeeeee;
+}
 .printContainer {
 	width: 100%;
 }
+.chartTitle{
+	text-align: center; 
+    width: 100%; 
+}
 </style>
diff --git a/src/views/enm_energy/electric_total.vue b/src/views/enm_energy/electric_total.vue
index 09ad7bab..f392c2f6 100644
--- a/src/views/enm_energy/electric_total.vue
+++ b/src/views/enm_energy/electric_total.vue
@@ -26,24 +26,17 @@
 					v-if = "query.type == 0"	
 					@change="dateChange"
 				/>
-				<el-date-picker
-					v-model="daterange"
-					type="datetimerange"
-					:shortcuts="shortcuts"
-					range-separator="To"
-      				start-placeholder="Start date"
-					end-placeholder="End date"
-					placeholder="时间范围"
-					value-format="YYYY-MM-DD hh:mm:ss"
+				<el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
 					v-if="query.type==1"
-					style="margin-right: 6px"
-					@change="changeDate"
-				/>
-				<!-- <el-button
-					type="primary"
-					icon="el-icon-search"
-					@click="dateChange"
-				></el-button> -->
+					@change="changeDate"/>
 				<el-button
 					type="primary"
 					@click="exportExcel()"
diff --git a/src/views/enm_energy/water.vue b/src/views/enm_energy/water.vue
index d8fdab10..98d1ad70 100644
--- a/src/views/enm_energy/water.vue
+++ b/src/views/enm_energy/water.vue
@@ -17,19 +17,18 @@
                     :value="item.id"
                     ></el-option>
 				</el-select>
-				<el-date-picker
-					v-model="daterange"
-					type="datetimerange"
-					:shortcuts="shortcuts"
-					range-separator="To"
-      				start-placeholder="Start date"
-					end-placeholder="End date"
-					placeholder="时间范围"
-					value-format="YYYY-MM-DD hh:mm:ss"
+                <el-date-picker 
+					v-model="daterange" 
+					type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" 
+					range-separator="至"
+					start-placeholder="开始时间" 
+					end-placeholder="结束时间"
+					format="YYYY-MM-DD HH"
+                    popper-class="tpc"
 					v-if="query.type==3"
-					style="margin-right: 6px"
-					@change="changeDate"
-				/>
+					@change="changeDate"/>
+
 				<el-date-picker
 					v-model="query.day"
 					type="date"
@@ -243,8 +242,9 @@
 <script>
 let legend = {
 	top: "2%",
-	data: ["工业水", "绿化水", "生活水"],
+	data: ["工业水(t)", "绿化水(t)", "生活水(t)"],
 };
+let colors = ["##36492E", "#4BA328", "#C6F47D"];
 import scEcharts from "@/components/scEcharts";
 export default {
 	components: {
@@ -303,7 +303,6 @@ export default {
 			sourceData: {},
 			option: {
 				title: {
-					// text: "全厂电量小时统计",
 					x: "center",
 				},
 				grid: {
@@ -423,6 +422,7 @@ export default {
 		for (let n = 1; n <= that.days; n++) {
 			that.xAxisData_day.push(n + "日");
 		}
+		let colors = ["##36492E", "#4BA328", "#C6F47D"];
 		this.getMPoints();
 		let heightContainer =
 			document.getElementById("app-container").clientHeight;
@@ -590,7 +590,7 @@ export default {
 			});
 		},
 		updateChart(gyhourlyData, shhourlyData, lvhourlyData) {
-			let that = this;
+		let that = this;
 			// 创建 ECharts 配置
 		let option = {
 			legend: legend,
@@ -606,32 +606,32 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '用水量'
+				name: ''
 			},
 			series: [{
-				name: '工业水', // 此处修改为对应分类的名称
+				name: '工业水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: gyhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#a9b6fe',
+					color: '#518A3A',
 				},
 				
 			},
 			{
-				name: '绿化水', // 此处修改为对应分类的名称
+				name: '绿化水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: lvhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#3398DB',
+					color: '#DCE6CB',
 				},
 				
 			},
 			{
-				name: '生活水', // 此处修改为对应分类的名称
+				name: '生活水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: shhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#EE6666',
+					color: '#93F607',
 				},
 				
 			},
@@ -707,32 +707,32 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '用水量'
+				name: ''
 			},
 			series: [{
-				name: '工业水', // 此处修改为对应分类的名称
+				name: '工业水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: gyhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#a9b6fe',
+					color: '#518A3A',
 				},
 				
 			},
 			{
-				name: '绿化水', // 此处修改为对应分类的名称
+				name: '绿化水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: lvhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#3398DB',
+					color: '#DCE6CB',
 				},
 				
 			},
 			{
-				name: '生活水', // 此处修改为对应分类的名称
+				name: '生活水(t)', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: shhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#EE6666',
+					color: '#93F607',
 				},
 				
 			},
@@ -837,14 +837,14 @@ export default {
 			},
 			yAxis: {
 				type: 'value',
-				name: '用水量'
+				name: ''
 			},
 			series: [{
 				name: '工业水', // 此处修改为对应分类的名称
 				type: 'bar',
 				data: gyhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#a9b6fe',
+					color: '#518A3A',
 				},
 				
 			},
@@ -853,7 +853,7 @@ export default {
 				type: 'bar',
 				data: lvhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#3398DB',
+					color: '#DCE6CB',
 				},
 				
 			},
@@ -862,7 +862,7 @@ export default {
 				type: 'bar',
 				data: shhourlyData, // 每小时的用水量
 				itemStyle: {
-					color: '#EE6666',
+					color: '#93F607',
 				},
 				
 			},
@@ -964,4 +964,13 @@ export default {
 .printContainer {
 	width: 100%;
 }
+.chartTitle{
+	text-align: center; 
+    width: 100%; 
+}
+.chartWrap {
+	width: 1500px;
+	margin-top: 20px;
+	border: 1px solid #eeeeee;
+}
 </style>