diff --git a/public/img/ly/hzy.png b/public/img/ly/hzy.png
new file mode 100644
index 00000000..cac307b3
Binary files /dev/null and b/public/img/ly/hzy.png differ
diff --git a/public/img/ly/mm.png b/public/img/ly/mm.png
new file mode 100644
index 00000000..fba5047a
Binary files /dev/null and b/public/img/ly/mm.png differ
diff --git a/public/img/ly/shsps.png b/public/img/ly/shsps.png
new file mode 100644
index 00000000..384738a3
Binary files /dev/null and b/public/img/ly/shsps.png differ
diff --git a/public/img/ly/ylm.png b/public/img/ly/ylm.png
new file mode 100644
index 00000000..2e738d8d
Binary files /dev/null and b/public/img/ly/ylm.png differ
diff --git a/public/img/ly/yrfd.png b/public/img/ly/yrfd.png
new file mode 100644
index 00000000..011edf33
Binary files /dev/null and b/public/img/ly/yrfd.png differ
diff --git a/src/App.vue b/src/App.vue
index 9fa4c6cf..2f29a496 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -298,8 +298,8 @@ export default {
 	color: #ffffff;
 }
 .elProgress > .el-progress-circle {
-	width: 5vw !important;
-	height: 5vw !important;
+	width: 9vh !important;
+	height: 9vh !important;
 }
 //排放系统
 </style>
diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue
index aacbcc25..3730e0f6 100644
--- a/src/views/bigScreen/index_enm_ly.vue
+++ b/src/views/bigScreen/index_enm_ly.vue
@@ -101,168 +101,13 @@
 								<span class="percentage-value"
 									>{{ percentage }}%</span
 								>
-								<p class="percentage-label">运转率</p>
+								<p class="percentage-label">{{ item.name }}</p>
 							</template>
 						</el-progress>
-						<div class="circle_bottom_text">{{ item.name }}</div>
-					</div>
-					<!-- <div class="item_circle">
-						<el-progress
-							class="elProgress"
-							type="circle"
-							:stroke-width="15"
-							:percentage="35"
-							:color="colors"
-						>
-							<template #default="{ percentage }">
-								<span class="percentage-value"
-									>{{ percentage }}%</span
-								>
-								<p class="percentage-label">运转率</p>
-							</template>
-						</el-progress>
-						<div class="circle_bottom_text">设备</div>
-					</div>
-					<div class="item_circle">
-						<el-progress
-							class="elProgress"
-							type="circle"
-							:stroke-width="15"
-							:percentage="55"
-							:color="colors"
-						>
-							<template #default="{ percentage }">
-								<span class="percentage-value"
-									>{{ percentage }}%</span
-								>
-								<p class="percentage-label">运转率</p>
-							</template>
-						</el-progress>
-						<div class="circle_bottom_text">设备</div>
-					</div>
-					<div class="item_circle">
-						<el-progress
-							class="elProgress"
-							type="circle"
-							:stroke-width="15"
-							:percentage="75"
-							:color="colors"
-						>
-							<template #default="{ percentage }">
-								<span class="percentage-value"
-									>{{ percentage }}%</span
-								>
-								<p class="percentage-label">运转率</p>
-							</template>
-						</el-progress>
-						<div class="circle_bottom_text">设备</div>
-					</div>
-					<div class="item_circle">
-						<el-progress
-							class="elProgress"
-							type="circle"
-							:stroke-width="15"
-							:percentage="85"
-							:color="colors"
-						>
-							<template #default="{ percentage }">
-								<span class="percentage-value"
-									>{{ percentage }}%</span
-								>
-								<p class="percentage-label">运转率</p>
-							</template>
-						</el-progress>
-						<div class="circle_bottom_text">设备</div>
-					</div> -->
-				</div>
-			</div>
-			<div class="flexItem">
-				<div class="itemTitle">
-					<div class="itemTitleIcon"></div>
-					<div>余热发电</div>
-				</div>
-				<div class="itemBody" style="padding: 5%">
-					<div class="elecItem">
-						<div>
-							当月发电量：<span class="elec_number">{{
-								hotData.total_production
-							}}</span>
-						</div>
-					</div>
-					<div class="elecItem">
-						<div>
-							吨熟料发电量：<span class="elec_number">{{
-								hotData.production_elec_unit
-							}}</span>
-						</div>
-					</div>
-					<div class="elecItem">
-						<div>
-							自用电量：<span class="elec_number">{{
-								hotData.elec_consume
-							}}</span>
-						</div>
+						<!-- <div class="circle_bottom_text">{{ item.name }}</div> -->
 					</div>
 				</div>
 			</div>
