From a532b5a35113b2ba9eb89ad0f26cecd0966db2e7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 十二月 2023 09:27:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Haier_MES
---
gmms/WebContent/login/bdg.jsp | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/gmms/WebContent/login/bdg.jsp b/gmms/WebContent/login/bdg.jsp
index 685f3ea..3b2dc2a 100644
--- a/gmms/WebContent/login/bdg.jsp
+++ b/gmms/WebContent/login/bdg.jsp
@@ -6,15 +6,12 @@
response.setContentType("text/html; charset=utf-8");
%>
-<%-- <%@ include file="/WEB-INF/../login/check.jsp" %>
- --%>
- <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>鍖楃幓</title>
-<link rel="shortcut icon" href="../img/3.ico" />
+<link rel="shortcut icon" href="../img/3.ico" />
<style>
#top {
background-image: linear-gradient(to right, #C6E2FF, #C6E2FF);
@@ -64,16 +61,16 @@
/* if(true){ */
if(coun!=0){
out.println("<iframe id='top' height='10%' width='100%' src='shuoming.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"' frameborder='0'></iframe>");
- out.println("<iframe id='left' height='90%' width='13%' style='float: left;' src='quanxian.jsp?adminid="+adminid+"&anquanma="+anquanma+"&yuyan="+yuyan+"' frameborder='0'></iframe>");
+ out.println("<iframe id='left' height='90%' width='13%' style='float: left;overflow-y: hidden;' src='quanxian.jsp?adminid="+adminid+"&anquanma="+anquanma+"&yuyan="+yuyan+"' frameborder='0'></iframe>");
}
else{
- out.print("<script type='text/javascript'>alert('璇峰厛鐧诲綍鍚庢搷浣�');document.location.href='index.jsp';</script>");
+ out.print("<script type='text/javascript'>alert('璇峰厛鐧诲綍鍚庢搷浣�');window.parent.location.href='index.jsp';</script>");
}
}
%>
- <iframe id='main' src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"' style="width:87%;height:90%" frameborder='0'></iframe>
+ <iframe id='main' src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"' style="width:87%;height:90%" frameborder='0'></iframe>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.8.0