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 3603719e..5e791df6 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": "equipmentjk",
@@ -1871,7 +1891,7 @@ const routes = [
             "meta": {
               "title": "巡检记录",
               "icon": "el-icon-cellphone",
-              "perms": ["equipment"]
+              "perms": ["einspect"]
             },
             "component": "em/xjRecord"
           },
@@ -2201,7 +2221,7 @@ const routes = [
     "path": "/bigScreenEnp",
     "name": "bigScreenEnp",
     "meta": {
-      "title": "数据大屏Enp",
+      "title": "环保大屏",
       "icon": "el-icon-platform",
       "perms": ["bigScreenEnp"],
       "fullpage": true,
diff --git a/src/utils/enum.js b/src/utils/enum.js
new file mode 100644
index 00000000..e5910710
--- /dev/null
+++ b/src/utils/enum.js
@@ -0,0 +1,59 @@
+/**
+ * 枚举创建工厂（构造函数），扩展枚举对象：keys、values(含key值的[{key,text,type}])、formatter。
+ * @param {*} enumObj 枚举值，支持标准模式{key:{text,type},}，简单模式{key:text,}（会自动转换为标准模式）
+ * @param {*} keyParseFunc key的转换函数，默认null，如果key为整数则传 parseInt
+ */
+export default function EnumFactory(enumObj, keyParseFunc = null) {
+    //复制（继承）enumObj
+    Object.assign(this, enumObj)
+  
+    // keys：枚举的key集合[key]
+    Object.defineProperty(this, 'keys', {
+      value: keyParseFunc ? Object.keys(enumObj).map(s => keyParseFunc(s)) : Object.keys(enumObj)
+    })
+  
+    // 处理 values
+    let values = []
+    const ovalues = Object.values(enumObj)
+    // 主要区分下value是简单类型（字符串）还是对象类型
+    if (typeof ovalues[0] === 'string') {
+      ovalues.forEach((text, index) => {
+        const obj = { key: this.keys[index], text }
+        values.push(obj)
+        this[this.keys[index]] = obj
+      })
+    }
+    else {
+      ovalues.forEach((item, index) => {
+        item.key = this.keys[index]
+        values.push(item)
+      })
+    }
+    // 设置values属性
+    Object.defineProperty(this, 'values', { value: values })
+  
+    // formatter：element中表格绑定枚举数据文本的formatter函数
+    // r、c为行列，可传入null
+    Object.defineProperty(this, 'formatter', {
+      value: function(r, c, value) {
+        return values.filter(v => v.key == value || v.text == value)[0]?.text || 'notfound'
+      }
+    })
+  
+    //枚举定义的数据都是常量，不可修改，冻结一下
+    Object.freeze(this)
+  }
+
+export const runningStateEnum = new EnumFactory({
+    10: { text: '运行', type: 'success' },
+    20: { text: '待机', type: 'primary' },
+    30: { text: '停机', type: 'warning' },
+    40: { text: '故障', type: 'danger' },
+    50: { text: '未知', type: 'info' },
+}, parseInt)
+
+export const drainTypeEnum = new EnumFactory({
+    'product': '生产工艺', 
+    'mtrans': '物料输送',
+    'mstore':'物料储存' 
+})
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue
index 0ec9053f..e3adbac2 100644
--- a/src/views/bigScreen/enpComponents/cems.vue
+++ b/src/views/bigScreen/enpComponents/cems.vue
@@ -2,60 +2,70 @@
     <el-container>
         <el-header style="height: 40%;padding: 0;">
             <el-container>
-                <el-header>
-                    <div class="panel_title">CEMS监测清单</div>
+                <el-header class="panel_title">
+                    <div class="left-panel">CEMS监测清单</div>
+                    <div class="right-panel">
+                        <el-button type="primary" @click="backtoMap">返回地图</el-button>
+                    </div>
                 </el-header>
                 <el-main class="nopadding">
                     <scTable :data="tableData" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id"
                         :params="params" hidePagination hideDo @row-click="rowClick">
                         <el-table-column type="index" width="50" />
-                        <el-table-column prop="equipment_number" label="设备编号" width="120" />
-                        <el-table-column prop="equipment_name" label="设备名称" width="180" />
-                        <el-table-column prop="name" label="监测状态" />
+                        <el-table-column prop="number" label="设备编号" width="120" />
+                        <el-table-column prop="name" label="设备名称" width="160" />
+                        <el-table-column prop="running_state" label="运行状态">
+                            <template #default="scope">
+                                <!-- <span>{{ scope.row.running_state }}</span> -->
+                                <el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
+                            runningStateEnum[scope.row.running_state]?.text }}</el-tag>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="颗粒物实测(mg/m3)" width="180">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.dust_rtd ? scope.row.equipment_envdata.dust_rtd : '-' }}
+                                {{ scope.row.envdata.dust_rtd ? scope.row.envdata.dust_rtd : '-' }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="SO2(mg/m3)" width="180">
+                        <el-table-column label="SO2(mg/m3)" width="160">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.SO2_rtd ? scope.row.equipment_envdata.SO2_rtd : '-' }}
+                                {{ scope.row.envdata.SO2_rtd ? scope.row.envdata.SO2_rtd : '-' }}
                             </template>
                         </el-table-column>