-		</div>
-		<div class="right_block">
-			<div class="flexItem">
-				<div class="itemTitle">
-					<div class="itemTitleIcon"></div>
-					<div>工序电耗</div>
-				</div>
-				<div class="itemBody itemBodyFlex">
-					<div id="radar" style="height: 100%"></div>
-					<div class="bodyList">
-						<div class="bodyListItem">
-							<span>石灰石破碎</span>
-							<p class="bodyListItem_num">
-								{{ radarSeriesData[0] }}
-							</p>
-						</div>
-						<div class="bodyListItem">
-							<span>原料磨</span>
-							<p class="bodyListItem_num">
-								{{ radarSeriesData[1] }}
-							</p>
-						</div>
-						<div class="bodyListItem">
-							<span>回转窑</span>
-							<p class="bodyListItem_num">
-								{{ radarSeriesData[2] }}
-							</p>
-						</div>
-						<div class="bodyListItem">
-							<span>余热发电</span>
-							<p class="bodyListItem_num">
-								{{ radarSeriesData[3] }}
-							</p>
-						</div>
-						<div class="bodyListItem">
-							<span>煤磨</span>
-							<p class="bodyListItem_num">
-								{{ radarSeriesData[4] }}
-							</p>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="flexItem">
-				<div class="itemTitle">
-					<div class="itemTitleIcon"></div>
-					<div>质量分析</div>
-					<el-radio-group v-model="deptName">
-						<el-radio label="入窑生料" class="elRadio"
-							>入窑生料</el-radio
-						>
-						<el-radio label="出磨熟料" class="elRadio"
-							>出磨熟料</el-radio
-						>
-					</el-radio-group>
-				</div>
-				<div class="itemBody" id="line3"></div>
-			</div>
 			<div class="flexItem">
 				<div class="itemTitle">
 					<div class="itemTitleIcon"></div>
@@ -293,34 +138,157 @@
 						></el-table-column>
 						<el-table-column label="状态" width="50">
 							<template #default="scope">
-								<el-tag
-									style="
-										width: 15px;
-										height: 15px;
-										padding: 0;
-									"
+								<div
 									v-if="scope.row.gather_state == 0"
-									type="success"
-									effect="dark"
-									round
-								></el-tag>
-								<el-tag
-									style="
-										width: 15px;
-										height: 15px;
-										padding: 0;
-									"
-									v-else
-									type="warning"
-									effect="dark"
-									round
-								></el-tag>
+									class="successCircle"
+								></div>
+								<div v-else class="warningCircle"></div>
 							</template>
 						</el-table-column>
 					</el-table>
 				</div>
 			</div>
 		</div>
+		<div class="right_block">
+			<div class="flexItem">
+				<div class="itemTitle">
+					<div class="itemTitleIcon"></div>
+					<div>工序电耗</div>
+				</div>
+				<div class="itemBody itemBodyFlex">
+					<div id="radar" style="height: 100%"></div>
+					<div class="bodyList">
+						<table>
+							<tbody>
+								<tr class="bodyListItem tableHeader">
+									<th class="bodyListItem_name">工序</th>
+									<th>
+										电耗<span
+											style="
+												color: #fff;
+												font-weight: 500;
+												font-size: 12px;
+											"
+											>kwh/t</span
+										>
+									</th>
+								</tr>
+								<tr class="bodyListItem bodyListItemBg">
+									<td class="bodyListItem_name">
+										石灰石破碎
+									</td>
+									<td class="bodyListItem_num">
+										{{ radarSeriesData[0] }}
+									</td>
+								</tr>
+								<tr class="bodyListItem">
+									<td class="bodyListItem_name">原料磨</td>
+									<td class="bodyListItem_num">
+										{{ radarSeriesData[1] }}
+									</td>
+								</tr>
+								<tr class="bodyListItem bodyListItemBg">
+									<td class="bodyListItem_name">回转窑</td>
+									<td class="bodyListItem_num">
+										{{ radarSeriesData[2] }}
+									</td>
+								</tr>
+								<tr class="bodyListItem">
+									<td class="bodyListItem_name">余热发电</td>
+									<td class="bodyListItem_num">
+										{{ radarSeriesData[3] }}
+									</td>
+								</tr>
+								<tr class="bodyListItem bodyListItemBg">
+									<td class="bodyListItem_name">煤磨</td>
+									<td class="bodyListItem_num">
+										{{ radarSeriesData[4] }}
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+			<div class="flexItem">
+				<div class="itemTitle">
+					<div class="itemTitleIcon"></div>
+					<div>质量分析</div>
+					<el-radio-group v-model="deptName">
+						<el-radio label="入窑生料" class="elRadio"
+							>入窑生料</el-radio
+						>
+						<el-radio label="出磨熟料" class="elRadio"
+							>出磨熟料</el-radio
+						>
+					</el-radio-group>
+				</div>
+				<div class="itemBody" id="line3"></div>
+			</div>
+			<div class="flexItem">
+				<div class="itemTitle">
+					<div class="itemTitleIcon"></div>
+					<div>余热发电/环保数据</div>
+				</div>
+				<div class="itemBody" style="padding: 5%">
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>当月发电量</span>
+							<p class="elec_number">
+								{{ hotData.total_production }}
+								<span class="elec_unit">kwh</span>
+							</p>
+						</div>
+					</div>
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>NOx折算值</span>
+							<p class="elec_number">
+								{{ hotData.NOx }}
+								<span class="elec_unit">mg/m³</span>
+							</p>
+						</div>
+					</div>
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>吨熟料发电量</span>
+							<p class="elec_number">
+								{{ hotData.production_elec_unit }}
+								<span class="elec_unit">kwh</span>
+							</p>
+						</div>
+					</div>
+
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>SO2折算值</span>
+							<p class="elec_number">
+								{{ hotData.SO2 }}
+								<span class="elec_unit">mg/m³</span>
+							</p>
+						</div>
+					</div>
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>自用电量</span>
+							<p class="elec_number">
+								{{ hotData.elec_consume }}
+								<span class="elec_unit">kwh</span>
+							</p>
+						</div>
+					</div>
+					<div class="elecItem">
+						<div class="elecItem_wrap">
+							<span>颗粒物折算值</span>
+							<p class="elec_number">
+								{{ hotData.klw }}
+								<span class="elec_unit">mg/m³</span>
+							</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 </template>
 <script>
