diff --git a/src/views/bigScreen/enpComponents/alarmrecord.vue b/src/views/bigScreen/enpComponents/alarmrecord.vue
index 089603b6..98d51353 100644
--- a/src/views/bigScreen/enpComponents/alarmrecord.vue
+++ b/src/views/bigScreen/enpComponents/alarmrecord.vue
@@ -1,35 +1,64 @@
 <template>
     <el-container>
-        <el-main class="nopadding">
+        <el-header style="height: 50%;padding: 0;">
             <el-container>
                 <el-header>
-                    <div class="panel_title">报警记录</div>
+                    <div class="panel_title">超标实时报警记录
+                        <div class="backMap" @click="backtoMap">
+                            切换地图
+                            <el-icon>
+                                <Switch />
+                            </el-icon>
+                        </div>
+                    </div>
                 </el-header>
+                <el-main class="nopadding">
+                    <scTable ref="table" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params"
+                        :query="query" hideDo>
+                        <el-table-column type="index" width="50" />
+                        <el-table-column prop="number" label="设备名称" />
+                        <el-table-column prop="name" label="报警时间" />
+                        <el-table-column prop="name" label="报警类型" />
+                        <el-table-column prop="mgroup" label="报警详情" />
+                        <el-table-column prop="mgroup" label="持续时长(h)" />
+                        <el-table-column prop="mgroup" label="处理进度" />
+                        <el-table-column prop="mgroup" label="处理结果" />
+                        <el-table-column prop="mgroup" label="是否反馈" />
+                    </scTable>
+                </el-main>
+            </el-container>
+        </el-header>
+        <el-main class="nopadding">
+            <el-container>
                 <el-main class="nopadding">
                     <el-container>
                         <el-header>
-                            <div class="searchWrap">
-                                <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-select>
+                            <div class="panel_title">
+                                <div style="display: flex;justify-content: space-between;">
+                                    <div class="left-panel">
+                                        设备实时报警记录
+                                    </div>
+                                </div>
                             </div>
                         </el-header>
-                        <el-main class="nopadding">
-                            <scTable ref="table" :data="tableData" style="width: 100%;" size="large" :apiObj="apiObj"
-                                row-key="id" :params="params" :query="query" hidePagination @row-click="rowClick">
+                        <el-main class="nppadding">
+                            <scTable ref="table2" style="width: 100%;" size="large" :apiObj="apiObj2" row-key="id"
+                                :params="params2" :query="query2" hideDo>
                                 <el-table-column type="index" width="50" />
-                                <el-table-column prop="number" label="污染源编号" width="180" />
-                                <el-table-column prop="name" label="污染源名称" />
-                                <el-table-column prop="name" label="污染源类型" />
-                                <el-table-column prop="mgroup_name" label="所属工段" />
+                                <el-table-column prop="number" label="设备名称" />
+                                <el-table-column prop="name" label="报警时间" />
+                                <el-table-column prop="name" label="报警类型" />
+                                <el-table-column prop="mgroup" label="报警详情" />
+                                <el-table-column prop="mgroup" label="持续时长(h)" />
+                                <el-table-column prop="mgroup" label="处理进度" />
+                                <el-table-column prop="mgroup" label="处理结果" />
+                                <el-table-column prop="mgroup" label="是否反馈" />
                             </scTable>
                         </el-main>
                     </el-container>
                 </el-main>
             </el-container>
         </el-main>
-
     </el-container>
 </template>
 <script>
@@ -37,15 +66,19 @@ export default {
     data() {
         return {
             query: {},
-            cateOptions: [{ id: 'mtrans', name: '生产工艺' }, { id: 'product', name: '物料输送' }, { id: 'mstore', name: '物料储存' }],
-            apiObj: this.$API.enp.drain.list,
-            params: { type: 20 },
+            query2: {},
+            cateOptions: [],
+            apiObj: null,
+            apiObj2: null,
+            params: {},
+            params2: {},
         }
     },
+    mounted() {
+        this.apiObj
+        this.apiObj2
+    },
     methods: {
-        handleQuery() {
-            this.$refs.table.queryData(this.query);
-        }
     }
 }
 </script>
\ No newline at end of file
diff --git a/src/views/bigScreen/enpComponents/envirmonitor.vue b/src/views/bigScreen/enpComponents/envirmonitor.vue
index 342cb7f4..0929b5ab 100644
--- a/src/views/bigScreen/enpComponents/envirmonitor.vue
+++ b/src/views/bigScreen/enpComponents/envirmonitor.vue
@@ -24,13 +24,13 @@
                                     :value="item"></el-option>
                             </el-select>
                             <el-input :input-style="searchInputStyle" style="width:7vw;margin:0 5px" v-model="query.search"
-                                placeholder=""></el-input>
+                                placeholder="设备名称/设备编号"></el-input>
                             <el-button @click="handleQuery">查询</el-button>
                         </div>
                     </div>
                 </el-header>
                 <el-main>