-                        <el-table-column label="NOX(mg/m3)" width="180">
+                        <el-table-column label="NOX(mg/m3)" width="160">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.NOX_rtd ? scope.row.equipment_envdata.NOX_rtd : '-' }}
+                                {{ scope.row.envdata.NOX_rtd ? scope.row.envdata.NOX_rtd : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="颗粒物折算(mg/m3)" width="180">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.dust_zs ? scope.row.equipment_envdata.dust_zs : '-' }}
+                                {{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="温度(℃)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.temperature ? scope.row.equipment_envdata.temperature : '-'
+                                {{ scope.row.envdata.temperature ? scope.row.envdata.temperature :
+                            '-'
                                 }}
                             </template>
                         </el-table-column>
                         <el-table-column label="压力(KPa)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.pressure ? scope.row.equipment_envdata.pressure : '-' }}
+                                {{ scope.row.envdata.pressure ? scope.row.envdata.pressure : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="流速(m/s)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.speed ? scope.row.equipment_envdata.speed : '-' }}
+                                {{ scope.row.envdata.speed ? scope.row.envdata.speed : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="湿度(%)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.humidity ? scope.row.equipment_envdata.humidity : '-' }}
+                                {{ scope.row.envdata.humidity ? scope.row.envdata.humidity : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="流量(m3/h)" width="130">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.flux ? scope.row.equipment_envdata.flux : '-' }}
+                                {{ scope.row.envdata.flux ? scope.row.envdata.flux : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="监测达标率" />
@@ -94,11 +104,13 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import { runningStateEnum } from "@/utils/enum.js";
 export default {
     data() {
         return {
-            apiObj: this.$API.enp.drain_equip.list,
-            params: { drain__type: 10, equipment__type: 20, has_envdata: 'yes' },
+            runningStateEnum,
+            apiObj: this.$API.em.equipment.list,
+            params: { cate__code: 'cems', has_envdata: 'yes' },
             currentEquipmentId: '',
             currentEquipmentName: '',
             timeRange: [],
@@ -137,7 +149,15 @@ export default {
                 },
                 xAxis: { type: 'category' },
                 yAxis: {},
-                series: [{ type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }]
+                series: [{ type: 'line', encode: { y: '颗粒物折算值', seriesName: ["颗粒物折算值"] } },
+                { type: 'line', encode: { y: 'so2折算值', seriesName: ["so2折算值"] } },
+                { type: 'line', encode: { y: 'nox折算值', seriesName: ["nox折算值"] } },
+                { type: 'line', encode: { y: '温度', seriesName: ["温度"] } },
+                { type: 'line', encode: { y: '压力', seriesName: ["压力"] } },
+                { type: 'line', encode: { y: '流速', seriesName: ["流速"] } },
+                { type: 'line', encode: { y: '湿度', seriesName: ["湿度"] } },
+                { type: 'line', encode: { y: '流量', seriesName: ["流量"] } }
+                ]
             },
             query: {
                 "end_time": "",
@@ -148,9 +168,13 @@ export default {
         }
     },
     mounted() {
+        console.log(runningStateEnum[50])
         this.initTimeRange()
     },
     methods: {
+        backtoMap() {
+            this.$emit('close')
+        },
         initTimeRange() {
             var now = new Date();
             var start = new Date();
@@ -158,9 +182,9 @@ export default {
             this.timeRange = [start, now]
         },
         rowClick(row) {
-            this.currentEquipmentId = row.equipment;
-            this.currentEquipmentName = row.equipment_name;
-            this.query.equipment_id = row.equipment;
+            this.currentEquipmentId = row.id;
+            this.currentEquipmentName = row.name;
+            this.query.equipment_id = row.id;
             this.$nextTick(() => { this.handleQuery() })
 
         },
@@ -176,17 +200,18 @@ export default {
                 raise_exception: true
             }).then(res => {
                 let newOption = Object.assign({}, this.basicOption);
-                let ds0 = res.data.ds0
-                ds0.pop()
-                let series = []
-                if (ds0) {
-                    let ds00 = ds0[0]
-                    for (var x = 1, y = ds00.length; x < y; x++) {
-                        series.push({ type: 'line' })
-                    }
-                }
+                // 去除最后一个数
+                // let ds0 = res.data.ds0
+                // ds0.pop()
+                // let series = []
+                // if (ds0) {
+                //     let ds00 = ds0[0]
+                //     for (var x = 1, y = ds00.length; x < y; x++) {
+                //         series.push({ type: 'line' })
+                //     }
+                // }
                 newOption.dataset.source = res.data.ds0;
-                newOption.series = series;
+                // newOption.series = series;
                 newOption.title.text = this.currentEquipmentName;
                 myChart.setOption(newOption);
             }).then(() => { myChart.hideLoading() })
diff --git a/src/views/bigScreen/enpComponents/cemsExport.vue b/src/views/bigScreen/enpComponents/cemsExport.vue
index 9619c7df..9abda20a 100644
--- a/src/views/bigScreen/enpComponents/cemsExport.vue
+++ b/src/views/bigScreen/enpComponents/cemsExport.vue
@@ -4,15 +4,23 @@
             <div class="left-panel">CEMS报表导出</div>
         </el-header>
         <el-main class="nopadding">
-            <div style="text-align: center;margin-top: 8px">
-                <el-date-picker size="large" v-model="query.time" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
-                    placeholder="时间选择" style=" width: 400px" />
-                <el-select size="large" v-model="query.type" placeholder="周期" style="margin-left:4px">
-                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-                <el-button size="large" type="primary" @click="exportExcel" style="margin-left: 4px"
-                    v-loading="eLoading">导出报表</el-button>
-            </div>
+            <el-container>
+                <el-header>
+                    <div class="left-panel">
+                        <el-date-picker size="large" v-model="query.time" type="datetime"
+                            value-format="YYYY-MM-DD HH:mm:ss" placeholder="时间选择" style=" width: 400px" />
+                        <el-select size="large" v-model="query.type" placeholder="周期" style="margin-left:4px">
+                            <el-option v-for="item in typeOptions" :key="item.value" :label="item.label"
+                                :value="item.value" />
+                        </el-select>
+                        <el-button size="large" type="primary" @click="exportExcel" style="margin-left: 4px"
+                            v-loading="eLoading">导出报表</el-button>
+                    </div>
+                </el-header>
+                <el-main class="nopadding">
+
+                </el-main>
+            </el-container>
         </el-main>
     </el-container>
     <!-- <div class="exportContainer">
diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 367a798b..f64bda38 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -24,7 +24,8 @@
                     <div class="right-panel">
                         <el-select v-model="query.level" placeholder="排口等级" style="width:10vw" clearable
                             @change="handleQuery">
-                            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                :value="item.value">
                             </el-option>
                         </el-select>
                         <!-- <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
@@ -92,8 +93,8 @@
                                     <div>
                                         <span class="infotitle">生产能力：</span>
                                         <span v-if="eqs.parameter_json && eqs.parameter_json.生产能力">{{
-                                            eqs.parameter_json.生产能力
-                                        }}</span>
+        eqs.parameter_json.生产能力
+    }}</span>
                                     </div>
                                 </el-col>
                             </el-row>
@@ -110,36 +111,37 @@
                             <el-row class="infoLine">
                                 <el-col :span="12">
                                     <div><span class="infotitle">风量：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.风量">{{ eqz.parameter_json.风量
-                                        }}m³/h</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.风量">{{
+        eqz.parameter_json.风量
+    }}m³/h</span>
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">过滤面积：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.过滤面积">{{
-                                            eqz.parameter_json.过滤面积
-                                        }} m²</span>
+        eqz.parameter_json.过滤面积
+    }} m²</span>
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">布袋材质：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.布袋材质">{{
-                                            eqz.parameter_json.布袋材质
-                                        }} </span>
+        eqz.parameter_json.布袋材质
+    }} </span>
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">过滤风速：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.过滤风速">{{
-                                            eqz.parameter_json.过滤风速
-                                        }} </span>m/min
+        eqz.parameter_json.过滤风速
+    }} </span>m/min
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">额定功率：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.额定功率">{{
                                             eqz.parameter_json.额定功率
-                                        }} </span> Kw
+                                            }} </span> Kw
                                     </div>
                                 </el-col>
                             </el-row>