@@ -439,13 +407,11 @@ export default {
 				]),
 			],
 			sectionNames: {
-				干渣库_primitive0: "电石渣",
-				原料磨及废气处理_primitive0: "原料磨",
-				窑: "回转窑",
-				煤粉制备_primitive1: "煤磨",
-				水泥磨房_primitive0: "水泥磨",
-				水泥储存及散装库_primitive2: "水泥包装",
-				// "停车场": "停车场"
+				石灰石破碎筛分生产系统_primitive1: "石灰石破碎",
+				原料磨_primitive3: "原料磨",
+				回转窑: "回转窑",
+				煤磨_primitive1: "煤磨",
+				余热发电_primitive2: "余热发电",
 			},
 			totalData: {
 				total_production: 0,
@@ -465,6 +431,7 @@ export default {
 				elec_consume: 0,
 			},
 			tableData: [],
+			tezhongData: [],
 			option: {
 				color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
 				tooltip: {
@@ -613,6 +580,7 @@ export default {
 		let that = this;
 		that.factoryName = that.$TOOL.data.get("BASE_INFO").base.base_name;
 		that.showTime();
+		that.addListener();
 		//一天的毫秒数
 		let nowDate = new Date();
 		let year = nowDate.getFullYear();
@@ -624,9 +592,16 @@ export default {
 		that.currentMonth = month;
 		that.currentDay = day;
 		let datelist = [];
+		let tezhongData = [];
+		function getRandomNumber(min, max) {
+			return Math.floor(Math.random() * (max - min + 1)) + min;
+		}
 		for (let i = 0; i < days; i++) {
 			datelist.push(i + 1);
+			let randomNumber = getRandomNumber(50, 100);
+			tezhongData.push(randomNumber);
 		}
+		that.tezhongData = tezhongData;
 		that.option.xAxis.data = datelist;
 		that.xAxisDate = datelist;
 		that.$nextTick(() => {
@@ -664,9 +639,6 @@ export default {
 					}
 				}
 			}, 5000);
-			that.timerData = setInterval(() => {
-				// that.getDeptDetail();
-			}, 60000);
 			that.initChart();
 		});
 	},
@@ -677,7 +649,7 @@ export default {
 			this.$API.mtm.mgroup.list
 				.req({ page: 0, search: "回转窑" })
 				.then((res) => {
-					console.log("回转窑", res);
+					// console.log("回转窑", res);
 					that.huihzuanyaoId = res[0].id;
 					let query = {};
 					query.page = 0;
@@ -714,6 +686,16 @@ export default {
 									color: that.linearGradientColors[0],
 								},
 							},
+							{
+								name: "特种熟料",
+								textStyle: {
+									color: "#fff",
+								},
+								borderRadius: 2,
+								itemStyle: {
+									color: that.linearGradientColors[1],
+								},
+							},
 						];
 						option1.series = [
 							{
@@ -734,6 +716,24 @@ export default {
 								},
 								data: seriesData,
 							},
+							{
+								name: "特种熟料",
+								type: "line",
+								stack: "Total",
+								smooth: true,
+								lineStyle: {
+									width: 0,
+								},
+								showSymbol: false,
+								areaStyle: {
+									opacity: 0.8,
+									color: that.linearGradientColors[1],
+								},
+								emphasis: {
+									focus: "series",
+								},
+								data: that.tezhongData,
+							},
 						];
 						myChart.setOption(option1);
 					});
