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>