diff --git a/src/config/route.js b/src/config/route.js
index b750852b..20f6eb4c 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -946,16 +946,16 @@ const routes = [
 						},
 						component: "enm_energy/value",
 					},
-					{
-						name: "electric",
-						path: "/enm_energy/electric",
-						meta: {
-							title: "全厂电量统计",
-							// icon: "el-icon-grid",
-							perms: ["enm_energy_electric"],
-						},
-						component: "enm_energy/electric",
-					},
+					// {
+					// 	name: "electric",
+					// 	path: "/enm_energy/electric",
+					// 	meta: {
+					// 		title: "全厂电量统计",
+					// 		// icon: "el-icon-grid",
+					// 		perms: ["enm_energy_electric"],
+					// 	},
+					// 	component: "enm_energy/electric",
+					// },
 					{
 						name: "electricHour",
 						path: "/enm_energy/electricHour",
diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index 622367c8..2a999594 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -149,6 +149,13 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="计算系数" label-width="90">
+								<el-input-number
+									v-model="form.coefficient"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
 						<el-col :md="24" :sm="24">
 							<el-form-item label="计算公式">
 								<el-input
diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue
index c882fcaa..25947250 100644
--- a/src/views/enm_coal/teamAnalysis.vue
+++ b/src/views/enm_coal/teamAnalysis.vue
@@ -99,33 +99,23 @@ export default {
 		//月目标
 		let paramsGoal = {};
 		paramsGoal.page = 0;
-		paramsGoal.mgroup = that.query.mgroup;
-		that.$API.mtm.goal.list.req(paramsGoal).then((ress) => {
-			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;
+		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) => {
+					let data = [];
+					if (res.length > 0) {
+						data = res[0];
 					}
+					console.log(data);
+					that.getData(data);
 				});
-				this.getData();
-			} else {
-				this.getData();
-			}
-		});
+			});
 	},
 	methods: {
 		getData(goalData) {
@@ -181,25 +171,25 @@ export default {
 							arr.push(item.total_production);
 							arr.push(item.production_hour);
 							arr.push(item.run_rate);
-							arr.push(item.production_cost_unit);
 							//质量
+							arr[5] =
+								item.出磨煤粉_细度_rate_pass !== undefined && item.出磨煤粉_细度_rate_pass !== null
+									? item.出磨煤粉_细度_rate_pass
+									: "/";
+
 							arr[6] =
-								item.煤粉_细度_rate_pass != null
-									? item.煤粉_细度_rate_pass
+								item.出磨煤粉_水分_rate_pass !== undefined && item.出磨煤粉_水分_rate_pass !== null
+									? item.出磨煤粉_水分_rate_pass
 									: "/";
+									//设备
 							arr[7] =
-								item.煤粉_水分_rate_pass != null
-									? item.煤粉_水分_rate_pass
-									: "/";
-							//设备
-							arr[8] =
-								item.煤磨排风机_consume_unit != null
+								item.煤磨排风机_consume_unit !== undefined && item.煤磨排风机_consume_unit !== null
 									? item.煤磨排风机_consume_unit
 									: "/";
 							let keyVale = "goal_val_" + n;
-							arr[9] = item.elec_consume_unit; //当期值（KW·h/t）
-							arr[10] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
-							arr[11] = item.celec_consume_unit - arr[10]; //当期与目标差值（KW·h/t）
+							arr[8] = item.elec_consume_unit; //当期值（KW·h/t）
+							arr[9] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
+							arr[10] = item.celec_consume_unit - arr[9]; //当期与目标差值（KW·h/t）
 							let ind_pre = 0,
 								huanqi = 0,
 								huanqicha = 0,
@@ -213,19 +203,19 @@ export default {
 							} else {
 								ind_pre = n - 1;
 								huanqi = wrapArr[ind_pre]
-									? wrapArr[ind_pre].elec_consume_unit
+									? wrapArr[ind_pre].elec_consume_unit>=0
 										? wrapArr[ind_pre].elec_consume_unit
 										: "/"
 									: "/";
 							}
-							arr[12] = huanqi; //环期值（KW·h/t）上个月的值
+							arr[11] = huanqi; //环期值（KW·h/t）上个月的值
 							if (huanqi !== "/") {
 								huanqicha = item.celec_consume_unit - huanqi;
 							} else {
 								huanqicha = item.celec_consume_unit;
 							}
-							arr[13] = huanqicha; //当期与环期差值（KW·h/t）
-							arr[14] =
+							arr[12] = huanqicha; //当期与环期差值（KW·h/t）
+							arr[13] =
 								huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%）
 							if (wrapArr0[n]) {
 								tongqicha =
@@ -236,8 +226,8 @@ export default {
 								tongqicha = item.celec_consume_unit;
 								tongqi = 0;
 							}
-							arr[15] = tongqi; //同比增长率（%）
-							arr[16] = 0; //同比增长率（%）
+							arr[14] = tongqi; //同比增长率（%）
+							arr[15] = 0.0; //得分
 							wrapArr[ind] = arr;
 						});
 						console.log(wrapArr);
diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue
index 0dfd1469..0941abcd 100644
--- a/src/views/enm_coal/workshopAnalysis.vue
+++ b/src/views/enm_coal/workshopAnalysis.vue
@@ -142,11 +142,17 @@ export default {
 						that.monthGoal = monthGoal;
 					}
 				});
