diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue
index 827d53d1..9e910cb8 100644
--- a/src/views/bigScreen/index_gx.vue
+++ b/src/views/bigScreen/index_gx.vue
@@ -1,14 +1,17 @@
 <template>
 	<div class="container">
 		<header class="pageHeader">
-			<div class="header_left">{{ bigScreenName }}</div>
+			<div class="header_center_text">{{ bigScreenName }}</div>
+			<div class="header_left">
+				<span>{{ currentYear }}年{{ currentMonth }}月{{ currentDay }}日</span>
+			</div>
 			<div class="header_right">
-				<span>{{ currentYear }}年{{ currentMonth }}月{{ currentDay }}日{{ currentTime }}</span>
+				<span>{{ currentTime }}</span>
 				<span style="margin: 0 5px;">|</span>
 				<img src="img/v_track.png" style="margin-right: 5px;">
 				<span>枣庄</span>
 			</div>
-			<img class="header_light" src="img/gx/header_light.png" />
+			<img class="header_bg" src="img/photon_header.png" />
 			<div class="header_line header_line1"></div>
 			<div class="header_line header_line2"></div>
 		</header>
@@ -48,20 +51,20 @@
 		<div class="left_block">
 			<div class="flexItem">
 				<div class="itemTitle">
-					<div>计划产量</div>
+					<div>任务产量</div>
 				</div>
 				<div class="itemBody itemBody1">
 					<div style="display: flex;justify-content: space-between;">
 						<div class="block1NumberWrap">
 							<div class="block1Numberinner">
 								<span class="block1Text">日产量</span>
-								<span class="block1Number">2345</span>
+								<span class="block1Number">{{ count_day }}</span>
 							</div>
 						</div>
 						<div class="block1NumberWrap">
 							<div class="block1Numberinner">
-								<span class="block1Text">日计划</span>
-								<span class="block1Number">2345</span>
+								<span class="block1Text">日任务</span>
+								<span class="block1Number">{{cprrws}}</span>
 							</div>
 						</div>
 					</div>
@@ -69,13 +72,13 @@
 						<div class="block1NumberWrap">
 							<div class="block1Numberinner">
 								<span class="block1Text">周产量</span>
-								<span class="block1Number">2345</span>
+								<span class="block1Number">{{ count_week }}</span>
 							</div>
 						</div>
 						<div class="block1NumberWrap">
 							<div class="block1Numberinner">
-								<span class="block1Text">周计划</span>
-								<span class="block1Number">2345</span>
+								<span class="block1Text">周任务</span>
+								<span class="block1Number">{{ cprrws*7 }}</span>
 							</div>
 						</div>
 					</div>
@@ -83,196 +86,501 @@
 						<div class="block1NumberWrap">
 							<div class="block1Numberinner">
 								<span class="block1Text">月产量</span>
-								<span class="block1Number">2345</span>
+								<span class="block1Number">{{ count_month }}</span>
 							</div>
 						</div>
 						<div class="block1NumberWrap">
 							<div class="block1Numberinner">
-								<span class="block1Text">月计划</span>
-								<span class="block1Number">2345</span>
+								<span class="block1Text">月任务</span>
+								<span class="block1Number">{{ cprrws*days }}</span>
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-			<div class="flexItem">
-				<div class="itemTitle">
-					<div>设备运转状态</div>
-				</div>
-				<div class="itemBody">
-					<scEcharts v-if="eqChartShow" height="300px" width="300px" :option="option_eq"></scEcharts>
-					<!-- <div id="eqPieChart" style="width: 300px;height: 300px;"></div> -->
-				</div>
-			</div>
-			<div class="flexItem">
-				<div class="itemTitle">
-					<div class="itemTitleIcon"></div>
-					<div>质量分析</div>
-				</div>
-				<div class="itemBody itemBody3">
-					<div>
-						<scEcharts height="155px" width="118px" :option="options"></scEcharts>
-						<scEcharts height="155px" width="118px" :option="option1"></scEcharts>
-						<scEcharts height="155px" width="118px" :option="option2"></scEcharts>
-					</div>
-					<div>
-						<scEcharts height="155px" width="118px" :option="option3"></scEcharts>
-						<scEcharts height="155px" width="118px" :option="option4"></scEcharts>
-					</div>
-				</div>
-			</div>
 		</div>
 		<div class="left_block2">
-			<div class="flexItem">
-				<div class="itemTitle">
-					<div>计划产量</div>
-				</div>
-				<div class="itemBody itemBody1">
-					<div style="display: flex;justify-content: space-between;">
-						<div class="block1NumberWrap">
-							<div class="block1Numberinner">
-								日产量<span class="block1Number">2345</span>
-							</div>
-						</div>
-						<div class="block1NumberWrap">
-							<div class="block1Numberinner">
-								日计划<span class="block1Number">2345</span>
-							</div>
-						</div>
-					</div>
-					<div style="display: flex;justify-content: space-between;">
-						<div class="block1NumberWrap">
-							<div class="block1Numberinner">
-								周产量<span class="block1Number">2345</span>
-							</div>
-						</div>
-						<div class="block1NumberWrap">
-							<div class="block1Numberinner">
-								周计划<span class="block1Number">2345</span>
-							</div>
-						</div>
-					</div>
-					<div style="display: flex;justify-content: space-between;">
-						<div class="block1NumberWrap">
-							<div class="block1Numberinner">
-								月产量<span class="block1Number">2345</span>
-							</div>
-						</div>
-						<div class="block1NumberWrap">
-							<div class="block1Numberinner">
-								月计划<span class="block1Number">2345</span>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
 			<div class="flexItem">
 				<div class="itemTitle">
 					<div>设备运转状态</div>
 				</div>
 				<div class="itemBody">
-					<scEcharts v-if="eqChartShow" height="300px" width="300px" :option="option_eq"></scEcharts>
-					<!-- <div id="eqPieChart" style="width: 300px;height: 300px;"></div> -->
+					<!-- <scEcharts v-if="eqChartShow" height="250px" width="335px" :option="option_eq"></scEcharts> -->
+					<div id="eqPieChart" style="width: 335px;height: 250px;"></div>
+				</div>
+			</div>
+		</div>
+		<div class="left_block3">
+			<div class="flexItem">
+				<div class="itemTitle2">
+					<div>库存</div>
+					<el-carousel height="40px" :interval="30000" indicator-position="none" 
+					style="position: absolute;top: 0;right: 0;width: 100px;">
+						<el-carousel-item>
+							<div style="color: #ffffff; z-index: 10;font-size: 18px;">成品库</div>
+						</el-carousel-item>
+						<el-carousel-item>
+							<div style="color: #ffffff; z-index: 10;font-size: 18px;">原料库</div>
+						</el-carousel-item>
+					</el-carousel>
+				</div>
+				<div class="itemBody itemBody1">
+					<el-carousel height="140px" :interval="30000" indicator-position="none">
+						<el-carousel-item>
+							<dv-scroll-board 
+								:config="configDataProd" 
+								class="boxmain" 
+								style="width:98%;margin:auto" 
+							/>
+						</el-carousel-item>
+						<el-carousel-item>
+							<dv-scroll-board 
+								:config="configData30" 
+								class="boxmain" 
+								style="width:98%;margin:auto" 
+							/>
+						</el-carousel-item>
+					</el-carousel>
 				</div>
 			</div>
 			<div class="flexItem">
