diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index f802c2f4..1a2dd238 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -133,28 +133,23 @@
 								</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-col :md="4" :sm="24">
+							<el-form-item label="是否展示">
+								<el-switch v-model="form.need_display" />
 							</el-form-item>
 						</el-col>
-						<el-col :md="24" :sm="24">
-							<el-form-item label="计算公式">
+						<el-col :md="8" :sm="24">
+							<el-form-item
+								label="报告排序"
+								prop="report_sortstr"
+							>
 								<el-input
-									v-model="form.formula"
+									v-model="form.report_sortstr"
 									clearable
-									type="textarea"
-									:rows="3"
 								></el-input>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :md="12" :sm="24">
-              <el-form-item label="调用方法">
-                <el-input v-model="form.func_on_change" clearable></el-input>
-              </el-form-item>
-            </el-col> -->
+						<el-divider/>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="采集间隔(s)" label-width="90">
 								<el-input-number
@@ -162,6 +157,18 @@
 								></el-input-number>
 							</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="12" :sm="24">
+							<el-form-item label="是否单位量">
+								<el-switch v-model="form.is_unit" />
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item
 								label="关联环保字段"
@@ -181,24 +188,26 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="6" :sm="24">
-							<el-form-item label="是否展示">
-								<el-switch v-model="form.need_display" />
-							</el-form-item>
-						</el-col>
-						<el-col :md="6" :sm="24">
-							<el-form-item label="是否单位量">
-								<el-switch v-model="form.is_unit" />
+						<el-divider/>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="计算系数" label-width="90">
+								<el-input-number
+									v-model="form.cal_coefficient"
+								></el-input-number>
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item
-								label="报告排序"
-								prop="report_sortstr"
-							>
+							<el-form-item label="是否需要变更计算系数" label-width="220">
+								<el-switch v-model="form.need_change_cal_coefficient" />
+							</el-form-item>
+						</el-col>
+						<el-col :md="24" :sm="24">
+							<el-form-item label="计算公式">
 								<el-input
-									v-model="form.report_sortstr"
+									v-model="form.formula"
 									clearable
+									type="textarea"
+									:rows="3"
 								></el-input>
 							</el-form-item>
 						</el-col>
@@ -389,7 +398,8 @@ export default {
 				interval: 10,
 				func_on_change: "",
 				is_rep_ep_running_state: false,
-				is_rep_ep0_running_state: false
+				is_rep_ep0_running_state: false,
+				need_change_cal_coefficient: false
 			},
 			rules: {
 				name: [{ required: true, message: "请输入测点名称" }],
diff --git a/src/views/enm_base/formulaSetting.vue b/src/views/enm_base/formulaSetting.vue
index d36b9b9d..d312e14d 100644
--- a/src/views/enm_base/formulaSetting.vue
+++ b/src/views/enm_base/formulaSetting.vue
@@ -1,26 +1,18 @@
 <template>
 	<el-container>
-		<el-main>
-			<el-card header="计算系数" shadow="hover">
-				<el-form>
-					<el-form-item label="熟料料耗系数">
+		<el-main class="nopadding">
+			<div v-for = "item in mpointList" :key="item.id" style="margin-top: 20px; margin-left: 10px">
+				<el-form :inline="true">
+					<el-form-item :label="item.name">
 						<el-input-number
-							v-model="form.enm_lhxs"
-							controls-position="right"
-							placeholder="熟料料耗系数"
-						></el-input-number>
+									v-model="item.cal_coefficient"
+								></el-input-number>
 					</el-form-item>
-
-					<el-form-item style="float: right">
-						<el-button
-							type="primary"
-							:loading="saveLoading"
-							@click="submitForm"
-							>保存</el-button
-						>
+					<el-form-item>
+						<el-button type="primary" @click="submitForm(item)" :loading="saveLoading">保存</el-button>
 					</el-form-item>
 				</el-form>
-			</el-card>
+			</div>
 		</el-main>
 	</el-container>
 </template>
@@ -29,32 +21,26 @@ export default {
 	data() {
 		return {
 			saveLoading: false,
-			form: {
-				enm_lhxs: "",
-			},
+			mpointList:[],
 		};
 	},
 	mounted() {
-		this.getSysConfig();
+		this.getMpoints();
 	},
 	methods: {
-		getSysConfig() {
-			this.$API.system.config.getInfo.req().then((res) => {
-				this.form = res.enm;
-			});
+		getMpoints() {
+			this.$API.enm.mpoint.list.req({page: 0, need_change_cal_coefficient: true}).then(res=>{
+				this.mpointList = res;
+			})
 		},
-		submitForm() {
+		submitForm(item) {
 			this.saveLoading = true;
-			let obj = {};
-			obj.enm = this.form;
-			this.$API.system.config.updateInfo
-				.req(obj)
-				.then((res) => {
-					this.saveLoading = false;
-				})
-				.catch((res) => {
-					this.saveLoading = false;
-				});
+			this.$API.enm.mpoint.update.req(item.id, item).then(res=>{
+				this.$message.success("保存成功");
+				this.saveLoading = false;
+			}).catch(err=>{
+				this.saveLoading = false;
+			})
 		},
 	},
 };