登录页面

gavel/src/main/resources/templates/views/kmes/gpjy/index.html

@@ -2,6 +2,22 @@
 		<script src="js/dbenlarge.js" type="text/javascript" charset="utf-8"></script>
 		<script src="js/gethash.js" type="text/javascript" charset="utf-8"></script>
 		<link rel="stylesheet" type="text/css" href="css/jyfk.css"/>
+		<style type="text/css">
+			.errdialog{
+				min-width:35%;
+				/* width: 35%; */
+				height: 40px;
+				text-align: center;
+				line-height: 40px;
+				position: absolute;
+				top: 50px;
+				right: 50%;
+				color: #FFFFFF;
+				background-color: rgba(255,0,0,0.5);
+				transform: translateX(50%);      
+				border-radius: 5px;
+			}
+		</style>
 		<div>
 			<div class="btn-group" >
 			    <button id="btnqh1" type="button" class="btn btn-default" style="color: white;position: absolute;right: 5px;z-index: 9999999999;height: 50px;width: 200px;border: 0 solid #00AAFF;background-color: #00AAFF;">切换风格</button>
@@ -25,6 +41,22 @@
 				
 			})
 			/* 通用代码 */
+			/* 初始化工序 */
+			function jyfk_getgx(e){
+				let that=e
+				that.gx=window.gxname||"获取失败"
+			}
+			/* 大屏内部弹框 */
+			function screenAlert(dom,msg,timeNum){
+				let getdom=$(dom)
+				getdom.css('position','relative')
+				let dialog="<div class='errdialog'>"+msg+"</div>"
+				getdom.prepend(dialog)
+				setTimeout(function(){
+					$('.errdialog').remove();
+				},timeNum)
+				
+			}
 			/* 时间 */
 			function jyfk_pagetime(w){
 				let that=w
@@ -77,7 +109,8 @@
 						     that.cpsn = res.data.records.wosnid;
 						     that.ph = res.data.records.wlxxCode;
 						     let woid  = res.data.records.woDjid;
-						y(woid)
+							 let fkid = res.data.records.id;
+						y(fkid)
 						/** wobom查询  **/
 						
 						/* 日志操作 */
@@ -92,8 +125,8 @@
 				})
 			}
 			/* jyfk */