@@ -163,7 +165,8 @@
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
-                                    <div><span class="infotitle">PM超低排放限值： </span> {{ detailItem.pm_limit }} mg/Nm³</div>
+                                    <div><span class="infotitle">PM超低排放限值： </span> {{ detailItem.pm_limit }} mg/Nm³
+                                    </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">治理措施： </span>{{ detailItem.measure }}</div>
@@ -220,8 +223,9 @@
                 <el-main>
                     <div class="aside_side">
                         <div class="pageTitle">排放口及关联设备动态信息</div>
-                        <div id="dataChart" style="width: 100%; height:200px;margin-top:1vh"></div>
-                        <div id="dataChart2" style="width: 100%; height:200px;margin-top:1vh"></div>
+                        <div id="dataChart" style="width: 100%; height:280px;margin-top:4px; padding: 4px"></div>
+                        <div style="height: 4px"></div>
+                        <div id="dataChart2" style="width: 100%; height:140px; padding: 4px"></div>
                     </div>
 
                 </el-main>
@@ -262,7 +266,7 @@ export default {
             biquery: {
                 end_time: '2024-02-01',
                 start_time: '2024-01-29',
-                time_bucket: "1 minute",
+                time_bucket: "5 minute",
                 equipment_id: "3491356310052896768",
             },
             basicOption: {
@@ -346,104 +350,78 @@ export default {
             this.detailItem = row;
             this.$nextTick(() => {
                 this.getEquipments(row.equipments);
-                this.getDetailData();
             })
 
         },
         getEquipments(ids) {
             let that = this;
-            console.log(ids);
+            let reqs = [];
             ids.forEach(id => {
-                that.$API.em.equipment.item.req(id).then(res => {
+                reqs.push(that.$API.em.equipment.item.req(id).then(res => {
                     if (res.type == 10) {
                         that.eqs = res;
-                    } else if (res.type == 20) {
+                    } else if (res.type == 40) {
                         that.eqc = res;
                     } else if (res.type == 30) {
                         that.eqz = res;
                     }
-                })
+                }))
             });
+            const promise = Promise.all(reqs);
+            promise.then(() => {
+                this.getDetailData()
+            })
+
         },
         getDetailData() {
+            var now = new Date();
+            var start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
             var that = this;
             var chartDom = document.getElementById('dataChart');
             var chartDom2 = document.getElementById('dataChart2');
-            var myChart = echarts.init(chartDom);
-            var myChart2 = echarts.init(chartDom2);
-            // let option = {
-            //     tooltip: {
-            //         trigger: 'axis',
-            //         position: function (pt) {
-            //             return [pt[0], '10%'];
-            //         }
-            //     },
-            //     title: {
-            //         left: 'center',
-            //         text: '动态信息展示'
-            //     },
-            //     xAxis: {
-            //         type: 'time',
-            //         boundaryGap: false
-            //     },
-            //     yAxis: {
-            //         type: 'value',
-            //         boundaryGap: [0, '100%']
-            //     },
-            //     dataZoom: [
-            //         {
-            //             type: 'inside',
-            //             start: 0,
-            //             end: 20
-            //         },
-            //         {
-            //             start: 0,
-            //             end: 20
-            //         }
-            //     ],
-            //     series: [
-            //         {
-            //             name: 'Fake Data',
-            //             type: 'line',
-            //             smooth: true,
-            //             symbol: 'none',
-            //             areaStyle: {},
-            //             data: data
-            //         }
-            //     ]
-            // };
-            // myChart.setOption(option);
+            var myChart = echarts.init(chartDom, 'dark');
+            var myChart2 = echarts.init(chartDom2, 'dark');
             let params = {
                 query: that.biquery,
                 // raise_exception: true
             };
+            params.query['start_time'] = this.$TOOL.dateFormat(start, 'yyyy-MM-dd hh:mm:00')
+            params.query['end_time'] = this.$TOOL.dateFormat(now, 'yyyy-MM-dd hh:mm:00')
+            console.log(this.eqc)
+            // params.query['equipment_id'] = this.eqc.id
+            myChart.showLoading();
+            myChart2.showLoading();
             this.$API.bi.dataset.exec.req('enp_edata2', params).then(res => {
                 let newOption = Object.assign({}, this.basicOption);
-                let ds0 = res.data.ds0
-                let series = []
-                if (ds0) {
-                    let ds00 = ds0[0]
-                    for (var x = 1, y = ds00.length; x < y; x++) {
-                        series.push({ type: 'line' })
-                    }
-                }
+                newOption.series = [{ type: 'line', encode: { y: '颗粒物折算值', seriesName: ["颗粒物折算值"] } },
+                { type: 'line', encode: { y: 'so2折算值', seriesName: ["so2折算值"] } },
+                { type: 'line', encode: { y: 'nox折算值', seriesName: ["nox折算值"] } },
+                { type: 'line', encode: { y: '温度', seriesName: ["温度"] } },
+                { type: 'line', encode: { y: '压力', seriesName: ["压力"] } },
+                { type: 'line', encode: { y: '流速', seriesName: ["流速"] } },
+                { type: 'line', encode: { y: '湿度', seriesName: ["湿度"] } },
+                { type: 'line', encode: { y: '流量', seriesName: ["流量"] } }
+                ]
                 newOption.dataset.source = res.data.ds0;
                 newOption.dataZoom.startValue = that.biquery.start_time;
                 newOption.title.text = that.eqc.name;
-                newOption.series = series;
+                myChart.hideLoading();
                 myChart.setOption(newOption);
                 // myChart2.setOption(newOption);
                 // echarts.connect([myChart, myChart2])
             }).then(() => {
+                params['equipment_id'] = this.eqs.id
                 that.$API.bi.dataset.exec.req('eq_status', params).then(res2 => {
                     let newOption2 = Object.assign({}, this.basicOption);
+                    newOption2.yAxis.minInterval = 1;
                     newOption2.dataset.source = res2.data.ds0;
                     newOption2.dataZoom.startValue = that.biquery.start_time;
-                    newOption2.title.text = that.eqc.name;
+                    newOption2.title.text = that.eqs.name;
                     myChart2.setOption(newOption2);
+                    myChart2.hideLoading()
                     echarts.connect([myChart, myChart2])
-                }).then(() => { myChart.hideLoading() })
-                myChart.hideLoading()
+                })
             })
         },
     }
