From 979ad5870d4fc3eee69bb9b3e5d05ccb5b90651c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 9 May 2024 16:02:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=A1=E7=AE=97=E7=B3=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js                       |   2 +-
 src/views/enm_base/formulaSetting.vue     | 121 +++++++---------------
 src/views/enm_base/settings/calculate.vue |  59 -----------
 3 files changed, 40 insertions(+), 142 deletions(-)
 delete mode 100644 src/views/enm_base/settings/calculate.vue

diff --git a/src/config/route.js b/src/config/route.js
index a49596e4..539b4364 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2372,7 +2372,7 @@ const routes = [
             "name": "formula",
             "path": "/enm_base/formula",
             "meta": {
-              "title": "计算公式",
+              "title": "计算系数",
               "icon": "el-icon-grid",
               "perms": ["enm_base"]
             },
diff --git a/src/views/enm_base/formulaSetting.vue b/src/views/enm_base/formulaSetting.vue
index d208b984..1fbc27d2 100644
--- a/src/views/enm_base/formulaSetting.vue
+++ b/src/views/enm_base/formulaSetting.vue
@@ -1,104 +1,61 @@
 <template>
-	<el-container class="page-user">
-		<el-aside style="width: 240px">
-			<el-container>
-				<el-main class="nopadding">
-					<el-menu class="menu" :default-active="page">
-						<el-menu-item-group
-							v-for="group in menu"
-							:key="group.groupName"
-							:title="group.groupName"
-						>
-							<el-menu-item
-								v-for="item in group.list"
-								:key="item.component"
-								:index="item.component"
-								@click="openPage"
-							>
-								<el-icon v-if="item.icon"
-									><component :is="item.icon"
-								/></el-icon>
-								<template #title>
-									<span>{{ item.title }}</span>
-								</template>
-							</el-menu-item>
-						</el-menu-item-group>
-					</el-menu>
-				</el-main>
-			</el-container>
-		</el-aside>
+	<el-container>
 		<el-main>
-			<Suspense>
-				<template #default>
-					<component :is="page" />
-				</template>
-				<template #fallback>
-					<el-skeleton :rows="3" />
-				</template>
-			</Suspense>
+			<el-card header="计算系数" shadow="hover">
+				<el-form>
+					<el-form-item label="料号系数">
+						<el-input-number
+							v-model="form.enm_lhxs"
+							controls-position="right"
+							placeholder="料号系数"
+						></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-form>
+			</el-card>
 		</el-main>
 	</el-container>
 </template>
-
 <script>
-import { defineAsyncComponent } from "vue";
-
 export default {
-	name: "userCenter",
-	components: {
-		calculate: defineAsyncComponent(() =>
-			import("./settings/calculate.vue")
-		),
-	},
 	data() {
 		return {
-			form: {},
-			menu: [
-				{
-					groupName: "配置",
-					list: [
-						{
-							icon: "el-icon-platform",
-							title: "计算系数",
-							component: "calculate",
-						},
-					],
-				},
-			],
-			userData: {},
-			page: "calculate",
+			saveLoading: false,
+			form: {
+				enm_lhxs: "",
+			},
 		};
 	},
-	//路由跳转进来 判断from是否有特殊标识做特殊处理
-	beforeRouteEnter(to, from, next) {
-		next((vm) => {
-			if (from.is) {
-				//删除特殊标识，防止标签刷新重复执行
-				delete from.is;
-				//执行特殊方法
-				vm.$alert("路由跳转过来后含有特殊标识，做特殊处理", "提示", {
-					type: "success",
-					center: true,
-				})
-					.then(() => {})
-					.catch(() => {});
-			}
-		});
-	},
 	mounted() {
 		this.getSysConfig();
 	},
 	methods: {
-		openPage(item) {
-			this.page = item.index;
-		},
-
 		getSysConfig() {
 			this.$API.system.config.getInfo.req().then((res) => {
-				this.form = res.base;
+				this.form = res.enm;
 			});
 		},
+		submitForm() {
+			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;
+				});
+		},
 	},
 };
 </script>
-<style scoped></style>
diff --git a/src/views/enm_base/settings/calculate.vue b/src/views/enm_base/settings/calculate.vue
deleted file mode 100644
index 0741ddb6..00000000
--- a/src/views/enm_base/settings/calculate.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-	<el-container>
-		<el-main>
-			<el-card header="计算系数" shadow="hover">
-				<el-form>
-					<el-form-item label="料号系数">
-						<el-input-number
-							v-model="form.enm_lhxs"
-							controls-position="right"
-							placeholder="料号系数"
-						></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-form>
-			</el-card>
-		</el-main>
-	</el-container>
-</template>
-<script>
-export default {
-	data() {
-		return {
-			saveLoading: false,
-			form: {
-				enm_lhxs: "",
-			},
-		};
-	},
-	mounted() {
-		this.getSysConfig();
-	},
-	methods: {
-		getSysConfig() {
-			this.$API.system.config.getInfo.req().then((res) => {
-				this.form = res.enm;
-			});
-		},
-		submitForm() {
-			this.saveLoading = true;
-			this.$API.system.config.updateInfo
-				.req(this.form)
-				.then((res) => {
-					this.saveLoading = false;
-				})
-				.catch((res) => {
-					this.saveLoading = false;
-				});
-		},
-	},
-};
-</script>