From f1a031bcd72dd49bb6d00c44eb03ace7a44f1ea8 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 30 Dec 2024 10:07:31 +0800
Subject: [PATCH] 1230

---
 src/components/scEnm/lineChartsdialog.vue     |  14 +-
 src/views/bigScreen/index_enm.vue             |  84 +++++-----
 src/views/bigScreen/index_enm_ly.vue          |  16 +-
 src/views/em/equipmentjl.vue                  |   2 +
 src/views/enm_base/mgroup.vue                 |   5 +
 src/views/enm_base/mgroup_form.vue            |   7 +-
 src/views/enm_coal/handoverLog.vue            |   2 +-
 src/views/enm_coal/power.vue                  |  12 +-
 src/views/enm_coal/report.vue                 |  35 ++--
 src/views/enm_coal/teamAnalysis.vue           |  18 +--
 src/views/enm_coal/workshopAnalysis.vue       |  73 ++++-----
 src/views/enm_coalbase/handoverLog.vue        |   2 +-
 src/views/enm_coalbase/power.vue              |  12 +-
 src/views/enm_coalbase/report.vue             |   8 +-
 src/views/enm_coalbase/teamAnalysis.vue       |  10 +-
 src/views/enm_coalbase/workshopAnalysis.vue   |  22 +--
 src/views/enm_cogeneration/handoverLog.vue    |   2 +-
 src/views/enm_cogeneration/report.vue         |  22 +--
 src/views/enm_cogeneration/teamAnalysis.vue   |  10 +-
 .../enm_cogeneration/workshopAnalysis.vue     |  74 ++++-----
 src/views/enm_energy/electric.vue             |   8 +-
 src/views/enm_energy/electric_peak.vue        |  17 +-
 src/views/enm_energy/electric_total.vue       |   2 +-
 src/views/enm_energy/energy.vue               |   4 +-
 src/views/enm_energy/energyFactory.vue        |   4 +-
 src/views/enm_energy/energyPicture.vue        |  38 ++---
 src/views/enm_kiln/handoverLog.vue            |   2 +-
 src/views/enm_kiln/power.vue                  |  12 +-
 src/views/enm_kiln/report.vue                 |  38 +++--
 src/views/enm_kiln/teamAnalysis.vue           |  24 +--
 src/views/enm_kiln/workshopAnalysis.vue       |  74 ++++-----
 src/views/enm_kilnbase/handoverLog.vue        |   2 +-
 src/views/enm_kilnbase/power.vue              |  14 +-
 src/views/enm_kilnbase/report.vue             |   8 +-
 src/views/enm_kilnbase/teamAnalysis.vue       |  20 +--
 src/views/enm_kilnbase/workshopAnalysis.vue   |  50 +++---
 src/views/enm_limestone/report.vue            |   6 +-
 src/views/enm_limestone/workshopAnalysis.vue  |  22 +--
 src/views/enm_mill/handoverLog.vue            |   2 +-
 src/views/enm_mill/power.vue                  |  12 +-
 src/views/enm_mill/report.vue                 |  27 ++--
 src/views/enm_mill/teamAnalysis.vue           |  18 +--
 src/views/enm_mill/workshopAnalysis.vue       |  26 +--
 src/views/enm_monthSet/goalSetting.vue        |   4 +
 src/views/enm_pack/handoverLog.vue            |   2 +-
 src/views/enm_pack/report.vue                 |   6 +-
 src/views/enm_pack/teamAnalysis.vue           |  14 +-
 src/views/enm_pack/workshopAnalysis.vue       |  22 +--
 src/views/enm_report/reportDay.vue            |  28 ++--
 src/views/enm_report/reportFactory.vue        |   2 +-
 src/views/enm_report/reportMonth.vue          |  36 ++---
 src/views/enm_rm/power.vue                    |  18 +--
 src/views/enm_rm/report.vue                   |  38 +++--
 src/views/enm_rm/teamAnalysis.vue             |  34 ++--
 src/views/enm_rm/workshopAnalysis.vue         |  22 +--
 src/views/enm_rm_copy/power.vue               |  18 +--
 src/views/enm_rm_copy/report.vue              |  30 ++--
 src/views/enm_rm_copy/teamAnalysis.vue        |  34 ++--
 src/views/enm_rm_copy/workshopAnalysis.vue    |  22 +--
 src/views/enm_rmbase/power.vue                |  12 +-
 src/views/enm_rmbase/report.vue               |  10 +-
 src/views/enm_rmbase/teamAnalysis.vue         |  20 +--
 src/views/enm_rmbase/workshopAnalysis.vue     |  22 +--
 src/views/enm_slag/handoverLog.vue            |   2 +-
 src/views/enm_slag/power.vue                  |   8 +-
 src/views/enm_slag/report.vue                 |  10 +-
 src/views/enm_slag/teamAnalysis.vue           | 153 +++++++++---------
 src/views/enm_slag/workshopAnalysis.vue       |  22 +--
 src/views/statistics/total_statistics.vue     |   2 +-
 src/views/wpm_bx/mlog_detail.vue              |   1 +
 src/views/wpm_bx/mlogb_form.vue               |  81 +++-------
 71 files changed, 772 insertions(+), 761 deletions(-)