@@ -522,7 +500,7 @@ export default {
     line-height: 5vh;
     color: #ffffff;
     font-size: 1.2vw;
-    padding-left: 6vw;
+    padding-left: 1vw;
 }
 
 /*  */
diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue
index 601abcd1..8dd186c5 100644
--- a/src/views/bigScreen/enpComponents/pollutant.vue
+++ b/src/views/bigScreen/enpComponents/pollutant.vue
@@ -15,8 +15,8 @@
                             </div>
                             <div class="right-panel">
                                 <el-select v-model="query.cate" placeholder="污染源分类" @change="handleQuery" clearable>
-                                    <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
-                                        :value="item.id"></el-option>
+                                    <el-option v-for="e in drainTypeEnum.values" :key="e.key" :value="e.key"
+                                        :label="e.text"></el-option>
                                 </el-select>
                             </div>
                         </el-header>
@@ -93,8 +93,8 @@
                                     <div>
                                         <span class="infotitle">生产能力：</span>
                                         <span v-if="eqs.parameter_json && eqs.parameter_json.生产能力">{{
-                                            eqs.parameter_json.生产能力
-                                        }}</span>
+        eqs.parameter_json.生产能力
+    }}</span>
                                     </div>
                                 </el-col>
                             </el-row>
@@ -111,36 +111,37 @@
                             <el-row class="infoLine">
                                 <el-col :span="12">
                                     <div><span class="infotitle">风量：</span>
