Merge remote-tracking branch 'remotes/origin/hechu1'

hechu1
zhai_lw 6 years ago
commit f273822c2e

@ -6,13 +6,14 @@ body{
height: 100%; height: 100%;
} }
.fill-top-blank{ .fill-top-blank{
border: 1px solid rgb(238, 238, 238);
border-radius: 5px; border-radius: 5px;
height: 70px; height: 70px;
width: 960px; width: 960px;
position: absolute; position: absolute;
top: 20px; top: 20px;
right: 10px; right: 10px;
background-color: #323232; background: url("images/topImg.jpg");
} }
.main2{ .main2{
background-color:#fafafa; background-color:#fafafa;
@ -37,7 +38,7 @@ ul{
position: fixed; position: fixed;
background-color: #c13139; background-color: #c13139;
z-index: 100; z-index: 100;
box-shadow: 5px 0px 10px rgba(0, 0, 0, 0.3); box-shadow: rgba(0, 0, 0, 0.23) 0 1px 2px;
} }
.top-center-bar{ .top-center-bar{
position: relative; position: relative;
@ -424,9 +425,9 @@ ul{
width: 400px; width: 400px;
height: 40px; height: 40px;
margin: 15px 10px; margin: 15px 10px;
background-color: #e4e4e4; background-color: rgba(0, 0, 0, 0.6);
border-radius: 5px; border-radius: 5px;
color: rgba(27, 27, 27, 0.87); color: rgb(255, 255, 255);
padding-left: 10px; padding-left: 10px;
line-height: 35px; line-height: 35px;
font-size: 18px; font-size: 18px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

@ -14,7 +14,7 @@ a{
height: 50px; height: 50px;
top:10px; top:10px;
right: 20px; right: 20px;
background-color: rgba(255, 255, 255, 0.23); background-color: rgba(0, 0, 0, 0.3);
border-radius: 5px; border-radius: 5px;
} }
.search-button{ .search-button{
@ -38,7 +38,7 @@ a{
float: left; float: left;
width: 280px; width: 280px;
height: 40px; height: 40px;
background: rgba(255, 255, 255, 0.85); background: rgba(255, 255, 255, 0.91);
} }
.search-input:hover{ .search-input:hover{
background: rgb(255, 255, 255); background: rgb(255, 255, 255);

@ -1,4 +1,5 @@
<%-- <%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %><%--
Created by IntelliJ IDEA. Created by IntelliJ IDEA.
User: lenovo User: lenovo
Date: 2019/1/14 Date: 2019/1/14
@ -13,7 +14,7 @@
<script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script> <script type="text/javascript" src="jsFile/jquery-3.3.1.js"></script>
<script type="text/javascript" src="jsFile/sub-msg-input.js"></script> <script type="text/javascript" src="jsFile/sub-msg-input.js"></script>
</head> </head>
</bod> <body>
<div class="updated"> <div class="updated">
<div class="blank-frame-sub"> <div class="blank-frame-sub">
<div class="fill-top-blank"><div class="model-info">填写选题信息</div></div> <div class="fill-top-blank"><div class="model-info">填写选题信息</div></div>
@ -60,6 +61,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>

@ -1,4 +1,5 @@
<%-- <%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %><%--
Created by IntelliJ IDEA. Created by IntelliJ IDEA.
User: lenovo User: lenovo
Date: 2019/1/9 Date: 2019/1/9
@ -28,6 +29,13 @@
</head> </head>
<body> <body>
<%String type="teacher";pageContext.setAttribute("userType",type);%> <%String type="teacher";pageContext.setAttribute("userType",type);%>
<%List<String> list=new ArrayList<>();
list.add("001");
list.add("002");
int index=0;
pageContext.setAttribute("list",list);
session.setAttribute("list",list);
%>
<div class="main"> <div class="main">
<div class="top-bar"> <div class="top-bar">
<div class="top-center-bar"> <div class="top-center-bar">
@ -53,7 +61,7 @@
<div class="nav-bar"> <div class="nav-bar">
<div class="point-bar"></div> <div class="point-bar"></div>
<div class="a-process personal-msg"> <div class="a-process personal-msg">
<a href="personal_setting.jsp" class="link-point personal-msg-page"> <a href="personal_setting.jsp?001" class="link-point personal-msg-page">
<div class="a-process-decoration personal-set"> <div class="a-process-decoration personal-set">
<img src="cssFile/images/man.png"> <img src="cssFile/images/man.png">
</div> </div>
@ -61,15 +69,14 @@
</a> </a>
</div> </div>
<div class="a-process aux-fun"> <div class="a-process aux-fun">
<a href="download.jsp" class="link-point aux-fun-page"> <a href="download.jsp?002" class="link-point aux-fun-page">
<div class="a-process-decoration download"> <div class="a-process-decoration download">
<img src="cssFile/images/download.png"> <img src="cssFile/images/download.png">
</div> </div>
<div class="nav-info">资料下载</div> <div class="nav-info">资料下载</div>
</a> </a>
</div> </div>
<c:if test="${userType=='teacher'}"> <div class="a-process">
<div class="a-process select-area">
<a href="select.jsp" class="link-point data-download-page"> <a href="select.jsp" class="link-point data-download-page">
<div class="a-process-decoration select"> <div class="a-process-decoration select">
<img src="cssFile/images/select.png"> <img src="cssFile/images/select.png">
@ -77,7 +84,7 @@
<div class="nav-info">选择老师</div> <div class="nav-info">选择老师</div>
</a> </a>
</div> </div>
<div class="a-process file-info"> <div class="a-process">
<a href="fill_Information.jsp" class="link-point"> <a href="fill_Information.jsp" class="link-point">
<div class="a-process-decoration"> <div class="a-process-decoration">
<img src="cssFile/images/fill.png"> <img src="cssFile/images/fill.png">
@ -101,7 +108,16 @@
<div class="nav-info">填写选题信息</div> <div class="nav-info">填写选题信息</div>
</a> </a>
</div> </div>
</c:if> <c:forEach items="${list}" var="value">
<div class="a-process">
<a href="fillSbjMsg.jsp?<%=index++%>" class="link-point">
<div class="a-process-decoration">
<img src="cssFile/images/filText.png">
</div>
<div class="nav-info">填写选题信息</div>
</a>
</div>
</c:forEach>
</div> </div>
<div class="update-frame"> <div class="update-frame">
<div class="small-ads"> <div class="small-ads">

@ -4,6 +4,10 @@ $(document).ready(function () {
function upadateFrame(e) { function upadateFrame(e) {
e.preventDefault(); e.preventDefault();
var updateUrl=$(this).attr('href'); var updateUrl=$(this).attr('href');
$('.update-frame').load(updateUrl+' .updated'); var arr=updateUrl.split('?');
var proccessIndex=arr[1];
var indexData={"index":proccessIndex};
$('.update-frame').load(updateUrl+' .updated',indexData,function (data) {
});
history.pushState(null,null,updateUrl); history.pushState(null,null,updateUrl);
} }

@ -2,7 +2,7 @@ $(document).ready(function () {
$(document).off('click',searchmsg).on('click','.search-button',searchmsg); $(document).off('click',searchmsg).on('click','.search-button',searchmsg);
$(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg); $(document).off('keydown',searchmsg).on('keydown','.search-input',KDsearchmsg);
$(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect); $(document).off('click',teacherSelect).on('click','.select-it.teacher',teacherSelect);
$(document).off('click',studentSelect).on('click','.select-it.teacher',studentSelect); $(document).off('click',studentSelect).on('click','.select-it.student',studentSelect);
}) })
function searchmsg(e) { function searchmsg(e) {
if($('.search-input').val()=='') if($('.search-input').val()=='')

Loading…
Cancel
Save