-				<div class="itemTitle">
+				<div class="itemTitle2">
 					<div class="itemTitleIcon"></div>
 					<div>质量分析</div>
 				</div>
-				<div class="itemBody itemBody3">
+				<div class="itemBody">
+					<div class="itemBody3">
+						<scEcharts height="155px" width="140px" :option="options"></scEcharts>
+						<scEcharts height="155px" width="140px" :option="option1"></scEcharts>
+						<scEcharts height="155px" width="140px" :option="option2"></scEcharts>
+						<scEcharts height="155px" width="140px" :option="option3"></scEcharts>
+						<scEcharts height="155px" width="140px" :option="option4"></scEcharts>
+					</div>
 				</div>
 			</div>
 		</div>
 		<div class="right_block">
-			<div class="flexItem">
+			<div class="flexItem videoFlexItem">
 				<div class="itemTitle2">
 					<div class="itemTitleIcon"></div>
 					<div>实时视频</div>
 				</div>
 				<div class="itemBody">
-					<!-- <img src="img/nodata.png" /> --> 
-					<img src="img/v_mask.png" style="height: 300px;width:620px;margin-left: 25px;"/>
+					<video width="670" height="400" autoplay controls loop>
+						<source src="img/gx/gx_video.mp4" type="video/mp4">
+					</video>
+					<!-- <img src="img/v_mask.png" style="height: 400px;width:620px;margin-left: 25px;"/> -->
 				</div>
 			</div>
 			<div class="flexItem">
 				<div class="itemTitle2">
 					<div class="itemTitleIcon"></div>
-					<div>库存</div>
+					<div>宣传公告</div>
 				</div>
-				<div class="itemBody inmItemBody">
-					<dv-scroll-board 
-						:config="configData" 
-						class="inmBoxmain" 
-						style="width:98%;margin:auto" 
-					/>
-					<dv-scroll-board 
-						:config="configData" 
-						class="inmBoxmain" 
-						style="width:98%;margin:auto" 
-					/>
+				<div class="itemBody" style="padding:10px">
+					<div class="viewsItem">
+						<div class="viewsItem_wrap">
+							<img style="float: left;" class="viewsItem_img"  src="img/gz_logo.png">
+							<article>
+								紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，筑牢“防护网”，紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，筑牢“防护网”
+							</article>
+						</div>
+					</div>
+					<div class="viewsItem">
+						<div class="viewsItem_wrap">
+							<img style="float: left;" class="viewsItem_img"  src="img/gz_logo.png">
+							<article>
+								紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查
+							</article>
+						</div>
+					</div>
 				</div>
 			</div>
-			<div class="flexItem">
-				<div class="itemTitle2">
-					<div class="itemTitleIcon"></div>
-					<div>余热发电/环保数据</div>
+		</div>
+		<div class="bottom_block">
+			<div id="scroll" class="bottom_block2">
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>切片</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData0" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</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 class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>白片抛</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 class="itemBody">
+						<dv-scroll-board 
+							:config="configData1" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
 					</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="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>扫边A</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 class="itemBody">
+						<dv-scroll-board 
+							:config="configData2" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
 					</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="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>黑化</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 class="itemBody">
+						<dv-scroll-board 
+							:config="configData3" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>退火</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData4" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>减薄A</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData5" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>减薄B</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData6" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>平磨</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData7" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>精雕</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData8" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>一次抛</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData9" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>扫边B</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData10" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>成品抛</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData11" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>倒角</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData12" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>一次超洗</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData13" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>二次超洗</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData14" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>三次超洗</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData15" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>切片</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData0" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>白片抛</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData1" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>扫边A</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData2" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>黑化</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData3" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>退火</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData4" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>减薄A</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData5" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>减薄B</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData6" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>平磨</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData7" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>精雕</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData8" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>一次抛</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData9" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>扫边B</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData10" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>成品抛</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData11" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>倒角</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData12" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>一次超洗</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData13" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>二次超洗</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData14" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
+					</div>
+				</div>
+				<div class="flexItem3">
+					<div class="itemTitle itemTitle_b">
+						<div>三次超洗</div>
+					</div>
+					<div class="itemBody">
+						<dv-scroll-board 
+							:config="configData15" 
+							class="inmBoxmain" 
+							style="width:98%;margin:auto" 
+						/>
 					</div>
 				</div>
 			</div>
@@ -295,6 +603,16 @@ BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
 	"./draco_decoder_gltf.js";
 import "babylonjs-loaders";
 import "animate.css";
