diff --git a/public/img/enp_blue/greenBlock.png b/public/img/enp_blue/greenBlock.png
new file mode 100644
index 00000000..80de97c1
Binary files /dev/null and b/public/img/enp_blue/greenBlock.png differ
diff --git a/public/img/enp_blue/smallTableBg.png b/public/img/enp_blue/smallTableBg.png
new file mode 100644
index 00000000..fa0e7044
Binary files /dev/null and b/public/img/enp_blue/smallTableBg.png differ
diff --git a/src/App.vue b/src/App.vue
index 5a32661e..82b38d9b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -139,36 +139,40 @@ export default {
 }
 
 // 排放系统
-.el-popper {
-	border-radius: 0;
-}
 
-.el-popper[data-popper-placement^=bottom]>.el-popper__arrow {
-	top: -5px;
-	display: none !important;
-}
+// .el-popper {
+// 	border-radius: 0;
+// }
 
-.el-popper.is-light {
-	background: linear-gradient(to right, #116a7c, #92f2ff);
-	border-image-source: linear-gradient(to right, #92f2ff, #116a7c);
-}
+// .el-popper[data-popper-placement^=bottom]>.el-popper__arrow {
+// 	top: -5px;
+// 	display: none !important;
+// }
 
-.el-dropdown-menu {
+// .el-popper.is-light {
+// 	background: linear-gradient(to right, #116a7c, #92f2ff);
+// 	border-image-source: linear-gradient(to right, #92f2ff, #116a7c);
+// }
+
+.enpMenu.el-dropdown-menu {
 	padding: 0.7vh 0.7vh 0.2vh;
-	background: linear-gradient(to right, #053949, #107b90);
+	background: linear-gradient(to right, #10608e, #1dabfd);
+	// background: linear-gradient(to right, #053949, #107b90);
 }
 
-.el-dropdown-menu__item {
+.enpMenu>.el-dropdown-menu__item {
 	margin-bottom: 0.5vh;
-	background: linear-gradient(to right, #1b8fa4, #107b90);
+	background: linear-gradient(to right, #29d, #1dabfd);
+	// background: linear-gradient(to right, #1b8fa4, #107b90);
 }
 
-.el-dropdown-menu__item:not(.is-disabled):focus {
-	background: linear-gradient(to right, #053949, #107b90);
+.enpMenu>.el-dropdown-menu__item:not(.is-disabled):focus {
+	background: linear-gradient(to right, #10608e, #1dabfd);
+	// background: linear-gradient(to right, #053949, #107b90);
 	color: #ffffff;
 }
 
-.el-dropdown-menu__item {
+.enpMenu>.el-dropdown-menu__item {
 	color: #ffffff;
 }
 
@@ -189,7 +193,6 @@ export default {
 	// background-image: url('/public/img/enp_blue/bg_enp_half.png');
 }
 
-
 #enpTable .el-table {
 	background-color: none !important;
 	background: none !important;
@@ -228,6 +231,10 @@ export default {
 	background: none !important;
 }
 
+#enpTable .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+	background-color: rgba(0, 50, 45, .5) !important;
+}
+
 .enpelCard.el-card {
 	background: none !important;
 }
@@ -250,5 +257,9 @@ export default {
 	background-image: url('/public/img/enp_blue/selectBg.png');
 }
 
+.enpCheckbox>.el-checkbox>.el-checkbox__label {
+	color: #ffffff;
+}
+
 //排放系统
 </style>
diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 177ee686..1239cc5f 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -1,7 +1,200 @@
 <template>
     <div>
-        <div class="tableBg">
-            <div style="height:5vh;line-height:5vh;color:#ffffff;font-size:1.2vw;padding-left:6vw">排放口清单</div>
+        <el-card v-if="pfkdetail" class="enpelCard">
+            <div class="headerTitle">排放口及关联设备信息
+                <span class="backBtn" @click="handleClick"> 返回 </span>
+            </div>
+            <div style="display:flex;">
+                <!-- 设备信息 -->
+                <div class="leftCard">
+                    <div class="pageTitle">排放口及关联设备静态信息</div>
+                    <div class="linesWrap">
+                        <div class="typeLine">
+                            <div class="greenBlock">
+                                <div class="greenBlockInner"></div>
+                            </div>
+                            <span>生产设备</span>
+                        </div>
+                        <div class="infoLine">
+                            <span class="circles"></span>
+                            <span>{{ eqs.name }}</span>
+                        </div>
+                        <el-row class="infoLine">
+                            <el-col :span="12">
+                                <div><span class="infotitle">设备类型：</span>主要生产设备</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div>
+                                    <span class="infotitle">电机功率：</span>
+                                    <span v-if="eqs.power_kw">{{ eqs.power_kw }}kw</span>
+                                </div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div>
+                                    <span class="infotitle">生产能力：</span>
+                                    <span v-if="eqs.parameter_json && eqs.parameter_json.生产能力">{{ eqs.parameter_json.生产能力
+                                    }}</span>
+                                </div>
+                            </el-col>
+                        </el-row>
+                        <div class="typeLine">
+                            <div class="greenBlock">
+                                <div class="greenBlockInner"></div>
+                            </div>
+                            <span>治理设备</span>
+                        </div>
+                        <div class="infoLine">
+                            <span class="circles"></span>
+                            <span>{{ eqz.name }}</span>
+                        </div>
+                        <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>
+                                </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>
+                                </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>
+                                </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
+                                </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
+                                </div>
+                            </el-col>
+                        </el-row>
+                        <div class="typeLine">
+                            <div class="greenBlock">
+                                <div class="greenBlockInner"></div>
+                            </div>
+
+                            <span>排放口</span>
+                        </div>
+                        <div class="infoLine">
+                            <span class="circles"></span>
+                            <span>{{ detailItem.name }}</span>
+                        </div>
+                        <el-row class="infoLine">
+                            <el-col :span="12">
+                                <div><span class="infotitle">排气筒高度：</span>{{ detailItem.height }} m</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">废气处理量：</span> {{ detailItem.treatment_capacity }} m³/h</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">PM超低排放限值： </span> {{ detailItem.pm_limit }} mg/Nm³</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">排污许可状况： </span>已许可</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">治理措施： </span>{{ detailItem.measure }}</div>
+                            </el-col>
+                        </el-row>
+                        <div class="typeLine">
+                            <div class="greenBlock">
+                                <div class="greenBlockInner"></div>
+                            </div>
+                            <span>监测设备</span>
+                        </div>
+                        <div class="infoLine">
+                            <span class="circles"></span>
+                            <span>{{ eqc.name }}</span>
+                        </div>
+                        <el-row class="infoLine">
+                            <el-col :span="24">
+                                <div>
+                                    <span class="infotitle">颗粒物：（实测值）</span>0.218 mg/m³
+                                    <span class="infotitle">（折算值）</span>0.218 mg/m³
+                                </div>
+                            </el-col>
+                            <el-col :span="24">
+                                <div>
+                                    <span class="infotitle">SO2：（实测值）</span>0.218 mg/m³
+                                    <span class="infotitle">（折算值）</span>0.218 mg/m³
+                                </div>
+                            </el-col>
+                            <el-col :span="24">
+                                <div>
+                                    <span class="infotitle">NOX：（实测值）</span>0.218 mg/m³
+                                    <span class="infotitle">（折算值）</span>0.218 mg/m³
+                                </div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">流量：</span> 0.000 m³/h</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">温度：</span> 0.000 ℃</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">湿度：</span> 0.000 %</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">压力：</span> 0.000 MPa</div>
+                            </el-col>
+                            <el-col :span="12">
+                                <div><span class="infotitle">含氧量：</span> 0.000 %</div>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </div>
+                <!-- 表 -->
+                <div class="rightCard">
+                    <div class="pageTitle">排放口及关联设备动态信息</div>
+                    <div id="dataChart" style="width: 100%; height:600px;margin-top:1vh"></div>
+                    <div style="color:#ffffff;">
+                        <div class="greenBlock">
+                            <div class="greenBlockInner"></div>
+                        </div>CEMS监测设备
+                        <div class="enpCheckbox">
+                            <el-checkbox v-model="checked1" label="超低排放限值（颗粒物:5; SO₂:-; NOx:-; 含氧量:-）" size="large" />
+                            <el-checkbox v-model="checked2" label="企业预警值（颗粒物:4; SO₂:-; NOx:-; 含氧量:-）" size="large" />
+                            <el-checkbox v-model="checked3" label="颗粒物实测值" size="large" />
+                            <el-checkbox v-model="checked4" label="颗粒物折算值" size="large" />
+                            <el-checkbox v-model="checked5" label="SO₂实测值" size="large" />
+                            <el-checkbox v-model="checked6" label="SO₂折算值" size="large" />
+                            <el-checkbox v-model="checked7" label="NOx实测值" size="large" />
+                            <el-checkbox v-model="checked8" label="NOx折算值" size="large" />
+                            <el-checkbox v-model="checked9" label="含氧量" size="large" />
+                            <el-checkbox v-model="checked10" label="流量" size="large" />
+                            <el-checkbox v-model="checked11" label="压力" size="large" />
+                            <el-checkbox v-model="checked12" label="温度" size="large" />
+                            <el-checkbox v-model="checked13" label="湿度" size="large" />
+                            <el-checkbox v-model="checked14" label="流速" size="large" />
+                        </div>
+                        <div class="greenBlock">
+                        </div>生产设备-水泥磨机
+                        <div class="enpCheckbox">
+                            <el-checkbox v-model="checked15" label="水泥磨机运行信号" size="large" />
+                        </div>
+                        <div class="greenBlock">
+                            <div class="greenBlockInner"></div>
+                        </div>治理设备-磨尾除尘器
+                        <div class="enpCheckbox">
+                            <el-checkbox v-model="checked16" label="磨尾除尘器运行信号" size="large" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </el-card>
+        <div class="tableBg" v-else>
+            <div class="pageTitle">排放口清单</div>
             <div class="backMap" @click="backtoMap">
                 切换地图
                 <el-icon>
@@ -10,8 +203,7 @@
             </div>
             <el-card class="enpelCard" style="margin: 2vh 1vw">
                 <!-- 全程排放口统计 -->
-                <div
-                    style="display:flex;justify-content:space-between;color:#ffffff;font-size:1.6vh;padding:0 0.5vw;height:3vh;line-height:3vh">
+                <div class="totalWrap" style="">
                     <div>全场</div>
                     <div>总排放口：<span class="totalNumber">5</span></div>
                 </div>
@@ -28,24 +220,33 @@
                 </div>
                 <!-- table表格 -->
                 <div style="margin-top:2vh" id="enpTable">
-                    <scTable :data="tableData" calss="enpTable" style="background:none;background-color:none;">
+                    <scTable :data="tableData" :apiObj="apiObj" calss="enpTable" 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="name" label="排放口名称"></el-table-column>
-                        <el-table-column prop="type" label="排放口类型"></el-table-column>
+                        <el-table-column prop="level" label="排放口等级">
+                            <template #default="scope">
+                                <span>{{ level_[scope.row.level] }}</span>
+                            </template>
+                        </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="eqpment" label="监测设备">
+                            <span
+                                style="width:0.6vh;height:0.6vh;border-radius:0.35vh;background:green;display:inline-block;margin-right:5px"></span>达标
+                        </el-table-column>
                     </scTable>
                 </div>
             </el-card>
-
         </div>
     </div>
 </template>
 <script>
+import * as echarts from "echarts";
 export default {
     data() {
         return {
+            apiObj: this.$API.enp.drain.list,
+            params: { type: 10 },
             options: [],
             query: {
                 area: '',
@@ -54,35 +255,245 @@ export default {
             searchInputStyle: {
                 color: '#fff',
             },
-            tableData: [
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-                { index: 1, number: '20240130', name: 'name1', type: '主要设备', mgroup: '水泥制成', eqpment: '达标' },
-            ],
+            level_: {
+                10: '主要排放口',
+                20: '次要排放口'
+            },
+            pfkdetail: false,
+            tableData: [],
+            detailItem: {},
+            detailForm: {
+                day: 18,
+                year: 2024,
+                month: 1
+            },
+            biquery: {
+                end_time: '2024-02-01',
+                start_time: '2024-01-29',
+                time_bucket: "1 minute",
+                equipment_id: "3491356310052896768",
+            },
+            basicOption: {
+                title: {
+                    text: '设备名称',
+                    left: 'center',
+                    top: 'top',
+                    textStyle: {
+                        color: '#fff'
+                    }
+                },
+                tooltip: {
+                    trigger: 'axis'
+                },
+                // grid: {
+                //     left: '3%',
+                //     right: '4%',
+                //     bottom: '3%',
+                //     containLabel: true
+                // },
+                grid: [{
+                    height: '35%',
+                    bottom: '50%',
+                }, {
+                    height: '35%',
+                    bottom: '3%',
+                }],
+                dataZoom: [
+                    {
+                        type: 'inside',
+                        start: 0,
+                        end: 20
+                    },
+                    {
+                        start: 0,
+                        end: 20
+                    }
+                ],
+                dataset: {
+                    source: []
+                },
+                xAxis: [
+                    { type: 'category' },
+                    { type: 'category' },
+                ],
+                yAxis: [{}, {}],
+                series: [
+                    { type: 'line', xAxisIndex: 0 }, { type: 'line', xAxisIndex: 0 },
+                    { type: 'line', xAxisIndex: 1 }, { type: 'line', xAxisIndex: 1 },
+                    { type: 'line', xAxisIndex: 1 }, { type: 'line', xAxisIndex: 1 },
+                    { type: 'line', xAxisIndex: 1 },
+                    { xAxisIndex: 1, type: 'line' },
+                ]
+            },
+            eqs: {},
+            eqc: {},
+            eqz: {}
         }
     },
     methods: {
+        initTimeNow() {
+            var now = new Date();
+            let year = now.getFullYear(); // 年份
+            let month = now.getMonth() + 1; // 月份
+            let day = now.getDate(); // 日期
+            this.detailForm.year = year;
+            this.detailForm.month = month;
+            this.detailForm.day = day;
+            // this.query.start_time = year + '-' + month + '-01';
+            // this.query.end_time = year + '-' + month + day;
+        },
         backtoMap() {
             this.$emit('close')
         },
+        handleClick() {
+            this.pfkdetail = false;
+            this.detailItem = {};
+        },
+        rowClick(row) {
+            this.pfkdetail = true;
+            this.detailItem = row;
+            this.$nextTick(() => {
+                this.getEquipments(row.equipments);
+                this.getDetailData();
+            })
+
+        },
+        getEquipments(ids) {
+            let that = this;
+            console.log(ids);
+            ids.forEach(id => {
+                that.$API.em.equipment.item.req(id).then(res => {
+                    if (res.type == 10) {
+                        that.eqs = res;
+                    } else if (res.type == 20) {
+                        that.eqc = res;
+                    } else if (res.type == 30) {
+                        that.eqz = res;
+                    }
+                })
+            });
+        },
+        getDetailData() {
+            var that = this;
+            let base = +new Date(1988, 9, 3);
+            let oneDay = 24 * 3600 * 1000;
+            let data = [[base, Math.random() * 300]];
+            for (let i = 1; i < 20000; i++) {
+                let now = new Date((base += oneDay));
+                data.push([+now, Math.round((Math.random() - 0.5) * 20 + data[i - 1][1])]);
+            }
+            var chartDom = document.getElementById('dataChart');
+            var myChart = echarts.init(chartDom);
+            // 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);
+            let params = {
+                query: that.biquery,
+                // raise_exception: true
+            };
+            this.$API.bi.dataset.exec.req('enp_edata', 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++) {
+                        if (x < 3) {
+                            series.push({ type: 'line', xAxisIndex: 0 })
+                        } else {
+                            series.push({ type: 'line', xAxisIndex: 1 })
+                        }
+
+                    }
+                }
+                newOption.dataset.source = res.data.ds0;
+                newOption.dataZoom.startValue = that.biquery.start_time;
+                newOption.title.text = that.eqc.name;
+                newOption.series = series;
+                myChart.setOption(newOption);
+            }).then(() => { myChart.hideLoading() })
+        },
     }
 }
 </script>
 <style>
 .tableBg {
     width: 100%;
-    height: 80vh;
+    height: 88vh;
     background-image: url('/public/img/enp_blue/bigtableBg.png');
     background-repeat: no-repeat;
     background-size: 100% 100%;
 }
 
+.leftCard {
+    height: 80vh;
+    flex: 1;
+    color: #ffffff;
+    font-size: 0.75vw;
+    background-image: url('/public/img/enp_blue/smallTableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    margin-right: 1vw;
+}
+
+.rightCard {
+    flex: 2;
+    height: 80vh;
+    color: #ffffff;
+    background-image: url('/public/img/enp_blue/tableBg.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+}
+
+.totalWrap {
+    display: flex;
+    justify-content: space-between;
+    color: #ffffff;
+    font-size: 1.6vh;
+    padding: 0 0.5vw;
+    height: 3vh;
+    line-height: 3vh;
+}
+
 .totalNumber {
     color: #64D2FF;
 }
@@ -103,9 +514,86 @@ export default {
     right: 3vh;
     top: 01.5vh;
     font-size: 1vh;
-    width: 4vw;
+    width: fit-content;
     color: #ffffff;
     padding: 0 0.5vw;
     background-image: url('/public/img/enp_blue/back.png');
 }
+
+.pageTitle {
+    height: 5vh;
+    line-height: 5vh;
+    color: #ffffff;
+    font-size: 1.2vw;
+    padding-left: 6vw;
+}
+
+/*  */
+.headerTitle {
+    color: #ffffff;
+    height: 4vh;
+    line-height: 4vh;
+    font-size: 2vh;
+    position: relative
+}
+
+.backBtn {
+    font-size: 1vh;
+    position: absolute;
+    top: 1vh;
+    right: 1vh;
+    line-height: 2vh
+}
+
+.greenBlock {
+    width: 1vh;
+    height: 1vh;
+    background-image: url('/public/img/enp_blue/greenBlock.png');
+    background-size: 100% 100%;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 0.5vw;
+}
+
+.circles {
+    width: 10px;
+    height: 10px;
+    border-radius: 5px;
+    background: #aaaaaa;
+    display: inline-block;
+    margin: auto 0.5vw auto 0;
+}
+
+.circles_1 {
+    background: #0ed877;
+}
+
+.circles_2 {
+    background: orange;
+}
+
+.linesWrap {
+    padding: 1vh 0.5vw;
+    height: 93%;
+    overflow: scroll;
+    font-weight: bold;
+    line-height: 3.5vh;
+}
+
+.typeLine {
+    height: 3.5vh;
+    line-height: 4vh;
+    font-weight: normal;
+}
+
+.infoLine {
+    line-height: 3vh;
+    padding-left: 0.5vw;
+    display: flex
+}
+
+.infotitle {
+    font-weight: normal;
+    color: #dddddd;
+}
 </style>
\ 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 34054a0b..97e8791b 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -18,7 +18,7 @@
                   有组织排放管理
                 </span>
                 <template #dropdown>
-                  <el-dropdown-menu>
+                  <el-dropdown-menu class="enpMenu">
                     <el-dropdown-item command="paikou">排放口清单</el-dropdown-item>
                     <el-dropdown-item command="cems">CEMS监测清单</el-dropdown-item>
                     <el-dropdown-item command="cems2">CEMS监测预警</el-dropdown-item>
@@ -35,7 +35,7 @@
                   无组织排放管理
                 </span>
                 <template #dropdown>
-                  <el-dropdown-menu>
+                  <el-dropdown-menu class="enpMenu">
                     <el-dropdown-item command="pollutant">污染源清单</el-dropdown-item>
                     <el-dropdown-item command="pollutant2">污染源监测</el-dropdown-item>
                     <el-dropdown-item>智能治理</el-dropdown-item>
@@ -58,7 +58,7 @@
                   运输清洁
                 </span>
                 <template #dropdown>
-                  <el-dropdown-menu>
+                  <el-dropdown-menu class="enpMenu">
                     <el-dropdown-item command="changwai">场外运输</el-dropdown-item>
                     <el-dropdown-item command="inner">场内清洁</el-dropdown-item>
                   </el-dropdown-menu>
@@ -354,9 +354,6 @@ export default {
           bottom: '3%',
           containLabel: true
         },
-        // tooltip: {
-        //   trigger: 'item',
-        // },
         series: {
           name: '无组织污染源',
           type: 'pie',
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index a7da7161..a763c25e 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -7,15 +7,8 @@
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="所属部门">
-                <el-cascader
-                  v-model="form.belong_dept"
-                  :options="group"
-                  :props="groupsProps"
-                  clearable
-                  :show-all-levels="false"
-                  style="width: 100%"
-                  @change="deptChange"
-                >
+                <el-cascader v-model="form.belong_dept" :options="group" :props="groupsProps" clearable
+                  :show-all-levels="false" style="width: 100%" @change="deptChange">
                 </el-cascader>
               </el-form-item>
             </el-col>
@@ -78,10 +71,11 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24" v-if="baseInfo.name == 'enm'">
+            <el-col :md="12" :sm="24">
               <el-form-item label="用电功率">
                 <el-input-number v-model="form.power_kw" :precision="2" :min="0" controls-position="right"
-                  placeholder="用电功率" />
+                  placeholder="用电功率" /><span style="margin-left:10px">(Kw)</span>
+
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
@@ -100,7 +94,7 @@
           </el-row>
           <el-row>
             <el-col :md="12" :sm="24">
-              <el-form-item label="技术参数">
+              <el-form-item label="简要技术参数">
                 <el-input type="textarea" :rows="4" v-model="form.parameter" placeholder="技术参数" />
               </el-form-item>
             </el-col>
@@ -110,20 +104,36 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col>
+              <el-form-item label="技术参数">
+                <el-button @click="addJsonItem">添加</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-for="(item, $index) in parameter_json" :key="item">
+            <el-col :span="11">
+              <el-form-item label="参数名">
+                <el-input v-model="item.key" placeholder="参数名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item label="参数值">
+                <el-input v-model="item.value" placeholder="参数值" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-button @click="delJsonItem($index)">删除</el-button>
+            </el-col>
+          </el-row>
         </el-form>
         <el-form ref="dialogForm" :model="form" :rules="rules" :disabled="mode == 'show'" label-width="120px"
           v-if="form.type == 20">
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="所属部门">
-                <el-cascader
-                  v-model="form.belong_dept"
-                  :options="group"
-                  :props="groupsProps"
-                  clearable
-                  :show-all-levels="false"
-                  style="width: 100%"
-                >
+                <el-cascader v-model="form.belong_dept" :options="group" :props="groupsProps" clearable
+                  :show-all-levels="false" style="width: 100%">
                 </el-cascader>
               </el-form-item>
             </el-col>
@@ -216,7 +226,7 @@
   </el-drawer>
 </template>
 <script>
-import {genTree} from "@/utils/verificate";
+import { genTree } from "@/utils/verificate";
 export default {
   emits: ["success", "closed"],
   data() {
@@ -229,8 +239,7 @@ export default {
         show: "查看",
       },
       form: {
-        type: 10,
-
+        type: 10
       },
       rules: {
         name: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -251,6 +260,9 @@ export default {
         value: 40,
         label: '禁用'
       }],
+      parameter_json: [
+        { key: '', value: '' }
+      ],
       visible: false,
       isSaveing: false,
       keeperOptions: [],
@@ -262,11 +274,11 @@ export default {
       mgroups: [],
       baseInfo: {},
       groupsProps: {
-					// value: "id",
-					multiple: false,
-					emitPath: false,
-					checkStrictly: true,
-				},
+        // value: "id",
+        multiple: false,
+        emitPath: false,
+        checkStrictly: true,
+      },
     };
   },
   mounted() {
@@ -286,10 +298,10 @@ export default {
     // },
     getGroup() {
       let that = this;
-      that.$API.system.dept.list.req({page: 0 , type: 'dept'}).then(res=>{
+      that.$API.system.dept.list.req({ page: 0, type: 'dept' }).then(res => {
         that.group = genTree(res);
       });
-		},
+    },
     getReceptionist(data) {
       this.form.keeper = data.id;
       this.form.keeper_name = data.name
@@ -313,6 +325,11 @@ export default {
           this.isSaveing = true;
           try {
             var res;
+            let obj = {};
+            this.parameter_json.forEach(item => {
+              obj[item.key] = item.value;
+            })
+            this.form.parameter_json = obj;
             if (this.mode == "add") {
               res = await this.$API.em.equipment.create.req(this.form);
             } else if (this.mode == "edit") {
@@ -334,10 +351,26 @@ export default {
         }
       });
     },
+    addJsonItem() {
+      this.parameter_json.push({ key: '', value: '' })
+    },
+    delJsonItem(index) {
+      this.parameter_json.splice(index, 1)
+    },
     //表单注入数据
     setData(data) {
       Object.assign(this.form, data);
-      this.deptChange()
+      if (data.parameter_json != null) {
+        let arr = [];
+        for (let key in data.parameter_json) {
+          let obj = {};
+          obj.key = key;
+          obj.value = data.parameter_json[key];
+          arr.push(obj);
+        }
+        this.parameter_json = arr;
+        this.deptChange()
+      }
     },
     //设置过滤项
     setFilters(filters) {
diff --git a/src/views/em/equipmentz.vue b/src/views/em/equipmentz.vue
new file mode 100644
index 00000000..c49a0a3f
--- /dev/null
+++ b/src/views/em/equipmentz.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