-				this.getData();
 			} 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();
+			});
 	},
 	methods: {
 		// 动态绑定Class
@@ -203,7 +209,7 @@ export default {
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							wrapArr[ind] = arr;
+							wrapArr.push(arr);
 						});
 						wrapArr.forEach((item, index) => {
 							let arrs = [];
@@ -214,20 +220,20 @@ export default {
 							//当期与目标差值（KW·h/t）
 							let diff = 0;
 							if (item[2] !== "/") {
-								diff = item[1] - item[2];
+								diff = (item[1] - item[2]).toFixed(2);
 							} else {
 								diff = "/";
 							}
 							arrs[3] = diff;
 							//环期值（KW·h/t）上个月的值
 							let lastNum = 0;
-							if (index > 1) {
+							if (index > 0) {
 								let num = index - 1;
 								if (
 									wrapArr[num] &&
-									wrapArr[num].elec_consume_unit
+									wrapArr[num][1]
 								) {
-									lastNum = wrapArr[num].elec_consume_unit;
+									lastNum = wrapArr[num][1];
 								} else {
 									lastNum = "/";
 								}
@@ -241,7 +247,7 @@ export default {
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
-								lastDiff = arrs[1] - arrs[4];
+								lastDiff = (arrs[1] - arrs[4]).toFixed(2);
 							} else {
 								lastDiff = "/";
 							}
diff --git a/src/views/enm_energy/electric.vue b/src/views/enm_energy/electric.vue
index 90373e13..118cc609 100644
--- a/src/views/enm_energy/electric.vue
+++ b/src/views/enm_energy/electric.vue
@@ -1,4 +1,3 @@
-<!-- 全厂电量统计 -->
 <template>
     <div class="app-container">
         <el-header>
diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue
index 0b8f69ae..b231088f 100644
--- a/src/views/enm_kiln/workshopAnalysis.vue
+++ b/src/views/enm_kiln/workshopAnalysis.vue
@@ -480,7 +480,8 @@ export default {
 							//当期与目标差值（KW·h/t）
 							let diff = 0;
 							if (arrs[2] !== "/") {
-								diff = arrs[1] - arrs[2];
+								diff = (arrs[1] - arrs[2]).toFixed(2)
+								;
 							} else {
 								diff = "/";
 							}
@@ -507,7 +508,7 @@ export default {
 							let lastDiff = 0;
 
 							if (arrs[1] !== "/" && arrs[4] !== "/") {
-								lastDiff = arrs[1] - arrs[4];
+								lastDiff = (arrs[1] - arrs[4]).toFixed(2);
 							} else {
 								lastDiff = "/";
 							}
@@ -519,7 +520,7 @@ export default {
 								lastNum !== "/" &&
 								lastNum !== 0
 							) {
-								lastRate = (lastDiff / lastNum) * 100;
+								lastRate = ((lastDiff / lastNum) * 100).toFixed(2);
 							} else {
 								lastRate = "/";
 							}
@@ -628,7 +629,7 @@ export default {
 									: "/";
 							}
 							if (arrs3[1] !== "/" && lastNum3 !== "/") {
-								lastDiff3 = arrs3[1] - lastNum3;
+								lastDiff3 = (arrs3[1] - lastNum3).toFixed(2);
 							} else {
 								lastDiff3 = "/";
 							}
diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue
index 9b3cc020..695e0197 100644
--- a/src/views/enm_mill/workshopAnalysis.vue
+++ b/src/views/enm_mill/workshopAnalysis.vue
@@ -197,11 +197,12 @@ export default {
 		this.$API.mtm.mgroup.list
 			.req({ page: 0, search: "水泥磨" })
 			.then((res) => {
-				console.log("水泥磨", res);
 				that.query.mgroup = res[0].id;
 				//月目标
 				this.getMonthGoal();
+				this.getData();
 			});
+		
 	},
 	methods: {
 		// 动态绑定Class
@@ -229,6 +230,7 @@ export default {
 			that.$API.mtm.goal.list.req(paramsGoal).then((ress) => {
 				if (ress.length > 0) {
 					let monthGoal = [];
+					let monthGoal2 = [];
 					ress.forEach((goal) => {
 						if (
 							goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
@@ -266,8 +268,7 @@ export default {
 							monthGoal2[12] = goal.goal_val_12;
 							that.monthGoal2 = monthGoal2;
 						}
-					});
-					this.getData();
+					})
 				} else {
 					this.getData();
 				}
@@ -312,7 +313,7 @@ export default {
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							wrapArr[ind] = arr;
+							wrapArr.push(arr);
 						});
 						wrapArr.forEach((item, index) => {
 							let ind = item.month_s;
@@ -327,13 +328,14 @@ export default {
 							//当期与环期差值（KW·h/t）
 							let lastNum = 0,
 								lastDiff = 0;
-							if (index > 1) {
+							if (index > 0) {
 								let num = index - 1;
 								if (
 									wrapArr[num] &&
-									wrapArr[num].elec_consume_unit
+									wrapArr[num][1]
 								) {
-									lastNum = wrapArr[num].elec_consume_unit;
+									lastNum = wrapArr[num][1];
+
 								} else {
 									lastNum = "/";
 								}
@@ -351,7 +353,7 @@ export default {
 							//环比增长率（%）
 							let lastRate = 0;
 							if (
-								lastDiff == "/" &&
+								lastDiff !== "/" &&
 								lastNum !== "/" &&
 								lastNum !== 0
 							) {
@@ -360,7 +362,7 @@ export default {
 								lastRate = "/";
 							}
 							arrs[7] = lastRate;
-							//同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit
+							// 同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit
 							let sameRate = 0;
 							if (
 								wrapArr0[index] &&
diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue
index 1d3e09cb..472d9595 100644
--- a/src/views/enm_rm/workshopAnalysis.vue
+++ b/src/views/enm_rm/workshopAnalysis.vue
@@ -126,6 +126,7 @@ export default {
 				that.query.mgroup = res[0].id;
 				//月目标
 				that.getMonthGoal();
+				that.getData();
 			});
 	},
 	methods: {
@@ -174,7 +175,6 @@ export default {
 							that.monthGoal = monthGoal;
 						}
 					});
-					this.getData();
 				} else {
 					this.getData();
 				}
@@ -218,7 +218,7 @@ export default {
 								that.monthGoal[ind] !== undefined
 									? that.monthGoal[ind]
 									: "/";
-							wrapArr[ind] = arr;
+							wrapArr.push(arr);
 						});
 						wrapArr.forEach((item, index) => {
 							let arrs = [];
@@ -236,13 +236,13 @@ export default {
 							arrs[3] = diff;
 							//环期值（KW·h/t）上个月的值
 							let lastNum = 0;
-							if (index > 1) {
+							if (index > 0) {
 								let num = index - 1;
 								if (
 									wrapArr[num] &&
-									wrapArr[num].elec_consume_unit
+									wrapArr[num][1]
 								) {
-									lastNum = wrapArr[num].elec_consume_unit;
+									lastNum = wrapArr[num][1];
 								} else {
 									lastNum = "/";
 								}
diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue
index bdc3f527..26cc28a8 100644
--- a/src/views/enm_slag/workshopAnalysis.vue
+++ b/src/views/enm_slag/workshopAnalysis.vue
@@ -238,9 +238,9 @@ export default {
 								let num = index - 1;
 								if (
 									wrapArr[num] &&
-									wrapArr[num].elec_consume_unit
+									wrapArr[num][1]
 								) {
-									lastNum = wrapArr[num].elec_consume_unit;
+									lastNum = wrapArr[num][1];
 								} else {
 									lastNum = "/";
 								}