登录页面

gavel/src/main/resources/static/js/gethash.js

+let hash=location.hash
+		let hashindex=hash.indexOf(';')
+		let idindex=hash.indexOf('+')
+		let gxindex=hash.indexOf('!')
+		let smkurl=hash.substring(1,hashindex)
+		let smkid=hash.substring(hashindex+1,idindex)
+		let sbzlx=hash.substring(idindex+1,gxindex)
+		let gxname=hash.substring(gxindex+1,hash.length)
+		window.gxname=decodeURI(gxname)
+		window.bzlx=sbzlx
\ No newline at end of file

gavel/src/main/resources/static/js/kmeshome.js

@@ -35,9 +35,12 @@ $(function () {
 	let hash=location.hash
 	let hashindex=hash.indexOf(';')
 	let idindex=hash.indexOf('+')
+	let gxindex=hash.indexOf('!')
 	let smkurl=hash.substring(1,hashindex)
 	let smkid=hash.substring(hashindex+1,idindex)
-	let sbzlx=hash.substring(idindex+1,hash.length)
+	let sbzlx=hash.substring(idindex+1,gxindex)
+	let gxname=hash.substring(gxindex+1,hash.length)
+	console.log("gxname")
 	window.bzlx=sbzlx
     HTTP.post("frame/init", {}, function (result) {
 		let isShow=false

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

 <script src="js/pdfshow.js" type="text/javascript" charset="utf-8"></script>
 		<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/zpfk.css"/>
 		<style type="text/css">
 			.errdialog{
@@ -39,6 +40,10 @@
 				}
 				
 			})
+
+
+		/* 取登录值 */
+		
 		/* 通用代码 */
 		/* 大屏内部弹框 */
 		function screenAlert(dom,msg,timeNum){
@@ -83,7 +88,7 @@
 		/* 初始化工序 */
 		function zpfk_getgx(e){
 			let that=e
-			that.gx=window.bzlx||"获取失败"
+			that.gx=window.gxname||"获取失败"
 		}
 		/* 判定代码类型 登录页面*/
 		function zpfk_hqlx(e){
@@ -127,10 +132,10 @@
 					let msg="查询工单信息:"+that.xlh+"成功"
 					zpfk_wrz(that,msg)
 					/* 赋值操作 */
-					that.gd =  res.data.records.djid;
-					that.cpsn = res.data.records.wosnCode;
+					that.gd =  res.data.records.woDjid;
+					     that.cpsn = res.data.records.wosnid;
 					     that.ph = res.data.records.wlxxCode;
-					let woid  = res.data.records.djid;
+					     let woid  = res.data.records.woDjid;
 					y(woid)
 					/** wobom查询  **/
 					
@@ -264,7 +269,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>
@@ -286,7 +291,7 @@
 								<span>工单</span><input class="easyuitext wid70" v-model="gd"  name="gd" />
 							</div>
 							<div class="ery">
-								<span>产品SN</span><input class="easyuitext wid70" v-model="cpsn" name="cpsn" />
+								<span>SN</span><input class="easyuitext wid70" v-model="cpsn" name="cpsn" />
 							</div>
 							<div class="ery">
 								<span>品号</span><input class="easyuitext wid70" v-model="ph" name="ph" />
@@ -330,7 +335,7 @@
 					<li class="tipulmid">ADMIN</li>
 					<li class="tipulmid">系统管理员</li>
 					<li class="tipulmid">甲班</li>
-					<li class="tipulmid" style="width: 100px;">当前工序:焊接</li>
+					<li class="tipulmid" style="width: 200px;">当前工序:{{gx}}</li>
 				</ul>
 				<ul class="tipul" style="height: 100%;width: 100%;">
 					<li style="width: 400px;">
@@ -354,7 +359,7 @@
 								<span>工单</span><input class="easyuitext" v-model="gd" style="width: 70%" name="gd" />
 							</div>
 							<div class="ery">
-								<span>产品SN</span><input class="easyuitext" v-model="cpsn" style="width: 70%"  name="cpsn" />
+								<span>SN</span><input class="easyuitext" v-model="cpsn" style="width: 70%"  name="cpsn" />
 							</div>
 							<div class="ery">
 								<span>品号</span><input class="easyuitext" v-model="ph" style="width: 70%" name="ph" />
@@ -403,7 +408,7 @@
 					<li class="tipulmid">甲班</li>
 					<li class="tipuli2">{{systime}}</li>
 					<li class="tipuli2" style="margin-right: 10px;">计数:30</li>
-					<li class="tipuli2" style="margin-right: 10px;">当前工序:焊接</li>
+					<li class="tipuli2" style="margin-right: 10px;">当前工序:{{gx}}</li>
 				</ul>
 			</div>
 			<!-- 标题下信息 -->
@@ -416,7 +421,7 @@
 					<span>工单</span><input class="easyuitext" style="width:70%" name="gd" v-model="gd" />
 				</div>
 				<div class="titdowinfor">
-					<span>产品SN</span><input class="easyuitext" style="width:70%"  name="cpsn" v-model="cpsn" />
+					<span>SN</span><input class="easyuitext" style="width:70%"  name="cpsn" v-model="cpsn" />
 				</div>
 				<div class="titdowinfor">
 					<span>品号</span><input class="easyuitext" style="width:70%"  name="ph" v-model="ph" />

gavel/src/main/resources/templates/views/login_view.html

@@ -54,13 +54,14 @@
 			width: 80%;
 		}
 		.errdialog{
+			z-index: 99999;
 			min-width:35%;
 			/* width: 35%; */
 			height: 40px;
 			text-align: center;
 			line-height: 40px;
 			position: absolute;
-			top: 50px;
+			top: 30px;
 			right: 50%;
 			color: #FFFFFF;
 			background-color: rgba(255,0,0,0.5);
@@ -112,7 +113,7 @@
 	/* 提示框 */
 	/* 大屏内部弹框 */
 	function logalert(msg){
-		let getdom=$("#kmessmdl")
+		let getdom=$("body")
 		getdom.css('position','relative')
 		let dialog="<div class='errdialog'>"+msg+"</div>"
 		getdom.prepend(dialog)
@@ -132,10 +133,11 @@
 				let mkurl=result.data.records.fkurl
 				let mkid=result.data.records.modulecode
 				let bzlx=result.data.records.id
-				window.bzlx=bzlx
-				let url="index#"+mkurl+";"+mkid+"+"+bzlx
+				let gx=result.data.records.name
+				let url="singleindex?url="+mkurl+"#"+mkurl+";"+mkid+"+"+bzlx+"!"+gx
 				window.location.href =url 
 			} else {
+				logalert(result.message||"登录失败")
 				$rygh.val("")
 				$gylx.val("")
 				$rygh.focus()