zhailw
/
gdms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java
zgl
何楚 6 years ago
parent d6350f17d4
commit aa7d6ce390
8 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File

BIN
web/WEB-INF/lib/jstl.jar
View File

Binary file not shown.

BIN
web/WEB-INF/lib/standard.jar
View File

Binary file not shown.

16
web/cssFile/home.css
Unescape View File

@ -1,12 +1,13 @@
body{ body{
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
background-color: #dad0ce; background-color:#f5f5f5;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.main2{ .main2{
background-color: #f8f9ff; background-color: rgb(249, 248, 255);
} }
a{ a{
text-decoration: none; text-decoration: none;
@ -172,7 +173,6 @@ width: 35px;
position: relative; position: relative;
width: 1100px; width: 1100px;
margin: 0px auto; margin: 0px auto;
background-color: white;
} }
.link-point{ .link-point{
display: block; display: block;
@ -193,8 +193,11 @@ width: 35px;
} }
.nav-info{ .nav-info{
color: white; color: white;
text-overflow: ellipsis;
text-align: center; text-align: center;
width: 100%;
font-size: 12px; font-size: 12px;
height: 16px;
} }
.update-frame{ .update-frame{
border-top: 1px solid rgba(255,105,0,0); border-top: 1px solid rgba(255,105,0,0);
@ -212,7 +215,7 @@ width: 35px;
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
border: 1px solid rgba(0, 0, 0, 0.33); border: 1px solid rgba(0, 0, 0, 0.33);
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.22); box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.22);
} }
.scroll-ads .scroll-ads-imgs .scroll-child{ .scroll-ads .scroll-ads-imgs .scroll-child{
display: inline-block; display: inline-block;
@ -243,6 +246,7 @@ width: 35px;
color: white; color: white;
} }
.notice-frame{ .notice-frame{
background-color: white;
margin:370px auto 0px 45px; margin:370px auto 0px 45px;
position: relative; position: relative;
width: 800px; width: 800px;
@ -250,7 +254,7 @@ width: 35px;
border:1px solid rgba(0, 0, 0, 0.32); border:1px solid rgba(0, 0, 0, 0.32);
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.29); box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.29);
} }
.notice-frame .notice-frame-info{ .notice-frame .notice-frame-info{
@ -279,7 +283,7 @@ width: 35px;
.bar-change::-webkit-scrollbar-thumb{ .bar-change::-webkit-scrollbar-thumb{
width: 10px; width: 10px;
transition: all 0.3s; transition: all 0.3s;
background-color: #e45053; background-color: rgba(210, 81, 80, 0.96);
border-radius: 10px; border-radius: 10px;
} }
.notice-child{ .notice-child{

26
web/cssFile/select-style.css
Unescape View File

@ -14,7 +14,7 @@ a{
width: 350px; width: 350px;
height: 50px; height: 50px;
top:40px; top:40px;
right: 60px; right: 90px;
background-color: rgba(0, 0, 0, 0.14); background-color: rgba(0, 0, 0, 0.14);
border-radius: 5px; border-radius: 5px;
} }
@ -45,6 +45,7 @@ a{
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
} }
.list-frame .list-child{ .list-frame .list-child{
margin: 10px 5px; margin: 10px 5px;
height: 120px; height: 120px;
width: 98%; width: 98%;
@ -57,12 +58,15 @@ a{
background: rgba(0, 0, 0, 0.06); background: rgba(0, 0, 0, 0.06);
} }
.list-frame{ .list-frame{
background-color: white;
border: 1px solid rgba(0, 0, 0, 0.28);
border-radius: 10px;
overflow-y: scroll; overflow-y: scroll;
right: 60px; right: 90px;
top: 100px; top: 100px;
position: absolute; position: absolute;
max-height: 700px; max-height: 700px;
width: 600px; width: 700px;
} }
.select-it{ .select-it{
box-shadow:0px 2px 4px rgba(0, 0, 0, 0.22); box-shadow:0px 2px 4px rgba(0, 0, 0, 0.22);
@ -100,9 +104,9 @@ a{
.count-select{ .count-select{
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
width: 200px; width: 150px;
top: 100px; top: 100px;
left: 100px; left: 20px;
transition: all 0.3s; transition: all 0.3s;
} }
.count-select:hover{ .count-select:hover{
@ -141,18 +145,18 @@ a{
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.27); box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.27);
} }
.other-msgs{ .other-msgs{
font-size: 10px; font-size: 11px;
float: left; float: left;
width: 350px; width: 380px;
height: 100px; height: 90px;
margin: 10px 0 10px 15px; margin: 15px 0 15px 30px;
} }
.other-msgs .one-msg{ .other-msgs .one-msg{
float:left; float:left;
padding-left: 10px; padding-left: 10px;
margin: 2px 2px; margin: 5px 2px;
width: 45%; width: 45%;
height:16px; height:20px;
background-color: rgba(0, 0, 0, 0.78); background-color: rgba(0, 0, 0, 0.78);
border-radius: 10px; border-radius: 10px;
transition: all 0.3s; transition: all 0.3s;

20
web/home.jsp
Unescape View File

@ -12,11 +12,13 @@
<link type="text/css" rel="stylesheet" href="cssFile/home.css"> <link type="text/css" rel="stylesheet" href="cssFile/home.css">
<link type="text/css" rel="stylesheet" href="cssFile/personal.css"> <link type="text/css" rel="stylesheet" href="cssFile/personal.css">
<link type="text/css" rel="stylesheet" href="cssFile/select-style.css"> <link type="text/css" rel="stylesheet" href="cssFile/select-style.css">
<link type="text/css" rel="stylesheet" href="cssFile/fill-style.css">
<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/homeActive.js"></script> <script type="text/javascript" src="jsFile/homeActive.js"></script>
<script type="text/javascript" src="jsFile/home-update.js"></script> <script type="text/javascript" src="jsFile/home-update.js"></script>
<script type="text/javascript" src="jsFile/personal.js"></script> <script type="text/javascript" src="jsFile/personal.js"></script>
<script type="text/javascript" src="jsFile/search.js"></script> <script type="text/javascript" src="jsFile/search.js"></script>
<script type="text/javascript" src="jsFile/fill-action.js"></script>
</head> </head>
<body> <body>
<div class="main"> <div class="main">
@ -47,24 +49,32 @@
<a href="personal_setting.jsp" class="link-point personal-msg-page"> <a href="personal_setting.jsp" 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 class="nav-info">个人信息</div>
</div> </div>
<div class="nav-info">个人信息</div>
</a> </a>
</div> </div>
<div class="a-process aux-fun"> <div class="a-process aux-fun">
<a href="#" class="link-point aux-fun-page"> <a href="#" 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 class="nav-info">资料下载</div>
</div> </div>
<div class="nav-info">资料下载</div>
</a> </a>
</div> </div>
<div class="a-process data-download"> <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 download"> <div class="a-process-decoration select">
<img src="cssFile/images/select.png"> <img src="cssFile/images/select.png">
<div class="nav-info">选择学生</div>
</div> </div>
<div class="nav-info">选择老师</div>
</a>
</div>
<div class="a-process file-info">
<a href="fill_Information.jsp" class="link-point">
<div class="a-process-decoration">
<img src="cssFile/images/fill.png">
</div>
<div class="nav-info">秘书填写信息</div>
</a> </a>
</div> </div>
</div> </div>

14
web/jsFile/search.js
Unescape View File

@ -23,13 +23,15 @@ function KDsearchmsg(e) {
} }
} }
function select_one() { function select_one() {
var id=$('.select-it').val(); var id=$(this).val();
var button=$(this);
var selectDate={"id":id}; var selectDate={"id":id};
var Url2='select'; var Url2='testfrom.jsp';
$.post(Url2,selectDate,function (data ,status) { $.post(Url2,selectDate,function (data,status) {
if(status==200) if(status=='success')
{ {
alert('操作成功'); button.css('background-color','rgba(88, 137, 238, 0.97)')
.html("已选")
} }
}) });
} }

4
web/result_list.jsp
Unescape View File

@ -17,8 +17,8 @@ for(int i=0;i<3;i++)
<div class="list-child"> <div class="list-child">
<div class="name"><span class="the-name"><%=a%></span></div> <div class="name"><span class="the-name"><%=a%></span></div>
<div class="other-msgs"> <div class="other-msgs">
<%for(int k=0;k<b.length;k++) <%for(int k=0;k<2;k++)
for (int n=0;n<b[0].length;n++) for (int n=0;n<2;n++)
out.print(" <div class=\"one-msg\">电话号码："+b[k][n]+"</div>"); out.print(" <div class=\"one-msg\">电话号码："+b[k][n]+"</div>");
%> %>
<div class="one-msg">电话号码：18711191679</div> <div class="one-msg">电话号码：18711191679</div>

2
web/select.jsp
Unescape View File

@ -35,8 +35,6 @@
<div class="one-msg">专业：软件工程</div> <div class="one-msg">专业：软件工程</div>
<div class="one-msg">电话号码：18711191679</div> <div class="one-msg">电话号码：18711191679</div>
<div class="one-msg">邮箱：823169880@qq.com</div> <div class="one-msg">邮箱：823169880@qq.com</div>
<div class="one-msg">年级：2016</div>
<div class="one-msg">专业：软件工程</div>
</div> </div>
<button class="select-it">选择</button> <button class="select-it">选择</button>
</div> </div>

Write Preview
Loading…
Cancel
Save