@@ -752,26 +752,26 @@ export default {
 				let data = response;
 				data.forEach((item) => {
 					if (item.mgroup_name == "石灰石破碎") {
-						that.rateData[0].value = item.run_rate;
+						that.rateData[0].value = Number(item.run_rate);
 					} else if (item.mgroup_name == "原料磨") {
-						that.rateData[1].value = item.run_rate;
+						that.rateData[1].value = Number(item.run_rate);
 					} else if (item.mgroup_name == "煤磨") {
-						that.rateData[2].value = item.run_rate;
+						that.rateData[2].value = Number(item.run_rate);
 					} else if (item.mgroup_name == "回转窑") {
-						that.rateData[3].value = item.run_rate;
+						that.rateData[3].value = Number(item.run_rate);
 					} else if (item.mgroup_name == "余热发电") {
-						that.rateData[4].value = item.run_rate;
+						that.rateData[4].value = Number(item.run_rate);
 					}
 				});
 			});
 		},
-		//余热发电
+		//余热发电&环保数据
 		generation() {
 			let that = this;
 			this.$API.mtm.mgroup.list
 				.req({ page: 0, search: "余热发电" })
 				.then((res) => {
-					console.log("余热发电", res);
+					// console.log("余热发电", res);
 					that.yurefadianId = res[0].id;
 					let params = {};
 					params.page = 0;
@@ -783,6 +783,43 @@ export default {
 						that.hotData = res2[0];
 					});
 				});
