diff --git a/src/views/bigScreen/enpComponents/envirmonitor.vue b/src/views/bigScreen/enpComponents/envirmonitor.vue
index 48ea7ee0..342cb7f4 100644
--- a/src/views/bigScreen/enpComponents/envirmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirmonitor.vue
@@ -19,27 +19,9 @@
                             车辆总数：<span class="totalNumber">0</span>
                         </div>
                         <div>
-                            <el-select v-model="query.timetype" placeholder="时间类型" @change="timeHandleQuery" clearable>
-                                <el-option v-for="item in timeOptions" :key="item" :label="item" :value="item"></el-option>
-                            </el-select>
-                            <!-- 时间 -->
-                            <el-date-picker v-model="query.time" v-if="query.timetype == '日'" type="date" placeholder="选择时间"
-                                format="YYYY-MM-DD" value-format="YYYY-MM-DD" :picker-options="pickerOptions" />
-                            <el-date-picker v-model="query.time" v-else-if="query.timetype == '月'" type="month"
-                                placeholder="选择月" format="YYYY-MM" value-format="YYYY-MM" :picker-options="pickerOptions" />
-                            <el-date-picker v-model="query.time" v-else-if="query.timetype == '年'" type="year"
-                                placeholder="选择年" format="YYYY" value-format="YYYY" :picker-options="pickerOptions" />
-                            <el-select v-model="query.cate" placeholder="车辆分类" @change="carHandleQuery" clearable>
-                                <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
-                                    :value="item.id"></el-option>
-                            </el-select>
-                            <el-select v-model="query.type" placeholder="出入类型" style="width:7vw">
-                                <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select>
-                            <el-select v-model="query.status" placeholder="行驶证状态" style="width:7vw">
-                                <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
+                            <el-select v-model="query.mgroup" placeholder="全部工序" @change="handleQuery" clearable>
+                                <el-option v-for="item in processOptions" :key="item" :label="item"
+                                    :value="item"></el-option>
                             </el-select>
                             <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
                                 placeholder=""></el-input>
@@ -50,12 +32,23 @@
                 <el-main>
                     <scTable :data="tableData" :apiObj="apiObj" size="large" style="" @row-click="rowClick">
                         <el-table-column prop="index" label="序号"></el-table-column>
-                        <el-table-column prop="number" label="车牌号码"></el-table-column>
-                        <el-table-column prop="level" label="过门禁时间"></el-table-column>
-                        <el-table-column prop="mgroup" label="进出厂类型"></el-table-column>
-                        <el-table-column prop="eqpment" label="门禁名称"></el-table-column>
-                        <el-table-column prop="mgroup" label="车辆识别代号（VIN）"></el-table-column>
-                        <el-table-column prop="mgroup" label="行驶证状态"></el-table-column>
+                        <el-table-column prop="number" label="设备编号"></el-table-column>
+                        <el-table-column prop="level" label="设备名称"></el-table-column>
+                        <el-table-column prop="mgroup" label="设备类型"></el-table-column>
+                        <el-table-column prop="eqpment" label="所属工序"></el-table-column>
+                        <el-table-column prop="mgroup" label="当前状态"></el-table-column>
+                        <el-table-column label="PM2.5" align="center">
+                            <el-table-column prop="mgroup" label="实测值"></el-table-column>
+                            <el-table-column prop="mgroup" label="预警值"></el-table-column>
+                        </el-table-column>
+                        <el-table-column prop="mgroup" label="PM10" align="center">
+                            <el-table-column prop="mgroup" label="实测值"></el-table-column>
+                            <el-table-column prop="mgroup" label="预警值"></el-table-column>
+                        </el-table-column>
+                        <el-table-column prop="level" label="湿度"></el-table-column>
+                        <el-table-column prop="mgroup" label="温度"></el-table-column>
+                        <el-table-column prop="eqpment" label="大气压"></el-table-column>
+                        <el-table-column prop="mgroup" label="风向"></el-table-column>
                     </scTable>
                 </el-main>
             </el-container>