-                    <scTable :data="tableData" :apiObj="apiObj" size="large" style="" @row-click="rowClick">
+                    <scTable :apiObj="apiObj" size="large" :params="params" :query="query">
                         <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>
@@ -59,10 +59,10 @@
 export default {
     data() {
         return {
+            params: {},
             query: {},
+            apiObj: null,
             processOptions: [],
-            apiObj: this.$API.enp.vehicle_access,
-            params: { type: 2 },
         }
     },
     methods: {
diff --git a/src/views/bigScreen/enpComponents/innerclean.vue b/src/views/bigScreen/enpComponents/innerclean.vue
index c661e083..3f4c01e7 100644
--- a/src/views/bigScreen/enpComponents/innerclean.vue
+++ b/src/views/bigScreen/enpComponents/innerclean.vue
@@ -22,11 +22,11 @@
                                 <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.area" placeholder="" style="width:7vw">
+                            <!-- <el-select v-model="query.area" placeholder="" style="width:7vw">
                                 <el-option v-for="item in options" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
-                            </el-select>
+                            </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>
@@ -35,8 +35,9 @@
                     </div>
                 </el-header>
                 <el-main>
-                    <scTable :data="tableData" :apiObj="apiObj" size="large" style="" @row-click="rowClick">
-                        <el-table-column prop="index" label="序号"></el-table-column>
+                    <scTable :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large" style=""
+                        @row-click="rowClick">
+                        <el-table-column type="index" width="50" />
                         <el-table-column prop="number" label="车牌号"></el-table-column>
                         <el-table-column prop="name" label="内部管理号牌"></el-table-column>
                         <el-table-column prop="level" label="环保登记编码"></el-table-column>
@@ -57,14 +58,15 @@ export default {
     data() {
         return {
             query: {},
+            params: { type: 30, tags: 'carwash' },
             cateOptions: [
                 { id: 1, name: '场内运输车辆（白名单）' },
                 { id: 2, name: '非路道移动机械' },
                 { id: 3, name: '环卫车辆' },
                 { id: 4, name: '其他车辆' },
             ],
-            apiObj: this.$API.enp.vehicle_access,
-            params: { type: 1 },
+            apiObj: this.$API.em.equipment.list,
+
         }
     },
     methods: {
diff --git a/src/views/bigScreen/enpComponents/pollutecalendar.vue b/src/views/bigScreen/enpComponents/pollutecalendar.vue
index 367dfc66..bd59f3f8 100644
--- a/src/views/bigScreen/enpComponents/pollutecalendar.vue
+++ b/src/views/bigScreen/enpComponents/pollutecalendar.vue
@@ -5,7 +5,7 @@
                 <el-header>
                     <div class="panel_title">污染日历</div>
                 </el-header>
-                <el-main class="nopadding">
+                <!-- <el-main class="nopadding">
                     <el-container>
                         <el-header>
                             <div class="searchWrap">
@@ -26,7 +26,7 @@
                             </scTable>
                         </el-main>
                     </el-container>
-                </el-main>
+                </el-main> -->
             </el-container>
         </el-main>
 
diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue
index ee78d845..d602f6ea 100644
--- a/src/views/bigScreen/enpComponents/transport.vue
+++ b/src/views/bigScreen/enpComponents/transport.vue
@@ -47,14 +47,19 @@
                     </div>
                 </el-header>
                 <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>
+                    <scTable ref="table" :data="tableData" :apiObj="apiObj" :params="params" :query="query" size="large"
+                        style="" @row-click="rowClick">
+                        <el-table-column type="index" width="50" />
+                        <el-table-column prop="vehicle_number" label="车牌号码"></el-table-column>
+                        <el-table-column prop="access_time" label="过门禁时间"></el-table-column>
+                        <el-table-column prop="type" label="进出厂类型">
+                            <template #default="scope">
+                                <span>{{ type_[scope.row.type] }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="door_name" label="门禁名称"></el-table-column>
+                        <el-table-column prop="vehicle_number" label="车辆识别代号（VIN）"></el-table-column>
+                        <el-table-column prop="emission_standard" label="排放标准"></el-table-column>
                     </scTable>
                 </el-main>
             </el-container>
@@ -80,6 +85,10 @@ export default {
                 { id: 10, name: '已录入' },
                 { id: 20, name: '未录入' }
             ],
+            type_: {
+                1: '进厂',
+                2: '出厂'
+            },
             timeOptions: ['日', '月', '年'],
             apiObj: this.$API.enp.vehicle_access,
             params: { type: 2 },
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index a763c25e..d1ed34d2 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -3,7 +3,7 @@
     <el-container v-loading="loading">
       <el-main style="padding: 0 20px 20px 20px">
         <el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode == 'show'" label-width="100px"
-          v-if="form.type == 10">
+          v-if="form.type == 10 || form.type == 30">
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="所属部门">