-			function jyfk_secjyfk(){
-				gas.post('kmes/gpfk/jyfk',{"fkid":"", "hgsn":""}, function(res){
+			function jyfk_secjyfk(that,s){
+				gas.post('kmes/gpfk/jyfk',{"fkid":s, "hgsn":that.xlh}, function(res){
 					if(res.data&&res.data.records){
 						
 					}
@@ -145,7 +178,7 @@
 					<li>甲班</li>
 					<li class="tipuli2">{{systime}}</li>
 					<li class="tipuli2" style="margin-right: 200px;">计数:30</li>
-					<li class="tipuli2">当前工序:焊接</li>
+					<li class="tipuli2">当前工序:{{gx}}</li>
 					
 				</ul>
 			</div>
@@ -179,10 +212,10 @@
 						<div style="height: 100%;display: flex;align-items: center;justify-content: center;">
 							<div class="cardList-wrapper" style="width: 55%;height: 100%;background-color: #FFFFFF;color: #FFFFFF;display: flex;flex-wrap: wrap;justify-content:space-around;align-items: center;">
 								<div class="" style="height: 45%;width: 90%;display: flex;align-items: center;justify-content: center;color: #FFFFFF;background-color: #00AAFF!important;">
-									<span style="font-size: 20px;font-weight: 800;">合格数量:0</span>
+									<span style="font-size: 20px;font-weight: 800;">合格数量:{{ng}}</span>
 								</div>
 								<div  class="" style="height: 45%;width: 90%;display: flex;align-items: center;justify-content: center;color: #FFFFFF;background-color: #FEC041!important;">
-									<span style="font-size: 20px;font-weight: 800;">NG数量:0</span>
+									<span style="font-size: 20px;font-weight: 800;">NG数量:{{hg}}</span>
 								</div>
 							</div>
 							<div class="cardList-wrappers" style="width: 40%;height: 95%;color: white;display: flex;align-items: center;justify-content: center;font-size: 30px;">
@@ -218,8 +251,8 @@
 					<li>系统管理员</li>
 					<li>甲班</li>
 					<li class="tipuli2">{{systime}}</li>
-					<li class="tipuli2" style="margin-right: 200px;">计数:30</li>
-					<li class="tipuli2">当前工序:焊接</li>
+					<li class="tipuli2" style="margin-right: 200px;">计数:{{ng+hg}}</li>
+					<li class="tipuli2">当前工序:{{gx}}</li>
 					
 				</ul>
 			</div>
@@ -253,10 +286,10 @@
 							</div>
 							<div style="display: flex;width: 45%;height: 100%;flex-wrap: wrap;align-items: center;">
 								<div style="height: 45%;width: 90%;background-color: #00AAFF;display: flex;align-items: center;justify-content: center;color: #FFFFFF;">
-									<span style="font-size: 20px;font-weight: 800;">合格数量:0</span>
+									<span style="font-size: 20px;font-weight: 800;">合格数量:{{ng}}</span>
 								</div>
 								<div style="height: 45%;width: 90%;background-color: #FEC041;display: flex;align-items: center;justify-content: center;color: #FFFFFF;">
-									<span style="font-size: 20px;font-weight: 800;">NG数量:0</span>
+									<span style="font-size: 20px;font-weight: 800;">NG数量:{{hg}}</span>
 								</div>
 							</div>
 						</div>
@@ -282,7 +315,7 @@
 			</div>
 			<!-- 右侧信息pdf -->
 			<div class="right">
-				<canvas id="pdf" class="rightPdf"></canvas>
+				<canvas id="pdf" class="kwrkb05pdf"></canvas>
 			</div>
 		</div>
 		<!-- 看板6html -->
@@ -295,7 +328,7 @@
 					<li>甲班</li>
 					<li class="tipuli2">{{systime}}</li>
 					<li class="tipuli2" style="margin-right: 200px;">计数:30</li>
-					<li class="tipuli2">当前工序:焊接</li>
+					<li class="tipuli2">当前工序:{{gx}}</li>
 					
 				</ul>
 			</div>
@@ -329,10 +362,10 @@
 							</div>
 							<div style="display: flex;width: 45%;height: 100%;flex-wrap: wrap;align-items: center;">
 								<div style="height: 45%;width: 90%;background-color: #00AAFF;display: flex;align-items: center;justify-content: center;color: #FFFFFF;">
-									<span style="font-size: 20px;font-weight: 800;">合格数量:0</span>
+									<span style="font-size: 20px;font-weight: 800;">合格数量:{{hg}}</span>
 								</div>
 								<div style="height: 45%;width: 90%;background-color: #FEC041;display: flex;align-items: center;justify-content: center;color: #FFFFFF;">
-									<span style="font-size: 20px;font-weight: 800;">NG数量:0</span>
+									<span style="font-size: 20px;font-weight: 800;">NG数量:{{ng}}</span>
 								</div>
 							</div>
 						</div>
@@ -363,13 +396,14 @@
 			</div>
 			<!-- 右侧信息pdf -->
 			<div class="right">
-				<canvas id="pdf" class="rightPdf"></canvas>
+				<canvas id="kwrkb06pdf" class="rightPdf"></canvas>
 			</div>
 		</div>
 		<script type="text/javascript">
 		let Vkwrkb04= new Vue({
 			el:"#kwrkb04",
 			mounted() {
+				jyfk_getgx(this)
 				dbenlarge('kwrkb04',1,this.isFocus())
 				pdfshow("pdf/dcAcess.pdf","gpjypdf",5000).then(e=>{
 					this.sivpdf=e
@@ -387,6 +421,8 @@
 			},
 			data:function(){
 				return{
+					ng:0,
+					hg:0,
 					pdfdom:"kwrkb04pdf",
 					el:"#kwrkb04",
 					addtop:0,
@@ -403,6 +439,7 @@
 				}
 			},
 			methods:{
+				
 				// 扫码接口
 				apiscanxlh(){
 					let that=this
@@ -442,6 +479,7 @@
 		let Vkwrkb05= new Vue({
 			el:"#kwrkb05",
 			mounted() {
+				jyfk_getgx(this)
 				dbenlarge('kwrkb05')
 				pdfshow("pdf/dcAcess.pdf","pdf",5000).then(e=>{
 					this.sivpdf=e
@@ -459,6 +497,8 @@
 			},
 			data:function(){
 				return{
+					ng:0,
+					hg:0,
 					pdfdom:"kwrkb05pdf",
 					el:"#kwrkb05",
 					addtop:0,
@@ -475,6 +515,7 @@
 				}
 			},
 			methods:{
+				
 				//扫码事件
 				scanxlh(e){
 					var evt = window.event || e;
@@ -509,6 +550,7 @@
 		let Vkwrkb06= new Vue({
 			el:"#kwrkb06",
 			mounted() {
+				jyfk_getgx(this)
 				dbenlarge('kwrkb06')
 				pdfshow("pdf/dcAcess.pdf","pdf",5000).then(e=>{
 					this.sivpdf=e
@@ -526,6 +568,8 @@
 			},
 			data:function(){
 				return{
+					ng:0,
+					hg:0,
 					pdfdom:"kwrkb06pdf",
 					el:"#kwrkb06",
 					addtop:0,
@@ -542,6 +586,7 @@
 				}
 			},
 			methods:{
+				
 				//扫码事件
 				scanxlh(e){
 					var evt = window.event || e;