@@ -67,21 +60,7 @@ export default {
     data() {
         return {
             query: {},
-            cateOptions: [
-                { id: 1, name: '货车' },
-                { id: 2, name: '罐车' },
-            ],
-            typeOptions: [
-                { id: '', name: '全部' },
-                { id: 1, name: '进厂' },
-                { id: 2, name: '出厂' }
-            ],
-            statusOptions: [
-                { id: '', name: '全部' },
-                { id: 10, name: '已录入' },
-                { id: 20, name: '未录入' }
-            ],
-            timeOptions: ['日', '月', '年'],
+            processOptions: [],
             apiObj: this.$API.enp.vehicle_access,
             params: { type: 2 },
         }
diff --git a/src/views/bigScreen/enpComponents/eqments.vue b/src/views/bigScreen/enpComponents/eqments.vue
index f3843fae..061c2f6a 100644
--- a/src/views/bigScreen/enpComponents/eqments.vue
+++ b/src/views/bigScreen/enpComponents/eqments.vue
@@ -16,20 +16,24 @@
                 <el-header>
                     <div class="searchWrap">
                         <div style="font-size: 1vh;">
-                            设备总数：<span class="totalNumber">0</span>
+                            <span class="eqmCateName">设备总数:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">在线:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">离线:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">运行:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">待机:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">停机:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">故障:</span><span class="totalNumber">0</span>
+                            <span class="eqmCateName">未知:</span><span class="totalNumber">0</span>
                         </div>
                         <div>
-                            <el-select v-model="query.timetype" placeholder="全部工序" @change="timeHandleQuery" clearable>
-                                <el-option v-for="item in timeOptions" :key="item" :label="item" :value="item"></el-option>
+                            <el-select v-model="query.mgroup" placeholder="全部工序" @change="handleQuery" clearable>
+                                <el-option v-for="item in processOptions" :key="item" :label="item"
+                                    :value="item"></el-option>
                             </el-select>
-                            <el-select v-model="query.cate" placeholder="全部单元" @change="carHandleQuery" clearable>
-                                <el-option v-for="item in cateOptions" :key="item.id" :label="item.name"
+                            <el-select v-model="query.type" placeholder="设备类型" @change="handleQuery" clearable>
+                                <el-option v-for="item in typeOptions" :key="item.id" :label="item.name"
                                     :value="item.id"></el-option>
                             </el-select>
-                            <el-select v-model="query.type" placeholder="TSP监测仪表" style="width:7vw">
-                                <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select>
                             <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
                                 placeholder="设备名称/设备编号"></el-input>
                             <el-button @click="handleQuery">查询</el-button>
@@ -37,14 +41,19 @@
                     </div>
                 </el-header>
                 <el-main>
-                    <scTable :data="tableData" :apiObj="apiObj" size="large" style="" @row-click="rowClick">
+                    <scTable ref="table" :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large"
+                        style="" @row-click="rowClick">
                         <el-table-column prop="index" label="序号"></el-table-column>
                         <el-table-column prop="number" label="设备编号"></el-table-column>
-                        <el-table-column prop="level" label="设备名称"></el-table-column>
-                        <el-table-column prop="mgroup" label="设备类型"></el-table-column>
-                        <el-table-column prop="eqpment" label="所属工序"></el-table-column>
-                        <el-table-column prop="mgroup" label="当前状态"></el-table-column>
-                        <el-table-column prop="mgroup" label="设备信息"></el-table-column>
+                        <el-table-column prop="name" label="设备名称"></el-table-column>
+                        <el-table-column prop="type" label="设备类型">
+                            <template #default="scope">
+                                {{ type_[scope.row.type] }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="mgroup" label="所属工序"></el-table-column>
+                        <el-table-column prop="state" label="当前状态"></el-table-column>
+                        <el-table-column prop="description" label="设备信息"></el-table-column>
                     </scTable>
                 </el-main>
             </el-container>
@@ -55,24 +64,31 @@
 export default {
     data() {
         return {
-            query: {},
-            cateOptions: [
-                { id: 1, name: '货车' },
-                { id: 2, name: '罐车' },
-            ],
+            query: {
+                type: 10,
+                mgroup: null,
+                search: ''
+            },
             typeOptions: [
-                { id: '', name: 'TSP监测仪表' },
-                // { id: 1, name: 'TSP监测仪表' },
-                // { id: 2, name: 'TSP监测仪表' }
+                { id: 10, name: '生产设备' },
+                { id: 20, name: '检测设备' },
+                { id: 30, name: '治理设备' },
             ],
-            statusOptions: [
-                { id: '', name: '全部' },
-                { id: 10, name: '已录入' },
-                { id: 20, name: '未录入' }
-            ],
-            timeOptions: ['日', '月', '年'],
-            apiObj: this.$API.enp.vehicle_access,
-            params: { type: 2 },
+            type_: {
+                10: '生产设备',
+                20: '检测设备',
+                30: '治理设备',
+            },
+            state_: {
+                10: '完好',
+                20: '限用',
+                30: '在修',
+                40: '禁用',
+                50: '治理设备',
+            },
+            processOptions: [],
+            apiObj: this.$API.em.equipment.list,
+            params: { type: 10 },
         }
     },
     methods: {
@@ -83,4 +99,14 @@ export default {
         carHandleQuery() { },
     }
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.eqmCateName {
+    font-size: 0.8vw;
+}
+
+.totalNumber {
+    font-size: 0.8vw;
+    margin-right: 0.5vw;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/smartg_carwash.vue b/src/views/bigScreen/enpComponents/smartg_carwash.vue
index 33e3bef4..edbcbaea 100644
--- a/src/views/bigScreen/enpComponents/smartg_carwash.vue
+++ b/src/views/bigScreen/enpComponents/smartg_carwash.vue
@@ -11,19 +11,12 @@
                     <scTable style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params" hidePagination
                         hideDo>
                         <el-table-column type="index" width="50" />
+                        <el-table-column label="车辆编号" prop="vehicle_number" />
                         <el-table-column prop="start_time" label="开始时间" width="120" />
                         <el-table-column prop="end_time" label="结束时间" width="120" />
-                        <el-table-column label="洗车时长">
-                            <template #default="scope">
-                                <span v-if="scope.row.drain_">{{ scope.row.drain_.mgroup_name }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column label="压力" />
-                        <el-table-column label="流量">
-                            <template #default="scope">
-                                {{ scope.row.equipment_envdata.tsp ? scope.row.equipment_envdata.tsp :
-                                    '-' }}
-                            </template>
+                        <el-table-column label="洗车时长" prop="duration"></el-table-column>
+                        <el-table-column label="压力" prop="pressure" />
+                        <el-table-column label="流量" prop="flux">
                         </el-table-column>
                     </scTable>
                 </el-main>
@@ -74,6 +67,9 @@ export default {
             apiObj2: null,
             params2: {},
         }
+    },
+    mounted() {
+        this.apiObj = this.$API.enp.carwash;
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index a60d4ba2..4d32c7fe 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -44,9 +44,6 @@
                     <el-dropdown-item command="pollutant">污染源清单</el-dropdown-item>
                     <el-dropdown-item command="pollutant2">污染源监测</el-dropdown-item>
                     <el-dropdown-item command="smartg">智能治理</el-dropdown-item>
-                    <el-dropdown-item>设备清单</el-dropdown-item>
-                    <el-dropdown-item>环境质量</el-dropdown-item>
-                    <el-dropdown-item>台账管理</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>