-                                        <span v-if="eqz.parameter_json && eqz.parameter_json.风量">{{ eqz.parameter_json.风量
-                                        }}m³/h</span>
+                                        <span v-if="eqz.parameter_json && eqz.parameter_json.风量">{{
+        eqz.parameter_json.风量
+    }}m³/h</span>
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">过滤面积：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.过滤面积">{{
-                                            eqz.parameter_json.过滤面积
-                                        }} m²</span>
+        eqz.parameter_json.过滤面积
+    }} m²</span>
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">布袋材质：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.布袋材质">{{
-                                            eqz.parameter_json.布袋材质
-                                        }} </span>
+        eqz.parameter_json.布袋材质
+    }} </span>
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">过滤风速：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.过滤风速">{{
                                             eqz.parameter_json.过滤风速
-                                        }} </span>m/min
+                                            }} </span>m/min
                                     </div>
                                 </el-col>
                                 <el-col :span="12">
                                     <div><span class="infotitle">额定功率：</span>
                                         <span v-if="eqz.parameter_json && eqz.parameter_json.额定功率">{{
                                             eqz.parameter_json.额定功率
-                                        }} </span> Kw
+                                            }} </span> Kw
                                     </div>
                                 </el-col>
                             </el-row>
@@ -178,17 +179,17 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import { drainTypeEnum } from "@/utils/enum.js";
 export default {
     data() {
         return {
+            drainTypeEnum,
             count: 0,
             eqs: {},
             eqc: {},
             eqz: {},
             pollutantDetail: false,
             query: {},
-
-            cateOptions: [{ id: 'mtrans', name: '生产工艺' }, { id: 'product', name: '物料输送' }, { id: 'mstore', name: '物料储存' }],
             apiObj: this.$API.enp.drain.list,
             params: { type: 20 },
             detailItem: {},
diff --git a/src/views/bigScreen/enpComponents/pollutant2.vue b/src/views/bigScreen/enpComponents/pollutant2.vue
index 36505cc9..5d152f5e 100644
--- a/src/views/bigScreen/enpComponents/pollutant2.vue
+++ b/src/views/bigScreen/enpComponents/pollutant2.vue
@@ -9,28 +9,31 @@
                     <scTable :data="tableData" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id"
                         :params="params" hidePagination hideDo @row-click="rowClick">
                         <el-table-column type="index" width="50" />
-                        <el-table-column prop="equipment_number" label="设备编号" width="120" />
-                        <el-table-column prop="equipment_name" label="设备名称" width="180" />
+                        <el-table-column prop="number" label="设备编号" width="120" />
+                        <el-table-column prop="name" label="设备名称" width="180" />
                         <el-table-column prop="mgroup_name" label="所属工段" width="120">
+                        </el-table-column>
+                        <el-table-column label="监测状态">
                             <template #default="scope">
-                                <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
+                                <el-tag :type="runningStateEnum[scope.row.running_state]?.type">{{
+                        runningStateEnum[scope.row.running_state]?.text }}</el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="监测状态" />
                         <el-table-column label="TSP(mg/m3)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.tsp ? scope.row.equipment_envdata.tsp : '-' }}
+                                {{ scope.row.envdata.tsp ? scope.row.envdata.tsp : '-' }}
                             </template>
                         </el-table-column>
                         <el-table-column label="温度(℃)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.temperature ? scope.row.equipment_envdata.temperature : '-'
+                                {{ scope.row.envdata.temperature ? scope.row.envdata.temperature :
+                        '-'
                                 }}
                             </template>
                         </el-table-column>
                         <el-table-column label="湿度(%)">
                             <template #default="scope">
-                                {{ scope.row.equipment_envdata.humidity ? scope.row.equipment_envdata.humidity : '-' }}
+                                {{ scope.row.envdata.humidity ? scope.row.envdata.humidity : '-' }}
                             </template>
                         </el-table-column>
                     </scTable>
@@ -68,11 +71,13 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import { runningStateEnum } from "@/utils/enum.js";
 export default {
     data() {
         return {
-            apiObj: this.$API.enp.drain_equip.list,
-            params: { drain__type: 20, equipment__type: 20, has_envdata: 'yes' },
+            runningStateEnum,
+            apiObj: this.$API.em.equipment.list,
+            params: { cate__code: 'tsp', has_envdata: 'yes' },
             currentEquipmentId: '',
             currentEquipmentName: '',
             timeRange: [],
@@ -129,9 +134,9 @@ export default {
             this.timeRange = [start, now]
         },
         rowClick(row) {
-            this.currentEquipmentId = row.equipment;
-            this.currentEquipmentName = row.equipment_name;
-            this.query.equipment_id = row.equipment;
+            this.currentEquipmentId = row.id;
+            this.currentEquipmentName = row.name;
+            this.query.equipment_id = row.id;
             this.$nextTick(() => { this.handleQuery() })
 
         },
diff --git a/src/views/bigScreen/enpComponents/smarg_trans.vue b/src/views/bigScreen/enpComponents/smarg_trans.vue
index 43acd983..6af98d52 100644
--- a/src/views/bigScreen/enpComponents/smarg_trans.vue
+++ b/src/views/bigScreen/enpComponents/smarg_trans.vue
@@ -3,16 +3,17 @@
         <el-header class="searchWrap">
             <div class="left-panel">
                 <el-select v-model="query.mgroup" placeholder="工段 " @change="handleQuery" clearable>
-                    <el-option v-for="item in mgroupOptions" :key="item" :label="item.name" :value="item.id"></el-option>
+                    <el-option v-for="item in mgroupOptions" :key="item" :label="item.name"
+                        :value="item.id"></el-option>
                 </el-select>
             </div>
             <div class="right-panel">
-                <div class="typebox">
+                <!-- <div class="typebox">
                     <span style="color:red;">
                         <img style="height: 16px; weight: 16px;"
                             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAABgElEQVQ4T52TzS4DURiG3++0op0REgtiU2emKsSmSz8XwB2oK1BXgCtQV4ArUFeAC/Cz7I7QzkxtJBYSkhmVtOeTM6Hamv6Z7XneZ97v/BD6fK401xEHrLJ/2QulXosMxJ5so6SZlBNkCWh043uK3LSxTUzHOszEeasSnAwtepybHB9pfD6AMB2KGC/12GgmU359j5J1beRK84AE9lpDrFCwPH9/YJEzk5gVCXEPokRbiLmmamrBfq5VO2WRjTzbPAWQ07B0/JDxbJO/w0Xp+Ft9Ra5MLhOJaxBCwR8Rg5nVquV93LbKOhuRZxlXIFr5gSIa6Z2/kW6wps/gh2sTuTK5SUIUW/8UKdIGpXKW93H2R+RKJEgYdwDJQUQAe6yCRctDTfPNRq5t7hJQ6Pdk2q4DsGc5/mFTVE5jKq5MffkmOkXdRgs5xltd+PNzFbyEjaq2ccSgfFSbnqJwJD6edYIdqqbGlhBXJQbFhxnrd5O5jrrI6uM+B9HGfyTNDPPFF8KilQlAZVW/AAAAAElFTkSuQmCC" />
                         产治未同步</span>
-                </div>
+                </div> -->
                 <div class="typebox">
                     <div class="greenb radio"></div>
                     <div class="green">设备正常</div>
@@ -32,8 +33,8 @@
             </div>
         </el-header>
         <el-main class="nopadding">
-            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination hideDo
-                :query="query">
+            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination
+                hideDo :query="query">
                 <el-table-column prop="number" label="污染源编号" />
                 <el-table-column prop="name" label="污染源名称" />
                 <el-table-column prop="mgroup_name" label="所在工段" />
@@ -43,7 +44,7 @@
                             <div v-if="item.type == 10">
                                 <span>{{ item.name }} |
                                     待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
-                                    }}</span> h
+                                        }}</span> h
                                 </span>
                             </div>
                         </div>
@@ -55,7 +56,7 @@
                             <div v-if="item.type == 30">
                                 <span>{{ item.name }} |
                                     待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
-                                    }}</span> h
+                                        }}</span> h
                                 </span>
                             </div>
                         </div>