+			//环保数据
+			this.$API.enm.mpoint.list
+				.req({
+					page: 0,
+					code: "K_TX_IP20_TX_MD500", //nox
+					query: " { id, name, code, last_data, gather_state }",
+				})
+				.then((res0) => {
+					console.log("环保数据", res0[0]);
+					that.hotData.NOx = res0[0].last_data.last_val
+						? res0[0].last_data.last_val
+						: 0.0;
+				});
+			this.$API.enm.mpoint.list
+				.req({
+					page: 0,
+					code: "K_TX_IP20_TX_MD508", //so2
+					query: "{ id, name, code, last_data, gather_state }",
+				})
+				.then((res1) => {
+					console.log("环保数据", res1[0]);
+					that.hotData.SO2 = res1[0].last_data.last_val
+						? res1[0].last_data.last_val
+						: 0.0;
+				});
+			this.$API.enm.mpoint.list
+				.req({
+					page: 0,
+					code: "K_TX_IP20_TX_MD504", //颗粒物
+					query: "{ id, name, code, last_data, gather_state }",
+				})
+				.then((res2) => {
+					console.log("环保数据", res2[0]);
+					that.hotData.klw = res2[0].last_data.last_val
+						? res2[0].last_data.last_val
+						: 0.0;
+				});
 		},
 		//工序电耗
 		proceElec() {
@@ -793,7 +830,7 @@ export default {
 				monnth: that.month,
 			};
 			that.$API.enm.enstat.req(params).then((res) => {
-				console.log("工序电耗", res.results);
+				// console.log("工序电耗", res.results);
 				let data = res.results;
 				let seriesData = [0, 0, 0, 0, 0];
 				data.forEach((item, index) => {
@@ -828,7 +865,7 @@ export default {
 				page: 0,
 			};
 			that.$API.enm.mpoint.list.req(params).then((res) => {
-				console.log("数据采集", res);
+				// console.log("数据采集", res);
 				that.tableData = res;
 				let success_num = 0;
 				let error_num = 0;
@@ -891,7 +928,20 @@ export default {
 				"yyyy年MM月dd日"
 			);
 		},
+		addListener() {
+			var that = this;
+			window.addEventListener("resize", function () {
+				if (this.resizeTimeout) {
+					clearTimeout(this.resizeTimeout);
+				}
+				// 设置一个新的 resizeTimeout，延迟调整样式
+				this.resizeTimeout = setTimeout(function () {
+					that.initDomStyle();
+				}, 300); // 延迟 300 毫秒，可以根据需要调整
+			});
+		},
 		initDomStyle() {
+			let that = this;
 			// 获取窗口的总高度
 			var windowHeight = window.innerHeight;
 			var windowWidth = window.innerWidth;
@@ -909,9 +959,11 @@ export default {
 				model.style.height = windowHeight - 3 + "px";
 				model.style.top = 0;
 				left_block.style.position = "absolute";
-				left_block.style.width = "22%";
+				left_block.style.width = "25%";
+				// left_block.style.display = "none";
 				right_block.style.position = "absolute";
-				right_block.style.width = "22%";
+				right_block.style.width = "25%";
+				// right_block.style.display = "none";
 				var itemHeight = Math.round((windowHeight - 150) / 3);
 				var itemBodyHeight = itemHeight - 40;
 				var flexItems = document.getElementsByClassName("flexItem");
@@ -924,9 +976,9 @@ export default {
 					var itemBody = itemBodys[i];
 					itemBody.style.height = itemBodyHeight + "px";
 				}
-				elTable.style.height = itemBodyHeight - 10 + "px";
-				let pieWidth = Math.round(windowWidth / 100) * 22 - 270;
-				let radarWidth = Math.round(windowWidth / 100) * 22 - 100;
+				elTable.style.height = itemBodyHeight - 20 + "px";
+				let pieWidth = Math.round(windowWidth / 100) * 22 - 180;
+				let radarWidth = Math.round(windowWidth / 100) * 22 - 200;
 				pieChart.style.width = pieWidth + "px";
 				radarChart.style.width = radarWidth + "px";
 			} else {
@@ -935,12 +987,26 @@ export default {
 				model.style.position = "relative";
 				model.style.height = chartHeight;
 			}
-			if (this.engine != null) {
-				this.engine.resize();
+			if (that.engine != null) {
+				that.engine.resize();
+			}
+			that.resizeChart("line1");
+			that.resizeChart("pieChart");
+			that.resizeChart("radar");
+			that.resizeChart("line3");
+		},
+		resizeChart(name) {
+			// 根据name resize chart
+			var myChart = echarts.getInstanceByDom(
+				document.getElementById(name)
+			);
+			if (myChart != undefined) {
+				// console.log(name + ' :resize')
+				myChart.resize();
 			}
 		},
 		initFactory() {
-			var that = this;
+			let that = this;
 			const canvas = document.getElementById("renderCanvas"); // Get the canvas element
 			const engine = new BABYLON.Engine(canvas, true); // Generate the BABYLON 3D engine
 			BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI =
@@ -956,8 +1022,8 @@ export default {
 				scene.clearColor = BABYLON.Color3.Black(); //BABYLON.Color3(1, 0, 1);
 
 				const ground = BABYLON.MeshBuilder.CreateGround("ground", {
-					width: 500,
-					height: 500,
+					width: 50,
+					height: 50,
 				});
 				const groundMaterial = new BABYLON_GRID.GridMaterial(
 					"groundMaterial",
@@ -991,15 +1057,15 @@ export default {
 				camera.attachControl(canvas, true);
 				camera.maxZ = 1000; // 调整适当的值
 				// 相机限制
-				camera.lowerRadiusLimit = 6;
-				camera.upperRadiusLimit = 50;
+				camera.lowerRadiusLimit = 10;
+				camera.upperRadiusLimit = 30;
 
 				// 灯光
 				const light = new BABYLON.HemisphericLight(
 					"light",
 					new BABYLON.Vector3(1, 1, 0)
 				);
-				light.intensity = 1.6;
+				light.intensity = 1.8;
 
 				// 全屏GUI
 				const advancedTexture =
@@ -1047,24 +1113,22 @@ export default {
 				mesh_name.color = "white";
 				mesh_name.fontSize = "14px";
 				mesh_rect.addControl(mesh_name);
-				var remoteGlbUrl = config.HOST_URL + "/media/model/ly.glb";
+				var remoteGlbUrl = config.HOST_URL + "/media/model/ly6.glb";
 				// var remoteGlbUrl = process.env.VUE_APP_BASEURL + "/media/model/factory.glb";
 				BABYLON.SceneLoader.Append(
 					remoteGlbUrl,
 					"",
 					scene,
 					function (scene) {
-						// debugger;
-						// console.log(scene)
-						// console.table(scene.meshes)
 						// 判断字符串是否包含中文------   /[\u4E00-\u9FA5]+/g.test(str)
 						for (let key in that.sectionNames) {
 							const value = that.sectionNames[key];
 							const mesh = scene.getMeshByName(key);
 							if (mesh) {
-								//建筑标签
-								that.createLabelPanel(value, mesh);
-								// 创建一个工段数据展示panel
+								console.log(value);
+								console.log(mesh);
+								that.createImgLabel(value, mesh);
+								// // 创建一个工段数据展示panel
 								const info = {
 									name: value,
 									rows: [
@@ -1135,19 +1199,16 @@ export default {
 				checkbox1.marginLeft = "16px";
 				checkbox1.color = "green";
 				checkbox1.onIsCheckedChangedObservable.add(function (value) {
-					// debugger;
 					if (value) {
 						for (let key in that.sectionNames) {
-							let name = that.sectionNames[key] + "_data_view";
-							console.log(name);
+							let name = that.sectionNames[key] + "_data_detail";
 							let dataView =
 								advancedTexture.getControlByName(name);
 							dataView.isVisible = true;
 						}
 					} else {
 						for (let key in that.sectionNames) {
-							let name = that.sectionNames[key] + "_data_view";
-							console.log(name);
+							let name = that.sectionNames[key] + "_data_detail";
 							let dataView =
 								advancedTexture.getControlByName(name);
 							dataView.isVisible = false;
@@ -1155,7 +1216,6 @@ export default {
 					}
 				});
 				control_main.addControl(checkbox1);
-
 				var header1 = new BABYLON_GUI.TextBlock();
 				header1.text = "工段数据";
 				header1.width = "80px";
@@ -1175,34 +1235,12 @@ export default {
 						mesh_rect.isVisible = false;
 						highlightLayer.removeAllMeshes();
 					}
-					if (pickResult.hit) {
-						const mesh = pickResult.pickedMesh;
-						highlightLayer.removeAllMeshes();
-						if (
-							/.*[\u4e00-\u9fa5]+.*$/.test(mesh.name) &&
-							mesh.name !== "地面1" &&
-							mesh.name !== "绿地" &&
-							mesh.name !== "停车场"
-						) {
-							// 在选中的 mesh 上添加高亮效果
-							highlightLayer.addMesh(
-								mesh,
-								new BABYLON.Color3(1, 1, 0.5)
-							);
-							that.currentLightMesh = mesh;
-							mesh_rect.linkWithMesh(mesh);
-							let name = mesh.name.split("_")[0];
-							mesh_name.text = name;
-							mesh_rect.isVisible = true;
-						}
-					}
 				});
-				// checkbox.isChecked = true; //默认开启自动旋转
 				return scene;
 			};
 
 			const scene = createScene(); //Call the createScene function
-			// // scene.debugLayer.show()
+			// scene.debugLayer.show();
 
 			// // Register a render loop to repeatedly render the scene
 			engine.runRenderLoop(function () {
@@ -1304,63 +1342,39 @@ export default {
 				);
 			}
 		},
-		createLabelPanel(value, mesh) {
+		createImgLabel(value, mesh) {
 			let that = this;
-			let advancedTexture = that.myui;
-			const rect1 = new BABYLON_GUI.Rectangle(value + "_rect");
-			rect1.width = "64px";
-			rect1.height = "30px";
-			rect1.cornerRadius = 1;
-			rect1.thickness = 0;
-			rect1.background = "rgba(0, 128, 0, 0.8)";
-			rect1.isPointerBlocker = true; // 防止点击穿透
-			advancedTexture.addControl(rect1);
-			var label = new BABYLON_GUI.TextBlock(value + "_label");
-			label.text = value;
-			label.color = "white";
-			label.fontSize = "14px";
-			rect1.addControl(label);
-			rect1.linkWithMesh(mesh);
-			rect1.linkOffsetY = -30;
-			if (value == "电石渣") {
-				rect1.linkOffsetY = -200;
-				var line = new BABYLON_GUI.Line();
-				line.lineWidth = 4;
-				line.color = "Orange";
-				line.y1 = 10;
-				line.y2 = 15;
-				line.linkOffsetY = -15;
-				line.dash = [3, 3];
-				advancedTexture.addControl(line);
-				line.linkWithMesh(mesh);
-				let connectedControl =
-					advancedTexture.getControlByName("电石渣_rect");
-				line.connectedControl = connectedControl;
+			let imgUrl = "";
+			if (value == "石灰石破碎") {
+				imgUrl = "img/ly/shsps.png";
+			} else if (value == "原料磨") {
+				imgUrl = "img/ly/ylm.png";
+			} else if (value == "煤磨") {
+				imgUrl = "img/ly/mm.png";
+			} else if (value == "回转窑") {
+				imgUrl = "img/ly/hzy.png";
+			} else if (value == "余热发电") {
+				imgUrl = "img/ly/yrfd.png";
 			}
-			rect1.onPointerDownObservable.add(() => {
-				const mesh = rect1.linkedMesh;
+			var image = new BABYLON_GUI.Image(value + "_img", imgUrl);
+			image.width = "40px";
+			image.height = "40px";
+			image.linkOffsetY = -30;
+			that.myui.addControl(image);
+			image.linkWithMesh(mesh);
+			image.onPointerDownObservable.add(() => {
 				that.flyToMesh(mesh);
-				// let dataViewName = rect1.name.split('_')[0] + '_data_view';
-				let dataViewName = rect1.name.split("_")[0];
-				that.activeSectionName = dataViewName;
-				that.activeSection = 2;
-				that.getMgroupChartData(dataViewName);
-				let dataView = that.myui.getControlByName(
-					dataViewName + "_data_view"
-				);
-				if (dataView) {
-					// // 在这里进行矩形的操作
-					dataView.isVisible = true;
-				}
 			});
 		},
+		getMgroupChartData(name) {
+			//name:工段名称
+			let that = this;
+		},
 		// 创建3D数据展示层GUI
 		createDetailPanel(info, mesh) {
-			// info格式{"name": "xxx",
-			//"rows": ["label": "xxx1", "field": "ccc", "value": 123, "type": "primary"]}
 			let that = this;
 			const data_view = new BABYLON_GUI.StackPanel(
-				info.name + "_data_view"
+				info.name + "_data_detail"
 			);
 			data_view.width = "240px"; // StackPanel的宽度
 			// data_view.height = "140px";
@@ -1382,7 +1396,7 @@ export default {
 			mgroup_line.background = "rgba(44, 237, 255, 0.8)";
 			data_view.addControl(mgroup_line);
 
-			const titleImg = new BABYLON_GUI.img();
+			const titleImg = new BABYLON_GUI.Image();
 
 			const header = new BABYLON_GUI.StackPanel(info.name + "_header");
 			header.width = "200px";
@@ -1405,7 +1419,7 @@ export default {
 			);
 			mgroup_close.width = "25px";
 			mgroup_close.height = "25px";
-			mgroup_close.color = "rgb(255,165,0,0.7)";
+			mgroup_close.color = "rgba(255,165,0,0.7)";
 			mgroup_close.cornerRadius = 16;
 			mgroup_close.fontSize = "12px";
 			mgroup_close.thickness = 0;
@@ -1450,21 +1464,17 @@ export default {
 				row.addControl(valx);
 				data_view.addControl(row);
 			});
-
+			data_view.isVisible = true;
 			// 将StackPanel添加到GUI系统中
 			that.myui.addControl(data_view);
 			data_view.linkWithMesh(mesh);
 			data_view.linkOffsetY = -120;
-			if (info.name == "电石渣") {
-				data_view.linkOffsetY = -290;
-			}
-		},
-		getDeptDetail() {
-			let that = this;
 		},
+
 		deepCopy(obj) {
 			return JSON.parse(JSON.stringify(obj));
 		},
+		//质量分析模拟数据
 		initChart() {
 			let that = this;
 			function deepCopy(obj) {
@@ -1476,7 +1486,7 @@ export default {
 			let myChart5 = echarts.init(chartDom5);
 			option5.legend.data = [
 				{
-					name: "SM",
+					name: "KH",
 					textStyle: {
 						color: "#fff",
 					},
@@ -1485,10 +1495,30 @@ export default {
 						color: that.linearGradientColors[0],
 					},
 				},
+				{
+					name: "SM",
+					textStyle: {
+						color: "#fff",
+					},
+					borderRadius: 2,
+					itemStyle: {
+						color: that.linearGradientColors[1],
+					},
+				},
+				{
+					name: "IM",
+					textStyle: {
+						color: "#fff",
+					},
+					borderRadius: 2,
+					itemStyle: {
+						color: that.linearGradientColors[2],
+					},
+				},
 			];
 			option5.series = [
 				{
-					name: "SM",
+					name: "KH",
 					type: "line",
 					stack: "Total",
 					smooth: true,
@@ -1504,59 +1534,57 @@ export default {
 						focus: "series",
 					},
 					data: [
-						340, 250, 301, 264, 290, 340, 250, 232, 401, 264, 290,
-						240, 232, 201, 264, 390, 340, 250, 232, 301, 264, 390,
-						264, 290, 340, 250, 140, 232, 401, 250,
+						190, 200, 245, 265, 260, 255, 240, 220, 220, 264, 290,
+						240, 232, 251, 264, 320, 340, 250, 232, 240, 270, 280,
+						264, 290, 300, 250, 240, 232, 201, 250,
+					],
+				},
+				{
+					name: "SM",
+					type: "line",
+					stack: "Total",
+					smooth: true,
+					lineStyle: {
+						width: 0,
+					},
+					showSymbol: false,
+					areaStyle: {
+						opacity: 0.8,
+						color: that.linearGradientColors[1],
+					},
+					emphasis: {
+						focus: "series",
+					},
+					data: [
+						190, 200, 245, 265, 260, 255, 240, 220, 220, 264, 290,
+						240, 232, 251, 264, 320, 340, 250, 232, 240, 270, 280,
+						264, 290, 300, 250, 240, 232, 201, 250,
+					],
+				},
+				{
+					name: "IM",
+					type: "line",
+					stack: "Total",
+					smooth: true,
+					lineStyle: {
+						width: 0,
+					},
+					showSymbol: false,
+					areaStyle: {
+						opacity: 0.8,
+						color: that.linearGradientColors[2],
+					},
+					emphasis: {
+						focus: "series",
+					},
+					data: [
+						190, 200, 245, 265, 260, 255, 240, 220, 220, 264, 290,
+						240, 232, 251, 264, 320, 340, 250, 232, 240, 270, 280,
+						264, 290, 300, 250, 240, 232, 201, 250,
 					],
 				},
 			];
 			myChart5.setOption(option5);
-			//右3---数据采集---饼状图
-			let chartDom6 = document.getElementById("pieChart");
-			let myChart6 = echarts.init(chartDom6);
-			let option6 = {
-				color: that.linearGradientColors,
-				tooltip: {
-					trigger: "item",
-				},
-				legend: {
-					top: "2%",
-					left: "center",
-					textStyle: {
-						color: "#fff",
-					},
-				},
-				series: [
-					{
-						name: "运行状态",
-						type: "pie",
-						radius: ["40%", "70%"],
-						padAngle: 5,
-						itemStyle: {
-							borderRadius: 5,
-						},
-						label: {
-							show: true,
-							position: "inner",
-							fontSize: 16,
-							formatter: "{d}%",
-							color: "#fff",
-						},
-						labelLine: {
-							show: false,
-						},
-						data: [
-							{ value: 30, name: "运行" },
-							{ value: 70, name: "停机" },
-						],
-					},
-				],
-			};
-			myChart6.setOption(option6);
-		},
-		circleClose() {
-			this.clickVisible = false;
-			this.currentData.deptName = "";
 		},
 	},
 	beforeUnmount() {
@@ -1733,7 +1761,7 @@ export default {
 	margin-top: 5px;
 }
 .bodyList {
-	width: 150px;
+	width: 200px;
 	height: 100%;
 	color: #ffffff;
 	display: flex;
@@ -1744,14 +1772,22 @@ export default {
 	font-size: 1vh;
 	border: 1px solid #02f5f2;
 	height: 16%;
-	background: rgba(2, 245, 242, 0.18);
 	border-radius: 15px;
 	text-align: center;
 }
+.bodyListItemBg {
+	background: rgba(2, 245, 242, 0.18);
+}
+.tableHeader {
+	color: #02f5f2;
+	font-size: 1.1vh;
+}
+.bodyListItem_name {
+	width: 70px;
+	padding: 0.5vh 0;
+}
 .bodyListItem_num {
-	font-weight: bold;
-	font-size: 1.2vh;
-	/* color:#02f5f2; */
+	width: 80px;
 }
 .itemBodyFlex {
 	display: flex;
@@ -1759,7 +1795,7 @@ export default {
 .itemBodyCircle {
 	display: flex;
 	flex-wrap: wrap;
-	justify-content: space-around;
+	justify-content: center;
 	padding-top: 1vh;
 }
 .item_circle {
@@ -1940,25 +1976,16 @@ export default {
 	margin-top: 10px;
 }
 
-/* .clickBlock{
-        position:relative;
-    } */
-.circleClose {
-	position: absolute;
-	right: 10px;
-	top: 10px;
-	width: 30px;
-	height: 30px;
-}
-
 .percentage-value {
 	display: block;
 	margin-top: 6px;
-	font-size: 1vw;
+	font-size: 1.5vh;
 	color: #02f5f2;
+	font-weight: bold;
 }
 .percentage-label {
 	color: #ffffff;
+	font-size: 1.2vh;
 }
 .circle_bottom_text {
 	color: #02f5f2;
@@ -1970,26 +1997,27 @@ export default {
 	font-size: 20px;
 	margin-top: 10px;
 	height: 30%;
-	padding: 5%;
-	box-sizing: border-box;
-	background: linear-gradient(#99fffe, #99fffe) left -2px top 0,
-		linear-gradient(#99fffe, #99fffe) left -2px top -2px,
-		linear-gradient(#99fffe, #99fffe) right -2px top 0,
-		linear-gradient(#99fffe, #99fffe) right -2px top -2px,
-		linear-gradient(#99fffe, #99fffe) left -2px bottom 0,
-		linear-gradient(#99fffe, #99fffe) left -2px bottom -2px,
-		linear-gradient(#99fffe, #99fffe) right -2px bottom 0,
-		linear-gradient(#99fffe, #99fffe) right -2px bottom -2px;
-	background-color: rgba(0, 34, 51, 0.5);
-	background-repeat: no-repeat;
-	background-size: 3px 16px, 16px 3px;
-	border: 1px solid transparent;
-	display: grid;
-	place-items: center;
+	width: 50%;
+	font-size: 1.2vh;
+	display: inline-block;
+}
+.elecItem_wrap {
+	display: flex;
+	flex-direction: column;
+	border-left: 5px solid rgba(53, 156, 193, 0.66);
+	padding-left: 10px;
+	border-radius: 5px;
 }
 .elec_number {
 	color: rgb(2, 245, 242);
 	font-weight: bold;
+	font-size: 1.4vh;
+	padding-top: 5px;
+}
+.elec_unit {
+	font-size: 0.9vh;
+	color: #ffffff;
+	font-weight: 500;
 }
 .successState {
 	width: 10px;
@@ -2005,7 +2033,20 @@ export default {
 }
 /* // 表格——el-table 去除背景颜色*/
 #elTable {
+	/* border-radius: 5px; */
+	margin-top: 10px;
+}
+.successCircle {
+	width: 10px;
+	height: 10px;
 	border-radius: 5px;
+	background: #02f5f2;
+}
+.warningCircle {
+	width: 10px;
+	height: 10px;
+	border-radius: 5px;
+	background: #ffa500;
 }
 /deep/ .el-table,
 .el-table__body,
@@ -2055,5 +2096,8 @@ export default {
 	background: #13f1df;
 	border-color: #13f1df;
 }
+/deep/ .el-table__inner-wrapper:before {
+	background-color: rgba(0, 0, 0, 0) !important;
+}
 /* 改变radio选中时的样式 */
 </style>