+const configData={
+	header : ['物料批次','未加工','进行中','已完成'],
+	headerBGC : '#0a3f44',
+	rowNum : 8,
+	headerHeight : 35,
+	align : 'center',
+	waitTime : 1500,
+	columnWidth: [160,80,80,80],
+	data : [],
+}
 export default {
 	components: {
 		scEcharts
@@ -326,8 +644,8 @@ export default {
 			currentYear: "",
 			currentMonth: "",
 			currentDay: "",
+			days:0,
 			timerTime: null,
-			timerData: null,
 			start_date: "",
 			end_date: "",
 			dialogData: {
@@ -342,59 +660,11 @@ export default {
 			count_meihao: 0,
 			count_elec: 0,
 			blockTableHeight: 0,
-			linearGradientColors: [
-				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(128, 255, 165)",
-					},
-					{
-						offset: 1,
-						color: "rgb(1, 191, 236)",
-					},
-				]),
-
-				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(0, 221, 255)",
-					},
-					{
-						offset: 1,
-						color: "rgb(77, 119, 255)",
-					},
-				]),
-				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(55, 162, 255)",
-					},
-					{
-						offset: 1,
-						color: "rgb(116, 21, 219)",
-					},
-				]),
-				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(255, 0, 135)",
-					},
-					{
-						offset: 1,
-						color: "rgb(135, 0, 157)",
-					},
-				]),
-				new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-					{
-						offset: 0,
-						color: "rgb(255, 191, 0)",
-					},
-					{
-						offset: 1,
-						color: "rgb(224, 62, 76)",
-					},
-				]),
-			],
+			count_day:0,
+			count_week:0,
+			count_month:0,
+			cprrws:0,
+			seriesData: [],
 			sectionNames: {
 				石灰石破碎筛分生产系统: "石灰石破碎",
 				原料磨: "原料磨",
@@ -402,17 +672,13 @@ export default {
 				煤磨: "煤磨",
 				余热发电: "余热发电",
 			},
-			hotData: {
-				total_production: "",
-				production_elec_unit: "",
-				elec_consume: "",
-				NOx: "",
-				SO2: "",
-				klw: "",
-			},
 			options: {
 				title: {
 					text: '总计',
+					textStyle:{
+						color: '#fff',
+					}
+					
 				},
 				grid: {
 					top: '5%'
@@ -436,7 +702,10 @@ export default {
 			},
 			option1: {
 				title: {
-					text: '尺寸白班',
+					text: '尺寸早班',
+					textStyle:{
+						color: '#fff',
+					}
 				},
 				grid: {
 					top: '5%'
@@ -460,7 +729,10 @@ export default {
 			},
 			option2: {
 				title: {
-					text: '尺寸夜班',
+					text: '尺寸晚班',
+					textStyle:{
+						color: '#fff',
+					}
 				},
 				grid: {
 					top: '5%'
@@ -484,7 +756,10 @@ export default {
 			},
 			option3: {
 				title: {
-					text: '外观白班',
+					text: '外观早班',
+					textStyle:{
+						color: '#fff',
+					}
 				},
 				grid: {
 					top: '5%'
@@ -508,7 +783,10 @@ export default {
 			},
 			option4: {
 				title: {
-					text: '外观夜班',
+					text: '外观晚班',
+					textStyle:{
+						color: '#fff',
+					}
 				},
 				grid: {
 					top: '5%'
@@ -531,62 +809,91 @@ export default {
 				}]
 			},
 			option_eq: {
-				grid: {
-					top: '1%'
-				},
+				color: ['rgb(145,204,117)', '#ffa500 ', 'rgb(250,200,88)', 'rgb(215,102,97)', 'rgb(185,51,46)' ],
 				tooltip: {
 					trigger: 'item',
 				},
 				legend: {
-					// type: 'scroll',
-					orient: 'vertical',
-					right: 10,
-					top: 20,
-					// data: ['运行', '待机', '停运', '故障', '掉线'],
+					// orient: 'vertical',
+					left: 'center',
+					bottom: '0',
+					textStyle:{
+						color:"#ffffff"
+					}
 				},
 				series:{
+					name:'设备状态',
 					type: 'pie',
-					radius: ['40%', '80%'],
-					center: ['45%', '55%'],
+					radius: ['30%', '60%'],
+					center: ['50%', '40%'],
 					itemStyle: {
 						borderRadius: 10,
 						borderWidth: 2
 					},
 					label: {
-						show: false
+						show: false,
+						position: 'center',
 					},
 					labelLine: {
 						show: false
 					},
 					emphasis: {
 						label: {
-						show: true,
-						fontSize: 40,
-						fontWeight: 'bold'
+							show: true,
+							fontSize: 20,
+							fontWeight: 'bold'
 						}
 					},
 					data: [
-						{value: 0, name: '运行'},
-						{value: 0, name: '待机'},
-						{value: 0, name: '停运'},
-						{value: 0, name: '故障'},
-						{value: 0, name: '掉线'},
+						{value: 0, name: '正常'},
+						{value: 0, name: '限用'},
+						{value: 0, name: '维修'},
+						{value: 0, name: '禁用'},
+						{value: 0, name: '报废'},
 					]
 				}
 			},
-			configData:{
+			configDataProd:{
 				header:['物料名称','物料批次','物料数量'],
 				headerBGC:'#0a3f44',
 				headerHeight:35,
 				align:'center',
 				data:[],
+				rowNum : 3,
 				waitTime:1000,
 			},
+			configData30:{
+				header:['物料批次','未加工','进行中','已完成'],
+				headerBGC:'#0a3f44',
+				headerHeight:35,
+				align:'center',
+				data:[],
+				rowNum : 3,
+				waitTime:1000,
+			},
+			configData0:{},
+			configData1:{},
+			configData2:{},
+			configData3:{},
+			configData4:{},
+			configData5:{},
+			configData6:{},
+			configData7:{},
+			configData8:{},
+			configData9:{},
+			configData10:{},
+			configData11:{},
+			configData12:{},
+			configData13:{},
+			configData14:{},
+			configData15:{},
+			scrollNum:0,
+			scrollInterval:null,
 		};
 	},
 	mounted() {
 		let that = this;
-		// that.initFactory();
+		that.initFactory();
 		that.bigScreenName = that.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
 		that.showTime();
 		that.addListener();
@@ -595,48 +902,38 @@ export default {
 		let year = nowDate.getFullYear();
 		let month = nowDate.getMonth() + 1;
 		let day = nowDate.getDate();
-		let days = new Date(year, month, 0).getDate();
+		that.days = new Date(year, month, 0).getDate();
 		// month = month < 10 ? "0" + month : month;
 		that.currentYear = year;
 		that.currentMonth = month;
 		that.currentDay = day;
 		that.getEquipments();
 		that.getMaterials();
-		let arr =[1,3,5,7,9];
-		function asyncFunction(num) {
-		  return new Promise((resolve, reject) => {
-		    setTimeout(() => {
-		      resolve(num * 2);
-		    }, 1000);
-		  });
-		}
-		// let chartsDom = document.getElementById("pieCharts");
-		// let myCharts = echarts.init(chartsDom);
-		// myCharts.setOption(that.options);
-		// let chart1Dom = document.getElementById("pieChart1");
-		// let myChart1 = echarts.init(chart1Dom);
-		// myChart1.setOption(that.option1);
-		// let chart2Dom = document.getElementById("pieChart2");
-		// let myChart2 = echarts.init(chart2Dom);
-		// myChart2.setOption(that.option2);
-		// let chart3Dom = document.getElementById("pieChart3");
-		// let myChart3 = echarts.init(chart3Dom);
-		// myChart3.setOption(that.option3);
-		// let chart4Dom = document.getElementById("pieChart4");
-		// let myChart4 = echarts.init(chart4Dom);
-		// myChart4.setOption(that.option4);
-		// let eqchartDom = document.getElementById("eqPieChart");
-		// let eqChart = echarts.init(eqchartDom);
-		// eqChart.setOption(that.option_eq);
-		let promises = arr.map(async (num) => {
-		  let result = await asyncFunction(num);
-		  return result;
-		});
-		Promise.all(promises).then((results) => {
-		  console.log(results); 
-		});
+		that.getMgroup();
+		that.getProcessData();
+		that.getTaskNumber();
+		that.addListener();
+		that.setIntervalFun();
+		let myChart = echarts.init(document.getElementById('eqPieChart'));
+		myChart.setOption(that.option_eq);
 	},
 	methods: {
+		setIntervalFun(){
+			let that = this;
+			that.scrollInterval = setInterval(() => {
+			if(that.scrollNum>14){
+				// console.log('清零');
+				that.scrollNum = 0;
+			}else{
+				// console.log('++++');
+				that.scrollNum++;
+			}
+			// console.log('that.scrollNum',that.scrollNum);
+			let nums = that.scrollNum * 356;
+			let lefts = 0-nums;
+		    document.getElementById("scroll").style.left = lefts +'px';
+		},6000)
+		},
 		showTime() {
 			this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
 			this.currentWeek = this.$TOOL.dateFormat(new Date(), "week");
@@ -648,6 +945,10 @@ export default {
 		addListener() {
 			let that = this;
 			window.addEventListener("resize", function () {
+				if (that.scrollInterval!=null) {
+				    clearInterval(that.scrollInterval);
+				}
+				that.setIntervalFun();
 				if (this.resizeTimeout) {
 					clearTimeout(this.resizeTimeout);
 				}
@@ -689,85 +990,125 @@ export default {
 				myChart.resize();
 			}
 		},
+		getTaskNumber(){
+			let that = this;
+			let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
+			let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
+			let current_date = that.currentYear+'-'+month+'-'+day;
+			let obj = {query:{current_date:current_date}};
+			that.$API.bi.dataset.exec.req('cprrws', obj).then((res) => {
+				if(res.data2.ds0){
+					that.cprrws = res.data2.ds0[0].日任务数;
+				}
+			});
+			let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'三次超洗'}};
+			that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => {
+				if(res0.data2.ds0){
+					that.count_day = res0.data2.ds0[0].生产数;
+				}
+			});
+			let ondDayTime = 86400000;
+			let nowDate = new Date();
+			let week = nowDate.getDay();//当前时间的week数
+			let weekFirst = week-1;//第一天对应的天数
+			let weekLast = 7-week;//最后一天对应的天数
+			let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
+			let last = new Date(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日
+			let objWeek = {query:{
+				start_date:first,end_date:last,mgroup_name:'三次超洗',
+				group_bys_date:',月,周',order_bys_date:',月,周',
+				select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周'
+			}};
+			that.$API.bi.dataset.exec.req('lineDay_m2', objWeek).then((res1) => {
+				if(res1.data2.ds0){
+					that.count_week = res1.data2.ds0[0].生产数;
+				}
+			});
+			let start_month = that.currentYear+'-'+month+'-01';
+			let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate();
+			let objMonth = {query:{
+				start_date:start_month,end_date:end_month,mgroup_name:'三次超洗',
+				group_bys_date:',月',order_bys_date:',月',
+				select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月'
+			}};
+			that.$API.bi.dataset.exec.req('lineDay_m2', objMonth).then((res2) => {
+				if(res2.data2.ds0){
+					that.count_month = res2.data2.ds0[0].生产数;
+				}
+			});
+		},
 		//设备统计
 		getEquipments(){
 			let that = this;
 			that.$API.em.equipment.count_running_state.req().then((res) => {
-				that.option_eq.series.data[0] = res.count_running;
-				that.option_eq.series.data[1] =res.count_standby;
-				that.option_eq.series.data[2] =res.count_stop;
-				that.option_eq.series.data[3] =res.count_fail;
-				that.option_eq.series.data[4] =res.count_offline;
+				that.option_eq.series.data[0] = res.count_ok;
+				that.option_eq.series.data[1] =res.count_limit;
+				that.option_eq.series.data[2] =res.count_fix;
+				that.option_eq.series.data[3] =res.count_disable;
+				that.option_eq.series.data[4] =res.count_scrap;
+				that.seriesData = that.option_eq.series.data;
 				that.eqChartShow = true;
 			})
 		},
 		//库存统计列表(原料30库库存和成品10库库存)
 		getMaterials() {
 			let that = this;
-			that.$API.inm.warehouse.batch.req({ page: 0,material__type:30,count__gte:1}).then((res) => {
-				that.configData.data = [];
-				if(res.length>0){
-					res.forEach((item) => {
+			that.$API.inm.warehouse.batch.req({ page: 0,material__type:10,count__gte:1}).then((res10) => {
+				that.configDataProd.data = [];
+				if(res10.length>0){
+					res10.forEach((item) => {
 					    let arr = [];
 						arr[0] = item.material_name;
 						arr[1] = item.batch;
 						arr[2] = item.count;
-						that.configData.data .push(arr);
+						that.configDataProd.data.push(arr);
+					})
+				}
+			})
+			that.$API.inm.warehouse.batch.req({ page: 0,material__type:30,count__gte:1}).then((res30) => {
+				that.configData30.data = [];
+				if(res30.length>0){
+					res30.forEach((item) => {
+					    let arr = [];
+						arr[0] = item.material_name;
+						arr[1] = item.batch;
+						arr[2] = item.count;
+						that.configData30.data.push(arr);
 					})
 				}
 			})
 		},
+		//获取工段中各个批次的数量
 		initFactory() {
 			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 =
-				function () {};
+			BABYLON.DefaultLoadingScreen.prototype.displayLoadingUI = function () {};
 			BABYLON.DefaultLoadingScreen.prototype.hideLoadingUI = function () {
 				document.getElementById("loadingScreen").style.display = "none";
 			};
-
 			engine.displayLoadingUI();
 			const createScene = function () {
 				const scene = new BABYLON.Scene(engine);
 				scene.clearColor = BABYLON.Color3.Black(); //BABYLON.Color3(1, 0, 1);
-
-				// const ground = BABYLON.MeshBuilder.CreateGround("ground", {
-				// 	width: 50,
-				// 	height: 50,
-				// });
-				// const groundMaterial = new BABYLON_GRID.GridMaterial(
-				// 	"groundMaterial",
-				// 	scene
-				// );
-				// groundMaterial.majorUnitFrequency = 5;
-				// groundMaterial.minorUnitVisibility = 0.5;
-				// groundMaterial.gridRatio = 2;
-				// ground.material = groundMaterial;
-				// ground.position.y = -0.1;
 				// 加载背景图片
-				const backgroundImage = new BABYLON.Layer(
-					"",
-					"img/gx/gx_bj.jpg",
-					scene,
-					true
-				);
+				const backgroundImage = new BABYLON.Layer("","img/gx/gx_bj.jpg",scene,true);
 				const camera = new BABYLON.ArcRotateCamera(
 					"camera",
 					that.initialAlpha,
 					that.initialBeta,
 					that.initialRadius,
-					new BABYLON.Vector3(0, 0, 1.2)
+					new BABYLON.Vector3(0, -4.5, 1.2)
 				);
 				that.camera = camera;
 				that.initialTarget = camera.getTarget();
-				camera.upperBetaLimit = Math.PI / 2.3; //无法移动到地面以下
+				camera.upperBetaLimit = Math.PI / 3.1; //无法移动到地面以下
 				camera.attachControl(canvas, true);
 				camera.maxZ = 1000; // 调整适当的值
 				// 相机限制
-				camera.lowerRadiusLimit = 8;
-				camera.upperRadiusLimit = 20;
-
+				camera.lowerRadiusLimit = 27;
+				camera.upperRadiusLimit = 50;
+				camera.useAutoRotationBehavior = true;
 				// 灯光
 				const light = new BABYLON.HemisphericLight(
 					"light",
@@ -793,19 +1134,19 @@ export default {
 				control_main.left = "-15%";
 				advancedTexture.addControl(control_main);
 
-				var button_main = BABYLON_GUI.Button.CreateSimpleButton(
-					"button_main",
-					"主视角"
-				);
-				button_main.width = "80px";
-				button_main.height = "30px";
-				button_main.color = "white";
-				button_main.cornerRadius = 20;
-				button_main.background = "green";
-				control_main.addControl(button_main);
-				button_main.onPointerClickObservable.add(() => {
-					that.flyToMesh();
-				});
+				// var button_main = BABYLON_GUI.Button.CreateSimpleButton(
+				// 	"button_main",
+				// 	"主视角"
+				// );
+				// button_main.width = "80px";
+				// button_main.height = "30px";
+				// button_main.color = "white";
+				// button_main.cornerRadius = 20;
+				// button_main.background = "green";
+				// control_main.addControl(button_main);
+				// button_main.onPointerClickObservable.add(() => {
+				// 	that.flyToMesh();
+				// });
 
 				// 高亮显示mesh名
 				const mesh_rect = new BABYLON_GUI.Rectangle("mesh_rect");
@@ -821,45 +1162,11 @@ 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/gx.glb";
 				BABYLON.SceneLoader.Append(
 					remoteGlbUrl,
 					"",
 					scene,
-					function (scene) {
-						// 判断字符串是否包含中文------   /[\u4E00-\u9FA5]+/g.test(str)
-						for (let key in that.sectionNames) {
-							const value = that.sectionNames[key];
-							const mesh = scene.getMeshByName(key);
-							if (mesh) {
-								// that.createImgLabel(value, mesh);
-								that.getMgroupChartData(value, mesh);
-
-								// // 创建一个工段数据展示panel
-								const info = {
-									name: value,
-									rows: [
-										{
-											label: "产品产量(t)",
-											field: "total_production",
-											value: 100,
-										},
-										{
-											label: "运转率(%)",
-											field: "run_rate",
-											value: 100,
-										},
-										{
-											label: "单位电耗(kwh)",
-											field: "elec_consume_unit",
-											value: 100,
-										},
-									],
-								};
-							}
-						}
-						engine.hideLoadingUI();
-					},
 					function (evt) {
 						var loadedPercent = 0;
 						if (evt.lengthComputable) {
@@ -873,384 +1180,88 @@ export default {
 						that.loadedPercent = loadedPercent;
 					}
 				);
-
-				// 自动旋转checkbox
-				var checkbox = new BABYLON_GUI.Checkbox();
-				checkbox.width = "20px";
-				checkbox.height = "20px";
-				checkbox.isChecked = false;
-				checkbox.marginLeft = "16px";
-				checkbox.color = "green";
-				checkbox.onIsCheckedChangedObservable.add(function (value) {
-					if (value) {
-						camera.useAutoRotationBehavior = true;
-					} else {
-						camera.useAutoRotationBehavior = false;
-					}
-				});
-				control_main.addControl(checkbox);
-
-				var header = new BABYLON_GUI.TextBlock();
-				header.text = "自动旋转";
-				header.width = "80px";
-				header.textHorizontalAlignment =
-					BABYLON_GUI.Control.HORIZONTAL_ALIGNMENT_LEFT;
-				header.color = "white";
-				control_main.addControl(header);
-				// 工段数据checkbox
-				var checkbox1 = new BABYLON_GUI.Checkbox();
-				checkbox1.width = "20px";
-				checkbox1.height = "20px";
-				checkbox1.isChecked = true;
-				checkbox1.marginLeft = "16px";
-				checkbox1.color = "green";
-				checkbox1.onIsCheckedChangedObservable.add(function (value) {
-					if (value) {
-						for (let key in that.sectionNames) {
-							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_detail";
-							let dataView =
-								advancedTexture.getControlByName(name);
-							dataView.isVisible = false;
-						}
-					}
-				});
-				control_main.addControl(checkbox1);
-				var header1 = new BABYLON_GUI.TextBlock();
-				header1.text = "工段数据";
-				header1.width = "80px";
-				header1.textHorizontalAlignment =
-					BABYLON_GUI.Control.HORIZONTAL_ALIGNMENT_LEFT;
-				header1.color = "white";
-				control_main.addControl(header1);
-
-				// 添加抓取事件
-				canvas.addEventListener("mousemove", (event) => {
-					// 使用 scene.pick 检测鼠标拾取
-					const pickResult = scene.pick(
-						scene.pointerX,
-						scene.pointerY
-					);
-					if (that.currentLightMesh) {
-						mesh_rect.isVisible = false;
-						highlightLayer.removeAllMeshes();
-					}
-				});
 				return scene;
 			};
 
 			const scene = createScene(); //Call the createScene function
-			// scene.debugLayer.show();
-
-			// // Register a render loop to repeatedly render the scene
 			engine.runRenderLoop(function () {
 				scene.render();
 			});
 			this.engine = engine;
 			this.scene = scene;
-			// Watch for browser/canvas resize events
 			window.addEventListener("resize", function () {
 				engine.resize();
 			});
 		},
-		flyToMesh(mesh = undefined) {
-			// 不传mesh默认回到初始位置
-			let that = this;
-			const camera = that.camera;
-			if (mesh == undefined) {
-				if (
-					camera.alpha != that.initialAlpha ||
-					camera.beta != that.initialBeta ||
-					camera.radius != that.initialRadius
-				) {
-					let cameraPosition = new BABYLON.Vector3(
-						0 +
-							that.initialRadius *
-								Math.sin(that.initialBeta) *
-								Math.cos(that.initialAlpha),
-						0 + that.initialRadius * Math.cos(that.initialBeta),
-						0 +
-							that.initialRadius *
-								Math.sin(that.initialBeta) *
-								Math.sin(that.initialAlpha)
-					);
-					let position = that.initialTarget;
-					var ease = new BABYLON.CubicEase();
-					ease.setEasingMode(
-						BABYLON.EasingFunction.EASINGMODE_EASEINOUT
-					);
-					BABYLON.Animation.CreateAndStartAnimation(
-						"at5",
-						camera,
-						"position",
-						45,
-						200,
-						camera.position,
-						cameraPosition,
-						0,
-						ease
-					);
-					BABYLON.Animation.CreateAndStartAnimation(
-						"at51",
-						camera,
-						"target",
-						45,
-						200,
-						camera.target,
-						position,
-						0,
-						ease
-					);
-				}
-			} else if (camera.target != mesh.position) {
-				console.log("fly to");
-				// 计算新的相机位置
-				let position = mesh._parentNode._position;
-				if (mesh._parentNode.id == "__root__") {
-					position = mesh.position;
-				}
-				let cameraPosition = new BABYLON.Vector3(
-					mesh.position.x +
-						9 * Math.sin(camera.beta) * Math.cos(Math.PI),
-					mesh.position.y + 9 * Math.cos(camera.beta),
-					mesh.position.z +
-						9 * Math.sin(camera.beta) * Math.sin(Math.PI)
-				);
-				var ease = new BABYLON.CubicEase();
-				ease.setEasingMode(BABYLON.EasingFunction.EASINGMODE_EASEINOUT);
-				BABYLON.Animation.CreateAndStartAnimation(
-					"at5",
-					camera,
-					"position",
-					45,
-					200,
-					camera.position,
-					cameraPosition,
-					0,
-					ease
-				);
-				BABYLON.Animation.CreateAndStartAnimation(
-					"at51",
-					camera,
-					"target",
-					45,
-					200,
-					camera.target,
-					position,
-					0,
-					ease
-				);
-			}
-		},
-		createImgLabel(value, mesh) {
-			let that = this;
-			let imgUrl = "";
-			if (value == "石灰石破碎") {
-				imgUrl = "img/ly/ps.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";
-			}
-			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);
-			});
-		},
-		getMgroupChartData(value, mesh) {
-			//value:工段名称,mesh:模块
-			let that = this;
-			//根据名称获取工段数据
-			let query = {
-				mgroup__name: value,
-				type: "month_s",
-				year_s: that.currentYear,
-				month_s: that.currentMonth,
-				page: 0,
-				query: "{total_production,run_rate,elec_consume_unit,production_elec_unit}",
-			};
-			that.$API.enm.enstat.req(query).then((res) => {
-				let info = {
-					name: value,
-					rows: [],
-				};
-				if (value == "余热发电") {
-					info.rows = [
-						{
-							label: "发电量(kwh)",
-							field: "total_production",
-							value: res[0].total_production,
-						},
-						{
-							label: "运转率(%)",
-							field: "run_rate",
-							value: res[0].run_rate,
-						},
-						{
-							label: "发电量(kwh/t)",
-							field: "production_elec_unit",
-							value: res[0].production_elec_unit
-								? res[0].production_elec_unit
-								: "0.00",
-						},
-					];
-				} else {
-					info.rows = [
-						{
-							label: "产品产量(t)",
-							field: "total_production",
-							value: res[0].total_production,
-						},
-						{
-							label: "运转率(%)",
-							field: "run_rate",
-							value: res[0].run_rate,
-						},
-						{
-							label: "单位电耗(kwh)",
-							field: "elec_consume_unit",
-							value: res[0].elec_consume_unit,
-						},
-					];
-				}
-
-				that.createDetailPanel(info, mesh);
-			});
-		},
-		// 创建3D数据展示层GUI
-		createDetailPanel(info, mesh) {
-			let that = this;
-			const data_view = new BABYLON_GUI.StackPanel(
-				info.name + "_data_detail"
-			);
-			data_view.width = "240px"; // StackPanel的宽度
-			// data_view.height = "140px";
-			data_view.padding = "20px";
-			data_view.boxShow = "10px";
-			data_view.shadowBlur = 20; // 阴影模糊度
-			data_view.shadowOffsetX = 0; // 阴影水平偏移
-			data_view.shadowOffsetY = 5; // 阴影垂直偏移v
-			data_view.background = "rgba(0, 34, 51, 0.6)"; //暗色
-
-			const mgroup_line = new BABYLON_GUI.Rectangle(info.name + "_line");
-			mgroup_line.height = "3px";
-			mgroup_line.width = "240px";
-			mgroup_line.thickness = 0;
-			mgroup_line.shadowBlur = 15; // 阴影模糊度
-			mgroup_line.shadowOffsetX = 0; // 阴影水平偏移
-			mgroup_line.shadowOffsetY = 0; // 阴影垂直偏移v
-			mgroup_line.shadowColor = "rgba(44, 237, 255, 0.8)";
-			mgroup_line.background = "rgba(44, 237, 255, 0.8)";
-			data_view.addControl(mgroup_line);
-
-			const titleImg = new BABYLON_GUI.Image();
-
-			const header = new BABYLON_GUI.StackPanel(info.name + "_header");
-			header.width = "200px";
-			header.height = "60px";
-			// header.background = "rgba(0, 34, 51, 0.6)";
-			header.isVertical = false;
-
-			const mgroupName = new BABYLON_GUI.TextBlock(info.name + "_label");
-			mgroupName.height = "30px";
-			mgroupName.width = "175px";
-			mgroupName.color = "white";
-			mgroupName.text = info.name;
-			mgroupName.textHorizontalAlignment = 0;
-			mgroupName.paddingLeft = "8px";
-			header.addControl(mgroupName);
-
-			const mgroup_close = BABYLON_GUI.Button.CreateSimpleButton(
-				info.name + "_close",
-				"X"
-			);
-			mgroup_close.width = "25px";
-			mgroup_close.height = "25px";
-			mgroup_close.color = "rgba(255,165,0,0.7)";
-			mgroup_close.cornerRadius = 16;
-			mgroup_close.fontSize = "12px";
-			mgroup_close.thickness = 0;
-			// mgroup_close.background = "white";
-			mgroup_close.onPointerClickObservable.add(() => {
-				data_view.isVisible = false;
-			});
-			header.addControl(mgroup_close);
-			data_view.addControl(header);
-
-			info.rows.forEach((item, index) => {
-				const row = new BABYLON_GUI.StackPanel(
-					info.name + `_${item.field}` + "_row"
-				);
-				row.width = "200px";
-				row.height = "30px";
-				row.isVertical = false;
-
-				const field = new BABYLON_GUI.TextBlock(
-					info.name + `_${item.field}` + "_label"
-				);
-				field.width = "120px";
-				field.height = "30px";
-				field.color = "rgba(255,255,255, 0.7)";
-				field.fontSize = 14;
-				field.text = item.label;
-				field.textHorizontalAlignment = 0;
-				field.paddingLeft = "8px";
-				row.addControl(field);
-
-				const valx = new BABYLON_GUI.TextBlock(
-					info.name + `_${item.field}` + "_value"
-				);
-				valx.width = "80px";
-				valx.height = "30px";
-				valx.color = "white";
-				valx.fontSize = 14;
-				valx.text = item.value;
-				valx.textHorizontalAlignment =
-					BABYLON_GUI.Control.HORIZONTAL_ALIGNMENT_RIGHT;
-				valx.paddingRight = "8px";
-				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;
-		},
 		deepCopy(obj) {
 			return JSON.parse(JSON.stringify(obj));
 		},
+		getMgroup(){
+			let that = this;
+			that.$API.mtm.mgroup.list.req({page:0}).then((res) => {
+			    let data = res;
+				for(let i=0;i<data.length;i++){
+					that.mgroupsData = res;
+					that.getProcessDatas(data[i].name,i);
+					// that.getProcessData(data[i].id,i);
+				}
+			})
+		},
+		// getProcessData(mgroupId,index){
+		// 	let that = this;
+		// 	that.$API.wpm.wmaterial.list.req({mgroupx:mgroupId,notok_sign__isnull:true,page:0}).then((res) => {
+		// 		let keys = 'configData'+index;
+		// 		that[keys] = that.deepCopy(configData);
+		// 		that[keys].data = [];
+		// 		if(res.length>0){
+		// 			res.forEach((item) => {
+		// 			    let arr = [];
+		// 				arr[0] = item.batch;
+		// 				arr[1] = item.count_cando;
+		// 				arr[2] = item.count_working;
+		// 				arr[3] = item.count-item.count_cando-item.count_working;
+		// 				that[keys].data.push(arr);
+		// 			})
+		// 		}
+		// 	})
+		// },
+		getProcessDatas(name,index){
+			let that = this;
+			let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
+			let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
+			let current_date = that.currentYear+'-'+month+'-'+day;
+			let obj = {query:{current_date:current_date,mgroup_name:name}};
+			that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
+				if(res.data2.ds0){
+					let lists = res.data2.ds0[0];
+					//根据工段名称分组
+					let keys = 'configData'+index;
+					that[keys] = that.deepCopy(configData);
+					that[keys].data = [];
+					lists.forEach((item) => {
+						let arr = [];
+						arr[0] = item.批次号;
+						arr[1] = item.待加工产物数;
+						arr[2] = item.加工中产物领用数;
+						arr[3] = item.今日合格数;
+						// arr[4] = Math.round((item.今日合格数/item.今日合格数)*100)+'%';
+						that[keys].data.push(arr);
+					})
+				}
+			});
+		},
 	},
 	beforeUnmount() {
 		let that = this;
 		this.scene = null;
 		clearInterval(that.timerTime);
-		clearInterval(that.timerData);
 		that.timerTime = null;
-		that.timerData = null;
 	},
 	beforeDestoryed() {
 		let that = this;
 		this.scene = null;
 		clearInterval(that.timerTime);
-		clearInterval(that.timerData);
 		that.timerTime = null;
-		that.timerData = null;
 	},
 };
 </script>
@@ -1273,29 +1284,29 @@ export default {
 }
 /* header-start */
 .pageHeader {
-	display: flex;
 	z-index: 100;
 	height: 74px;
+	width: 100%;
+	padding: 0 20px;
 	line-height:74px;
 	color: #ffffff;
-	position: relative;
-	padding: 0 20px;
+	position: absolute;
+	text-align: center;
 	box-sizing: border-box;
 	justify-content: space-between;
-	border-bottom: 1px solid rgba(54, 217, 187, 0.3);
+	/* border-bottom: 1px solid rgba(54, 217, 187, 0.3); */
 }
 .header_left{
-	font-size: 40px;
-	font-family: "myfont";
+	position: absolute;top: 0;left: 10px;font-size: 20px;
 }
+ .header_center_text{
+	font-family: myfont;letter-spacing: 0.2em; font-size: 50px;line-height:53px;z-index: 100;
+ }
 .header_right{
-	font-size: 20px;
+	position: absolute;top: 0;right: 10px;font-size: 20px;
 }
-.header_light{
-	left: 0;
-	top:41px;
-	height: 77px;
-	position: absolute;
+.header_bg{
+	z-index: -1;position: absolute;top:0;left:0;width: 100%;height: 100%;
 }
 .header_line{
 	top:75px;
@@ -1316,8 +1327,7 @@ export default {
 /* 两边的模块 */
 .left_block,
 .left_block2,
-.right_block,
-right_block2 {
+.right_block{
 	top:74px;
 	width:355px;
 	z-index: 10;
@@ -1325,7 +1335,20 @@ right_block2 {
 	position:absolute;
 	overflow:hidden;
 	flex-direction: column;
+	padding: 0 10px ;
+	height: 320px;
+	background: rgba(9, 31, 43, 0.5);
+}
+.left_block3{
+	top:400px;
+	left: 0;
+	width:710px;
+	display: flex;
+	position:absolute;
+	overflow:hidden;
+	flex-direction: column;
 	padding: 0 20px 0 20px;
+	height: 390px;
 	background: rgba(9, 31, 43, 0.5);
 }
 .left_block {
@@ -1334,32 +1357,66 @@ right_block2 {
 .right_block {
 	right: 0;
 	width:710px;
+	height: 740px;
 }
 .left_block2{
 	left: 355px;
 }
+.bottom_block{
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	height: 370px;
+	overflow: hidden;
+}
+.bottom_block2{
+	width: 400%;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	height: 370px;
+	display: flex;
+	transition: left 2s ease;
+}
 .flexItem {
 	height: 370px;
 }
+.flexItem3 {
+	width: 356px;
+	height: 370px;
+	background: rgba(0,0,0,.8);
+}
+.videoFlexItem{
+	height: 470px;
+}
 .itemTitle2 {
 	color: #fff;
-	height:60px;
+	height:50px;
 	padding-left: 1.5em;
-	font-size: 24px;
-	line-height: 58px;
+	font-size: 20px;
+	line-height: 44px;
 	background: url("/public/img/gx/title_bg.png") ;
 	background-size: 100% 100%;
 	display: flex;
+	position: relative;
 }
 .itemTitle{
 	color: #fff;
-	height:60px;
+	height:50px;
 	padding-left: 1.5em;
-	font-size: 24px;
-	line-height: 58px;
+	font-size: 20px;
+	line-height: 44px;
 	background-size: 100% 100%;
 	background-image: url("/public/img/gx/title_bg2.png");
 }
+.itemTitle_b{
+	height: 42px;
+	line-height: 42px;
+	width: 350px;
+	font-size: 14px;
+	padding-left: 2.5em;
+}
 .block1NumberWrap{
 	width:48%;
 	border: 1px solid rgba(54, 217, 187, 0.3);
@@ -1369,8 +1426,8 @@ right_block2 {
 .block1Numberinner{
 	background: rgba(54, 217, 187, 0.3);
 	color: #fff;
-	height:85px;
-	line-height:85px;
+	height:80px;
+	line-height:80px;
 	position: relative;
 }
 .block1Text{
@@ -1379,6 +1436,7 @@ right_block2 {
 	height: 30px;
 	line-height: 30px;
 	position: absolute;
+	font-size: 14px;
 }
 .block1Number{
 	font-size: 26px;
@@ -1392,20 +1450,30 @@ right_block2 {
 	border-radius: 20px;
 	margin-top: 5px;
 }
+.flexItem3>.itemBody{
+    margin-top: 0;
+}
 .itemBody1{
 	display: flex;
 	flex-direction: column;
 	justify-content:space-around;
 }
-.itemBody3{
+.eqItem{
+	width: 50%;
+	display: inline-block;
 }
 .inmItemBody{
 	display: flex;
 }
+.boxmain{
+	height: 140px;
+}
 .inmBoxmain{
 	flex: 1;
+	height: 320px;
+	box-shadow: 0 0 10px 10px rgb(255 255 255 / 5%);
 }
-.itemBody3>div{
+.itemBody3{
 	display: flex;
 	justify-content: space-around;
 }
@@ -1432,51 +1500,6 @@ right_block2 {
 .bodyListItemBg {
 	background: rgba(2, 245, 242, 0.18);
 }
-.tableHeader {
-	color: #02f5f2;
-	font-size: 1.1vh;
-}
-.bodyListItem_name {
-	width: 60px;
-	padding: 0.5vh 0;
-}
-.bodyListItem_num {
-	width: 65px;
-}
-.itemBodyFlex {
-	display: flex;
-}
-
-.item_circle {
-	width: 33%;
-	text-align: center;
-}
-@keyframes rotate {
-	0% {
-		transform: rotate(0deg);
-	}
-
-	25% {
-		transform: rotate(90deg);
-	}
-
-	50% {
-		transform: rotate(180deg);
-	}
-
-	75% {
-		transform: rotate(270deg);
-	}
-
-	100% {
-		transform: rotate(360deg);
-	}
-}
-
-.row-item {
-	height: 40px !important;
-	line-height: 40px !important;
-}
 
 #scrollTable > .hader {
 	background: rgb(10, 63, 68) !important;
@@ -1641,62 +1664,37 @@ right_block2 {
 	font-size: 0.8vw;
 }
 
-.elecItem {
+.viewsItem {
 	color: #ffffff;
 	font-size: 20px;
-	margin-top: 10px;
-	height: 30%;
-	width: 50%;
+	width: 650px;
+	height: 85px;
 	font-size: 1.2vh;
 	display: inline-block;
+	margin-bottom: 20px;
 }
-.elecItem_wrap {
-	display: flex;
+.viewsItem_wrap {
+	height: 85px;
+	/* display: flex; */
 	flex-direction: column;
 	border-left: 5px solid rgba(53, 156, 193, 0.66);
 	padding-left: 10px;
 	border-radius: 5px;
 }
-.elec_number {
+.viewsItem_img{
+	width: 85px;
+	/* height: 50px; */
+}
+article{
+	text-indent: 2em;
+}
+/* .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;
-	height: 10px;
-	border-radius: 5px;
-	background: #00ff00;
-}
-.warningState {
-	width: 10px;
-	height: 10px;
-	border-radius: 5px;
-	background: #0000ff;
-}
+} */
 /* // 表格——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: rgb(255, 0, 135);
-}
 /deep/ .el-table,
 .el-table__body,
 /deep/ .el-table .el-table__body-wrapper {
diff --git a/src/views/qm/products_form.vue b/src/views/qm/products_form.vue
index 60be64fe..0485da04 100644
--- a/src/views/qm/products_form.vue
+++ b/src/views/qm/products_form.vue
@@ -21,8 +21,8 @@
 									v-model="form.batch"
 									placeholder="物料批次"
 									clearable
+									filterable
 									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									style="width: 100%"
 									@change="handleChange"
 								>
 									<el-option
@@ -35,6 +35,7 @@
 										<span style="float:right">({{item.count}})</span>
 									</el-option>
 								</el-select>
+								<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
@@ -407,8 +408,12 @@
 	</el-dialog>
 </template>
 <script>
+import scanDialog from "./../template/scan.vue";
 export default {
 	emits: ["success", "closed"],
+	components: {
+		scanDialog
+	},
 	data() {
 		return {
 			mode:'sizeAdd',
@@ -657,6 +662,11 @@ export default {
 			this.form.count_notok = data.count_notok;
 			this.count_notok_json = data.count_notok_json;
 		},
+		scanClose(data){
+			let id = data.split('#')[1];
+			console.log('id',id);
+			this.form.batch = id;
+		},
 		//设置过滤项
 		setFilters(filters) {
 			this.selectionFilters = filters;
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 74838781..eac2ace2 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -16,6 +16,20 @@
 				<!-- <el-button type="primary" @click="materialsChoses('wm')"
 					>选择物料</el-button
 				> -->
+				<el-select
+					v-model="query.state"
+					placeholder="物料状态"
+					clearable
+					@change="searchStateChange"
+					style="width: 250px"
+				>
+					<el-option
+						v-for="item in stateOptions"
+						:key="item.value"
+						:label="item.name"
+						:value="item.value"
+					/>
+				</el-select>
 				<el-input
 					style="margin-right: 5px"
 					v-model="query.search"
@@ -202,7 +216,10 @@ export default {
 				belong_dept:''
 			},
 			wmtype:0,
-			query: {},
+			query: {
+				search: "",
+				state: null,
+			},
 			dialog: {
 				save: false,
 				scrap: false,
@@ -212,6 +229,13 @@ export default {
 			},
 			tableData: [],
 			selection: [],
+			stateOptions:[
+				{ value: 10, name: "合格"},
+				{ value: 20, name: "不合格"},
+				{ value: 30, name: "返修"},
+				// { value: 40, name: "检验"},
+				// { value: 50, name: "报废"},
+			],
 			queryWm: {
 				search: "",
 				material: "",
diff --git a/src/views/wpm_gx/inm_record_form.vue b/src/views/wpm_gx/inm_record_form.vue
index d8f3fc01..8b2236e0 100644
--- a/src/views/wpm_gx/inm_record_form.vue
+++ b/src/views/wpm_gx/inm_record_form.vue
@@ -44,7 +44,6 @@
 				<el-select
 					v-model="form.batch"
 					filterable
-					style="width: 100%"
 					@change="selectwmChange"
 				>
 					<el-option
@@ -63,13 +62,13 @@
 						>
 					</el-option>
 				</el-select>
+				<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="批次" v-if="cate == 'do_out'">
 				<el-select
 					v-model="selectBatch"
 					value-key="id"
 					clearable
-					style="width: 100%"
 					@change="selectBatchChange"
 					@clear="selectBatchClear"
 				>
@@ -90,6 +89,7 @@
 						>
 					</el-option>
 				</el-select>
+				<scan-dialog ref="scanDialog" @closed="scanClose"> </scan-dialog>
 			</el-form-item>
 			<el-form-item label="仓库">
 				<el-select
@@ -123,6 +123,7 @@
 	</el-dialog>
 </template>
 <script>
+import scanDialog from "./../template/scan.vue";
 export default {
 	emits: ["success", "closed"],
 	props: {
@@ -131,6 +132,9 @@ export default {
 		mgroupId: { type: String, default: "" },
 		process: { type: String, default: "" },
 	},
+	components: {
+		scanDialog
+	},
 	data() {
 		return {
 			type: "do_in",
@@ -219,6 +223,12 @@ export default {
 					this.batchOptions = res;
 				});
 		},
+		scanClose(data){
+			let that = this;
+			let id = data.split('#')[1];
+			console.log('id',id);
+			that.form.batch = id;
+		},
 		selectMaterialChange() {
 			this.getBatchOptions();
 		},