diff --git a/src/api/model/em.js b/src/api/model/em.js
index efc8ff5a..5233d627 100644
--- a/src/api/model/em.js
+++ b/src/api/model/em.js
@@ -146,4 +146,55 @@ export default {
 			}
 		},
 	},
+	//设备分类
+	ecate: {
+		list: {
+			name: "列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/em/ecate/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/em/ecate/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/em/ecate/${id}/`,
+					data);
+			}
+		},
+        create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/em/ecate/`,
+					data);
+			}
+		},
+        delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/em/ecate/${id}/`);
+			}
+		},
+        cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/em/ecate/cquery/`,
+					data);
+			}
+		},
+	},
 }
\ No newline at end of file
diff --git a/src/config/route.js b/src/config/route.js
index 3ac387bf..19e6b31c 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -1815,6 +1815,16 @@ const routes = [
           "perms": ["em"]
         },
         "children": [
+          {
+            "name": "ecate",
+            "path": "/em/ecate",
+            "meta": {
+              "title": "设备分类",
+              "icon": "el-icon-cellphone",
+              "perms": ["ecate"]
+            },
+            "component": "em/ecate"
+          },
           {
             "name": "equipment",
             "path": "/em/equipment",
@@ -1831,9 +1841,9 @@ const routes = [
             "meta": {
               "title": "计量设备",
               "icon": "el-icon-cellphone",
-              "perms": ["equipmentc"]
+              "perms": ["equipmentjl"]
             },
-            "component": "em/equipmentc"
+            "component": "em/equipmentjl"
           },
           {
             "name": "equipmentz",
@@ -1841,9 +1851,9 @@ const routes = [
             "meta": {
               "title": "治理设备",
               "icon": "el-icon-cellphone",
-              "perms": ["equipmentz"]
+              "perms": ["equipmentzl"]
             },
-            "component": "em/equipmentz"
+            "component": "em/equipmentzl"
           },
           {
             "name": "equipmentj",
@@ -1851,9 +1861,19 @@ const routes = [
             "meta": {
               "title": "监控设备",
               "icon": "el-icon-cellphone",
-              "perms": ["equipmentj"]
+              "perms": ["equipmentjk"]
             },
-            "component": "em/equipmentj"
+            "component": "em/equipmentjk"
+          },
+          {
+            "name": "equipmentj",
+            "path": "/em/equipmentjc",
+            "meta": {
+              "title": "监测设备",
+              "icon": "el-icon-cellphone",
+              "perms": ["equipmentjc"]
+            },
+            "component": "em/equipmentjc"
           },
           {
             "name": "xjRecord",
@@ -1861,7 +1881,7 @@ const routes = [
             "meta": {
               "title": "巡检记录",
               "icon": "el-icon-cellphone",
-              "perms": ["equipment"]
+              "perms": ["einspect"]
             },
             "component": "em/xjRecord"
           },
@@ -2191,7 +2211,7 @@ const routes = [
     "path": "/bigScreenEnp",
     "name": "bigScreenEnp",
     "meta": {
-      "title": "数据大屏Enp",
+      "title": "环保大屏",
       "icon": "el-icon-platform",
       "perms": ["bigScreenEnp"],
       "fullpage": true,
diff --git a/src/views/em/ecate.vue b/src/views/em/ecate.vue
new file mode 100644
index 00000000..d617a18f
--- /dev/null
+++ b/src/views/em/ecate.vue
@@ -0,0 +1,126 @@
+<template>
+    <el-container>
+        <el-header>
+            <div class="left-panel">
+                <el-button type="primary" icon="el-icon-plus" v-auth="'ecate.create'" @click="add"></el-button>
+            </div>
+        </el-header>
+        <el-main class="nopadding">
+            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :query="query">
+                <el-table-column type="index" width="50" />
+                <el-table-column label="名称" prop="name" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="编码" prop="code" show-overflow-tooltip></el-table-column>
+                <el-table-column label="类型" show-overflow-tooltip>
+                    <template #default="scope">
+                        <span>{{ typeOptions_[scope.row.type] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否用于安全" show-overflow-tooltip>
+                    <template #default="scope">
+                        <el-icon v-if="scope.row.is_for_safe" color="green">
+                            <CircleCheckFilled />
+                        </el-icon>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否用于环保" prop="is_for_enp" show-overflow-tooltip>
+                    <template #default="scope">
+                        <el-icon v-if="scope.row.is_for_enp" color="green">
+                            <CircleCheckFilled />
+                        </el-icon>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否为车辆" show-overflow-tooltip>
+                    <template #default="scope">
+                        <el-icon v-if="scope.row.is_car" color="green">
+                            <CircleCheckFilled />
+                        </el-icon>
+                    </template>
+                </el-table-column>
+            </scTable>
+        </el-main>
+    </el-container>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            apiObj: this.$API.em.ecate.list,
+            query: {},
+            typeOptions_: {
+                10: '生产设备',
+                20: '计量设备',
+                30: '治理设备',
+                40: '监测设备',
+                50: '监控设备',
+            },
+            typeOptions: [
+                { id: 10, name: '生产设备' },
+                { id: 20, name: '计量设备' },
+                { id: 30, name: '治理设备' },
+                { id: 40, name: '监测设备' },
+                { id: 50, name: '监控设备' }
+            ],
+        };
+    },
+    methods: {
+        //添加
+        add() {
+            this.dialog.save = true;
+            this.$nextTick(() => {
+                this.$refs.saveDialog.open("add", 20);
+            });
+        },
+        //编辑
+        table_edit(row) {
+            this.dialog.save = true;
+            this.$nextTick(() => {
+                this.$refs.saveDialog.open("edit", 20).setData(row);
+            });
+        },
+        //删除
+        async table_del(row) {
+            this.$API.em.equipment.delete
+                .req(row.id)
+                .then((res) => {
+                    this.$message.success("删除成功");
+                    this.$refs.table.refresh();
+                })
+                .catch((err) => {
+                    return err;
+                });
+        },
+        //提交检验
+        submit() {
+            this.$refs.dialogForm.validate(async (valid) => {
+                if (valid) {
+                    this.isSaveing = true;
+                    this.$API.em.echeckrecord.create.req(this.form).then(res => {
+                        this.visible = false;
+                        this.isSaveing = false;
+                        this.$message.success("操作成功");
+                        this.$refs.drawer_table.refresh();
+                        this.$refs.table.refresh();
+                    }).catch(() => {
+                        this.isSaveing = false;
+                    })
+                }
+            });
+        },
+        //本地更新数据
+        handleSaveSuccess(data, mode) {
+            if (mode == "add") {
+                this.$refs.table.refresh();
+            } else if (mode == "edit") {
+                this.$refs.table.refresh();
+            }
+        },
+        handleQuery() {
+            this.$refs.table.queryData(this.query)
+        },
+        resetQuery() {
+            this.query = {};
+        },
+    },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/em/equipmentz.vue b/src/views/em/equipmentjc.vue
similarity index 100%
rename from src/views/em/equipmentz.vue
rename to src/views/em/equipmentjc.vue
diff --git a/src/views/em/equipmentc.vue b/src/views/em/equipmentjk.vue
similarity index 100%
rename from src/views/em/equipmentc.vue
rename to src/views/em/equipmentjk.vue
diff --git a/src/views/em/equipmentj.vue b/src/views/em/equipmentjl.vue
similarity index 100%
rename from src/views/em/equipmentj.vue
rename to src/views/em/equipmentjl.vue
diff --git a/src/views/em/equipmentzl.vue b/src/views/em/equipmentzl.vue
new file mode 100644
index 00000000..c49a0a3f
--- /dev/null
+++ b/src/views/em/equipmentzl.vue
@@ -0,0 +1,325 @@
+<template>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
+      </div>
+      <div class="right-panel">
+        <el-cascader v-model="query.belong_dept" :options="group" :props="groupsProps" clearable placeholder="所在车间"
+          :show-all-levels="false">
+        </el-cascader>
+        <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
+        <el-table-column type="index" width="50" />
+        <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="设备编号" prop="number">
+        </el-table-column>
+        <el-table-column label="型号规格" prop="model">
+        </el-table-column>
+        <el-table-column label="生产厂" prop="factory" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="生产日期" prop="production_date">
+        </el-table-column>
+        <el-table-column label="购置日期" prop="buy_date">
+        </el-table-column>
+        <el-table-column label="状态">
+          <template #default="scope">
+            <el-tag v-if="scope.row.state === 10" type="success">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state === 20" type="warning">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state === 30">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else type="danger">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="所在车间" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.belong_dept_name }}</template>
+        </el-table-column>
+        <el-table-column label="所在工段" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.mgroup_name }}</template>
+        </el-table-column>
+        <el-table-column label="保管人">
+          <template #default="scope">{{ scope.row.keeper_name }}</template>
+        </el-table-column>
+        <el-table-column label="存放位置" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.place }}</template>
+        </el-table-column>
+        <el-table-column label="备注" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.description }}</template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="left" width="180">
+          <template #default="scope">
+            <el-button link type="primary" @click="table_record(scope.row)" v-auth="'echeckrecord.create'">
+              巡检
+            </el-button>
+            <el-button link type="warning" @click="table_edit(scope.row)" v-auth="'equipment.update'">
+              编辑
+            </el-button>
+            <el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row)" v-auth="'equipment.delete'">
+              <template #reference>
+                <el-button link type="danger">删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </scTable>
+    </el-main>
+  </el-container>
+  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+    @closed="dialog.save = false"></save-dialog>
+  <el-drawer title="巡检记录" v-model="visibleRecord" :size="1000" destroy-on-close @closed="visibleRecord = false">
+    <el-container v-loading="loading">
+      <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'"
+        style="position: absolute;z-index: 10;left: 110px;top: 16px;">新增</el-button>
+      <el-button type="primary" icon="el-icon-download" @click="exportExcel"
+        style="position: absolute;z-index: 10;left:200px;top: 16px;">导出</el-button>
+      <el-main style="padding: 0 20px 20px 20px">
+        <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2">
+          <el-table-column type="index" width="50" />
+          <el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column label="巡检时间" prop="inspect_time">
+          </el-table-column>
+          <el-table-column label="巡检结果" prop="result">
+            <template #default="scope">
+              <span>{{ results_[scope.row.result] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡检人" prop="inspect_user_name">
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="center" width="160px">
+            <template #default="scope">
+              <el-link type="danger" @click="record_del(scope.row)" v-auth="'equipment.delete'">
+                删除
+              </el-link>
+            </template>
+          </el-table-column>
+        </scTable>
+        <scTable ref="drawer_table" :apiObj="apiObj2" row-key="id" stripe :params="query2" id="myTable"
+          style="display: none;">
+          <el-table-column type="index" width="50" />
+          <el-table-column label="设备名称" prop="equipment_name" show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column label="巡检时间" prop="inspect_time">
+          </el-table-column>
+          <el-table-column label="巡检结果" prop="result">
+            <template #default="scope">
+              <span>{{ results_[scope.row.result] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡检人" prop="inspect_user_name">
+          </el-table-column>
+        </scTable>
+      </el-main>
+    </el-container>
+  </el-drawer>
+  <el-dialog title="设备巡检" v-model="visible">
+    <el-form ref="dialogForm" :rules="rules" label-width="100px" :model="form">
+      <el-row>
+        <el-col :md="12" :sm="24" prop="inspect_time">
+          <el-form-item label="巡检时间">
+            <el-date-picker v-model="form.inspect_time" type="datetime" placeholder="巡检时间"
+              value-format="YYYY-MM-DD HH:mm:ss" style="width:100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="巡检人" prop="inspect_user">
+            <span style="display:flex">
+              <el-input readonly v-model="form.inspect_user_name"></el-input>
+              <ehsUserSelect :multiple="false" @submit="getReceptionist" />
+            </span>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="巡检结果" prop="result">
+            <el-select style="width: 100%" v-model="form.result" placeholder="巡检结果">
+              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="备注">
+            <el-input v-model="form.note" placeholder="备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-footer>
+      <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+      <el-button @click="visible = false">取消</el-button>
+    </el-footer>
+  </el-dialog>
+</template>
+<script>
+import saveDialog from "./equipment_form.vue";
+import { genTree } from "@/utils/verificate";
+export default {
+  name: "rparty",
+  components: {
+    saveDialog,
+  },
+  data() {
+    return {
+      deptOptions: [],
+      dialog: {
+        save: false,
+      },
+      apiObj: this.$API.em.equipment.list,
+      paramsEquipment: { type: 30 },
+      query: { type: 30 },
+      apiObj2: this.$API.em.einspect.list,
+      query2: {
+        equipment: ''
+      },
+      group: [],
+      selection: [],
+      state_: {
+        10: '完好',
+        20: '限用',
+        30: '在修',
+        40: '禁用',
+      },
+      groupsProps: {
+        // value: "id",
+        multiple: false,
+        emitPath: false,
+        checkStrictly: true,
+      },
+      // stateOptions: [
+      //   { label: '完好', value: 10 },
+      //   { label: '限用', value: 20 },
+      //   { label: '在修', value: 30 },
+      //   { label: '禁用', value: 40 },
+      // ],
+      results_: {
+        'pass': '合格',
+        'fail': '不合格',
+      },
+      options: [
+        { id: 'pass', name: '合格' },
+        { id: 'fail', name: '不合格' }
+      ],
+      form: {},
+      rules: {
+        check_date: [{ required: true, message: "请选择检验时间" }],
+        check_organization: [{ required: true, message: "请填写检定机构" }],
+      },
+      item: {},
+      visible: false,
+      visibleRecord: false,
+      excelName: ''
+    };
+  },
+  mounted() {
+    this.getDept()
+  },
+  methods: {
+    getDept() {
+      let that = this;
+      that.$API.system.dept.list.req({ page: 0 }).then(res => {
+        that.group = genTree(res);
+      });
+
+    },
+    getReceptionist(data) {
+      this.form.inspect_user = data.id;
+      this.form.inspect_user_name = data.name;
+    },
+    //添加
+    add() {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("add", 10);
+      });
+    },
+    //编辑
+    table_edit(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("edit", 10).setData(row);
+      });
+    },
+    //查看
+    table_show(row) {
+      this.dialog.save = true;
+      this.$nextTick(() => {
+        this.$refs.saveDialog.open("show", 10).setData(row);
+      });
+    },
+    table_record(row) {
+      this.item = row;
+      this.form.equipment = row.id;
+      this.query2.equipment = row.id;
+      this.excelName = row.name;
+      this.$nextTick(() => {
+        this.visibleRecord = true;
+      })
+    },
+    //新增检验
+    record_create() {
+      this.visible = true;
+    },
+    //提交巡检记录
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          this.$API.em.einspect.create.req(this.form).then(res => {
+            this.visible = false;
+            this.isSaveing = false;
+            this.$message.success("操作成功");
+            this.$refs.drawer_table.refresh();
+          }).catch(() => {
+            this.isSaveing = false;
+          })
+        }
+      });
+    },
+    //删除
+    async table_del(row) {
+      this.$API.em.equipment.delete
+        .req(row.id)
+        .then((res) => {
+          this.$message.success("删除成功");
+          return res;
+        })
+        .catch((err) => {
+          return err;
+        });
+    },
+
+    //本地更新数据
+    handleSaveSuccess(data, mode) {
+      if (mode == "add") {
+        this.$refs.table.refresh();
+      } else if (mode == "edit") {
+        this.$refs.table.refresh();
+      }
+    },
+    handleQuery() {
+      this.$refs.table.queryData(this.query)
+    },
+    resetQuery() {
+      this.query = {};
+    },
+    exportExcel() {
+      this.exportLoading = true;
+      this.$XLSX('#myTable', this.excelName)
+      this.exportLoading = false;
+    },
+  },
+};
+</script>
\ No newline at end of file