@@ -67,7 +68,7 @@
                             <div v-if="item.type == 20">
                                 <span>{{ item.name }} |
                                     待机 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_standby
-                                    }}</span> h
+                                        }}</span> h
                                 </span>
                             </div>
                         </div>
diff --git a/src/views/bigScreen/enpComponents/smartg_prod.vue b/src/views/bigScreen/enpComponents/smartg_prod.vue
index 349707e0..282e0fc6 100644
--- a/src/views/bigScreen/enpComponents/smartg_prod.vue
+++ b/src/views/bigScreen/enpComponents/smartg_prod.vue
@@ -3,16 +3,17 @@
         <el-header class="searchWrap">
             <div class="left-panel">
                 <el-select v-model="query.mgroup" placeholder="工段 " @change="handleQuery" clearable>
-                    <el-option v-for="item in mgroupOptions" :key="item" :label="item.name" :value="item.id"></el-option>
+                    <el-option v-for="item in mgroupOptions" :key="item" :label="item.name"
+                        :value="item.id"></el-option>
                 </el-select>
             </div>
             <div class="right-panel">
-                <div class="typebox">
+                <!-- <div class="typebox">
                     <span style="color:red;">
                         <img style="height: 16px; weight: 16px;"
                             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAABgElEQVQ4T52TzS4DURiG3++0op0REgtiU2emKsSmSz8XwB2oK1BXgCtQV4ArUFeAC/Cz7I7QzkxtJBYSkhmVtOeTM6Hamv6Z7XneZ97v/BD6fK401xEHrLJ/2QulXosMxJ5so6SZlBNkCWh043uK3LSxTUzHOszEeasSnAwtepybHB9pfD6AMB2KGC/12GgmU359j5J1beRK84AE9lpDrFCwPH9/YJEzk5gVCXEPokRbiLmmamrBfq5VO2WRjTzbPAWQ07B0/JDxbJO/w0Xp+Ft9Ra5MLhOJaxBCwR8Rg5nVquV93LbKOhuRZxlXIFr5gSIa6Z2/kW6wps/gh2sTuTK5SUIUW/8UKdIGpXKW93H2R+RKJEgYdwDJQUQAe6yCRctDTfPNRq5t7hJQ6Pdk2q4DsGc5/mFTVE5jKq5MffkmOkXdRgs5xltd+PNzFbyEjaq2ccSgfFSbnqJwJD6edYIdqqbGlhBXJQbFhxnrd5O5jrrI6uM+B9HGfyTNDPPFF8KilQlAZVW/AAAAAElFTkSuQmCC" />
                         产治未同步</span>
