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 @@
+
+
+
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"],
},
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 96d5d30d..01c27bfe 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -91,7 +91,7 @@
-
@@ -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() {
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 56a4e673..a6ba7a4c 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -199,6 +199,12 @@ 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 +217,7 @@ export default {
show: "查看",
},
form: {
- type: 10
+ type: 10,
},
rules: {
name: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -257,11 +263,13 @@ export default {
this.getGroup();
this.getBaseInfo();
this.getCateOptions();
+ this.form.type = this.eqtype;
},
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() {
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 @@
-
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 @@
-
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 @@
-