diff --git a/src/components/scEnm/lineChartsdialog.vue b/src/components/scEnm/lineChartsdialog.vue
index f5272061..a1b70c78 100644
--- a/src/components/scEnm/lineChartsdialog.vue
+++ b/src/components/scEnm/lineChartsdialog.vue
@@ -310,9 +310,9 @@ export default {
 			if (that.cate == "总产量（t）" || that.cate == "出厂水泥合计（t）") {
 				that.cateName = "total_production";
 			} else if (
-				that.cate == "单位产品分布电耗（KW·h/t）" ||
-				that.cate == "生料分布电耗（KW·h/t）" ||
-				that.cate == "煤磨分布电耗（KW·h/t）"
+				that.cate == "单位产品分布电耗（kW·h/t）" ||
+				that.cate == "生料分布电耗（kW·h/t）" ||
+				that.cate == "煤磨分布电耗（kW·h/t）"
 			) {
 				that.cateName = "elec_consume_unit";
 			} else if (that.cate == "台时产量（t/h）") {
@@ -328,17 +328,17 @@ export default {
 				that.cate == "生料成本（元/吨）"
 			) {
 				that.cateName = "production_cost_unit";
-			} else if (that.cate == "单位产品综合电耗（KW·h/t）") {
+			} else if (that.cate == "单位产品综合电耗（kW·h/t）") {
 				that.cateName = "celec_consume_unit";
 			} else if (that.cate == "单位产品标煤耗（kgce/t）") {
 				that.cateName = "coal_consume_unit";
 			} else if (that.cate == "单位产品综合能耗（kgce/t）") {
 				that.cateName = "cen_consume_unit";
-			} else if (that.cate == "发电功率（KW·h）") {
+			} else if (that.cate == "发电功率（kW·h）") {
 				that.cateName = "production_hour";
-			} else if (that.cate == "吨熟料发电量（KW·h/t）") {
+			} else if (that.cate == "吨熟料发电量（kW·h/t）") {
 				that.cateName = "production_elec_unit";
-			} else if (that.cate == "总电耗（KW·h）"||that.cate =="总电量（KW·h）") {
+			} else if (that.cate == "总电耗（kW·h）"||that.cate =="总电量（kW·h）") {
 				that.cateName = "elec_consume";
 			}else if (that.cate == "消耗") {
 				that.cateName = "amount_consume";
diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 253eafd7..4a2ddc3a 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -176,7 +176,7 @@
 												font-weight: 500;
 												font-size: 12px;
 											"
-											>kw.h</span
+											>kW·h</span
 										>
 									</th>
 								</tr>
@@ -200,7 +200,7 @@
 			<div class="flexItem">
 				<div class="itemTitle">
 					<div class="itemTitleIcon"></div>
-					<div>能源消耗</div>
+					<div>本月能源消耗</div>
 				</div>
 				<div class="itemBody" id="line3"></div>
 			</div>
@@ -215,7 +215,7 @@
 							<span>熟料综合电耗</span>
 							<p class="elec_number">
 								{{ (Number(hotData.celec_consume_unit)+Number(dicData.b_sl_elec)).toFixed(2) }}
-								<span class="elec_unit">kw.h/t</span>
+								<span class="elec_unit">kW·h/t</span>
 							</p>
 						</div>
 					</div>
@@ -251,7 +251,7 @@
 							<span>水泥工序电耗</span>
 							<p class="elec_number">
 								{{ (Number(hotData.sn_elec_consume_unit)+Number(dicData.b_sn_elec)).toFixed(2) }}
-								<span class="elec_unit">kw.h/t</span>
+								<span class="elec_unit">kW·h/t</span>
 							</p>
 						</div>
 					</div>
@@ -260,7 +260,7 @@
 							<span>水泥包装工序电耗</span>
 							<p class="elec_number">
 								{{(Number(hotData.bz_elec_consume_unit) + Number(dicData.b_snbz_elec)).toFixed(2) }}
-								<span class="elec_unit">kw.h/t</span>
+								<span class="elec_unit">kW·h/t</span>
 							</p>
 						</div>
 					</div>
@@ -819,7 +819,7 @@ export default {
 					option1.color = ['#FFFF00','#CC00FF', '#FFBF00']
 					option1.legend.data = [
 				{
-					name: "熟料",
+					name: "熟料(t)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -829,7 +829,7 @@ export default {
 					},
 				},
 				{
-					name: "水泥",
+					name: "水泥(t)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -839,7 +839,7 @@ export default {
 					},
 				},
 				{
-					name: "出厂水泥",
+					name: "出厂水泥(t)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -851,7 +851,7 @@ export default {
 			];
 					option1.series = [
 						{
-							name: "熟料",
+							name: "熟料(t)",
 							type: "line",
 							smooth: true,
 							lineStyle: {
@@ -868,7 +868,7 @@ export default {
 							data: seriesData,
 						},
 						{
-							name: "水泥",
+							name: "水泥(t)",
 							type: "line",
 							smooth: true,
 							lineStyle: {
@@ -885,7 +885,7 @@ export default {
 							data: seriesData1,
 						},
 						{
-							name: "出厂水泥",
+							name: "出厂水泥(t)",
 							type: "line",
 							smooth: true,
 							lineStyle: {
@@ -1048,7 +1048,7 @@ export default {
 			option3.color = ['#FFBF00','#6495ED', '#CC00FF']
 			option3.legend.data = [
 			{
-					name: "生活水",
+					name: "生活水(t)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -1058,7 +1058,7 @@ export default {
 					},
 				},
 				{
-					name: "绿化水",
+					name: "绿化水(t)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -1068,7 +1068,7 @@ export default {
 					},
 				},
 				{
-					name: "工业水",
+					name: "工业水(t)",
 					textStyle: {
 						color: "#fff",
 					},
@@ -1080,7 +1080,7 @@ export default {
 			];
 			option3.series = [
 				{
-				name: '生活水',
+				name: '生活水(t)',
 				type: 'line',
 				data: seriesData1,
 				lineStyle: {
@@ -1088,7 +1088,7 @@ export default {
 				},
 				},
 				{
-				name: '绿化水',
+				name: '绿化水(t)',
 				type: 'line',
 				data: seriesData3,
 				lineStyle: {
@@ -1096,7 +1096,7 @@ export default {
 				},
 				},
 				{
-				name: '工业水',
+				name: '工业水(t)',
 				type: 'line',
 				data: seriesData5,
 				lineStyle: {
@@ -1285,25 +1285,26 @@ export default {
 			let myChart = echarts.init(chartDom);
 
 			// 初始化各个series数据数组
-			let seriesData = new Array(12).fill(0); 
-			let seriesData1 = new Array(12).fill(0); 
+			let seriesData = new Array(31).fill(0); 
+			let seriesData1 = new Array(31).fill(0); 
 
 			// 定义查询参数的生成函数
 			function generateQuery(mgroupId) {
 				return {
 					page: 0,
 					//获取当前年的第一个月
-					start_time: that.currentYear + "-01-01 00:00:00",
-					end_time: that.currentYear + "-12-31 00:00:00",
-					type: "month_s",
+					year_s: that.currentYear,
+					month_s: that.currentMonth,
+					type: "day_s",
 					mgroup: mgroupId,
 				};
 			}
 			function generateQueryMpoint(mpointId) {
 				return {
 					page: 0,
-					type: "month",
-					year: that.currentYear,
+					type: "day_s",
+					year_s: that.currentYear,
+					month_s: that.currentMonth,
 					mpoint: mpointId,
 				};
 			}
@@ -1312,18 +1313,18 @@ export default {
 			this.$API.enm.enstat.req(query1).then((response) => {
 				response.forEach((item) => {
 					if (item.qua_data.length > 0) {
-						let ind = item.month_s - 1;
+						let ind = item.day_s - 1;
 						seriesData[ind] = item.total_production || 0;
 					}
 				});
-				// 获取每个月的全厂电量
+				// 获取每日的全厂电量
 				let query2 = generateQueryMpoint("3631880992400515072");
 				return this.$API.enm.mpointstat.list.req(query2);
 			}).then((response) => {
 				let maxId;
 			    response.forEach((item) => {
-					let ind = item.month - 1;
-					maxId = 12;
+					let ind = item.day_s - 1;
+					maxId = 31;
 						seriesData1[ind] = item.val || 0;
 			    	});
 				// 更新图表数据
@@ -1340,7 +1341,7 @@ export default {
 						},
 					},
 					{
-						name: "全厂电量(kwh)",
+						name: "全厂电量(kW·h)",
 						textStyle: {
 							color: "#fff",
 						},
@@ -1371,7 +1372,7 @@ export default {
 					},
 					
 					{
-					name: '全厂电量(kwh)',
+					name: '全厂电量(kW·h)',
 					type: 'line',
 					yAxisIndex: 1,
 					data: seriesData1,
@@ -1389,20 +1390,7 @@ export default {
 							},
 					},
 				];
-				option5.xAxis.data = [
-					"1月",
-					"2月",
-					"3月",
-					"4月",
-					"5月",
-					"6月",
-					"7月",
-					"8月",
-					"9月",
-					"10月",
-					"11月",
-					"12月",
-				];
+				// option5.xAxis.data = that.datelist;
 				myChart.setOption(option5); // 设置更新后的图表
 				let index3 = 0;
 				intervalId = setInterval(function () {
@@ -1682,7 +1670,7 @@ export default {
 											value: 100,
 										},
 										{
-											label: "单位电耗(kwh)",
+											label: "单位电耗(kW·h)",
 											field: "elec_consume_unit",
 											value: 100,
 										},
@@ -1926,7 +1914,7 @@ export default {
 				if (value == "余热发电") {
 					info.rows = [
 						{
-							label: "发电量(kwh)",
+							label: "发电量(kW·h)",
 							field: "total_production",
 							value: res[0].total_production,
 						},
@@ -1936,7 +1924,7 @@ export default {
 							value: res[0].run_rate,
 						},
 						{
-							label: "发电量(kwh/t)",
+							label: "发电量(kW·h/t)",
 							field: "production_elec_unit",
 							value: res[0].production_elec_unit
 								? res[0].production_elec_unit
@@ -1956,7 +1944,7 @@ export default {
 							value: res[0].run_rate,
 						},
 						{
-							label: "单位电耗(kwh)",
+							label: "单位电耗(kW·h)",
 							field: "elec_consume_unit",
 							value: res[0].elec_consume_unit,
 						},
diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue
index 4f62013c..b0e7d760 100644
--- a/src/views/bigScreen/index_enm_ly.vue
+++ b/src/views/bigScreen/index_enm_ly.vue
@@ -170,7 +170,7 @@
 												font-weight: 500;
 												font-size: 12px;
 											"
-											>kwh</span
+											>kW·h</span
 										>
 									</th>
 								</tr>
@@ -237,7 +237,7 @@
 							<span>当月发电量</span>
 							<p class="elec_number">
 								{{ hotData.total_production }}
-								<span class="elec_unit">kwh</span>
+								<span class="elec_unit">kW·h</span>
 							</p>
 						</div>
 					</div>
@@ -255,7 +255,7 @@
 							<span>发电量</span>
 							<p class="elec_number">
 								{{ hotData.production_elec_unit }}
-								<span class="elec_unit">kwh</span>
+								<span class="elec_unit">kW·h</span>
 							</p>
 						</div>
 					</div>
@@ -274,7 +274,7 @@
 							<span>自用电量</span>
 							<p class="elec_number">
 								{{ hotData.elec_consume }}
-								<span class="elec_unit">kwh</span>
+								<span class="elec_unit">kW·h</span>
 							</p>
 						</div>
 					</div>
@@ -1232,7 +1232,7 @@ export default {
 											value: 100,
 										},
 										{
-											label: "单位电耗(kwh)",
+											label: "单位电耗(kW·h)",
 											field: "elec_consume_unit",
 											value: 100,
 										},
@@ -1475,7 +1475,7 @@ export default {
 				if (value == "余热发电") {
 					info.rows = [
 						{
-							label: "发电量(kwh)",
+							label: "发电量(kW·h)",
 							field: "total_production",
 							value: res[0].total_production,
 						},
@@ -1485,7 +1485,7 @@ export default {
 							value: res[0].run_rate,
 						},
 						{
-							label: "发电量(kwh/t)",
+							label: "发电量(kW·h/t)",
 							field: "production_elec_unit",
 							value: res[0].production_elec_unit
 								? res[0].production_elec_unit
@@ -1505,7 +1505,7 @@ export default {
 							value: res[0].run_rate,
 						},
 						{
-							label: "单位电耗(kwh)",
+							label: "单位电耗(kW·h)",
 							field: "elec_consume_unit",
 							value: res[0].elec_consume_unit,
 						},
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index b7cb118f..8faf6841 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -51,6 +51,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="工段运行" prop="indicate_mgroup_running">
+        </el-table-column>
         <el-table-column label="生产厂家" prop="factory" show-overflow-tooltip>
         </el-table-column>
         <el-table-column label="检定日期" prop="check_date" ></el-table-column>
diff --git a/src/views/enm_base/mgroup.vue b/src/views/enm_base/mgroup.vue
index 54637970..df17ccaa 100644
--- a/src/views/enm_base/mgroup.vue
+++ b/src/views/enm_base/mgroup.vue
@@ -41,6 +41,11 @@
 					prop="name"
 					min-width="100"
 				></el-table-column>
+				<el-table-column
+					label="标识"
+					prop="code"
+					min-width="100"
+				></el-table-column>
 				<el-table-column label="分类" prop="cate" min-width="100">
 					<template #default="scope">
 						<span>{{ cates_[scope.row.cate] }}</span>
diff --git a/src/views/enm_base/mgroup_form.vue b/src/views/enm_base/mgroup_form.vue
index 8c1a908a..9160c813 100644
--- a/src/views/enm_base/mgroup_form.vue
+++ b/src/views/enm_base/mgroup_form.vue
@@ -19,6 +19,9 @@
 					<el-form-item label="名称" prop="name">
 						<el-input v-model="form.name" clearable></el-input>
 					</el-form-item>
+					<el-form-item label="标识" prop="code">
+						<el-input v-model="form.code" clearable></el-input>
+					</el-form-item>
 					<!-- <el-form-item label="排班规则">
             <el-input v-model="form.shift_rule" clearable></el-input>
           </el-form-item> -->
@@ -221,9 +224,9 @@ export default {
 		//加载树数据
 		getGroup() {
 			this.$API.system.dept.list
-				.req({ page_size: 3, type: "dept" })
+				.req({ page: 0, type: "dept" })
 				.then((res) => {
-					this.group = res.results;
+					this.group = res;
 				});
 		},
 		//获取产品列表
diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue
index 13715c5d..6b5a90a3 100644
--- a/src/views/enm_coal/handoverLog.vue
+++ b/src/views/enm_coal/handoverLog.vue
@@ -206,7 +206,7 @@
 								<td class="numCell">
 									{{ reportItem.shut_sec }}
 								</td>
-								<td class="numCell">煤磨分布电耗（KW·h/t）</td>
+								<td class="numCell">煤磨分布电耗（kW·h/t）</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
 								</td>
diff --git a/src/views/enm_coal/power.vue b/src/views/enm_coal/power.vue
index 3717f596..5db2f69d 100644
--- a/src/views/enm_coal/power.vue
+++ b/src/views/enm_coal/power.vue
@@ -196,7 +196,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -236,8 +236,8 @@ export default {
 			mpoint: "",
 			tableName: "主要设备（100KW以上）单位产品电耗数据表",
 			tableDatas: [
-				["煤磨排风机主电机", "", "KW·h/t", "", "", ""],
-				["煤磨主电机", "", "KW·h/t", "", "", ""],
+				["煤磨排风机主电机", "", "kW·h/t", "", "", ""],
+				["煤磨主电机", "", "kW·h/t", "", "", ""],
 			],
 			tableData: [],
 			modelValue: true,
@@ -432,7 +432,7 @@ export default {
 						let obj = [];
 						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
-						obj[2] = "KW·h/t";
+						obj[2] = "kW·h/t";
 						obj[3] = item.elec_consume_unit;
 						obj[4] = 0;
 						obj[5] = 0;
@@ -471,7 +471,7 @@ export default {
 								let obj = [];
 								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
-								obj[2] = "KW·h/t";
+								obj[2] = "kW·h/t";
 								obj[4] = item.elec_consume_unit;
 								obj[6] = item.mpoint;
 								that.tableDatas[index_d] = obj;
@@ -498,7 +498,7 @@ export default {
 									let obj = [];
 									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
-									obj[2] = "KW·h/t";
+									obj[2] = "kW·h/t";
 									obj[5] = item.elec_consume_unit;
 									obj[6] = item.mpoint;
 									that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 93e8a3ab..f44d038b 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -170,7 +170,7 @@
 	</div>
 </template>
 <script>
-const colors = ["#647bfe", "#8698fe", "#a9b6fe", "#91CC75", "#EE6666"];
+const colors = ["#5b9bd5", "#ed7d31", "#70ad47", "#ffc000", "#4472c4"];
 let tooltip = {
 	show: true,
 	trigger: "axis",
@@ -182,8 +182,8 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "10%",
-	left: "4%",
+	right: "11%",
+	left: "11%",
 	top: "20%",
 };
 let toolbox = {
@@ -235,14 +235,31 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		nameRotate: 30,
 		axisLine: {
 			show: true,
 			lineStyle: {
-				color: colors[3],
+				color: colors[2],
+			},
+		},
+		axisLabel: {
+			formatter: "{value}",
+		},
+	},
+	{
+		type: "value",
+		name: "台时(t/h)",
+		position: "left",
+		alignTicks: true,
+		nameRotate: 30,
+		offset: 60,
+		axisLine: {
+			show: true,
+			lineStyle: {
+				color: colors[1],
 			},
 		},
 		axisLabel: {
@@ -281,8 +298,8 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, "/", 0, 0, "/", "/"],
 				["运转时间", "运转率（%）", "/", 0, 0, "/", 0, 0, "/","/"],
-				["能耗", "煤磨分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "总电耗（KW·h）", 0, 0, 0, 0, "/", "/", "/", "/"]
+				["能耗", "煤磨分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "总电耗（kW·h）", 0, 0, 0, 0, "/", "/", "/", "/"]
 			],
 			tableName: "生产报告",
 			modelValue: true,
@@ -375,7 +392,7 @@ export default {
 					{
 						name: "台时产量",
 						type: "bar",
-						yAxisIndex: 0,
+						yAxisIndex: 3,
 						data: [],
 					},
 					{
@@ -574,7 +591,7 @@ export default {
 									// that.tableDatas[3][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（KW·h/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue
index 2c614b58..65fc8d66 100644
--- a/src/views/enm_coal/teamAnalysis.vue
+++ b/src/views/enm_coal/teamAnalysis.vue
@@ -53,7 +53,7 @@
 							<tr>
 								<th>细度（%）</th>
 								<th>水分（%）</th>
-								<th>煤磨排风机主电机（KW·h/t）</th>
+								<th>煤磨排风机主电机（kW·h/t）</th>
 								<th>当期值（kW·h/t）</th>
 								<th>目标值（kW·h/t）</th>
 								<th>当期与目标值差值（kW·h/t）</th>
@@ -113,7 +113,7 @@ export default {
 					// let data = [];
 					if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        that.getGoalData();
 						    }
 						})
@@ -132,7 +132,7 @@ export default {
 			this.$API.mtm.goal.list.req(params).then((res) => {
 				if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        this.getData(item);
 						    }
 						})
@@ -217,9 +217,9 @@ export default {
 									? item.煤磨排风机主电机_consume_unit
 									: "/";
 							let keyVale = "goal_val_" + n;
-							arr[8] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[9] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
-							arr[10] = (arr[8] - arr[9]).toFixed(2); //当期与目标差值（KW·h/t）
+							arr[8] = item.elec_consume_unit; //当期值（kW·h/t）
+							arr[9] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取
+							arr[10] = (arr[8] - arr[9]).toFixed(2); //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanqi = 0,
 								huanqicha = 0,
@@ -238,18 +238,18 @@ export default {
 								}
 							})
 							}
-							arr[11] = huanqi; //环期值（KW·h/t）上个月的值
+							arr[11] = huanqi; //环期值（kW·h/t）上个月的值
 							if (huanqi !== "/") {
 								huanqicha = (arr[8] - arr[11]).toFixed(2);
 							} else {
 								huanqicha = 0;
 							}
-							arr[12] = huanqicha; //当期与环期差值（KW·h/t）
+							arr[12] = huanqicha; //当期与环期差值（kW·h/t）
 							// arr[13] =
 							if (arr[11] !=="/" && arr[11]!=0 && arr[12] !=0 && arr[12] !== "undefined"){
 								arr[13] = ((arr[12]/arr[11])*100).toFixed(2);
 							}else{
-								arr[13] = "/"; //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100%
+								arr[13] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100%
 							}
 							arr[14] = tongqi; //同比增长率（%）
 							// arr[15] = 0.0; //得分
diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue
index 20be239e..4cce12b9 100644
--- a/src/views/enm_coal/workshopAnalysis.vue
+++ b/src/views/enm_coal/workshopAnalysis.vue
@@ -44,11 +44,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 								<th>分析说明</th>
@@ -126,47 +126,42 @@ export default {
 			asynDialog: false,
 		};
 	},
-	mounted() {
+	async mounted() {
 		let that = this;
 		var myDate = new Date();
 		let year = myDate.getFullYear();
 		that.query.year_s = year;
+		try{
+			var res = await this.$API.mtm.mgroup.list.req({ page: 0, search: "煤磨" });
+			that.query.mgroup = res[0].id;
+		}catch(e){
+			this.$message.error("获取工段失败");
+		}
 		//月目标
 		let paramsGoal = {};
 		paramsGoal.page = 0;
 		paramsGoal.mgroup = that.query.mgroup;
-		that.$API.mtm.goal.list.req(paramsGoal).then((ress) => {
-			if (ress.length > 0) {
+		paramsGoal.goal_cate__code = "elec_consume_unit";
+		var ress = await that.$API.mtm.goal.list.req(paramsGoal);
+		if (ress.length > 0) {
 				let monthGoal = [];
 				ress.forEach((goal) => {
-					if (goal.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
-						monthGoal[0] = goal.goal_val;
-						monthGoal[1] = goal.goal_val_2;
-						monthGoal[2] = goal.goal_val_3;
-						monthGoal[3] = goal.goal_val_4;
-						monthGoal[4] = goal.goal_val_5;
-						monthGoal[5] = goal.goal_val_6;
-						monthGoal[6] = goal.goal_val_7;
-						monthGoal[7] = goal.goal_val_8;
-						monthGoal[8] = goal.goal_val_9;
-						monthGoal[9] = goal.goal_val_10;
-						monthGoal[10] = goal.goal_val_11;
-						monthGoal[11] = goal.goal_val_12;
-						monthGoal[12] = goal.goal_val_12;
-						that.monthGoal = monthGoal;
-					}
+					monthGoal[0] = goal.goal_val;
+					monthGoal[1] = goal.goal_val_2;
+					monthGoal[2] = goal.goal_val_3;
+					monthGoal[3] = goal.goal_val_4;
+					monthGoal[4] = goal.goal_val_5;
+					monthGoal[5] = goal.goal_val_6;
+					monthGoal[6] = goal.goal_val_7;
+					monthGoal[7] = goal.goal_val_8;
+					monthGoal[8] = goal.goal_val_9;
+					monthGoal[9] = goal.goal_val_10;
+					monthGoal[10] = goal.goal_val_11;
+					monthGoal[11] = goal.goal_val_12;
+					monthGoal[12] = goal.goal_val_12;
 				});
-			} else {
-				this.getData();
 			}
-		});
-		this.$API.mtm.mgroup.list
-			.req({ page: 0, search: "煤磨" })
-			.then((res) => {
-				console.log("煤磨", res);
-				that.query.mgroup = res[0].id;
-				this.getData();
-			});
+		this.getData();
 	},
 	methods: {
 		// 动态绑定Class
@@ -227,7 +222,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -241,8 +236,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = (item[1] - item[2]).toFixed(2);
@@ -250,7 +245,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 0) {
 								let num = index - 1;
@@ -268,7 +263,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_coalbase/handoverLog.vue b/src/views/enm_coalbase/handoverLog.vue
index 33c2ea06..081903b6 100644
--- a/src/views/enm_coalbase/handoverLog.vue
+++ b/src/views/enm_coalbase/handoverLog.vue
@@ -194,7 +194,7 @@
 								<td class="numCell">
 									{{ reportItem.shut_hour }}
 								</td>
-								<td class="numCell">煤磨分布电耗（KW·h/t）</td>
+								<td class="numCell">煤磨分布电耗（kW·h/t）</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
 								</td>
diff --git a/src/views/enm_coalbase/power.vue b/src/views/enm_coalbase/power.vue
index 4ead0344..286ed56a 100644
--- a/src/views/enm_coalbase/power.vue
+++ b/src/views/enm_coalbase/power.vue
@@ -190,7 +190,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -229,8 +229,8 @@ export default {
 			searchDate: "",
 			tableName: "主要设备单位产品电耗数据表",
 			tableDatas: [
-				["煤磨排风机主电机", "", "KW·h/t", "", "", ""],
-				["煤磨主电机", "", "KW·h/t", "", "", ""],
+				["煤磨排风机主电机", "", "kW·h/t", "", "", ""],
+				["煤磨主电机", "", "kW·h/t", "", "", ""],
 			],
 			tableData: [],
 			modelValue: true,
@@ -389,7 +389,7 @@ export default {
 						let index = that.mpoints.indexOf(item.mpoint_nickname);
 						let obj = [];
 						obj[0] = item.mpoint_nickname;
-						obj[1] = "KW·h/t";
+						obj[1] = "kW·h/t";
 						obj[2] = item.elec_consume_unit;
 						obj[3] = 0;
 						obj[4] = 0;
@@ -424,7 +424,7 @@ export default {
 							} else {
 								let obj = [];
 								obj[0] = item.mpoint_nickname;
-								obj[1] = "KW·h/t";
+								obj[1] = "kW·h/t";
 								obj[3] = item.elec_consume_unit;
 								obj[5] = item.mpoint;
 								that.tableDatas[index_d] = obj;
@@ -450,7 +450,7 @@ export default {
 								} else {
 									let obj = [];
 									obj[0] = item.mpoint_nickname;
-									obj[1] = "KW·h/t";
+									obj[1] = "kW·h/t";
 									obj[4] = item.elec_consume_unit;
 									obj[5] = item.mpoint;
 									that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_coalbase/report.vue b/src/views/enm_coalbase/report.vue
index 5c2276c7..649a76f9 100644
--- a/src/views/enm_coalbase/report.vue
+++ b/src/views/enm_coalbase/report.vue
@@ -227,7 +227,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h)",
+		name: "分布电耗(kW·h)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -270,7 +270,7 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转率（%）", "/", 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "煤磨分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "煤磨分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
 			modelValue: true,
@@ -330,7 +330,7 @@ export default {
 					},
 					{
 						type: "value",
-						name: "分布电耗(KW.h/t)",
+						name: "分布电耗(kW·h/t)",
 						position: "right",
 						alignTicks: true,
 						axisLine: {
@@ -567,7 +567,7 @@ export default {
 									that.tableDatas[3][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（KW·h/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
diff --git a/src/views/enm_coalbase/teamAnalysis.vue b/src/views/enm_coalbase/teamAnalysis.vue
index b53e9a1f..18d3cab1 100644
--- a/src/views/enm_coalbase/teamAnalysis.vue
+++ b/src/views/enm_coalbase/teamAnalysis.vue
@@ -165,9 +165,9 @@ export default {
 							arr.push(item.run_rate);
 
 							let keyVale = "goal_val_" + n;
-							arr[5] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[6] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
-							arr[7] = item.celec_consume_unit - arr[10]; //当期与目标差值（KW·h/t）
+							arr[5] = item.elec_consume_unit; //当期值（kW·h/t）
+							arr[6] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取
+							arr[7] = item.celec_consume_unit - arr[10]; //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanqi = 0,
 								huanqicha = 0,
@@ -186,13 +186,13 @@ export default {
 										: "/"
 									: "/";
 							}
-							arr[8] = huanqi; //环期值（KW·h/t）上个月的值
+							arr[8] = huanqi; //环期值（kW·h/t）上个月的值
 							if (huanqi !== "/") {
 								huanqicha = item.celec_consume_unit - huanqi;
 							} else {
 								huanqicha = item.celec_consume_unit;
 							}
-							arr[9] = huanqicha; //当期与环期差值（KW·h/t）
+							arr[9] = huanqicha; //当期与环期差值（kW·h/t）
 							arr[10] =
 								huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%）
 							if (wrapArr0[n]) {
diff --git a/src/views/enm_coalbase/workshopAnalysis.vue b/src/views/enm_coalbase/workshopAnalysis.vue
index df6bb8e2..e804b060 100644
--- a/src/views/enm_coalbase/workshopAnalysis.vue
+++ b/src/views/enm_coalbase/workshopAnalysis.vue
@@ -43,11 +43,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -132,7 +132,7 @@ export default {
 						ress.forEach((goal) => {
 							if (
 								goal.goal_cate_name ==
-								"单位产品分布电耗（KW·h/t）"
+								"单位产品分布电耗（kW·h/t）"
 							) {
 								monthGoal[0] = goal.goal_val;
 								monthGoal[1] = goal.goal_val_2;
@@ -207,7 +207,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -219,8 +219,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = item[1] - item[2];
@@ -228,7 +228,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -246,7 +246,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_cogeneration/handoverLog.vue b/src/views/enm_cogeneration/handoverLog.vue
index 8a53c7bd..d24013af 100644
--- a/src/views/enm_cogeneration/handoverLog.vue
+++ b/src/views/enm_cogeneration/handoverLog.vue
@@ -210,7 +210,7 @@
 								<td class="numCell">
 									{{ reportItem.shut_hour }}
 								</td>
-								<td class="numCell">自用电量（KW·h/t）</td>
+								<td class="numCell">自用电量（kW·h/t）</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
 								</td>
diff --git a/src/views/enm_cogeneration/report.vue b/src/views/enm_cogeneration/report.vue
index 5a73c0fa..244cb615 100644
--- a/src/views/enm_cogeneration/report.vue
+++ b/src/views/enm_cogeneration/report.vue
@@ -320,7 +320,7 @@ let legend = {
 let yAxis = [
 	{
 		type: "value",
-		name: "电量 (KW·h)",
+		name: "电量 (kW·h)",
 		position: "left",
 
 		offset: 80,
@@ -352,7 +352,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "吨熟料发电量(KW·h/t)",
+		name: "吨熟料发电量(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -394,12 +394,12 @@ export default {
 				mgroup: "3347217246321065984",
 			},
 			tableDatas: [
-				["产量", "总发电量（KW·h）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["产量", "发电功率（KW·h）", "/", 0, 0, 0, 0, 0, 0, 0],
-				["产量", "吨熟料发电量（KW·h/t）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["产量", "总发电量（kW·h）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["产量", "发电功率（kW·h）", "/", 0, 0, 0, 0, 0, 0, 0],
+				["产量", "吨熟料发电量（kW·h/t）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转率（%）", "/", 0, 0, 0, 0, 0, 0, 0],
-				["自用电量", "用电量（KW·h）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["自用电量", "用电量（kW·h）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
 			modelValue: true,
@@ -430,7 +430,7 @@ export default {
 				yAxis: [
 					{
 						type: "value",
-						name: "电量 (KW·h)",
+						name: "电量 (kW·h)",
 						position: "left",
 						alignTicks: true,
 						axisLine: {
@@ -445,7 +445,7 @@ export default {
 					},
 					{
 						type: "value",
-						name: "吨熟料发电量（KW·h/t）",
+						name: "吨熟料发电量（kW·h/t）",
 						position: "right",
 						alignTicks: true,
 						axisLine: {
@@ -689,13 +689,13 @@ export default {
 									that.tableDatas[0][6] = item5[str];
 									that.tableDatas[0][8] = item5.goal_val;
 								} else if (
-									item5.goal_cate_name == "发电功率（KW·h）"
+									item5.goal_cate_name == "发电功率（kW·h）"
 								) {
 									that.tableDatas[1][6] = item5[str];
 									that.tableDatas[1][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"吨熟料发电量（KW·h/t）"
+									"吨熟料发电量（kW·h/t）"
 								) {
 									that.tableDatas[2][6] = item5[str];
 									that.tableDatas[2][8] = item5.goal_val;
@@ -710,7 +710,7 @@ export default {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
 								} else if (
-									item5.goal_cate_name == "用电量（KW·h）"
+									item5.goal_cate_name == "用电量（kW·h）"
 								) {
 									that.tableDatas[5][6] = item5[str];
 									that.tableDatas[5][8] = item5.goal_val;
diff --git a/src/views/enm_cogeneration/teamAnalysis.vue b/src/views/enm_cogeneration/teamAnalysis.vue
index 5999bd11..8a977a94 100644
--- a/src/views/enm_cogeneration/teamAnalysis.vue
+++ b/src/views/enm_cogeneration/teamAnalysis.vue
@@ -161,9 +161,9 @@ export default {
 							arr.push(item.production_hour);
 							arr.push(item.run_rate);
 							//发电量
-							arr[5] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[6] = item.celec_consume_unit; //目标值（KW·h/t）//需要接口获取
-							arr[7] = item.celec_consume_unit; //当期与目标差值（KW·h/t）
+							arr[5] = item.elec_consume_unit; //当期值（kW·h/t）
+							arr[6] = item.celec_consume_unit; //目标值（kW·h/t）//需要接口获取
+							arr[7] = item.celec_consume_unit; //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanbi = 0;
 							if (item.month_s == 1) {
@@ -179,8 +179,8 @@ export default {
 										: "/"
 									: "/";
 							}
-							arr[8] = huanbi; //环期值（KW·h/t）上个月的值
-							arr[9] = item.celec_consume_unit; //当期与环期差值（KW·h/t）
+							arr[8] = huanbi; //环期值（kW·h/t）上个月的值
+							arr[9] = item.celec_consume_unit; //当期与环期差值（kW·h/t）
 							arr[10] = item.celec_consume_unit; //环比增长率（%）
 							arr[11] = item.celec_consume_unit; //同比增长率（%）
 							wrapArr[ind] = arr;
diff --git a/src/views/enm_cogeneration/workshopAnalysis.vue b/src/views/enm_cogeneration/workshopAnalysis.vue
index 915d3299..a9dfb0ea 100644
--- a/src/views/enm_cogeneration/workshopAnalysis.vue
+++ b/src/views/enm_cogeneration/workshopAnalysis.vue
@@ -55,11 +55,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -107,10 +107,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 							</tr>
@@ -157,10 +157,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 							</tr>
@@ -207,10 +207,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 							</tr>
@@ -344,7 +344,7 @@ export default {
 						monthGoal4 = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -362,7 +362,7 @@ export default {
 							that.monthGoal = monthGoal;
 						}
 						if (
-							goal.goal_cate_name == "单位产品综合电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品综合电耗（kW·h/t）"
 						) {
 							monthGoal2[0] = goal.goal_val;
 							monthGoal2[1] = goal.goal_val_2;
@@ -474,7 +474,7 @@ export default {
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							//当期与目标差值（KW·h/t）
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (arrs[2] !== "/") {
 								diff = arrs[1] - arrs[2];
@@ -482,7 +482,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -500,7 +500,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
@@ -545,7 +545,7 @@ export default {
 							arrs2[3] = 48;
 							arrs2[4] = 57;
 							arrs2[5] = 61;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum2 = 0,
 								lastDiff2 = 0;
 							if (index > 1) {
@@ -606,7 +606,7 @@ export default {
 							arrs3[3] = 94;
 							arrs3[4] = 100;
 							arrs3[5] = 109;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum3 = 0,
 								lastDiff3 = 0;
 							if (index > 1) {
@@ -667,7 +667,7 @@ export default {
 							arrs4[3] = 100;
 							arrs4[4] = 107;
 							arrs4[5] = 117;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum4 = 0,
 								lastDiff4 = 0;
 							if (index > 1) {
@@ -730,8 +730,8 @@ export default {
 						//     arrs[0]=item[0];
 						//     arrs[1]=item[1];
 						//     arrs[2]=item[2];
-						//     //目标值（KW·h/t）//需要接口获取
-						//     //当期与目标差值（KW·h/t）
+						//     //目标值（kW·h/t）//需要接口获取
+						//     //当期与目标差值（kW·h/t）
 						//     let diff = 0;
 						//     if(item[2]!=='/'){
 						//         diff = item[1]-item[2];
@@ -739,7 +739,7 @@ export default {
 						//         diff = '/';
 						//     }
 						//     arrs[3]=diff;
-						//     //环期值（KW·h/t）上个月的值
+						//     //环期值（kW·h/t）上个月的值
 						//     let lastNum = 0;
 						//     if(index>1){
 						//         let num = index-1;
@@ -752,7 +752,7 @@ export default {
 						//         lastNum = wrapArr0[12]?wrapArr0[12].elec_consume_unit:'/';
 						//     }
 						//     arrs[4]=lastNum;
-						//     //当期与环期差值（KW·h/t）
+						//     //当期与环期差值（kW·h/t）
 						//     let lastDiff = 0;
 
 						//     if(arrs[1]!=='/'&&arrs[4]!=='/'){
@@ -786,8 +786,8 @@ export default {
 						//     arrs[0]=item[0];
 						//     arrs[1]=item[1];
 						//     arrs[2]=item[2];
-						//     //目标值（KW·h/t）//需要接口获取
-						//     //当期与目标差值（KW·h/t）
+						//     //目标值（kW·h/t）//需要接口获取
+						//     //当期与目标差值（kW·h/t）
 						//     let diff = 0;
 						//     if(item[2]!=='/'){
 						//         diff = item[1]-item[2];
@@ -795,7 +795,7 @@ export default {
 						//         diff = '/';
 						//     }
 						//     arrs[3]=diff;
-						//     //环期值（KW·h/t）上个月的值
+						//     //环期值（kW·h/t）上个月的值
 						//     let lastNum = 0;
 						//     if(index>1){
 						//         let num = index-1;
@@ -808,7 +808,7 @@ export default {
 						//         lastNum = wrapArr0[12]?wrapArr0[12].elec_consume_unit:'/';
 						//     }
 						//     arrs[4]=lastNum;
-						//     //当期与环期差值（KW·h/t）
+						//     //当期与环期差值（kW·h/t）
 						//     let lastDiff = 0;
 
 						//     if(arrs[1]!=='/'&&arrs[4]!=='/'){
@@ -842,8 +842,8 @@ export default {
 						//     arrs[0]=item[0];
 						//     arrs[1]=item[1];
 						//     arrs[2]=item[2];
-						//     //目标值（KW·h/t）//需要接口获取
-						//     //当期与目标差值（KW·h/t）
+						//     //目标值（kW·h/t）//需要接口获取
+						//     //当期与目标差值（kW·h/t）
 						//     let diff = 0;
 						//     if(item[2]!=='/'){
 						//         diff = item[1]-item[2];
@@ -851,7 +851,7 @@ export default {
 						//         diff = '/';
 						//     }
 						//     arrs[3]=diff;
-						//     //环期值（KW·h/t）上个月的值
+						//     //环期值（kW·h/t）上个月的值
 						//     let lastNum = 0;
 						//     if(index>1){
 						//         let num = index-1;
@@ -864,7 +864,7 @@ export default {
 						//         lastNum = wrapArr0[12]?wrapArr0[12].elec_consume_unit:'/';
 						//     }
 						//     arrs[4]=lastNum;
-						//     //当期与环期差值（KW·h/t）
+						//     //当期与环期差值（kW·h/t）
 						//     let lastDiff = 0;
 
 						//     if(arrs[1]!=='/'&&arrs[4]!=='/'){
diff --git a/src/views/enm_energy/electric.vue b/src/views/enm_energy/electric.vue
index 118cc609..8590edc1 100644
--- a/src/views/enm_energy/electric.vue
+++ b/src/views/enm_energy/electric.vue
@@ -26,10 +26,10 @@
                             <th>车间</th>
                             <th>工段</th>
                             <th>设备</th>
-                            <th>上一个小时（KW·h）</th>
-                            <th>昨日电量累计（KW·h）</th>
-                            <th>本月电量累计（KW·h）</th>
-                            <th>本年电量累计（KW·h）</th>
+                            <th>上一个小时（kW·h）</th>
+                            <th>昨日电量累计（kW·h）</th>
+                            <th>本月电量累计（kW·h）</th>
+                            <th>本年电量累计（kW·h）</th>
                         </tr>
                     </thead>
                     <tr v-for="(item,index) in tableData" :key="index">
diff --git a/src/views/enm_energy/electric_peak.vue b/src/views/enm_energy/electric_peak.vue
index 77970170..ef46f0d5 100644
--- a/src/views/enm_energy/electric_peak.vue
+++ b/src/views/enm_energy/electric_peak.vue
@@ -116,6 +116,7 @@ import * as echarts from 'echarts';
                     {id:2,name:'年统计'},
                 ],
                 row_list : ['peak','high','low','deep','flat'],
+                row_translate: ['峰值', '高峰', '低谷', '深谷', '平谷'],
                 
             };
         },
@@ -149,7 +150,9 @@ import * as echarts from 'echarts';
 				}
 			}
 		    },
-            
+            translate(){
+                
+            },
             dateChange() {
                 let that = this;
                 let arr = [],
@@ -211,9 +214,9 @@ import * as echarts from 'echarts';
                 let seriesData = [];
                 let categories = this.mpoint_name;  // 横轴设备名称
                 let rowList = this.row_list;    // ['peak', 'high', 'low', 'deep', 'flat']
-
+                let row_translate = this.row_translate; // ['峰值', '高峰', '低谷', '深谷', '平谷']
                 // 为每个电量级别（'peak', 'high', 'low', 'deep', 'flat'）创建一个系列
-                rowList.forEach(level => {
+                rowList.forEach((level, index) => {
                     let data = categories.map(device => {
                         // 查找对应设备和电量级别的数据
                         let deviceData = chartData[device]?.find(item => item.level === level);
@@ -221,7 +224,7 @@ import * as echarts from 'echarts';
                     });
 
                     seriesData.push({
-                        name: level,  // 系列名称（如 peak、high 等）
+                        name: row_translate[index],  // 系列名称（如 peak、high 等）
                         type: 'bar',
                         data: data,   // 数据数组
                         label: {
@@ -243,7 +246,7 @@ import * as echarts from 'echarts';
             axisPointer: { type: 'shadow' } // 鼠标悬停提示
         },
         legend: {
-            data: rowList, // 显示 'peak', 'high' 等级别的图例
+            data: row_translate, // 显示 'peak', 'high' 等级别的图例
             top: '10%'
         },
         xAxis: {
@@ -256,7 +259,7 @@ import * as echarts from 'echarts';
         yAxis: {
             type: 'value',
             axisLabel: {
-                formatter: '{value} kWh'  // 单位为 kWh
+                formatter: '{value} kW·h'  // 单位为 kW·h
             }
         },
         series: seriesData 
@@ -264,7 +267,7 @@ import * as echarts from 'echarts';
 
     // 设置图表选项
     myChart.setOption(option);
-    },
+            },
 
             handlePrint() {
                 this.$PRINT('#myReport');
diff --git a/src/views/enm_energy/electric_total.vue b/src/views/enm_energy/electric_total.vue
index 94a8acad..09ad7bab 100644
--- a/src/views/enm_energy/electric_total.vue
+++ b/src/views/enm_energy/electric_total.vue
@@ -105,7 +105,7 @@
 								prop="mpoint__code"
 								align="center"
 							></el-table-column><el-table-column
-								label="统计值(kwh)"
+								label="统计值(kW·h)"
 								prop="total_val"
 								align="center"
 							></el-table-column>
diff --git a/src/views/enm_energy/energy.vue b/src/views/enm_energy/energy.vue
index ad88c0cd..66a99433 100644
--- a/src/views/enm_energy/energy.vue
+++ b/src/views/enm_energy/energy.vue
@@ -106,7 +106,7 @@
                             <th rowspan="2">单位压缩空气（m3/t）</th>
                         </tr>
                         <tr>
-                            <th>电量（KW.h）</th>
+                            <th>电量（kW·h）</th>
                             <th>电量折标煤（tce）</th>
                             <th v-if="deptName=='烧成车间'">煤粉（t）</th>
                             <th v-if="deptName=='烧成车间'">煤粉折标煤（tce）</th>
@@ -118,7 +118,7 @@
                             <th>产品产量（t）</th>
                             <th v-if="deptName=='烧成车间'">单位产品综合能耗（tce/t）</th>
                             <th v-else>单位产品能耗（tce/t）</th>
-                            <th>电量（KW.h）</th>
+                            <th>电量（kW·h）</th>
                             <th>电量折标煤（tce）</th>
                             <!-- <th v-if="deptName=='原料车间'">水（t）</th> -->
                             <!-- <th v-if="deptName=='原料车间'">窑尾余热利用（tce）</th> -->
diff --git a/src/views/enm_energy/energyFactory.vue b/src/views/enm_energy/energyFactory.vue
index 646c628f..3664c20e 100644
--- a/src/views/enm_energy/energyFactory.vue
+++ b/src/views/enm_energy/energyFactory.vue
@@ -106,9 +106,9 @@
                 tableDatas:[
                     {index:1,name:'水泥单位产品综合能耗(kgce/t)',value:0,note:''},
                     {index:2,name:'熟料单位产品综合能耗(kgce/t)',value:0,note:''},
-                    {index:3,name:'熟料单位产品综合电耗(kw.h/t)',value:0,note:''},
+                    {index:3,name:'熟料单位产品综合电耗(kW·h/t)',value:0,note:''},
                     {index:4,name:'熟料单位产品综合煤耗(kgce/t)',value:0,note:''},
-                    {index:5,name:'水泥单位产品分布电耗(kw.h/t)',value:0,note:''},
+                    {index:5,name:'水泥单位产品分布电耗(kW·h/t)',value:0,note:''},
                 ],
 
             };
diff --git a/src/views/enm_energy/energyPicture.vue b/src/views/enm_energy/energyPicture.vue
index 6087e1cb..8de1d64f 100644
--- a/src/views/enm_energy/energyPicture.vue
+++ b/src/views/enm_energy/energyPicture.vue
@@ -10,99 +10,99 @@
                 <div class="energyNumber energyNumberLeft" style="top: 183px;">
                     <img v-if="dataObj.全厂用电合计" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.全厂用电合计 }} 
-                    <span v-if="dataObj.全厂用电合计">kWh</span>
+                    <span v-if="dataObj.全厂用电合计">kW·h</span>
                 </div>
                 <div class="energyNumber energyNumberLeft2" style="top: 84px;">
                     <img v-if="dataObj.电石渣配电室用电_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.电石渣配电室用电_电 }} 
-                    <span v-if="dataObj.电石渣配电室用电_电">kWh</span>
+                    <span v-if="dataObj.电石渣配电室用电_电">kW·h</span>
                 </div>
                 <!-- 窑头配电室用电_电 -->
                 <div class="energyNumber energyNumberLeft2" style="top: 181px;">
                     <img v-if="dataObj.回转窑_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.回转窑_电 }} 
-                    <span v-if="dataObj.回转窑_电">kWh</span>
+                    <span v-if="dataObj.回转窑_电">kW·h</span>
                 </div>
                 <div class="energyNumber energyNumberLeft2" style="top: 331px;">
                     <img v-if="dataObj.水泥配电室用电_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.水泥配电室用电_电 }} 
-                    <span v-if="dataObj.水泥配电室用电_电">kWh</span>
+                    <span v-if="dataObj.水泥配电室用电_电">kW·h</span>
                 </div>
 
                 <div class="energyNumber" style="top: 77px;">
                     <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/tkx_ele.png"> 
                     {{ dataObj.烘干破碎机_电 }} 
-                    <span v-if="dataObj.烘干破碎机_电">kWh</span>
+                    <span v-if="dataObj.烘干破碎机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 131px;">
                     <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.原料立磨主电机 }}
-                    <span v-if="dataObj.原料立磨主电机">kWh</span>
+                    <span v-if="dataObj.原料立磨主电机">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 175px;">
                     <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.生粉制备_循环风机_电 }} 
-                    <span v-if="dataObj.生粉制备_循环风机_电">kWh</span>
+                    <span v-if="dataObj.生粉制备_循环风机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 219px;">
                     <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.生粉制备_选粉机_电 }} 
-                    <span v-if="dataObj.生粉制备_选粉机_电">kWh</span>
+                    <span v-if="dataObj.生粉制备_选粉机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 269px;">
                     <img v-if="dataObj.高温风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.高温风机_电 }} 
-                    <span v-if="dataObj.高温风机_电">kWh</span>
+                    <span v-if="dataObj.高温风机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 325px;">
                     <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.尾排风机_电 }} 
-                    <span v-if="dataObj.尾排风机_电">kWh</span>
+                    <span v-if="dataObj.尾排风机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 379px;">
                     <img v-if="dataObj.烧成工序用电合计" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.烧成工序用电合计 }} 
-                    <span v-if="dataObj.烧成工序用电合计">kWh</span>
+                    <span v-if="dataObj.烧成工序用电合计">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 430px;">
                     <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.原料立磨主电机}} 
-                    <span v-if="dataObj.原料立磨主电机">kWh</span>
+                    <span v-if="dataObj.原料立磨主电机">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 488px;">
                     <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.煤磨排风机_电 }} 
-                    <span v-if="dataObj.煤磨排风机_电">kWh</span>
+                    <span v-if="dataObj.煤磨排风机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 538px;">
                     <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.窑头排风机_电 }} 
-                    <span v-if="dataObj.窑头排风机_电">kWh</span>
+                    <span v-if="dataObj.窑头排风机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 608px;">
                     <img v-if="dataObj.水泥磨用电合计" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.水泥磨用电合计 }} 
-                    <span v-if="dataObj.水泥磨用电合计">kWh</span>
+                    <span v-if="dataObj.水泥磨用电合计">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 665px;">
                     <img v-if="dataObj.辊压机动_电||dataObj.辊压机定_电" class="iconImg" src="img/tkx_ele.png">
                     {{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }} 
-                    <span v-if="dataObj.辊压机动_电||dataObj.辊压机定_电">kWh</span>
+                    <span v-if="dataObj.辊压机动_电||dataObj.辊压机定_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 721px;">
                     <img v-if="dataObj.系统风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.系统风机_电 }} 
-                    <span v-if="dataObj.系统风机_电">kWh</span>
+                    <span v-if="dataObj.系统风机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 776px;">
                     <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.水泥磨_选粉机_电 }} 
-                    <span v-if="dataObj.水泥磨_选粉机_电">kWh</span>
+                    <span v-if="dataObj.水泥磨_选粉机_电">kW·h</span>
                 </div>
                 <div class="energyNumber" style="top: 833px;">
                     <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/tkx_ele.png">
                     {{ dataObj.水泥磨_循环风机_电 }} 
-                    <span v-if="dataObj.水泥磨_循环风机_电">kWh</span>
+                    <span v-if="dataObj.水泥磨_循环风机_电">kW·h</span>
                 </div>
                 <!-- 煤 -->
                 <div class="energyNumberLeft coalNumber" style="top: 478px;">
diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue
index d70a83b1..30483ca4 100644
--- a/src/views/enm_kiln/handoverLog.vue
+++ b/src/views/enm_kiln/handoverLog.vue
@@ -207,7 +207,7 @@
 									{{ reportItem.shut_sec }}
 								</td>
 								<td class="numCell">
-									单位产品分布电耗（KW·h/t）
+									单位产品分布电耗（kW·h/t）
 								</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
diff --git a/src/views/enm_kiln/power.vue b/src/views/enm_kiln/power.vue
index 0b76b350..a2f3f384 100644
--- a/src/views/enm_kiln/power.vue
+++ b/src/views/enm_kiln/power.vue
@@ -205,7 +205,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -247,8 +247,8 @@ export default {
 			mpoint: "",
 			tableName: "主要设备（100KW以上）单位产品电耗数据表",
 			tableDatas: [
-				["高温风机", "", "KW·h/t", "", "", ""],
-				["窑主电机", "", "KW·h/t", "", "", ""],
+				["高温风机", "", "kW·h/t", "", "", ""],
+				["窑主电机", "", "kW·h/t", "", "", ""],
 			],
 			tableData: [],
 			modelValue: true,
@@ -550,7 +550,7 @@ export default {
 						let obj = [];
 						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
-						obj[2] = "KW·h/t";
+						obj[2] = "kW·h/t";
 						obj[3] = item.elec_consume_unit;
 						obj[4] = 0;
 						obj[5] = 0;
@@ -589,7 +589,7 @@ export default {
 								let obj = [];
 								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
-								obj[2] = "KW·h/t";
+								obj[2] = "kW·h/t";
 								obj[4] = item.elec_consume_unit;
 								obj[6] = item.mpoint;
 								that.tableDatas[index_d] = obj;
@@ -616,7 +616,7 @@ export default {
 									let obj = [];
 									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
-									obj[2] = "KW·h/t";
+									obj[2] = "kW·h/t";
 									obj[5] = item.elec_consume_unit;
 									obj[6] = item.mpoint;
 									that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index 3656e39c..d9c2c887 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -365,7 +365,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		nameRotate: 30,
@@ -398,7 +398,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "成本(元)",
+		name: "成本(元/吨)",
 		position: "left",
 		alignTicks: true,
 		nameRotate: 30,
@@ -409,9 +409,9 @@ let yAxis = [
 				color: colors[5],
 			},
 		},
-		axisLabel: {
-			formatter: "{value}/元",
-		},
+		// axisLabel: {
+		// 	formatter: "{value}/元",
+		// },
 	},
 ];
 import scEcharts from "@/components/scEcharts";
@@ -446,11 +446,11 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, "/", "/", 0, "/", "/"],
 				["运转时间", "运转率（%）", "/", 0, 0, "/", "/", 0, "/", "/"],
-				["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "单位产品综合电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品综合电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "单位产品标煤耗（kgce/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "单位产品综合能耗（kgce/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "总电耗（KW·h）", 0, 0, 0, 0, "/", "/", "/", "/"],
+				["能耗", "总电耗（kW·h）", 0, 0, 0, 0, "/", "/", "/", "/"],
 				["成本", "单位产品成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["氨水", "氨水消耗量(t)", 0, 0, 0, 0, "/", "/", "/", "/"],
 				["氨水", "单位氨水消耗量(kg/t)", 0, 0, 0, 0, "/", "/", "/", "/"],
@@ -469,7 +469,15 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: legend,
+				legend: {
+					top: "2%",
+					data: [
+						"总产量",
+						"分布电耗",
+						"单位产品标煤耗",
+						"成本",
+					],
+				},
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -773,13 +781,13 @@ export default {
 									// that.tableDatas[3][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（KW·h/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品综合电耗（KW·h/t）"
+									"单位产品综合电耗（kW·h/t）"
 								) {
 									that.tableDatas[5][6] = item5[str];
 									that.tableDatas[5][8] = item5.goal_val;
@@ -987,16 +995,16 @@ export default {
 				data.forEach((item) => {
 					let ind = item.hour;
 					seriesData0[ind] = item.total_production;
-					seriesData1[ind] = item.production_hour;
-					seriesData2[ind] = item.run_rate;
+					// seriesData1[ind] = item.production_hour;
+					// seriesData2[ind] = item.run_rate;
 					seriesData3[ind] = item.elec_consume_unit;
 					seriesData4[ind] = item.coal_consume_unit;
 					seriesData5[ind] = item.production_cost_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
+				// options.series[1].data = seriesData1;
+				// options.series[2].data = seriesData2;
 				options.series[3].data = seriesData3;
 				options.series[4].data = seriesData4;
 				options.series[5].data = seriesData5;
diff --git a/src/views/enm_kiln/teamAnalysis.vue b/src/views/enm_kiln/teamAnalysis.vue
index e9dd22b0..2c229585 100644
--- a/src/views/enm_kiln/teamAnalysis.vue
+++ b/src/views/enm_kiln/teamAnalysis.vue
@@ -245,20 +245,20 @@ export default {
 									: "/";
 
 							//煤耗
-							arr[12] = item.coal_consume_unit; //当期值（KW·h/t）
+							arr[12] = item.coal_consume_unit; //当期值（kW·h/t）
 							let keyValue = "goal_val_" + n;
 							if (goalData.length > 0){
 								goalData.forEach((item) => {
 								if (item.goal_cate_name == "单位产品标煤耗（kgce/t）") {
-									arr[13] = item[keyValue]; //目标值（KW·h/t）//需要接口获取
-								}else if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）"){
-									arr[25] = item[keyValue]; //目标值（KW·h/t）//需要接口获取
+									arr[13] = item[keyValue]; //目标值（kW·h/t）//需要接口获取
+								}else if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）"){
+									arr[25] = item[keyValue]; //目标值（kW·h/t）//需要接口获取
 								}
 							});
 						};
 							let dq = 0
 							if (arr[13] !== null && arr[13] !== undefined){
-								dq = (arr[12] - arr[13]).toFixed(2); //当期与目标差值（KW·h/t）
+								dq = (arr[12] - arr[13]).toFixed(2); //当期与目标差值（kW·h/t）
 							}else{
 								dq == "/"
 							};
@@ -278,9 +278,9 @@ export default {
 								}
 							})
 							}
-							arr[15] = huanbi; //环期值（KW·h/t）上个月的值
+							arr[15] = huanbi; //环期值（kW·h/t）上个月的值
 							if(huanbi !=="/"){
-								arr[16] = (arr[12] - arr[15]).toFixed(2); //当期与环期差值（KW·h/t）
+								arr[16] = (arr[12] - arr[15]).toFixed(2); //当期与环期差值（kW·h/t）
 							}else{
 								arr[16] = "/"
 							};
@@ -325,10 +325,10 @@ export default {
 								item.窑头排风机主电机_consume_unit != null
 									? item.窑头排风机主电机_consume_unit
 									: "/";
-							arr[24] = item.elec_consume_unit; //当期值（KW·h/t）
-							// arr[25] = item.celec_consume_unit; //目标值（KW·h/t）//需要接口获取
+							arr[24] = item.elec_consume_unit; //当期值（kW·h/t）
+							// arr[25] = item.celec_consume_unit; //目标值（kW·h/t）//需要接口获取
 							if (item.elec_consume_unit != null &&item.elec_consume_unit !== "/"){
-								arr[26] = (arr[24]-arr[25]).toFixed(2); //当期与目标差值（KW·h/t）
+								arr[26] = (arr[24]-arr[25]).toFixed(2); //当期与目标差值（kW·h/t）
 							}
 							let huanbiec = 0;
 							if (item.month_s == 1) {
@@ -344,9 +344,9 @@ export default {
 								}
 							})
 							}
-							arr[27] = huanbiec; //环期值（KW·h/t）上个月的值
+							arr[27] = huanbiec; //环期值（kW·h/t）上个月的值
 							if(arr[27]!=="/" && huanbiec!=="/"){
-								arr[28] = (arr[24] - huanbiec).toFixed(2); //当期与环期差值（KW·h/t）
+								arr[28] = (arr[24] - huanbiec).toFixed(2); //当期与环期差值（kW·h/t）
 							}else{
 								arr[28] = "/"
 							}
diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue
index 872a981d..a8234ab8 100644
--- a/src/views/enm_kiln/workshopAnalysis.vue
+++ b/src/views/enm_kiln/workshopAnalysis.vue
@@ -56,11 +56,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 								<th>分析说明</th>
@@ -121,10 +121,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 								<th rowspan="2">分析说明</th>
@@ -190,10 +190,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 								<th rowspan="2">分析说明</th>
@@ -259,10 +259,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 								<th rowspan="2">分析说明</th>
@@ -467,7 +467,7 @@ export default {
 						monthGoal4 = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -485,7 +485,7 @@ export default {
 							that.monthGoal = monthGoal;
 						}
 						if (
-							goal.goal_cate_name == "单位产品综合电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品综合电耗（kW·h/t）"
 						) {
 							monthGoal2[0] = goal.goal_val;
 							monthGoal2[1] = goal.goal_val_2;
@@ -597,7 +597,7 @@ export default {
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							//当期与目标差值（KW·h/t）
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (arrs[2] !== "/") {
 								diff = (arrs[1] - arrs[2]).toFixed(2)
@@ -606,7 +606,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -624,7 +624,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
@@ -671,7 +671,7 @@ export default {
 							arrs2[3] = 48;
 							arrs2[4] = 57;
 							arrs2[5] = 61;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum2 = 0,
 								lastDiff2 = 0;
 							if (index > 1) {
@@ -734,7 +734,7 @@ export default {
 							arrs3[3] = 94;
 							arrs3[4] = 100;
 							arrs3[5] = 109;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum3 = 0,
 								lastDiff3 = 0;
 							if (index > 1) {
@@ -797,7 +797,7 @@ export default {
 							arrs4[3] = 100;
 							arrs4[4] = 107;
 							arrs4[5] = 117;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum4 = 0,
 								lastDiff4 = 0;
 							if (index > 1) {
@@ -862,8 +862,8 @@ export default {
 						//     arrs[0]=item[0];
 						//     arrs[1]=item[1];
 						//     arrs[2]=item[2];
-						//     //目标值（KW·h/t）//需要接口获取
-						//     //当期与目标差值（KW·h/t）
+						//     //目标值（kW·h/t）//需要接口获取
+						//     //当期与目标差值（kW·h/t）
 						//     let diff = 0;
 						//     if(item[2]!=='/'){
 						//         diff = item[1]-item[2];
@@ -871,7 +871,7 @@ export default {
 						//         diff = '/';
 						//     }
 						//     arrs[3]=diff;
-						//     //环期值（KW·h/t）上个月的值
+						//     //环期值（kW·h/t）上个月的值
 						//     let lastNum = 0;
 						//     if(index>1){
 						//         let num = index-1;
@@ -884,7 +884,7 @@ export default {
 						//         lastNum = wrapArr0[12]?wrapArr0[12].elec_consume_unit:'/';
 						//     }
 						//     arrs[4]=lastNum;
-						//     //当期与环期差值（KW·h/t）
+						//     //当期与环期差值（kW·h/t）
 						//     let lastDiff = 0;
 
 						//     if(arrs[1]!=='/'&&arrs[4]!=='/'){
@@ -918,8 +918,8 @@ export default {
 						//     arrs[0]=item[0];
 						//     arrs[1]=item[1];
 						//     arrs[2]=item[2];
-						//     //目标值（KW·h/t）//需要接口获取
-						//     //当期与目标差值（KW·h/t）
+						//     //目标值（kW·h/t）//需要接口获取
+						//     //当期与目标差值（kW·h/t）
 						//     let diff = 0;
 						//     if(item[2]!=='/'){
 						//         diff = item[1]-item[2];
@@ -927,7 +927,7 @@ export default {
 						//         diff = '/';
 						//     }
 						//     arrs[3]=diff;
-						//     //环期值（KW·h/t）上个月的值
+						//     //环期值（kW·h/t）上个月的值
 						//     let lastNum = 0;
 						//     if(index>1){
 						//         let num = index-1;
@@ -940,7 +940,7 @@ export default {
 						//         lastNum = wrapArr0[12]?wrapArr0[12].elec_consume_unit:'/';
 						//     }
 						//     arrs[4]=lastNum;
-						//     //当期与环期差值（KW·h/t）
+						//     //当期与环期差值（kW·h/t）
 						//     let lastDiff = 0;
 
 						//     if(arrs[1]!=='/'&&arrs[4]!=='/'){
@@ -974,8 +974,8 @@ export default {
 						//     arrs[0]=item[0];
 						//     arrs[1]=item[1];
 						//     arrs[2]=item[2];
-						//     //目标值（KW·h/t）//需要接口获取
-						//     //当期与目标差值（KW·h/t）
+						//     //目标值（kW·h/t）//需要接口获取
+						//     //当期与目标差值（kW·h/t）
 						//     let diff = 0;
 						//     if(item[2]!=='/'){
 						//         diff = item[1]-item[2];
@@ -983,7 +983,7 @@ export default {
 						//         diff = '/';
 						//     }
 						//     arrs[3]=diff;
-						//     //环期值（KW·h/t）上个月的值
+						//     //环期值（kW·h/t）上个月的值
 						//     let lastNum = 0;
 						//     if(index>1){
 						//         let num = index-1;
@@ -996,7 +996,7 @@ export default {
 						//         lastNum = wrapArr0[12]?wrapArr0[12].elec_consume_unit:'/';
 						//     }
 						//     arrs[4]=lastNum;
-						//     //当期与环期差值（KW·h/t）
+						//     //当期与环期差值（kW·h/t）
 						//     let lastDiff = 0;
 
 						//     if(arrs[1]!=='/'&&arrs[4]!=='/'){
diff --git a/src/views/enm_kilnbase/handoverLog.vue b/src/views/enm_kilnbase/handoverLog.vue
index d7782cd9..b562eb12 100644
--- a/src/views/enm_kilnbase/handoverLog.vue
+++ b/src/views/enm_kilnbase/handoverLog.vue
@@ -195,7 +195,7 @@
 									{{ reportItem.shut_hour }}
 								</td>
 								<td class="numCell">
-									单位产品分布电耗（KW·h/t）
+									单位产品分布电耗（kW·h/t）
 								</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
diff --git a/src/views/enm_kilnbase/power.vue b/src/views/enm_kilnbase/power.vue
index 95d8c663..11741de6 100644
--- a/src/views/enm_kilnbase/power.vue
+++ b/src/views/enm_kilnbase/power.vue
@@ -191,7 +191,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "电耗(KW.h/t)",
+	name: "电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -233,9 +233,9 @@ export default {
 			searchDate: "",
 			tableName: "主要设备单位产品电耗数据表",
 			tableDatas: [
-				["尾排风机", "KW·h/t", "", "", ""],
-				["高温风机", "KW·h/t", "", "", ""],
-				["头排风机", "KW·h/t", "", "", ""],
+				["尾排风机", "kW·h/t", "", "", ""],
+				["高温风机", "kW·h/t", "", "", ""],
+				["头排风机", "kW·h/t", "", "", ""],
 			],
 			modelValue: true,
 			type: "hour_s",
@@ -390,7 +390,7 @@ export default {
 					let index = that.mpoints.indexOf(item.mpoint_nickname);
 					let obj = [];
 					obj[0] = item.mpoint_nickname;
-					obj[1] = "KW·h/t";
+					obj[1] = "kW·h/t";
 					obj[2] = item.elec_consume_unit;
 					obj[3] = 0;
 					obj[4] = 0;
@@ -424,7 +424,7 @@ export default {
 						} else {
 							let obj = [];
 							obj[0] = item.mpoint_nickname;
-							obj[1] = "KW·h/t";
+							obj[1] = "kW·h/t";
 							obj[3] = item.elec_consume_unit;
 							obj[5] = item.mpoint;
 							that.tableDatas[index_d] = obj;
@@ -449,7 +449,7 @@ export default {
 							} else {
 								let obj = [];
 								obj[0] = item.mpoint_nickname;
-								obj[1] = "KW·h/t";
+								obj[1] = "kW·h/t";
 								obj[4] = item.elec_consume_unit;
 								obj[5] = item.mpoint;
 								that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_kilnbase/report.vue b/src/views/enm_kilnbase/report.vue
index 665fe208..46017fa6 100644
--- a/src/views/enm_kilnbase/report.vue
+++ b/src/views/enm_kilnbase/report.vue
@@ -403,8 +403,8 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转率（%）", "/", 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "单位产品综合电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品综合电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "单位产品标煤耗（kgce/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "单位产品综合能耗（kgce/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
@@ -729,13 +729,13 @@ export default {
 									that.tableDatas[3][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（KW·h/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品综合电耗（KW·h/t）"
+									"单位产品综合电耗（kW·h/t）"
 								) {
 									that.tableDatas[5][6] = item5[str];
 									that.tableDatas[5][8] = item5.goal_val;
diff --git a/src/views/enm_kilnbase/teamAnalysis.vue b/src/views/enm_kilnbase/teamAnalysis.vue
index 34b49c0f..2d24bfd9 100644
--- a/src/views/enm_kilnbase/teamAnalysis.vue
+++ b/src/views/enm_kilnbase/teamAnalysis.vue
@@ -183,9 +183,9 @@ export default {
 							arr.push(item.run_rate);
 
 							//煤耗
-							arr[5] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[6] = item.celec_consume_unit; //目标值（KW·h/t）//需要接口获取
-							arr[7] = item.celec_consume_unit; //当期与目标差值（KW·h/t）
+							arr[5] = item.elec_consume_unit; //当期值（kW·h/t）
+							arr[6] = item.celec_consume_unit; //目标值（kW·h/t）//需要接口获取
+							arr[7] = item.celec_consume_unit; //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanbi = 0;
 							if (item.month_s == 1) {
@@ -201,15 +201,15 @@ export default {
 										: "/"
 									: "/";
 							}
-							arr[8] = huanbi; //环期值（KW·h/t）上个月的值
-							arr[9] = item.celec_consume_unit; //当期与环期差值（KW·h/t）
+							arr[8] = huanbi; //环期值（kW·h/t）上个月的值
+							arr[9] = item.celec_consume_unit; //当期与环期差值（kW·h/t）
 							arr[10] = item.celec_consume_unit; //环比增长率（%）
 							arr[11] = item.celec_consume_unit; //同比增长率（%）
 							//电耗
 
-							arr[12] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[13] = item.celec_consume_unit; //目标值（KW·h/t）//需要接口获取
-							arr[14] = item.celec_consume_unit; //当期与目标差值（KW·h/t）
+							arr[12] = item.elec_consume_unit; //当期值（kW·h/t）
+							arr[13] = item.celec_consume_unit; //目标值（kW·h/t）//需要接口获取
+							arr[14] = item.celec_consume_unit; //当期与目标差值（kW·h/t）
 							let ind_pre1 = 0,
 								huanbi1 = 0;
 							if (item.month_s == 1) {
@@ -225,8 +225,8 @@ export default {
 										: "/"
 									: "/";
 							}
-							arr[15] = huanbi; //环期值（KW·h/t）上个月的值
-							arr[16] = item.celec_consume_unit; //当期与环期差值（KW·h/t）
+							arr[15] = huanbi; //环期值（kW·h/t）上个月的值
+							arr[16] = item.celec_consume_unit; //当期与环期差值（kW·h/t）
 							arr[17] = item.celec_consume_unit; //环比增长率（%）
 							arr[18] = item.celec_consume_unit; //同比增长率（%）
 							arr[19] = item.celec_consume_unit; //同比增长率（%）
diff --git a/src/views/enm_kilnbase/workshopAnalysis.vue b/src/views/enm_kilnbase/workshopAnalysis.vue
index d1217d1b..a4c72f2a 100644
--- a/src/views/enm_kilnbase/workshopAnalysis.vue
+++ b/src/views/enm_kilnbase/workshopAnalysis.vue
@@ -55,11 +55,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -107,10 +107,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 							</tr>
@@ -157,10 +157,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 							</tr>
@@ -207,10 +207,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 							</tr>
@@ -348,7 +348,7 @@ export default {
 						monthGoal4 = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -366,7 +366,7 @@ export default {
 							that.monthGoal = monthGoal;
 						}
 						if (
-							goal.goal_cate_name == "单位产品综合电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品综合电耗（kW·h/t）"
 						) {
 							monthGoal2[0] = goal.goal_val;
 							monthGoal2[1] = goal.goal_val_2;
@@ -478,7 +478,7 @@ export default {
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							//当期与目标差值（KW·h/t）
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (arrs[2] !== "/") {
 								diff = arrs[1] - arrs[2];
@@ -486,7 +486,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -504,7 +504,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
@@ -549,7 +549,7 @@ export default {
 							arrs2[3] = 48;
 							arrs2[4] = 57;
 							arrs2[5] = 61;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum2 = 0,
 								lastDiff2 = 0;
 							if (index > 1) {
@@ -610,7 +610,7 @@ export default {
 							arrs3[3] = 94;
 							arrs3[4] = 100;
 							arrs3[5] = 109;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum3 = 0,
 								lastDiff3 = 0;
 							if (index > 1) {
@@ -671,7 +671,7 @@ export default {
 							arrs4[3] = 100;
 							arrs4[4] = 107;
 							arrs4[5] = 117;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum4 = 0,
 								lastDiff4 = 0;
 							if (index > 1) {
diff --git a/src/views/enm_limestone/report.vue b/src/views/enm_limestone/report.vue
index 6dd171f0..5ac3c970 100644
--- a/src/views/enm_limestone/report.vue
+++ b/src/views/enm_limestone/report.vue
@@ -302,7 +302,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -345,7 +345,7 @@ export default {
 			},
 			tableDatas: [
 				["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			searchDate: "",
 			tableName: "生产报告",
@@ -572,7 +572,7 @@ export default {
 										that.tableDatas[0][8] = item5.goal_val;
 									} else if (
 										item5.goal_cate_name ==
-										"单位产品分布电耗（KW·h/t）"
+										"单位产品分布电耗（kW·h/t）"
 									) {
 										that.tableDatas[1][6] = item5[str];
 										that.tableDatas[1][8] = item5.goal_val;
diff --git a/src/views/enm_limestone/workshopAnalysis.vue b/src/views/enm_limestone/workshopAnalysis.vue
index ec1a721f..0cef50e8 100644
--- a/src/views/enm_limestone/workshopAnalysis.vue
+++ b/src/views/enm_limestone/workshopAnalysis.vue
@@ -43,11 +43,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -156,7 +156,7 @@ export default {
 					let monthGoal = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -213,7 +213,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -225,8 +225,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = item[1] - item[2];
@@ -234,7 +234,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -252,7 +252,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue
index faaf6f98..b4456813 100644
--- a/src/views/enm_mill/handoverLog.vue
+++ b/src/views/enm_mill/handoverLog.vue
@@ -207,7 +207,7 @@
 								<td class="numCell">
 									{{ reportItem.shut_sec }}
 								</td>
-								<td class="numCell">分布电耗（KW·h/t）</td>
+								<td class="numCell">分布电耗（kW·h/t）</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
 								</td>
diff --git a/src/views/enm_mill/power.vue b/src/views/enm_mill/power.vue
index 528839c5..37f75cb6 100644
--- a/src/views/enm_mill/power.vue
+++ b/src/views/enm_mill/power.vue
@@ -203,7 +203,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -245,8 +245,8 @@ export default {
 			mpoint: "",
 			tableName: "主要设备（100KW以上）单位产品电耗数据表",
 			tableDatas: [
-				["循环风机1906", "", "KW·h/t", "", "", ""],
-				["系统风机", "", "KW·h/t", "", "", ""],
+				["循环风机1906", "", "kW·h/t", "", "", ""],
+				["系统风机", "", "kW·h/t", "", "", ""],
 			],
 			tableData: [],
 			modelValue: true,
@@ -507,7 +507,7 @@ export default {
 						let obj = [];
 						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
-						obj[2] = "KW·h/t";
+						obj[2] = "kW·h/t";
 						obj[3] = item.elec_consume_unit;
 						obj[6] = item.mpoint;
 						that.tableDatas[index] = obj;
@@ -544,7 +544,7 @@ export default {
 								let obj = [];
 								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
-								obj[2] = "KW·h/t";
+								obj[2] = "kW·h/t";
 								obj[4] = item.elec_consume_unit;
 								obj[6] = item.mpoint;
 								that.tableDatas[index_d] = obj;
@@ -571,7 +571,7 @@ export default {
 									let obj = [];
 									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
-									obj[2] = "KW·h/t";
+									obj[2] = "kW·h/t";
 									obj[5] = item.elec_consume_unit;
 									obj[6] = item.mpoint;
 									that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index b0dbfaf9..f83f1d27 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -293,8 +293,8 @@ let tooltip = {
 	triggerOn: "mousemove",
 };
 let grid = {
-	right: "10%",
-	left: "10%",
+	right: "11%",
+	left: "11%",
 	top: "20%",
 };
 let toolbox = {
@@ -345,7 +345,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		nameRotate: 30,
@@ -361,7 +361,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "成本(元)",
+		name: "成本(元/吨)",
 		position: "left",
 		alignTicks: true,
 		nameRotate: 30,
@@ -409,9 +409,9 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, "/", 0, 0, "/", "/"],
 				["运转时间", "运转率（%）", "/", 0, 0, "/", 0, 0, "/", "/"],
-				["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "单位产品分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["能耗", "单位产品综合能耗（kgce/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "总电耗（KW·h）", 0, 0, 0, 0, "/", "/", "/", "/"],
+				["能耗", "总电耗（kW·h）", 0, 0, 0, 0, "/", "/", "/", "/"],
 				["成本", "单位产品成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
@@ -428,7 +428,10 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: legend,
+				legend: {
+					top: "2%",
+					data: ["总产量", "分布电耗", "成本"],
+				},
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -713,7 +716,7 @@ export default {
 									// that.tableDatas[3][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（KW·h/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[4][6] = item5[str];
 									that.tableDatas[4][8] = item5.goal_val;
@@ -877,15 +880,15 @@ export default {
 				data.forEach((item) => {
 					let ind = item.hour;
 					seriesData0[ind] = item.total_production;
-					seriesData1[ind] = item.production_hour;
-					seriesData2[ind] = item.run_rate;
+					// seriesData1[ind] = item.production_hour;
+					// seriesData2[ind] = item.run_rate;
 					seriesData3[ind] = item.production_cost_unit;
 					seriesData4[ind] = item.elec_consume_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
+				// options.series[1].data = seriesData1;
+				// options.series[2].data = seriesData2;
 				options.series[3].data = seriesData4;
 				options.series[4].data = seriesData3;
 				let hourXAxis = [];
diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue
index d55bb0f7..c7866d76 100644
--- a/src/views/enm_mill/teamAnalysis.vue
+++ b/src/views/enm_mill/teamAnalysis.vue
@@ -58,8 +58,8 @@
 								<th>比表面积（%）</th>
 								<th>SO3（%）</th>
 								<th>掺量（%）</th>
-								<th>原料循环风机（KW·h/t）</th>
-								<th>系统风机（KW·h/t）</th>
+								<th>原料循环风机（kW·h/t）</th>
+								<th>系统风机（kW·h/t）</th>
 								<th>目标值（kW·h/t）</th>
 								<th>当期值（kW·h/t）</th>
 								<th>当期与目标值差值（kW·h/t）</th>
@@ -129,7 +129,7 @@ export default {
 			this.$API.mtm.goal.list.req(params).then((res) => {
 				if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        this.getData(item);
 						    }
 						})
@@ -225,13 +225,13 @@ export default {
 							let keyVale = "goal_val_" + n;
 							if (goalData.length > 0){
 								goalData.forEach((item) => {
-								if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）"){
-									arr[11] = item[keyVale]; //目标值（KW·h/t）//需要接口获取
+								if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）"){
+									arr[11] = item[keyVale]; //目标值（kW·h/t）//需要接口获取
 								}
 							});
 						};	
-							arr[12] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[13] = (item.elec_consume_unit - arr[11]).toFixed(2); //当期与目标差值（KW·h/t）
+							arr[12] = item.elec_consume_unit; //当期值（kW·h/t）
+							arr[13] = (item.elec_consume_unit - arr[11]).toFixed(2); //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanqi = 0,
 								huanqicha = 0,
@@ -250,13 +250,13 @@ export default {
 								}
 							})
 							}
-							arr[14] = huanqi; //环期值（KW·h/t）上个月的值
+							arr[14] = huanqi; //环期值（kW·h/t）上个月的值
 							if (huanqi !== "/") {
 								huanqicha = (item.elec_consume_unit - huanqi).toFixed(2);
 							} else {
 								huanqicha = item.elec_consume_unit;
 							}
-							arr[15] = huanqicha; //当期与环期差值（KW·h/t）
+							arr[15] = huanqicha; //当期与环期差值（kW·h/t）
 							arr[16] =
 								huanqi != "/"  && huanqicha!=0 && huanqi!=0 ? ((huanqicha / huanqi) * 100).toFixed(2) :"/" ; //环比增长率（%）
 							if (wrapArr0[n]) {
diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue
index a8f3c59d..61042ae6 100644
--- a/src/views/enm_mill/workshopAnalysis.vue
+++ b/src/views/enm_mill/workshopAnalysis.vue
@@ -57,10 +57,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 								<th rowspan="2">分析说明</th>
@@ -120,10 +120,10 @@
 							</tr>
 							<tr>
 								<th rowspan="2">月份</th>
-								<th rowspan="2">当期值（KW·h/t）</th>
-								<th rowspan="2">目标值（KW·h/t）</th>
-								<th colspan="3">国家标准（KW·h/t）</th>
-								<th rowspan="2">当期与环期差值（KW·h/t）</th>
+								<th rowspan="2">当期值（kW·h/t）</th>
+								<th rowspan="2">目标值（kW·h/t）</th>
+								<th colspan="3">国家标准（kW·h/t）</th>
+								<th rowspan="2">当期与环期差值（kW·h/t）</th>
 								<th rowspan="2">环比增长率（%）</th>
 								<th rowspan="2">同比增长率（%）</th>
 								<th rowspan="2">分析说明</th>
@@ -260,7 +260,7 @@ export default {
 					let monthGoal2 = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -335,12 +335,12 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							arr.push(item.cen_consume_unit); //综合能耗当期值（KW·h/t）
+							arr.push(item.cen_consume_unit); //综合能耗当期值（kW·h/t）
 							arr[4] = that.monthGoal2[ind] !== undefined
 									? that.monthGoal2[ind]
 									: "/";
@@ -358,7 +358,7 @@ export default {
 							arrs[3] = 26;
 							arrs[4] = 29;
 							arrs[5] = 34;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum = 0,
 								lastDiff = 0;
 							if (index > 0) {
@@ -421,7 +421,7 @@ export default {
 							arrs2[3] = 80;
 							arrs2[4] = 87;
 							arrs2[5] = 94;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastNum2 = 0,
 								lastDiff2 = 0;
 							if (index >= 1) {
diff --git a/src/views/enm_monthSet/goalSetting.vue b/src/views/enm_monthSet/goalSetting.vue
index a834ba27..addfa457 100644
--- a/src/views/enm_monthSet/goalSetting.vue
+++ b/src/views/enm_monthSet/goalSetting.vue
@@ -76,6 +76,10 @@
 					width="190"
 					fixed="left"
 				></el-table-column>
+				<el-table-column
+					label="年份"
+					prop="year"
+				></el-table-column>
 				<el-table-column
 					label="1月"
 					prop="goal_val_1"
diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue
index b71e368f..3d3e0e5d 100644
--- a/src/views/enm_pack/handoverLog.vue
+++ b/src/views/enm_pack/handoverLog.vue
@@ -190,7 +190,7 @@
 									{{ reportItem.total_production }}
 								</td>
 								<td class="numCell">
-									单位产品分布电耗（KW·h/t）
+									单位产品分布电耗（kW·h/t）
 								</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index 681aa275..09757fc2 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -289,7 +289,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -345,8 +345,8 @@ export default {
 				["出厂水泥", "袋装水泥(t)",  0,0, 0, 0],
 				["出厂水泥", "出厂水泥合计（t）", 0,0, 0, 0, 0, 0, 0, 0],
 				["出厂熟料", "熟料（t）",  0,0, 0, 0],
-				["能耗", "单位产品分布电耗（KW·h/t）", 0,0, 0, 0],
-				["能耗", "总电耗（KW·h）", 0,0, 0, 0],
+				["能耗", "单位产品分布电耗（kW·h/t）", 0,0, 0, 0],
+				["能耗", "总电耗（kW·h）", 0,0, 0, 0],
 				
 			],
 			tableName: "生产报告",
diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue
index f39e8f0d..24980eed 100644
--- a/src/views/enm_pack/teamAnalysis.vue
+++ b/src/views/enm_pack/teamAnalysis.vue
@@ -175,11 +175,11 @@ export default {
 							arr.push(item.team_name);
 
 							arr.push(item.total_production);
-							arr[3] = item.elec_consume_unit; //当期值（KW·h/t）
+							arr[3] = item.elec_consume_unit; //当期值（kW·h/t）
 
 							let keyVale = "goal_val_" + n;
-							arr[4] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
-							arr[5] = (arr[3] - arr[4]).toFixed(2); //当期与目标差值（KW·h/t）
+							arr[4] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取
+							arr[5] = (arr[3] - arr[4]).toFixed(2); //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanbi = 0;
 							if (item.month_s == 1) {
@@ -195,17 +195,17 @@ export default {
 								}
 							})
 							}
-							arr[6] = huanbi; //环期值（KW·h/t）上个月的值\
+							arr[6] = huanbi; //环期值（kW·h/t）上个月的值\
 							if (arr[6] !== "/"){
-								arr[7] = (arr[3] - arr[6]).toFixed(2); //当期与环期差值（KW·h/t）
+								arr[7] = (arr[3] - arr[6]).toFixed(2); //当期与环期差值（kW·h/t）
 							}else{
-								arr[7] = "/"; //当期与环期差值（KW·h/t）
+								arr[7] = "/"; //当期与环期差值（kW·h/t）
 							}
 							// console.log(arr[7], arr[6])
 							if (arr[7] !=="/" && arr[6] !==0 && arr[7] !== "undefined"){
 								arr[8] = ((arr[7]/arr[6])*100).toFixed(2);
 							}else{
-								arr[8] = "/"; //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100%
+								arr[8] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100%
 							}
 							let sameRate = 0;
 							if (
diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue
index 0e1dcee0..ad53656e 100644
--- a/src/views/enm_pack/workshopAnalysis.vue
+++ b/src/views/enm_pack/workshopAnalysis.vue
@@ -44,11 +44,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 								<th>分析说明</th>
@@ -171,7 +171,7 @@ export default {
 					let monthGoal = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -228,7 +228,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -242,8 +242,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = (item[1] - item[2]).toFixed(2);
@@ -251,7 +251,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -269,7 +269,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_report/reportDay.vue b/src/views/enm_report/reportDay.vue
index aa096948..12fda1fd 100644
--- a/src/views/enm_report/reportDay.vue
+++ b/src/views/enm_report/reportDay.vue
@@ -115,15 +115,15 @@
                     [4,'主机设备台产','回转窑台产（t/h）'],
                     [5,'主机设备台产','水泥磨台产（t/h）'],
 
-                    [6,'能耗','熟料日综合电耗（kw.h/t）'],
+                    [6,'能耗','熟料日综合电耗（kW·h/t）'],
                     [7,'能耗','熟料日单位标煤耗(kgce/t)'],
                     [8,'能耗','熟料日综合能耗(kgce/t)'],
                     [9,'能耗','水泥日综合能耗(kgce/t)'],
-                    [10,'能耗','日电石渣分布电耗（kw.h/t）'],
-                    [11,'能耗','日生料分布电耗（kw.h/t）'],
-                    [12,'能耗','日熟料分布电耗（kw.h/t）'],
-                    [13,'能耗','日水泥粉磨分布电耗（kw.h/t）'],
-                    [14,'能耗','日水泥包装分布电耗（kw.h/t）'],
+                    [10,'能耗','日电石渣分布电耗（kW·h/t）'],
+                    [11,'能耗','日生料分布电耗（kW·h/t）'],
+                    [12,'能耗','日熟料分布电耗（kW·h/t）'],
+                    [13,'能耗','日水泥粉磨分布电耗（kW·h/t）'],
+                    [14,'能耗','日水泥包装分布电耗（kW·h/t）'],
 
                     
                     [15,'产量','日电石渣产量(t)'],
@@ -150,12 +150,12 @@
                     // [33,'成本','日水泥包装成本(元/吨)'],
 
                   
-                    [33,'耗电量','日电石渣耗电量（kw.h）'],
-                    [34,'耗电量','日生料耗电量（kw.h）'],
-                    [35,'耗电量','日熟料耗电量（kw.h）'],
-                    [36,'耗电量','日水泥粉磨耗电量（kw.h）'],
-                    [37,'耗电量','日水泥包装耗电量（kw.h）'],
-                    [38,'耗电量','日生活区耗电量（kw.h）'],
+                    [33,'耗电量','日电石渣耗电量（kW·h）'],
+                    [34,'耗电量','日生料耗电量（kW·h）'],
+                    [35,'耗电量','日熟料耗电量（kW·h）'],
+                    [36,'耗电量','日水泥粉磨耗电量（kW·h）'],
+                    [37,'耗电量','日水泥包装耗电量（kW·h）'],
+                    [38,'耗电量','日生活区耗电量（kW·h）'],
 
                 ],
                 year:'',
@@ -233,7 +233,7 @@
                     that.tableDatas[2][3] =  dataList.煤磨.production_hour;           
                     that.tableDatas[3][3] =  dataList.回转窑.production_hour;           
                     that.tableDatas[4][3] =  dataList.水泥磨.production_hour;
-                    //能耗（kw.h/t）
+                    //能耗（kW·h/t）
                     that.tableDatas[5][3] =  dataList.回转窑.celec_consume_unit;
                     that.tableDatas[6][3] =  dataList.回转窑.coal_consume_unit;
                     that.tableDatas[7][3] =  dataList.回转窑.cen_consume_unit;
@@ -254,7 +254,7 @@
                     that.tableDatas[30][3] =  dataList.回转窑.production_cost_unit;
                     that.tableDatas[31][3] =  dataList.水泥磨.production_cost_unit; 
                     // that.tableDatas[32][3] =  dataList.水泥包装.production_cost_unit;
-                    //耗电量（kw.h）
+                    //耗电量（kW·h）
                     that.tableDatas[32][3] =  dataList.电石渣.elec_consume;
                     that.tableDatas[33][3] =  dataList.原料磨.elec_consume;
                     that.tableDatas[34][3] =  dataList.回转窑.elec_consume;
diff --git a/src/views/enm_report/reportFactory.vue b/src/views/enm_report/reportFactory.vue
index 56418113..a4e73557 100644
--- a/src/views/enm_report/reportFactory.vue
+++ b/src/views/enm_report/reportFactory.vue
@@ -114,7 +114,7 @@
                     ['台产(t/h)'],
                     ['质量'],
                     ['煤耗(t)'],
-                    ['电耗(kw.h)'],
+                    ['电耗(kW·h)'],
                     ['柴油消耗(t)'],
                     ['绿化水耗(m³)'],
                     ['生活水耗(m³)'],
diff --git a/src/views/enm_report/reportMonth.vue b/src/views/enm_report/reportMonth.vue
index ebcf45d2..93cf58f1 100644
--- a/src/views/enm_report/reportMonth.vue
+++ b/src/views/enm_report/reportMonth.vue
@@ -94,15 +94,15 @@
                     [4,'主机设备台产','回转窑台产（t/h）'],
                     [5,'主机设备台产','水泥磨台产（t/h）'],
 
-                    [6,'能耗','熟料月综合电耗（kw.h/t）'],
+                    [6,'能耗','熟料月综合电耗（kW·h/t）'],
                     [7,'能耗','熟料月单位标煤耗(kgce/t)'],
                     [8,'能耗','熟料月综合能耗(kgce/t)'],
                     [9,'能耗','水泥月综合能耗(kgce/t)'],
-                    [10,'能耗','月电石渣分布电耗（kw.h/t）'],
-                    [11,'能耗','月生料分布电耗（kw.h/t）'],
-                    [12,'能耗','月熟料分布电耗（kw.h/t）'],
-                    [13,'能耗','月水泥粉磨分布电耗（kw.h/t）'],
-                    [14,'能耗','月水泥包装分布电耗（kw.h/t）'],
+                    [10,'能耗','月电石渣分布电耗（kW·h/t）'],
+                    [11,'能耗','月生料分布电耗（kW·h/t）'],
+                    [12,'能耗','月熟料分布电耗（kW·h/t）'],
+                    [13,'能耗','月水泥粉磨分布电耗（kW·h/t）'],
+                    [14,'能耗','月水泥包装分布电耗（kW·h/t）'],
 
                     
                     [15,'产量','月电石渣产量(t)'],
@@ -123,12 +123,12 @@
                     [29,'成本','月水泥粉磨成本(元/吨)'],
                     // [30,'成本','月水泥包装成本(元/吨)'],
                   
-                    [30,'耗电量','月电石渣耗电量（kw.h）'],
-                    [31,'耗电量','月生料耗电量（kw.h）'],
-                    [32,'耗电量','月熟料耗电量（kw.h）'],
-                    [33,'耗电量','月水泥粉磨耗电量（kw.h）'],
-                    [34,'耗电量','月水泥包装耗电量（kw.h）'],
-                    [35,'耗电量','月生活区耗电量（kw.h）'],
+                    [30,'耗电量','月电石渣耗电量（kW·h）'],
+                    [31,'耗电量','月生料耗电量（kW·h）'],
+                    [32,'耗电量','月熟料耗电量（kW·h）'],
+                    [33,'耗电量','月水泥粉磨耗电量（kW·h）'],
+                    [34,'耗电量','月水泥包装耗电量（kW·h）'],
+                    [35,'耗电量','月生活区耗电量（kW·h）'],
                 ],
                 year:'',
                 month:'',
@@ -199,7 +199,7 @@
                     that.tableDatas[3][3] =  dataList.回转窑.production_hour;          
                     that.nowData[4] =  dataList.水泥磨.production_hour;
                     that.tableDatas[4][3] =  dataList.水泥磨.production_hour;
-                    //能耗（kw.h/t）
+                    //能耗（kW·h/t）
                     that.nowData[5] =  dataList.回转窑.celec_consume_unit;
                     that.tableDatas[5][3] =  dataList.回转窑.celec_consume_unit;
                     that.nowData[6] =  dataList.回转窑.coal_consume_unit;
@@ -239,7 +239,7 @@
                     that.tableDatas[28][3] = dataList.水泥磨.production_cost_unit; 
                     that.nowData[29] =  dataList.水泥包装.production_cost_unit;
                     that.tableDatas[29][3] = dataList.水泥包装.production_cost_unit;
-                    //耗电量（kw.h）
+                    //耗电量（kW·h）
                     // that.nowData[30] =  dataList.电石渣.elec_consume;
                     // that.tableDatas[30][3] = dataList.电石渣.elec_consume;
                     that.nowData[30] =  dataList.原料磨.elec_consume;
@@ -331,7 +331,7 @@
                     that.tableDatas[2][4] =  this.canCompute(that.nowData[2],dataList.煤磨.production_hour);           
                     that.tableDatas[3][4] =  this.canCompute(that.nowData[3],dataList.回转窑.production_hour);           
                     that.tableDatas[4][4] =  this.canCompute(that.nowData[4],dataList.水泥磨.production_hour);
-                    //能耗（kw.h/t）
+                    //能耗（kW·h/t）
                     that.tableDatas[5][4] =  this.canCompute(that.nowData[5],dataList.回转窑.celec_consume_unit);
                     that.tableDatas[6][4] =  this.canCompute(that.nowData[6],dataList.回转窑.coal_consume_unit);
                     that.tableDatas[7][4] =  this.canCompute(that.nowData[7],dataList.回转窑.cen_consume_unit);
@@ -352,7 +352,7 @@
                     that.tableDatas[27][4] =  this.canCompute(that.nowData[27],dataList.回转窑.production_cost_unit);
                     that.tableDatas[28][4] =  this.canCompute(that.nowData[28],dataList.水泥磨.production_cost_unit); 
                     that.tableDatas[29][4] =  this.canCompute(that.nowData[29],dataList.水泥包装.production_cost_unit);
-                    //耗电量（kw.h）
+                    //耗电量（kW·h）
                     // that.tableDatas[30][4] =  this.canCompute(that.nowData[30],dataList.电石渣.elec_consume);
                     that.tableDatas[30][4] =  this.canCompute(that.nowData[30],dataList.原料磨.elec_consume);
                     that.tableDatas[31][4] =  this.canCompute(that.nowData[31],dataList.回转窑.elec_consume);
@@ -414,7 +414,7 @@
                     that.tableDatas[2][5] =  this.canCompute(that.nowData[2],dataList.煤磨.production_hour);           
                     that.tableDatas[3][5] =  this.canCompute(that.nowData[3],dataList.回转窑.production_hour);           
                     that.tableDatas[4][5] =  this.canCompute(that.nowData[4],dataList.水泥磨.production_hour);
-                    //能耗（kw.h/t）
+                    //能耗（kW·h/t）
                     that.tableDatas[5][5] =  this.canCompute(that.nowData[5],dataList.回转窑.celec_consume_unit);
                     that.tableDatas[6][5] =  this.canCompute(that.nowData[6],dataList.回转窑.coal_consume_unit);
                     that.tableDatas[7][5] =  this.canCompute(that.nowData[7],dataList.回转窑.cen_consume_unit);
@@ -435,7 +435,7 @@
                     that.tableDatas[27][5] =  this.canCompute(that.nowData[27],dataList.回转窑.production_cost_unit);
                     that.tableDatas[28][5] =  this.canCompute(that.nowData[28],dataList.水泥磨.production_cost_unit); 
                     that.tableDatas[29][5] =  this.canCompute(that.nowData[29],dataList.水泥包装.production_cost_unit);
-                    //耗电量（kw.h）
+                    //耗电量（kW·h）
                     // that.tableDatas[30][5] =  this.canCompute(that.nowData[30],dataList.电石渣.elec_consume);
                     that.tableDatas[30][5] =  this.canCompute(that.nowData[30],dataList.原料磨.elec_consume);
                     that.tableDatas[31][5] =  this.canCompute(that.nowData[31],dataList.回转窑.elec_consume);
diff --git a/src/views/enm_rm/power.vue b/src/views/enm_rm/power.vue
index c2e3d5f8..6ccce9cc 100644
--- a/src/views/enm_rm/power.vue
+++ b/src/views/enm_rm/power.vue
@@ -195,7 +195,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -237,11 +237,11 @@ export default {
 			mpoint: "",
 			tableName: "主要设备（100KW以上）单位产品电耗数据表",
 			tableDatas: [
-				["立磨主电机", "", "KW·h/t", "", "", ""],
-				["循环风机", "", "KW·h/t", "", "", ""],
-				// ['烘干破主','','KW·h/t','','',''],
-				// ['废气风机','','KW·h/t','','',''],
-				// ['尾排风机','','KW·h/t','','',''],
+				["立磨主电机", "", "kW·h/t", "", "", ""],
+				["循环风机", "", "kW·h/t", "", "", ""],
+				// ['烘干破主','','kW·h/t','','',''],
+				// ['废气风机','','kW·h/t','','',''],
+				// ['尾排风机','','kW·h/t','','',''],
 			],
 			tableData: [],
 			modelValue: true,
@@ -484,7 +484,7 @@ export default {
 						let obj = [];
 						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
-						obj[2] = "KW·h/t";
+						obj[2] = "kW·h/t";
 						obj[3] = item.elec_consume_unit;
 						obj[4] = 0;
 						obj[5] = 0;
@@ -523,7 +523,7 @@ export default {
 								let obj = [];
 								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
-								obj[2] = "KW·h/t";
+								obj[2] = "kW·h/t";
 								obj[4] = item.elec_consume_unit;
 								obj[6] = item.mpoint;
 								that.tableDatas[index_d] = obj;
@@ -553,7 +553,7 @@ export default {
 									let obj = [];
 									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
-									obj[2] = "KW·h/t";
+									obj[2] = "kW·h/t";
 									obj[5] = item.elec_consume_unit;
 									obj[6] = item.mpoint;
 									that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 94fc1092..d7d5566b 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -25,7 +25,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">生料工序生产报告</th>
+								<th colspan="10">生料辅料工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -295,8 +295,8 @@ let tooltip = {
 	// alwaysShowContent:true,
 };
 let grid = {
-	right: "10%",
-	left: "10%",
+	right: "11%",
+	left: "11%",
 	top: "15%",
 };
 let toolbox = {
@@ -344,7 +344,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h)",
+		name: "分布电耗(kW·h)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -388,11 +388,11 @@ export default {
 			},
 			tableDatas: [
 				["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
-				["运转时间", "运转时间（h）", "/", 0, 0, "/", 0, 0, "/", "/"],
-				["运转时间", "运转率（%）", "/", 0, 0, "/", 0, 0, "/", "/"],
-				["能耗", "生料分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "总电耗（KW·h）", 0, 0, 0, 0, "/", "/", "/","/"],
+				["产量", "台时产量（t/h）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["运转时间", "运转时间（h）", 0, 0, 0, "/", 0, 0, "/", "/"],
+				["运转时间", "运转率（%）", 0, 0, 0, "/", 0, 0, "/", "/"],
+				["能耗", "生料分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "总电耗（kW·h）", 0, 0, 0, 0, "/", "/", "/","/"],
 				// ["成本", "生料成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
@@ -409,7 +409,10 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: legend,
+				legend: {
+					top: "2%",
+					data: ["总产量", "分布电耗"],
+				},
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -641,7 +644,7 @@ export default {
 					},
 					{
 						type: "value",
-						name: "分布电耗(KW.h)",
+						name: "分布电耗(kW·h)",
 						position: "left",
 						alignTicks: true,
 						axisLine: {
@@ -806,6 +809,9 @@ export default {
 								that.tableDatas[4][2] = 0;
 								that.tableDatas[5][2] = 0;
 							}else {
+							that.tableDatas[1][2] = data4.production_hour;
+							that.tableDatas[2][2] = data4.run_hour;
+							that.tableDatas[3][2] = data4.run_rate;
 							that.tableDatas[4][2] = data4.elec_consume_unit;
 							that.tableDatas[5][2] = data4.elec_consume;
 						}
@@ -846,7 +852,7 @@ export default {
 										// that.tableDatas[3][8] = item5.goal_val;
 									} else if (
 										item5.goal_cate_name ==
-										"单位产品分布电耗（KW·h/t）"
+										"单位产品分布电耗（kW·h/t）"
 									) {
 										that.tableDatas[4][6] = item5[str];
 										that.tableDatas[4][8] = item5.goal_val;
@@ -996,14 +1002,14 @@ export default {
 				data.forEach((item) => {
 					let ind = item.hour;
 					seriesData0[ind] = item.total_production;
-					seriesData1[ind] = Number(item.production_hour).toFixed(2);
-					seriesData2[ind] = item.run_rate;
+					// seriesData1[ind] = Number(item.production_hour).toFixed(2);
+					// seriesData2[ind] = item.run_rate;
 					seriesData3[ind] = item.elec_consume_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
+				// options.series[1].data = seriesData1;
+				// options.series[2].data = seriesData2;
 				options.series[3].data = seriesData3;
 				let hourXAxis = [];
 				for (let i = 0; i < 24; i++) {
diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue
index f2db03f7..f8413427 100644
--- a/src/views/enm_rm/teamAnalysis.vue
+++ b/src/views/enm_rm/teamAnalysis.vue
@@ -62,14 +62,14 @@
 								<th>Fe₂O₃（%）</th>
 								<th>水分（%）</th>
 								<th>CaO（%）</th>
-								<th>循环风机（KW·h/t）</th>
-								<th>立磨主电机（KW·h/t）</th>
+								<th>循环风机（kW·h/t）</th>
+								<th>立磨主电机（kW·h/t）</th>
 
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -121,7 +121,7 @@ export default {
 				this.$API.mtm.goal.list.req(params).then((res) => {
 					if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        that.getData(item);
 						    }
 						})
@@ -140,7 +140,7 @@ export default {
 			this.$API.mtm.goal.list.req(params).then((res) => {
 				if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        this.getData(item);
 						    }
 						})
@@ -247,10 +247,10 @@ export default {
 									? item.立磨主电机_consume_unit
 									: "/";
 							//
-							arr[15] = item.elec_consume_unit; //当期值（KW·h/t）
+							arr[15] = item.elec_consume_unit; //当期值（kW·h/t）
 							let keyVale = "goal_val_" + n;
-							arr[16] = goalData[keyVale]?goalData[keyVale]:0; //目标值（KW·h/t）//需要接口获取
-							arr[17] = (arr[15] - arr[16]).toFixed(2); //当期与目标差值（KW·h/t）
+							arr[16] = goalData[keyVale]?goalData[keyVale]:0; //目标值（kW·h/t）//需要接口获取
+							arr[17] = (arr[15] - arr[16]).toFixed(2); //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanbi = 0;
 							if (item.month_s == 1) {
@@ -266,18 +266,18 @@ export default {
 								}
 							})
 							}
-							arr[18] = huanbi; //环期值（KW·h/t）上个月的值
-							 //当期与环期差值（KW·h/t）
+							arr[18] = huanbi; //环期值（kW·h/t）上个月的值
+							 //当期与环期差值（kW·h/t）
 							if (arr[19] !== "/"){
-								arr[19] = (arr[15] - arr[18]).toFixed(2); //当期与环期差值（KW·h/t）
+								arr[19] = (arr[15] - arr[18]).toFixed(2); //当期与环期差值（kW·h/t）
 							}else{
-								arr[19] = "/"; //当期与环期差值（KW·h/t）
+								arr[19] = "/"; //当期与环期差值（kW·h/t）
 							}
 							arr[20] = 0; //环比增长率（%）
 							if (arr[18] !=="/" && arr[19] !==0 && arr[19] !== "undefined" && arr[18] !== 0){
 								arr[20] = ((arr[19]/arr[18])*100).toFixed(2);
 							}else{
-								arr[20] = "/"; //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100%
+								arr[20] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100%
 							}
 							arr[21] = item.celec_consume_unit; //同比增长率（%）
 	
diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue
index 89f41cc3..090b361d 100644
--- a/src/views/enm_rm/workshopAnalysis.vue
+++ b/src/views/enm_rm/workshopAnalysis.vue
@@ -44,11 +44,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 								<th>分析说明</th>
@@ -172,7 +172,7 @@ export default {
 					let monthGoal = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -228,7 +228,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -242,8 +242,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = (item[1] - item[2]).toFixed(2);
@@ -251,7 +251,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 0) {
 								let num = index - 1;
@@ -269,7 +269,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_rm_copy/power.vue b/src/views/enm_rm_copy/power.vue
index c2e3d5f8..6ccce9cc 100644
--- a/src/views/enm_rm_copy/power.vue
+++ b/src/views/enm_rm_copy/power.vue
@@ -195,7 +195,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -237,11 +237,11 @@ export default {
 			mpoint: "",
 			tableName: "主要设备（100KW以上）单位产品电耗数据表",
 			tableDatas: [
-				["立磨主电机", "", "KW·h/t", "", "", ""],
-				["循环风机", "", "KW·h/t", "", "", ""],
-				// ['烘干破主','','KW·h/t','','',''],
-				// ['废气风机','','KW·h/t','','',''],
-				// ['尾排风机','','KW·h/t','','',''],
+				["立磨主电机", "", "kW·h/t", "", "", ""],
+				["循环风机", "", "kW·h/t", "", "", ""],
+				// ['烘干破主','','kW·h/t','','',''],
+				// ['废气风机','','kW·h/t','','',''],
+				// ['尾排风机','','kW·h/t','','',''],
 			],
 			tableData: [],
 			modelValue: true,
@@ -484,7 +484,7 @@ export default {
 						let obj = [];
 						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
-						obj[2] = "KW·h/t";
+						obj[2] = "kW·h/t";
 						obj[3] = item.elec_consume_unit;
 						obj[4] = 0;
 						obj[5] = 0;
@@ -523,7 +523,7 @@ export default {
 								let obj = [];
 								obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 								obj[1] = item.ep_monitored_number;
-								obj[2] = "KW·h/t";
+								obj[2] = "kW·h/t";
 								obj[4] = item.elec_consume_unit;
 								obj[6] = item.mpoint;
 								that.tableDatas[index_d] = obj;
@@ -553,7 +553,7 @@ export default {
 									let obj = [];
 									obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 									obj[1] = item.ep_monitored_number;
-									obj[2] = "KW·h/t";
+									obj[2] = "kW·h/t";
 									obj[5] = item.elec_consume_unit;
 									obj[6] = item.mpoint;
 									that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_rm_copy/report.vue b/src/views/enm_rm_copy/report.vue
index 558383f6..87b0998d 100644
--- a/src/views/enm_rm_copy/report.vue
+++ b/src/views/enm_rm_copy/report.vue
@@ -344,7 +344,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h)",
+		name: "分布电耗(kW·h)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -359,7 +359,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "成本(元)",
+		name: "成本(元/吨)",
 		position: "left",
 		alignTicks: true,
 		offset: 70,
@@ -407,8 +407,8 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, "/", 0, 0, "/", "/"],
 				["运转时间", "运转率（%）", "/", 0, 0, "/", 0, 0, "/", "/"],
-				["能耗", "生料分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "总电耗（KW·h）", 0, 0, 0, 0, "/", "/", "/","/"],
+				["能耗", "生料分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "总电耗（kW·h）", 0, 0, 0, 0, "/", "/", "/","/"],
 				["成本", "生料成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
@@ -425,7 +425,10 @@ export default {
 				tooltip: tooltip,
 				grid: grid,
 				toolbox: toolbox,
-				legend: legend,
+				legend: {
+					top: "2%",
+					data: ["总产量", "分布电耗", "成本"],
+				},
 				xAxis: {
 					axisTick: {
 						show: true,
@@ -676,7 +679,7 @@ export default {
 					},
 					{
 						type: "value",
-						name: "成本(元)",
+						name: "成本(元/吨)",
 						position: "right",
 						alignTicks: true,
 						offset: 160,
@@ -692,7 +695,7 @@ export default {
 					},
 					{
 						type: "value",
-						name: "分布电耗(KW.h)",
+						name: "分布电耗(kW·h)",
 						position: "left",
 						alignTicks: true,
 						axisLine: {
@@ -858,6 +861,9 @@ export default {
 								that.tableDatas[5][2] = 0;
 								that.tableDatas[6][2] = 0;
 							}else {
+							that.tableDatas[1][2] = data4.production_hour;
+							that.tableDatas[2][2] = data4.run_hour;
+							that.tableDatas[3][2] = data4.run_rate;
 							that.tableDatas[4][2] = data4.elec_consume_unit;
 							that.tableDatas[5][2] = data4.elec_consume;
 							that.tableDatas[6][2] = data4.production_cost_unit;}
@@ -898,7 +904,7 @@ export default {
 										// that.tableDatas[3][8] = item5.goal_val;
 									} else if (
 										item5.goal_cate_name ==
-										"单位产品分布电耗（KW·h/t）"
+										"单位产品分布电耗（kW·h/t）"
 									) {
 										that.tableDatas[4][6] = item5[str];
 										that.tableDatas[4][8] = item5.goal_val;
@@ -1070,15 +1076,15 @@ export default {
 				data.forEach((item) => {
 					let ind = item.hour;
 					seriesData0[ind] = item.total_production;
-					seriesData1[ind] = Number(item.production_hour).toFixed(2);
-					seriesData2[ind] = item.run_rate;
+					// seriesData1[ind] = Number(item.production_hour).toFixed(2);
+					// seriesData2[ind] = item.run_rate;
 					seriesData3[ind] = item.elec_consume_unit;
 					seriesData4[ind] = item.production_cost_unit;
 				});
 				let options = { ...that.option1 };
 				options.series[0].data = seriesData0;
-				options.series[1].data = seriesData1;
-				options.series[2].data = seriesData2;
+				// options.series[1].data = seriesData1;
+				// options.series[2].data = seriesData2;
 				options.series[3].data = seriesData3;
 				options.series[4].data = seriesData4;
 				let hourXAxis = [];
diff --git a/src/views/enm_rm_copy/teamAnalysis.vue b/src/views/enm_rm_copy/teamAnalysis.vue
index f2db03f7..f8413427 100644
--- a/src/views/enm_rm_copy/teamAnalysis.vue
+++ b/src/views/enm_rm_copy/teamAnalysis.vue
@@ -62,14 +62,14 @@
 								<th>Fe₂O₃（%）</th>
 								<th>水分（%）</th>
 								<th>CaO（%）</th>
-								<th>循环风机（KW·h/t）</th>
-								<th>立磨主电机（KW·h/t）</th>
+								<th>循环风机（kW·h/t）</th>
+								<th>立磨主电机（kW·h/t）</th>
 
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -121,7 +121,7 @@ export default {
 				this.$API.mtm.goal.list.req(params).then((res) => {
 					if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        that.getData(item);
 						    }
 						})
@@ -140,7 +140,7 @@ export default {
 			this.$API.mtm.goal.list.req(params).then((res) => {
 				if (res.length > 0) {
 						res.forEach((item) => {
-						    if (item.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
 						        this.getData(item);
 						    }
 						})
@@ -247,10 +247,10 @@ export default {
 									? item.立磨主电机_consume_unit
 									: "/";
 							//
-							arr[15] = item.elec_consume_unit; //当期值（KW·h/t）
+							arr[15] = item.elec_consume_unit; //当期值（kW·h/t）
 							let keyVale = "goal_val_" + n;
-							arr[16] = goalData[keyVale]?goalData[keyVale]:0; //目标值（KW·h/t）//需要接口获取
-							arr[17] = (arr[15] - arr[16]).toFixed(2); //当期与目标差值（KW·h/t）
+							arr[16] = goalData[keyVale]?goalData[keyVale]:0; //目标值（kW·h/t）//需要接口获取
+							arr[17] = (arr[15] - arr[16]).toFixed(2); //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanbi = 0;
 							if (item.month_s == 1) {
@@ -266,18 +266,18 @@ export default {
 								}
 							})
 							}
-							arr[18] = huanbi; //环期值（KW·h/t）上个月的值
-							 //当期与环期差值（KW·h/t）
+							arr[18] = huanbi; //环期值（kW·h/t）上个月的值
+							 //当期与环期差值（kW·h/t）
 							if (arr[19] !== "/"){
-								arr[19] = (arr[15] - arr[18]).toFixed(2); //当期与环期差值（KW·h/t）
+								arr[19] = (arr[15] - arr[18]).toFixed(2); //当期与环期差值（kW·h/t）
 							}else{
-								arr[19] = "/"; //当期与环期差值（KW·h/t）
+								arr[19] = "/"; //当期与环期差值（kW·h/t）
 							}
 							arr[20] = 0; //环比增长率（%）
 							if (arr[18] !=="/" && arr[19] !==0 && arr[19] !== "undefined" && arr[18] !== 0){
 								arr[20] = ((arr[19]/arr[18])*100).toFixed(2);
 							}else{
-								arr[20] = "/"; //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100%
+								arr[20] = "/"; //环比增长率（%）= 当期与环期差值（kW·h/t）/环期值（kW·h/t）*100%
 							}
 							arr[21] = item.celec_consume_unit; //同比增长率（%）
 	
diff --git a/src/views/enm_rm_copy/workshopAnalysis.vue b/src/views/enm_rm_copy/workshopAnalysis.vue
index 89f41cc3..090b361d 100644
--- a/src/views/enm_rm_copy/workshopAnalysis.vue
+++ b/src/views/enm_rm_copy/workshopAnalysis.vue
@@ -44,11 +44,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 								<th>分析说明</th>
@@ -172,7 +172,7 @@ export default {
 					let monthGoal = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -228,7 +228,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -242,8 +242,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = (item[1] - item[2]).toFixed(2);
@@ -251,7 +251,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 0) {
 								let num = index - 1;
@@ -269,7 +269,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_rmbase/power.vue b/src/views/enm_rmbase/power.vue
index aeb0ef78..11e6f7f6 100644
--- a/src/views/enm_rmbase/power.vue
+++ b/src/views/enm_rmbase/power.vue
@@ -183,7 +183,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -225,8 +225,8 @@ export default {
 			searchDate: "",
 			tableName: "主要设备单位产品电耗数据表",
 			tableDatas: [
-				// ["辊压机", "KW·h/t", "", "", ""],
-				// ["循环风机", "KW·h/t", "", "", ""],
+				// ["辊压机", "kW·h/t", "", "", ""],
+				// ["循环风机", "kW·h/t", "", "", ""],
 			],
 			modelValue: true,
 			type: "hour_s",
@@ -380,7 +380,7 @@ export default {
 					let index = that.mpoints.indexOf(item.mpoint_nickname);
 					let obj = [];
 					obj[0] = item.mpoint_nickname;
-					obj[1] = "KW·h/t";
+					obj[1] = "kW·h/t";
 					obj[2] = item.elec_consume_unit;
 					obj[3] = 0;
 					obj[4] = 0;
@@ -414,7 +414,7 @@ export default {
 						} else {
 							let obj = [];
 							obj[0] = item.mpoint_nickname;
-							obj[1] = "KW·h/t";
+							obj[1] = "kW·h/t";
 							obj[3] = item.elec_consume_unit;
 							obj[5] = item.mpoint;
 							that.tableDatas[index_d] = obj;
@@ -440,7 +440,7 @@ export default {
 						} else {
 							let obj = [];
 							obj[0] = item.mpoint_nickname;
-							obj[1] = "KW·h/t";
+							obj[1] = "kW·h/t";
 							obj[4] = item.elec_consume_unit;
 							obj[5] = item.mpoint;
 							that.tableDatas[index_m] = obj;
diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue
index da76b007..5ff54a75 100644
--- a/src/views/enm_rmbase/report.vue
+++ b/src/views/enm_rmbase/report.vue
@@ -24,7 +24,7 @@
 					>
 						<thead class="myTableHead">
 							<tr>
-								<th colspan="10">生料工序生产报告</th>
+								<th colspan="10">生料辅料工序生产报告</th>
 							</tr>
 							<tr>
 								<th colspan="2">参数</th>
@@ -352,7 +352,7 @@ let yAxis = [
 	},
 	{
 		type: "value",
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "right",
 		alignTicks: true,
 		axisLine: {
@@ -399,7 +399,7 @@ export default {
 				["产量", "台时产量（t/h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转时间（h）", "/", 0, 0, 0, 0, 0, 0, 0],
 				["运转时间", "运转率（%）", "/", 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "生料分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "生料分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
 			],
 			tableName: "生产报告",
 			modelValue: true,
@@ -446,7 +446,7 @@ export default {
 					},
 					{
 						type: "value",
-						name: "分布电耗(KW.h/t)",
+						name: "分布电耗(kW·h/t)",
 						position: "right",
 						alignTicks: true,
 						axisLine: {
@@ -691,7 +691,7 @@ export default {
 										that.tableDatas[3][8] = item5.goal_val;
 									} else if (
 										item5.goal_cate_name ==
-										"单位产品分布电耗（KW·h/t）"
+										"单位产品分布电耗（kW·h/t）"
 									) {
 										that.tableDatas[4][6] = item5[str];
 										that.tableDatas[4][8] = item5.goal_val;
diff --git a/src/views/enm_rmbase/teamAnalysis.vue b/src/views/enm_rmbase/teamAnalysis.vue
index 09f9f330..ae66f471 100644
--- a/src/views/enm_rmbase/teamAnalysis.vue
+++ b/src/views/enm_rmbase/teamAnalysis.vue
@@ -50,11 +50,11 @@
 								<th>总产量（t）</th>
 								<th>台时产量（t/h）</th>
 								<th>运转率（%）</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -168,10 +168,10 @@ export default {
 							arr.push(item.run_rate);
 
 							//
-							arr[5] = item.elec_consume_unit; //当期值（KW·h/t）
+							arr[5] = item.elec_consume_unit; //当期值（kW·h/t）
 							let keyVale = "goal_val_" + n;
-							arr[6] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
-							arr[7] = item.celec_consume_unit - arr[16]; //当期与目标差值（KW·h/t）
+							arr[6] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取
+							arr[7] = item.celec_consume_unit - arr[16]; //当期与目标差值（kW·h/t）
 							let ind_pre = 0,
 								huanbi = 0;
 							if (item.month_s == 1) {
@@ -187,8 +187,8 @@ export default {
 										: "/"
 									: "/";
 							}
-							arr[8] = huanbi; //环期值（KW·h/t）上个月的值
-							arr[9] = item.celec_consume_unit; //当期与环期差值（KW·h/t）
+							arr[8] = huanbi; //环期值（kW·h/t）上个月的值
+							arr[9] = item.celec_consume_unit; //当期与环期差值（kW·h/t）
 							arr[10] = item.celec_consume_unit; //环比增长率（%）
 							arr[11] = item.celec_consume_unit; //同比增长率（%）
 							arr[12] = item.celec_consume_unit; //同比增长率（%）
diff --git a/src/views/enm_rmbase/workshopAnalysis.vue b/src/views/enm_rmbase/workshopAnalysis.vue
index 7f79a196..80d89e15 100644
--- a/src/views/enm_rmbase/workshopAnalysis.vue
+++ b/src/views/enm_rmbase/workshopAnalysis.vue
@@ -43,11 +43,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -156,7 +156,7 @@ export default {
 					let monthGoal = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -213,7 +213,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -225,8 +225,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = item[1] - item[2];
@@ -234,7 +234,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -252,7 +252,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue
index 9a57ff00..0f5c632d 100644
--- a/src/views/enm_slag/handoverLog.vue
+++ b/src/views/enm_slag/handoverLog.vue
@@ -186,7 +186,7 @@
 									{{ reportItem.total_production }}
 								</td>
 								<td class="numCell">
-									单位产品分布电耗（KW·h/t）
+									单位产品分布电耗（kW·h/t）
 								</td>
 								<td class="numCell">
 									{{ reportItem.elec_consume_unit }}
diff --git a/src/views/enm_slag/power.vue b/src/views/enm_slag/power.vue
index 91887e0c..266f28b6 100644
--- a/src/views/enm_slag/power.vue
+++ b/src/views/enm_slag/power.vue
@@ -171,7 +171,7 @@ let legend = {
 };
 let yAxis = {
 	type: "value",
-	name: "分布电耗(KW.h/t)",
+	name: "分布电耗(kW·h/t)",
 	alignTicks: true,
 	axisLine: {
 		show: true,
@@ -210,7 +210,7 @@ export default {
 			},
 			mpoint: "",
 			tableName: "主要设备（100KW以上）单位产品电耗数据表",
-			tableDatas: [["烘干破主电机", "", "kw.h/t", "", "", ""]],
+			tableDatas: [["烘干破主电机", "", "kW·h/t", "", "", ""]],
 			tableData: [],
 			modelValue: true,
 			type: "day_s",
@@ -357,7 +357,7 @@ export default {
 						let obj = [];
 						obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 						obj[1] = item.ep_monitored_number;
-						obj[2] = "KW·h/t";
+						obj[2] = "kW·h/t";
 						obj[3] = item.elec_consume_unit;
 						obj[5] = item.mpoint;
 						obj[6] = item.val;
@@ -387,7 +387,7 @@ export default {
 							let obj = [];
 							obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
 							obj[1] = item.ep_monitored_number;
-							obj[2] = "KW·h/t";
+							obj[2] = "kW·h/t";
 							obj[4] = item.elec_consume_unit;
 							obj[5] = item.mpoint;
 							obj[8] = item.val;
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 98fde991..6791abfd 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -298,7 +298,7 @@ let yAxis = [
 	{
 		type: "value",
 		nameRotate: 45,
-		name: "分布电耗(KW.h/t)",
+		name: "分布电耗(kW·h/t)",
 		position: "left",
 		alignTicks: true,
 		offset: 100,
@@ -315,7 +315,7 @@ let yAxis = [
 	{
 		type: "value",
 		nameRotate: 45,
-		name: "总电量(KW.h)",
+		name: "总电量(kW·h)",
 		position: "left",
 		alignTicks: true,
 		offset: 50,
@@ -406,8 +406,8 @@ export default {
 			},
 			tableDatas: [
 				["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
-				["能耗", "总电量（KW·h）", 0, 0, 0, "/", "/", "/", "/", "/"],
+				["能耗", "单位产品分布电耗（kW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
+				["能耗", "总电量（kW·h）", 0, 0, 0, "/", "/", "/", "/", "/"],
 				["成本", "电石渣成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
 				["湿电石渣", "消耗", 0, 0, 0, "/", "/", "/", "/", "/"],
 				["湿电石渣", "进厂", 0, 0, 0, "/", "/", "/", "/", "/"],
@@ -640,7 +640,7 @@ export default {
 									that.tableDatas[0][8] = item5.goal_val;
 								} else if (
 									item5.goal_cate_name ==
-									"单位产品分布电耗（KW·h/t）"
+									"单位产品分布电耗（kW·h/t）"
 								) {
 									that.tableDatas[1][6] = item5[str];
 									that.tableDatas[1][8] = item5.goal_val;
diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue
index 431b0e55..b5e787ea 100644
--- a/src/views/enm_slag/teamAnalysis.vue
+++ b/src/views/enm_slag/teamAnalysis.vue
@@ -49,11 +49,11 @@
 								<th rowspan="2">得分</th>
 							</tr>
 							<tr>
-								<th>当期值（kKW·h/t）</th>
-								<th>目标值（kKW·h/t）</th>
-								<th>当期与目标值差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期值差值（KW·h/t）</th>
+								<th>当期值（kkW·h/t）</th>
+								<th>目标值（kkW·h/t）</th>
+								<th>当期与目标值差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期值差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 							</tr>
@@ -95,11 +95,24 @@ export default {
 		let year = myDate.getFullYear();
 		this.timeStamp = myDate.getTime();
 		that.query.year_s = year;
-		this.$API.mtm.mgroup.list.req({ page: 0, search: "电石渣" }).then((res) => {
-			console.log("工段数据：", res);
-			that.query.mgroup = res[0].id;
-					that.getGoalData();
-		});
+		this.$API.mtm.mgroup.list
+			.req({ page: 0, search: "电石渣" })
+			.then((res) => {
+				that.query.mgroup = res[0].id;
+				let params = {};
+				params.page = 0;
+				params.year = year;
+				params.mgroup = that.query.mgroup;
+				this.$API.mtm.goal.list.req(params).then((res) => {
+					if (res.length > 0) {
+						res.forEach((item) => {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
+						        that.getData(item);
+						    }
+						})
+					}
+				});
+			});
 	},
 	methods: {
 		getGoalData() {
@@ -110,16 +123,16 @@ export default {
 			params.mgroup = self.query.mgroup;
 			self.$API.mtm.goal.list.req(params).then((res) => {
 				if (res.length > 0) {
-					res.forEach((item) => {
-						if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
-							console.log("目标数据：", item);
-							self.getData(item);
-						}
-					})
-				}
-			}).catch((error) => {
-				console.error('获取目标数据失败：', error);
-			});
+						res.forEach((item) => {
+						    if (item.goal_cate_name == "单位产品分布电耗（kW·h/t）") {
+						        this.getData(item);
+						    }
+						})
+					}
+			})
+			.catch((error) => {
+            console.error('获取目标数据失败：', error);
+        });
 		},
 		getData(goalData) {
 			let that = this;
@@ -174,64 +187,50 @@ export default {
 						arr.push(item.total_production);
 						arr.push(item.production_hour);
 
-						arr[4] = item.elec_consume_unit; //当期值（KW·h/t）
-						let keyVale = "goal_val_" + n;
-						arr[5] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
-						arr[6] = (arr[4] - arr[5]).toFixed(2); //当期与目标差值（KW·h/t）
-						let ind_pre = 0,
-							huanqi = 0,
-							tongqi = 0,
-							tongqicha = 0;
-						if (n == 1) {
-							ind_pre = 12;
-							huanqi = wrapArr0[ind_pre]
-								? wrapArr0[ind_pre].elec_consume_unit
-								: "/";
-						} else {
-							// 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi
-							compareArr0.forEach((item0) => {
-								if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) {
-									huanqi = item0[2];
+							arr[4] = item.elec_consume_unit; //当期值（kW·h/t）
+							let keyVale = "goal_val_" + n;
+							arr[5] = goalData[keyVale]; //目标值（kW·h/t）//需要接口获取
+							arr[6] = (arr[4] - arr[5]).toFixed(2); //当期与目标差值（kW·h/t）
+							let ind_pre = 0,
+								huanqi = 0,
+								huanqicha = 0,
+								tongqi = 0,
+								tongqicha = 0;
+							if (n == 1) {
+								ind_pre = 12;
+								huanqi = wrapArr0[ind_pre]
+									? wrapArr0[ind_pre].elec_consume_unit
+									: "/";
+							} else {
+								// 如果 wrapArr数组长度大于0，那么循环遍历wrapArr数组，找到与item.month_s相差1的元素 而 item.name相同，并赋值给huanbi
+								compareArr0.forEach((item0) => {
+									if (item0[0] == item.month_s - 1 && item0[1] == item.team_name) {
+										huanqi = item0[2];
+								}
+							})
 							}
-						})
-						}
-						arr[7] = Number(huanqi); //环期值（KW·h/t）上个月的值
-						if (arr[6] !== "/"){
-							arr[8] = (Number(arr[4]) - arr[7]).toFixed(2); //当期与环期差值（KW·h/t）
-						}else{
-							arr[8] = "/"; //当期与环期差值（KW·h/t）
-						}
-						let growthRate = 0;
-						if (arr[8]!== "/" &&  arr[7]!== 0  && arr[8]!== 0 ) {
-							growthRate = ((Number(arr[8]) /arr[7]) * 100).toFixed(2);
-						} else{
-							growthRate = "/";
-						}
-						arr[9] = growthRate; //环比增长率（%）
-						if (wrapArr0[n]) {
-							tongqicha =
-								item.celec_consume_unit -
-								wrapArr0[n].celec_consume_unit;
-							tongqi = tongqicha / tongqi;
-						} else {
-							tongqicha = item.celec_consume_unit;
-							tongqi = 0;
-						}
-						arr[10] = tongqi; //同比增长率（%）
-						//如果n = month_list的key值，则遍历里面的对象按照value排序, 如果 index==0，则arr[11] = 100，如果 index==1，则arr[11] = 80，如果 index==2，则arr[11] = 70，如果 index==3，则arr[11] = 0
-						if (month_obj[n]) {
-							const monthData = month_obj[n];
-							const itemValue = item.elec_consume_unit; // 当前项的值
-							const sortedData = monthData.sort((a, b) => parseFloat(b.value) - parseFloat(a.value));
-							const index = sortedData.findIndex(obj => parseFloat(obj.value) === parseFloat(itemValue));								
-							if (index === 0){
-								arr[11] = 50;
-							} else if (index === 1) {
-								arr[11] = 40;
-							} else if (index === 2) {
-								arr[11] = 30;
-							} else if (index === 3) {
-								arr[11] = 20;
+							arr[7] = huanqi; //环期值（kW·h/t）上个月的值
+							if (arr[6] !== "/"){
+								arr[8] = (arr[4] - arr[7]).toFixed(2); //当期与环期差值（kW·h/t）
+							}else{
+								arr[8] = "/"; //当期与环期差值（kW·h/t）
+							}
+							// arr[8] = huanqicha; //当期与环期差值（kW·h/t）
+							let growthRate = 0;
+							if (arr[8]!== "/" && arr[7]!== 0  && arr[8]!== 0 ) {
+								growthRate = ((arr[8] / arr[7]) * 100).toFixed(2);
+							} else{
+								growthRate = "/";
+							}
+							arr[9] = growthRate; //环比增长率（%）
+							if (wrapArr0[n]) {
+								tongqicha =
+									item.celec_consume_unit -
+									wrapArr0[n].celec_consume_unit;
+								tongqi = tongqicha / tongqi;
+							} else {
+								tongqicha = item.celec_consume_unit;
+								tongqi = 0;
 							}
 							const total_elec_consume = item.elec_consume;
 							const sortedTotalData = monthData.sort((a, b) => parseFloat(b.elec_consume) - parseFloat(a.elec_consume));
diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue
index bba32f11..e4f0ab88 100644
--- a/src/views/enm_slag/workshopAnalysis.vue
+++ b/src/views/enm_slag/workshopAnalysis.vue
@@ -42,11 +42,11 @@
 							</tr>
 							<tr>
 								<th>月份</th>
-								<th>当期值（KW·h/t）</th>
-								<th>目标值（KW·h/t）</th>
-								<th>当期与目标差值（KW·h/t）</th>
-								<th>环期值（KW·h/t）</th>
-								<th>当期与环期差值（KW·h/t）</th>
+								<th>当期值（kW·h/t）</th>
+								<th>目标值（kW·h/t）</th>
+								<th>当期与目标差值（kW·h/t）</th>
+								<th>环期值（kW·h/t）</th>
+								<th>当期与环期差值（kW·h/t）</th>
 								<th>环比增长率（%）</th>
 								<th>同比增长率（%）</th>
 								<th>分析说明</th>
@@ -153,7 +153,7 @@ export default {
 					let monthGoal = [];
 					ress.forEach((goal) => {
 						if (
-							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
+							goal.goal_cate_name == "单位产品分布电耗（kW·h/t）"
 						) {
 							monthGoal[0] = goal.goal_val;
 							monthGoal[1] = goal.goal_val_2;
@@ -227,7 +227,7 @@ export default {
 							let arr = [];
 							let time = "" + item.year_s + "." + item.month_s;
 							arr.push(time);
-							arr.push(item.elec_consume_unit); //当期值（KW·h/t）
+							arr.push(item.elec_consume_unit); //当期值（kW·h/t）
 							arr[2] =
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
@@ -241,8 +241,8 @@ export default {
 							arrs[0] = item[0];
 							arrs[1] = item[1];
 							arrs[2] = item[2];
-							//目标值（KW·h/t）//需要接口获取
-							//当期与目标差值（KW·h/t）
+							//目标值（kW·h/t）//需要接口获取
+							//当期与目标差值（kW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
 								diff = (item[1] - item[2]).toFixed(2);
@@ -250,7 +250,7 @@ export default {
 								diff = "/";
 							}
 							arrs[3] = diff;
-							//环期值（KW·h/t）上个月的值
+							//环期值（kW·h/t）上个月的值
 							let lastNum = 0;
 							if (index > 1) {
 								let num = index - 1;
@@ -268,7 +268,7 @@ export default {
 									: "/";
 							}
 							arrs[4] = lastNum;
-							//当期与环期差值（KW·h/t）
+							//当期与环期差值（kW·h/t）
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
diff --git a/src/views/statistics/total_statistics.vue b/src/views/statistics/total_statistics.vue
index 398acb64..a934534f 100644
--- a/src/views/statistics/total_statistics.vue
+++ b/src/views/statistics/total_statistics.vue
@@ -401,7 +401,7 @@ export default {
 							key = "退火";
 						} else if (
 							item5.车间 == "6车间" &&
-							item5.工序 == "管料成型"
+							item5.工序 == "管料退火"
 						) {
 							key = "库存";
 						} else if (
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 8aabf493..cf628be1 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -195,6 +195,7 @@
 									</el-descriptions-item>
 								</el-descriptions>
 							</div>
+							<!-- 检测项和判断项 -->
 							<div style="padding-left: 50px" v-else>
 								<el-descriptions :column="4">
 									<el-descriptions-item label="划伤">{{
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index 9c98e7bf..1844e5bd 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -34,37 +34,10 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item label="批次号" prop="wm_in">
-						<el-input  ref="codeInput" v-model="wm_in" clearable @change="formWminChange"></el-input>
-						<!-- <el-select
-							v-model="form.wm_in"
-							placeholder="交接物料"
-							clearable
-							style="width: 100%"
-						>
-							<el-option
-								v-for="item in materialOptions"
-								:key="item.id"
-								:label="item.batch"
-								:value="item.id"
-							>
-								<div
-									style="
-										display: flex;
-										justify-content: space-between;
-									"
-								>
-									<span>{{ item.batch }}</span
-									><span>{{ item.count }}</span>
-								</div>
-							</el-option>
-						</el-select> -->
+						<el-input  ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)"></el-input>
 					</el-form-item>
 				</el-form>
 			</el-main>
-			<el-footer>
-				<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-				<el-button @click="visible = false">取消</el-button>
-			</el-footer>
 		</el-container>
 	</el-dialog>
 </template>
@@ -74,7 +47,9 @@ const defaultForm = {
 	mlog: "",
 	mtask: "",
 	batch: "",
+	wn_in: "",
 	count_use: 1,
+	note:''
 };
 export default {
 	props: {
@@ -110,14 +85,7 @@ export default {
 						message: "请填写批次号",
 						trigger: "blur",
 					},
-				],
-				count_use: [
-					{
-						required: true,
-						message: "请填写领用数量",
-						trigger: "blur",
-					},
-				],
+				]
 			},
 			wm_in:'',
 			options: [],
@@ -135,6 +103,7 @@ export default {
 		open() {
 			this.visible = true;
 		},
+		//获取任务列表
 		getMtask() {
 			let that = this;
 			this.$API.pm.mtask.list
@@ -158,29 +127,31 @@ export default {
 				});
 		},
 		//扫描后处理方法
-		formWminChange(){
-			//根据扫描内容获取输入物料
-			this.materialOptions.forEach((item) => {
-				if (item.batch == this.wm_in) {
-					this.form.wm_in = item.id;
-					//提交
-					this.submit();
-				}
-			});	
+		formWminChange(wm_in){
+			// wn_in:扫码获取的内容
+			let that = this;
+			let arr = that.materialOptions.filter((item) => {
+				return item.batch == wm_in;
+			});
+			if (arr.length > 0) {
+				that.form.wm_in = arr[0].id;
+				that.form.mlog = that.mlog;
+				that.form.mtask = that.mtask;
+				//提交
+				that.submit();
+			}else{
+				that.wm_in = '';
+				that.$message.error("批次号不存在");
+			}
 		},
 		//表单提交方法
 		submit() {
 			let that = this;
-			that.$refs.dialogForm.validate(async (valid) => {
-				if (valid) {
-					that.form.mlog = that.mlog;
-					that.$API.wpm.mlogb.in.req(that.form).then((res) => {
-						that.$emit("mlogbinSuccess");
-						that.$message.success("添加成功");
-					}).catch((err) => {
-					});
-				}
-			});
+			that.form.mlog = that.mlog;
+			that.$API.wpm.mlogb.in.req(that.form).then((res) => {
+				that.$message.success("添加成功");
+				that.wm_in = '';
+			}).catch((err) => {});
 		},
 		//设置过滤项
 		setFilters(filters) {