-                </div>
+                </div> -->
                 <div class="typebox">
                     <div class="greenb radio"></div>
                     <div class="green">设备正常</div>
@@ -32,8 +33,8 @@
             </div>
         </el-header>
         <el-main class="nopadding">
-            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination hideDo
-                :query="query">
+            <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination
+                hideDo :query="query">
                 <el-table-column prop="number" label="污染源编号" />
                 <el-table-column prop="name" label="污染源名称" />
                 <el-table-column prop="mgroup_name" label="所在工段" />
@@ -43,7 +44,7 @@
                             <div v-if="item.type == 10">
                                 <span>{{ item.name }} |
                                     运行时间 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_run
-                                    }}</span> h
+                                        }}</span> h
                                 </span>
                             </div>
                         </div>
@@ -55,7 +56,7 @@
                             <div v-if="item.type == 30">
                                 <span>{{ item.name }} |
                                     运行时间 <span style="font-weight:bold; font-size: 1.6vh">{{ item.total_duration_run
-                                    }}</span> h
+                                        }}</span> h
                                 </span>
                             </div>
                         </div>
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/equipmentc.vue b/src/views/em/equipmentc.vue
deleted file mode 100644
index 7232e7f2..00000000
--- a/src/views/em/equipmentc.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<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-input v-model="query.search" placeholder="名称" clearable style="margin-right: 5px;"></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="model">
-        </el-table-column>
-        <el-table-column label="量范" prop="model">
-        </el-table-column>
-        <el-table-column label="出厂编号" prop="model">
-        </el-table-column>
-        <el-table-column label="启用日期" prop="model">
-        </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="cycle" width="100">
-        </el-table-column>
-        <el-table-column label="检定日期" prop="check_date" width="100">
-          <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="下次检定日期" prop="next_check_date" width="100">
-        </el-table-column>
-        <el-table-column label="精度等级" prop="accuracy_level" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column label="安装位置" prop="place" show-overflow-tooltip>
-        </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="center" width="170px">
-          <template #default="scope">
-            <el-button link type="primary" v-if="scope.row.cycle !== null" @click="table_record(scope.row)"
-              v-auth="'einspect.create'">
-              检定记录
-            </el-button>
-            <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'equipment.update'">
-              编辑
-            </el-button>
-            <el-button link type="danger" @click="table_del(scope.row)" v-auth="'equipment.delete'">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </scTable>
-      <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="check_date">
-              <el-form-item label="检定时间">
-                <el-date-picker v-model="form.check_date" type="date" placeholder="检定时间" value-format="YYYY-MM-DD"
-                  style="width:100%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="检定单位" prop="check_organization">
-                <el-input v-model="form.check_organization" placeholder="检定单位" />
-              </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>
-      <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-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="check_date">
-              </el-table-column>
-              <el-table-column label="检定结果" prop="result">
-                <template #default="scope">
-                  <span>{{ state_[scope.row.result] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="检定单位" prop="check_organization">
-              </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>
-          </el-main>
-        </el-container>
-      </el-drawer>
-    </el-main>
-  </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
-    @closed="dialog.save = false"></save-dialog>
-</template>
-<script>
-import saveDialog from "./equipment_form.vue";
-export default {
-  name: "计量设备",
-  components: {
-    saveDialog,
-  },
-  data() {
-    return {
-      dialog: {
-        save: false,
-        permission: false,
-      },
-      apiObj: this.$API.em.equipment.list,
-      query: {
-        page: 1,
-        page_size: 20,
-        type: 20,
-      },
-      apiObj2: this.$API.em.echeckrecord.list,
-      query2: {
-        page: 1,
-        page_size: 20,
-        equipment: ''
-      },
-      visible: false,
-      isSaveing: false,
-      visibleRecord: false,
-      selection: [],
-      state_: {
-        10: '完好',
-        20: '限用',
-        30: '在修',
-        40: '禁用',
-      },
-      options: [
-        { id: 10, name: '正常' },
-        { id: 20, name: '异常' }
-      ],
-      form: {},
-      rules: {
-        check_date: [{ required: true, message: "请选择检验时间" }],
-        check_organization: [{ required: true, message: "请填写检定机构" }],
-      },
-      item: {},
-    };
-  },
-  methods: {
-    table_record(row) {
-      this.item = row;
-      this.form.equipment = row.id;
-      this.query2.equipment = row.id;
-      this.$nextTick(() => {
-        this.visibleRecord = true;
-      })
-    },
-    //添加
-    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);
-      });
-    },
-    //查看
-    table_show(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("show", 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;
-        });
-    },
-    //新增检验
-    record_create() {
-      this.visible = true;
-    },
-    //提交检验
-    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;
-          })
-        }
-      });
-    },
-    //删除检验
-    record_del(row) {
-      this.$API.em.echeckrecord.delete.req(row.id).then((res) => {
-        this.$message.success("删除成功");
-        this.$refs.drawer_table.refresh();
-        this.$refs.table.refresh();
-      }).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 = {};
-    },
-  },
-};
-</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/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
diff --git a/src/views/ops/menu.vue b/src/views/ops/menu.vue
index 128d0608..26a9f51a 100644
--- a/src/views/ops/menu.vue
+++ b/src/views/ops/menu.vue
@@ -2,30 +2,15 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          @click="addMenu"
-        ></el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="addMenu"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
-        ref="table"
-        :isTree="true"
-        :apiObj="apiObj"
-        :params="params"
-        row-key="id"
-        @selection-change="selectionChange"
-        hidePagination
-      >
+      <scTable ref="table" :isTree="true" :apiObj="apiObj" :params="params" row-key="id"
+        @selection-change="selectionChange" hidePagination>
         <!-- <el-table-column type="selection" width="50"></el-table-column> -->
         <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column
