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

# Conflicts: # src/core/operation/Select.json # src/core/process/Process.java
6 years ago · ac8875bcad
parent 8ab7fc962e
commit ac8875bcad
10 changed files with 35 additions and 6 deletions
--- a/.idea/libraries/lib.xml
+++ b/.idea/libraries/lib.xml
@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/web/WEB-INF/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/web/WEB-INF/lib" recursive="false" />
+  </library>
+</component>
--- a/web/cssFile/download_style.css
+++ b/web/cssFile/download_style.css
@ -11,6 +11,8 @@
  margin: 20px;
 }
 .link-frame{
+  transition: 0.3s;
+  line-height: 40px;
  margin: 10px;
  padding-left: 20px;
  border-radius: 10px;
@ -21,6 +23,7 @@
 }
 .link-frame:hover{
  background-color: rgba(210, 66, 73, 0.89);
+  height: 50px;
 }
 .download-select{
  margin: 20px 20px 0 20px;
--- a/web/cssFile/fill-style.css
+++ b/web/cssFile/fill-style.css
@ -1,14 +1,17 @@
 .fill-child{
  position: relative;
-  margin: 20px 0px;
+  margin: 10px 10px;
  background-color: white;
-  width: 98%;
+  width: 97%;
  height: 200px;
  border-radius: 10px;
  border: 1px solid rgba(0, 0, 0, 0.26);
 }
 .fill-frame{
+  border-radius: 5px;
+  border: 1px solid rgba(0, 0, 0, 0.35);
  position:absolute;
+  background-color: white;
  top: 100px;
  right: 10px;
  width: 960px;
--- a/web/cssFile/home.css
+++ b/web/cssFile/home.css
@ -408,4 +408,16 @@ ul{
  width: 100%;
  text-align: center;
  color: #7b7b7b;
+}
+.model-info{
+  float: left;
+  width: 100px;
+  height: 40px;
+  margin: 15px 10px;
+  background-color: #e4e4e4;
+  border-radius: 5px;
+  color: #1b1b1b;
+  padding-left: 10px;
+  line-height: 35px;
+  font-size: 18px;
 }
--- a/web/cssFile/images/opt.png
+++ b/web/cssFile/images/opt.png
--- a/web/cssFile/images/opt.sai2
+++ b/web/cssFile/images/opt.sai2
--- a/web/fill_Information.jsp
+++ b/web/fill_Information.jsp
@ -29,7 +29,7 @@
    pageContext.setAttribute("type",type);
 %>
 <div class="updated">
-    <div class="fill-top-blank"></div>
+    <div class="fill-top-blank"><div class="model-info">填写意见</div></div>
    <div class="fill-frame bar-change">
        <div class="fill-child">
            <div class="fill-name">${map.姓名}</div>
--- a/web/login.jsp
+++ b/web/login.jsp
@ -47,9 +47,9 @@
                   placeholder="请输入密码">
            <input class="register-input-text name-text" type="text" name="name"
                   placeholder="姓名">
-            <input class="register-input-text e-mail-text" type="text" name="e-mail"
+            <input class="register-input-text e-mail-text" type="text" name="e_mail_location"
                   placeholder="邮箱">
-            <input class="register-input-text phone-number" type="text" name="phone-number"
+            <input class="register-input-text phone-number" type="text" name="phone_number"
                   placeholder="请输入电话">
            <input class="register-input-text check-password-text" type="password" name="password-check"
                   placeholder="请确认密码">
--- a/web/select.jsp
+++ b/web/select.jsp
@ -17,6 +17,7 @@
 <div class="updated">
    <div class="select-frame">
        <div class="top-blank">
+            <div class="model-info">选择学生</div>
            <div class="search-frame">
                <input class="search-input" type="text" name="id" value="" placeholder="输入学号查找">
                <div class="search-button"></div>
--- a/web/upload_file.jsp
+++ b/web/upload_file.jsp
@ -15,7 +15,7 @@
 </head>
 <body>
 <div class="updated">
-    <div class="fill-top-blank"></div>
+    <div class="fill-top-blank"><div class="model-info">上传定稿</div></div>
        <div class="upload-frame">
            <div class="upload-tips">上传定稿</div>
            <div class="file-msg">