From 9fba7a1330b93ee10cd35a246b4a57aa2b470172 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 14:56:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87typ?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment.vue      |  2 +-
 src/views/em/equipment_form.vue | 10 +++++++++-
 src/views/em/equipmentjc.vue    |  2 +-
 src/views/em/equipmentjk.vue    |  2 +-
 src/views/em/equipmentjl.vue    |  2 +-
 src/views/em/equipmentzl.vue    |  2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 96d5d30d..f140eb4f 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -91,7 +91,7 @@
       </scTable>
     </el-main>
   </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="10"
     @closed="dialog.save = false"></save-dialog>
   <check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
     @closed="dialog.save = false"></check-dialog>
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 56a4e673..94f1d3fb 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -199,6 +199,13 @@ import { genTree } from "@/utils/verificate";
 import { iMEnum } from "@/utils/enum";
 export default {
   emits: ["success", "closed"],
+  props:{
+    eqtype:{
+      type:String,
+      default: ''
+      }
+    },
+  },
   data() {
     return {
       iMEnum,
@@ -211,7 +218,7 @@ export default {
         show: "查看",
       },
       form: {
-        type: 10
+        type: 10,
       },
       rules: {
         name: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -257,6 +264,7 @@ export default {
     this.getGroup();
     this.getBaseInfo();
     this.getCateOptions();
+    this.form.type = this.eqtype;
   },
   methods: {
     getCateOptions() {
diff --git a/src/views/em/equipmentjc.vue b/src/views/em/equipmentjc.vue
index 16369e08..f1f65989 100644
--- a/src/views/em/equipmentjc.vue
+++ b/src/views/em/equipmentjc.vue
@@ -91,7 +91,7 @@
       </scTable>
     </el-main>
   </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype='40'
     @closed="dialog.save = false"></save-dialog>
   <check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
     @closed="dialog.save = false"></check-dialog>
diff --git a/src/views/em/equipmentjk.vue b/src/views/em/equipmentjk.vue
index 805a4d26..5c861c27 100644
--- a/src/views/em/equipmentjk.vue
+++ b/src/views/em/equipmentjk.vue
@@ -91,7 +91,7 @@
       </scTable>
     </el-main>
   </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="50"
     @closed="dialog.save = false"></save-dialog>
   <check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
     @closed="dialog.save = false"></check-dialog>
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index 89af9e4d..eee230f0 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -138,7 +138,7 @@
       </el-drawer>
     </el-main>
   </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="20"
     @closed="dialog.save = false"></save-dialog>
 </template>
 <script>
diff --git a/src/views/em/equipmentzl.vue b/src/views/em/equipmentzl.vue
index 24e051fa..f01b2e2a 100644
--- a/src/views/em/equipmentzl.vue
+++ b/src/views/em/equipmentzl.vue
@@ -92,7 +92,7 @@
       </scTable>
     </el-main>
   </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" :eqtype="30"
     @closed="dialog.save = false"></save-dialog>
   <check-dialog v-if="dialog.check" ref="checkDialog" :eqms="selectiones" @success="handleCheckSuccess"
     @closed="dialog.save = false"></check-dialog>

From 06c3e107f02cdd64b60ad54c59363365845219af Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 15:25:34 +0800
Subject: [PATCH 2/6] fix:eq

---
 src/views/em/equipment_form.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 94f1d3fb..a6ba7a4c 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -203,7 +203,6 @@ export default {
     eqtype:{
       type:String,
       default: ''
-      }
     },
   },
   data() {
@@ -268,8 +267,9 @@ export default {
   },
   methods: {
     getCateOptions() {
-      this.$API.em.ecate.list.req({page:0}).then(res => {
-        this.cateOptions = res
+      let that = this;
+      that.$API.em.ecate.list.req({page:0,type:that.eqtype}).then(res => {
+        that.cateOptions = res;
       })
     },
     getBaseInfo() {

From 9fa6081434d8cc9486eb01ea4626c26dadf85641 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 15:44:42 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=E7=94=9F=E4=BA=A7=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E5=90=8E=E5=88=B7=E6=96=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=85=89?=
 =?UTF-8?q?=E5=AD=90=E5=8D=95=E7=8B=AC=E4=B8=80=E4=B8=AA=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/ecate_form.vue |  4 ++++
 src/views/em/equipment.vue  | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/em/ecate_form.vue b/src/views/em/ecate_form.vue
index 2a7ec819..6309e7d0 100644
--- a/src/views/em/ecate_form.vue
+++ b/src/views/em/ecate_form.vue
@@ -103,6 +103,10 @@ export default {
 				name: [{ required: true, message: "请输入类型名称" }],
 				type: [{ required: true, message: "请请选择设备类型" }],
 			},
+			type_gx:[
+				{ text: '生产设备', key: 10 },
+				{ text: '计量设备', key: 20 },
+			],
 			visible: false,
 			isSaveing: false,
 		};
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index f140eb4f..01c27bfe 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -341,10 +341,12 @@ export default {
     },
     //删除
     async table_del(row) {
-      this.$API.em.equipment.delete
+      let that = this;
+      that.$API.em.equipment.delete
         .req(row.id)
         .then((res) => {
-          this.$message.success("删除成功");
+          that.$message.success("删除成功");
+          that.$refs.table.refresh();
           return res;
         })
         .catch((err) => {
@@ -354,11 +356,7 @@ export default {
 
     //本地更新数据
     handleSaveSuccess(data, mode) {
-      if (mode == "add") {
-        this.$refs.table.refresh();
-      } else if (mode == "edit") {
-        this.$refs.table.refresh();
-      }
+      this.$refs.table.refresh();
     },
     handleCheckSuccess() { },
     handleQuery() {

From e998dd2f8e97a08efde5c76728968f10113b2f7f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 15 Aug 2024 15:58:26 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95icon=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/Env.vue  | 5 +++++
 src/assets/icons/index.js | 3 ++-
 src/config/route.js       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/icons/Env.vue

diff --git a/src/assets/icons/Env.vue b/src/assets/icons/Env.vue
new file mode 100644
index 00000000..38519596
--- /dev/null
+++ b/src/assets/icons/Env.vue
@@ -0,0 +1,5 @@
+<template>
+	<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32">
+		<path fill="currentColor" d="M5 5c2.614 8.976 2.362 13.181 6.896 16.693c3.97 3.026 7.94 2.237 10.112 1.914L25.398 27h2l-3.98-3.98C23.393 20.613 29.01 5 5 5m3.084 2.002c.135.011.45.121 1.047.396c3.999 1.85 5.408 4.592 6.931 7.4c1.096 2.023 3.019 5.103 4.374 6.095c1.356.983 2.836 1.709-.288.398c-3.134-1.311-5.417-5.032-6.931-7.85c-1.164-2.162-2.163-4.153-4.336-5.613c0 0-1.203-.86-.797-.826" />
+	</svg>
+</template>
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index a85f299c..d8fa74ea 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -21,4 +21,5 @@ export { default as Shenpi } from './Shenpi.vue'
 export { default as Shebei } from './Shebei.vue'
 export { default as Xiaoshou } from './Xiaoshou.vue'
 export { default as Zhixing } from './Zhixing.vue'
-export { default as Zhizao } from './Zhizao.vue'
\ No newline at end of file
+export { default as Zhizao } from './Zhizao.vue'
+export { default as Env } from './Env.vue'
\ No newline at end of file
diff --git a/src/config/route.js b/src/config/route.js
index d00e0bdb..c2a522bd 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -898,7 +898,7 @@ const routes = [
 				path: "/enp",
 				meta: {
 					title: "环保模块",
-					icon: "el-icon-grid",
+					icon: "sc-icon-env",
 					type: "menu",
 					perms: ["enm_hb"],
 				},

From acfc04653a5deb807730e1b58b3916259aa02112 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 15 Aug 2024 15:59:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=8E=92=E6=94=BE=E5=8F=A3infotitle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enp/pfk_detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/enp/pfk_detail.vue b/src/views/enp/pfk_detail.vue
index d948e44d..8f9d9e5c 100644
--- a/src/views/enp/pfk_detail.vue
+++ b/src/views/enp/pfk_detail.vue
@@ -704,6 +704,6 @@ export default {
 
 .infotitle {
 	font-weight: normal;
-	color: #333333;
+	color: #dddddd;
 }
 </style>

From 3435ffa71894cb3f355185970558fbff93897639 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 15 Aug 2024 16:07:32 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E5=B7=A5=E8=89=BA?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E7=82=B9=E5=87=BB=E4=B8=8A=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E6=97=B6=E5=88=9B=E5=BB=BA=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/routepack_form.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/mtm/routepack_form.vue b/src/views/mtm/routepack_form.vue
index da4ac074..8d270754 100644
--- a/src/views/mtm/routepack_form.vue
+++ b/src/views/mtm/routepack_form.vue
@@ -244,6 +244,7 @@ export default {
 			let form = {};
 			form.name = that.form.name;
 			form.material = that.form.material;
+			console.log("that.form",that.form)
 			if (that.form.id) {
 				that.$API.mtm.routepack.update
 					.req(that.form.id, that.form)
@@ -258,7 +259,9 @@ export default {
 			} else {
 				that.$API.mtm.routepack.create.req(form).then((res) => {
 					this.active = 1;
+					that.form.id = res.id;
 					that.routepack = res.id;
+					console.log("that.form",that.form)
 				});
 			}
 		},