-          label="菜单名称"
-          prop="name"
-          min-width="200"
-        ></el-table-column>
+        <el-table-column label="菜单名称" prop="name" min-width="200"></el-table-column>
         <el-table-column label="类型" prop="type" min-width="200">
           <template #default="scope">
             <span>{{ types[scope.row.type] }}</span>
@@ -36,43 +21,23 @@
             <el-tag v-for="i in scope.row.codes" v-bind:key="i">{{ i }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          label="排序"
-          prop="sort"
-          min-width="200"
-        ></el-table-column>
+        <el-table-column label="排序" prop="sort" min-width="200"></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template #default="scope">
-            <el-button
-              type="primary"
-              size="small"
-              @click="editMenu(scope.row, scope.$index)"
-              >编辑</el-button
-            >
-            <el-button
-              type="danger"
-              size="small"
-              @click="delMenu(scope.row.id)"
-              >删除</el-button
-            >
+            <el-button type="primary" size="small" @click="editMenu(scope.row, scope.$index)">编辑</el-button>
+            <el-button type="danger" size="small" @click="delMenu(scope.row.id)">删除</el-button>
             <!--<el-popconfirm title="确定删除吗？" @confirm="delMenu(scope.row, scope.$index)">
 							<template #reference>
 								<el-button link size="small">删除</el-button>
 							</template>
-						</el-popconfirm>-->
+  </el-popconfirm>-->
           </template>
         </el-table-column>
       </scTable>
     </el-main>
   </el-container>
   <el-dialog :title="titleMap[type]" v-model="limitedVisible" :width="600">
-    <el-form
-      :model="addForm"
-      :rules="rules"
-      ref="addForm"
-      label-width="100px"
-      label-position="right"
-    >
+    <el-form :model="addForm" :rules="rules" ref="addForm" label-width="100px" label-position="right">
       <el-form-item label="类型" prop="type">
         <el-radio-group v-model="addForm.type">
           <el-radio :label="10">目录</el-radio>
@@ -85,49 +50,23 @@
       </el-form-item>
       <el-form-item label="标识">
         <!-- <el-input v-model="codes" clearable style="width: 90%;"></el-input> -->
-        <el-select
-          v-model="addForm.codes"
-          multiple
-          filterable
-          allow-create
-          default-first-option
-          :reserve-keyword="false"
-          placeholder="权限标识(回车添加多个)"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in permCodes"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
+        <el-select v-model="addForm.codes" multiple filterable allow-create default-first-option
+          :reserve-keyword="false" placeholder="权限标识(回车添加多个)" style="width: 100%">
+          <el-option v-for="item in permCodes" :key="item" :label="item" :value="item" />
         </el-select>
       </el-form-item>
       <el-form-item label="父级">
-        <el-cascader
-          v-model="addForm.parent"
-          :options="group"
-          :props="groupsProps"
-          :show-all-levels="false"
-          clearable
-          style="width: 100%"
-          @change="handleChange"
-        ></el-cascader>
+        <el-cascader v-model="addForm.parent" :options="group" :props="groupsProps" :show-all-levels="false" clearable
+          style="width: 100%" @change="handleChange"></el-cascader>
       </el-form-item>
       <el-form-item label="排序">
-        <el-input-number
-          v-model="addForm.sort"
-          controls-position="right"
-          :min="1"
-          style="width: 100%"
-        ></el-input-number>
+        <el-input-number v-model="addForm.sort" controls-position="right" :min="1"
+          style="width: 100%"></el-input-number>
       </el-form-item>
     </el-form>
     <template #footer>
       <el-button @click="limitedVisible = false">取 消</el-button>
-      <el-button type="primary" :loading="isSaving" @click="submitHandle()"
-        >保 存</el-button
-      >
+      <el-button type="primary" :loading="isSaving" @click="submitHandle()">保 存</el-button>
     </template>
   </el-dialog>
 </template>
@@ -232,12 +171,7 @@ export default {
         confirmButtonClass: "el-button--danger",
       }).then(() => {
         this.$API.system.permission.delete.req(id).then((res) => {
-          if (res.err_msg) {
-            this.$message.error(res.err_msg);
-            this.$refs.table.refresh();
-          } else {
-            this.$message.success("操作成功");
-          }
+          this.$refs.table.refresh();
         });
       });
     },
@@ -280,8 +214,8 @@ export default {
     },
     //搜索
     handleQuery() {
-				this.$refs.table.queryData(this.query)
-			},
+      this.$refs.table.queryData(this.query)
+    },
     //本地更新数据
     handleSaveSuccess(data, mode) {
       if (mode == "add") {
@@ -306,6 +240,7 @@ export default {
   right: 0;
   top: 0;
 }
+
 .formSaveButton,
 .formDelButton {
   padding: 0;
@@ -318,6 +253,7 @@ export default {
   left: 20px;
   top: 0;
 }
+
 .formDelButton {
   left: 60px;
 }