diff --git a/src/views/bigScreen/enpComponents/orgwryList.vue b/src/views/bigScreen/enpComponents/orgwryList.vue
index 868dd389..b5e02dc9 100644
--- a/src/views/bigScreen/enpComponents/orgwryList.vue
+++ b/src/views/bigScreen/enpComponents/orgwryList.vue
@@ -69,13 +69,13 @@
                     <div class="aside_one">
                         <div class="pageTitle">排放口及关联设备静态信息</div>
                         <div class="linesWrap">
-                            <div class="typeLine">
+                            <!-- <div class="typeLine">
                                 <div class="greenBlock">
                                     <div class="greenBlockInner"></div>
                                 </div>
 
                                 <span>排放口</span>
-                            </div>
+                            </div> -->
                             <div class="infoLine">
                                 <span class="circles circles_1"></span>
                                 <span>{{ detailItem.name }}</span>
@@ -478,6 +478,7 @@ export default {
             })
         },
         resizeChart(name) {
+            console.log(name)
 			var myChart = echarts.getInstanceByDom(
 				document.getElementById(name)
 			);
@@ -487,10 +488,7 @@ export default {
 		},
         addListener() {
 			var that = this;
-            if (this.resizeTimeout) {
-                clearTimeout(this.resizeTimeout);
-            }
-            this.resizeTimeout = setTimeout(function () {
+            setTimeout(function () {
                 that.resizeChart("dataChart");
                 that.resizeChart("dataChart2");
                 that.resizeChart("dataChart3");
diff --git a/src/views/bigScreen/enpComponents/pollutant.vue b/src/views/bigScreen/enpComponents/pollutant.vue
index 08c2181f..70dad411 100644
--- a/src/views/bigScreen/enpComponents/pollutant.vue
+++ b/src/views/bigScreen/enpComponents/pollutant.vue
@@ -27,15 +27,63 @@
                             <scTable ref="table" :data="tableData" style="width: 100%;" size="large" :apiObj="apiObj"
                                 row-key="id" :params="params" :query="query" @row-click="rowClick"
                                 @dataChange="updateCount">
-                                <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="" label="生产设备" />
-                                <el-table-column prop="" label="治理设备" />
-                                <el-table-column prop="" label="监测设备" />
-                                <el-table-column prop="" label="监控设备" />
+                                <!-- <el-table-column type="index" width="50" /> -->
+                                <el-table-column prop="number" label="污染源编号" width="120" />
+                                <el-table-column prop="name" label="污染源名称" width="120" />
+                                <el-table-column prop="name" label="污染源类型" width="120" />
+                                <el-table-column prop="mgroup_name" label="所属工段" width="100" />
+                                <el-table-column label="生产设备" >
+                                    <template #default="scope">
+                                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                                            <div v-if="item.type == 10">
+                                                <div>
+                                                    <el-tag :type="runningStateEnum[item.running_state]?.type">{{
+                                    runningStateEnum[item.running_state]?.text }}</el-tag>|
+                                                    {{ item.name }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="治理设备" >
+                                    <template #default="scope">
+                                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                                            <div v-if="item.type == 30">
+                                                <div>
+                                                    <el-tag :type="runningStateEnum[item.running_state]?.type">{{
+                                    runningStateEnum[item.running_state]?.text }}</el-tag>|
+                                                    {{ item.name }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="监测设备" >
+                                    <template #default="scope">
+                                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                                            <div v-if="item.type == 40">
+                                                <div>
+                                                    <el-tag :type="runningStateEnum[item.running_state]?.type">{{
+                                    runningStateEnum[item.running_state]?.text }}</el-tag>|
+                                                    {{ item.name }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="监控设备" >
+                                    <template #default="scope">
+                                        <div v-for="item in scope.row.equip_data" v-bind:key="item.id">
+                                            <div v-if="item.type == 50">
+                                                <div>
+                                                    <el-tag :type="runningStateEnum[item.running_state]?.type">{{
+                                    runningStateEnum[item.running_state]?.text }}</el-tag>|
+                                                    {{ item.name }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </template>
+                                </el-table-column>
                             </scTable>
                         </el-main>
                     </el-container>
@@ -188,9 +236,11 @@
 <script>
 import * as echarts from "echarts";
 import { drainTypeEnum } from "@/utils/enum.js";
+import { runningStateEnum } from "@/utils/enum.js";
 export default {
     data() {
         return {
+            runningStateEnum,
             drainTypeEnum,
             count: 0,
             eqs: {},
@@ -199,7 +249,7 @@ export default {
             pollutantDetail: false,
             query: {},
             apiObj: this.$API.enp.drain.list,
-            params: { type: 20 },
+            params: { type: 20, equip_data: 'base' },
             detailItem: {},
             detailForm: {
                 day: 18,
diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index 1020ddd3..f44f7dd2 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -1301,7 +1301,7 @@ export default {
 					"light",
 					new BABYLON.Vector3(1, 1, 0)
 				);
-				light.intensity = 3;
+				light.intensity = 1.5;
 				// 全屏GUI
 				const advancedTexture =
 					BABYLON_GUI.AdvancedDynamicTexture.CreateFullscreenUI(
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index e191fbc8..17503778 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -287,7 +287,7 @@ export default {
 		//获取工段列表
 		getMgroupOptions() {
 			this.$API.mtm.mgroup.list
-				.req({ page: 0, type__in: "dept" })
+				.req({ page: 0})
 				.then((res) => {
 					this.mgroupOptions = res;
 				});
@@ -338,12 +338,12 @@ export default {
 			this.mgroupOptions.forEach(item => {
 				if(item.id==that.form.recive_mgroup){
 					deptID = item.belong_dept;
+					this.$API.system.user.list
+					.req({ depts: deptID, page: 0 })
+					.then((res) => {
+						that.userList2 = res;
+					});
 				}
-				this.$API.system.user.list
-				.req({ depts: deptID, page: 0 })
-				.then((res) => {
-					that.userList2 = res;
-				});
 			});
 		},
 		//获取接收部门人员