Browse Source

search function update

UnowHouse 6 years ago
parent
commit
a5724a59af

+ 127 - 62
.idea/workspace.xml

@@ -27,21 +27,78 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
-      <file leaf-file-name="manage.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="manage.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/resources/static/manage.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="742">
-              <caret line="129" column="34" lean-forward="true" selection-start-line="129" selection-start-column="34" selection-end-line="129" selection-end-column="34" />
+            <state relative-caret-position="228">
+              <caret line="154" column="38" lean-forward="true" selection-start-line="154" selection-start-column="38" selection-end-line="154" selection-end-column="38" />
+              <folding>
+                <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#footer#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="e#5462#5468#0" expanded="true" />
+                <element signature="n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#2;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#div#3;n#body#0;n#html#0;n#!!top" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="mainFunction.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="192">
+              <caret line="389" column="24" lean-forward="true" selection-start-line="389" selection-start-column="24" selection-end-line="389" selection-end-column="24" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="entrance.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="96">
-              <caret line="7" column="71" lean-forward="true" selection-start-line="7" selection-start-column="71" selection-end-line="7" selection-end-column="71" />
+              <caret line="4" column="23" lean-forward="false" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="entrance.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="604">
+              <caret line="48" column="30" lean-forward="false" selection-start-line="48" selection-start-column="30" selection-end-line="48" selection-end-column="30" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/css/style.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="24">
+              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CourseManagerApplication.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/CourseManagerApplication.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="360">
+              <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CourseController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="260">
+              <caret line="68" column="37" lean-forward="true" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />
               <folding />
             </state>
           </provider>
@@ -106,7 +163,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/unow/vo/NodeBody.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/mapper/CourseMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/CourseManagerApplication.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/common/ExceptionPage.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/common/MyException.java" />
@@ -116,15 +172,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/unow/pojo/Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/common/ExceptionEnum.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/mapper/ManagerMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/interceptor/WebConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/public/css/style.css" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/entrance.html" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/entrance.html" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/public/css/style.css" />
+        <option value="$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js" />
         <option value="$PROJECT_DIR$/src/main/resources/static/manage.html" />
       </list>
     </option>
@@ -255,7 +312,10 @@
               <item name="course-manager" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="unow" type="462c0819:PsiDirectoryNode" />
+              <item name="web" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
@@ -263,7 +323,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
@@ -272,7 +331,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
-              <item name="public" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
@@ -282,7 +340,6 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
-              <item name="bootstrap" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
@@ -319,7 +376,7 @@
     <property name="android.project.structure.proportion" value="0.15" />
     <property name="recentsLimit" value="5" />
     <property name="settings.editor.selected.configurable" value="vcs.Git" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../hospital-record" />
     <property name="android.sdk.path" value="C:/softwares/AndroidStudio/SDK" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15527344" />
@@ -610,7 +667,7 @@
       <workItem from="1545052860026" duration="7260000" />
       <workItem from="1545094096309" duration="3576000" />
       <workItem from="1545150547271" duration="757000" />
-      <workItem from="1545180127357" duration="4834000" />
+      <workItem from="1545180127357" duration="12535000" />
     </task>
     <servers />
   </component>
@@ -647,7 +704,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="48470000" />
+    <option name="totallyTimeSpent" value="56171000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
@@ -655,13 +712,14 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292978" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32991362" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47215497" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4079903" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292978" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -680,7 +738,6 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292978" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32820514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -739,6 +796,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="384">
           <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -790,6 +848,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="11" column="24" lean-forward="false" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -943,13 +1002,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/CourseManagerApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="16" column="27" lean-forward="false" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/WebConfig.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="432">
@@ -967,87 +1019,100 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="576">
-          <caret line="33" column="23" lean-forward="false" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1272">
           <caret line="62" column="19" lean-forward="false" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1368">
-          <caret line="64" column="5" lean-forward="false" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="1056">
+          <caret line="44" column="24" lean-forward="false" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="792">
+          <caret line="33" column="47" lean-forward="false" selection-start-line="33" selection-start-column="47" selection-end-line="33" selection-end-column="47" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="3" column="40" lean-forward="false" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
+        <state relative-caret-position="24">
+          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="355">
+          <caret line="64" column="5" lean-forward="false" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1056">
-          <caret line="44" column="24" lean-forward="false" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+        <state relative-caret-position="604">
+          <caret line="48" column="30" lean-forward="false" selection-start-line="48" selection-start-column="30" selection-end-line="48" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/CourseManagerApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="792">
-          <caret line="33" column="47" lean-forward="false" selection-start-line="33" selection-start-column="47" selection-end-line="33" selection-end-column="47" />
+        <state relative-caret-position="360">
+          <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="9" column="30" lean-forward="false" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
+        <state relative-caret-position="96">
+          <caret line="4" column="23" lean-forward="false" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="456">
-          <caret line="19" column="6" lean-forward="true" selection-start-line="14" selection-start-column="4" selection-end-line="19" selection-end-column="6" />
+        <state relative-caret-position="260">
+          <caret line="68" column="37" lean-forward="true" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/manage.html">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="742">
-          <caret line="129" column="34" lean-forward="true" selection-start-line="129" selection-start-column="34" selection-end-line="129" selection-end-column="34" />
+        <state relative-caret-position="192">
+          <caret line="389" column="24" lean-forward="true" selection-start-line="389" selection-start-column="24" selection-end-line="389" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/manage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="7" column="71" lean-forward="true" selection-start-line="7" selection-start-column="71" selection-end-line="7" selection-end-column="71" />
-          <folding />
+        <state relative-caret-position="228">
+          <caret line="154" column="38" lean-forward="true" selection-start-line="154" selection-start-column="38" selection-end-line="154" selection-end-column="38" />
+          <folding>
+            <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#footer#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="e#5462#5468#0" expanded="true" />
+            <element signature="n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#div#2;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#div#3;n#body#0;n#html#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 2 - 0
src/main/java/com/unow/web/CourseController.java

@@ -70,6 +70,8 @@ public class CourseController {
         return ResponseEntity.status(HttpStatus.OK).build();
     }
 
+//    @GetMapping("search")
+//    public ResponseEntity<List<Course>>
 
 }
 

+ 23 - 6
src/main/resources/static/manage.html

@@ -114,12 +114,23 @@
           <button id="btnAdd" type="button" class="btn btn-primary btn-md " >
             <span class="glyphicon glyphicon-plus"></span> 新增子学科
           </button>
+
+
+            <form class="navbar-form navbar-right">
+              <input id="input-select-node" type="text" class="form-control" placeholder="课程学科名称">
+              <button id="query" type="button" class="btn btn-default btn-sm">
+                <span class="glyphicon glyphicon-search"></span> Search
+              </button>
+            </form>
+
+
           <h2 class="sub-header"></h2>
           <div class="table-responsive">
             <table class="table table-hover">
-              <caption style="text-align: center;">子课程学科详情</caption>
+              <caption style="text-align: center;font-size: 25px;">子课程学科详情</caption>
               <thead>
                 <tr>
+                  <th>id</th>
                   <th>学科范畴</th>
                   <th>课程学科名</th>
                   <th>创建时间</th>
@@ -132,15 +143,21 @@
               </tbody>
             </table>
 
-                <ul class="pager">
-                  <li  id="pre"><a href="#">上一页</a></li>
-                  <li>当前页:<span id="viewpage">1</span></li>
-                  <li  id="next"><a href="#">下一页</a></li>
-                </ul>
+            <ul class="pager">
+              <li  id="pre"><a href="#">上一页</a></li>
+              <li>当前页:<span id="viewpage">1</span></li>
+              <li  id="next"><a href="#">下一页</a></li>
+            </ul>
 
           </div>
+          <footer class="navbar-fixed-bottom">
+            <p align="center" style="margin-top: 20px;color:#878B91;">
+              课程学科管理系统 &copy;2018 Unow
+            </p>
+          </footer>
         </div>
       </div>
+
     </div>
     <!--弹出框 新增权限 start-->
     <div class="modal fade" id="addOperation-dialog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">

+ 1 - 1
src/main/resources/static/public/css/style.css

@@ -1,7 +1,7 @@
 body {
     margin: 0;
     padding: 0;
-    background: -webkit-radial-gradient(top, circle cover, #3c3b52 0%, #252233 80%)
+    background: -webkit-radial-gradient(top, circle cover, #fbfff7 0%, #6eade8 80%)
 }
 
 a {

+ 30 - 17
src/main/resources/static/public/js/mainFunction.js

@@ -63,7 +63,6 @@
 			sendRequest(url,{pid:pid},true,'get'
 			,function(data){
 				$.each(data,function(index,val){
-
 					if(show){
 						$('#left-tree').treeview('addNode',[val,parentNode]);
 						$('#editName').val(parentNode[0].text);
@@ -75,7 +74,7 @@
 					}
 				});             
 			},function(failue){
-				$.showMsgText(failure);
+				$.showMsgText(failue.msg);
 			});
 		}
 	}
@@ -184,7 +183,10 @@
 					$('#editName').val(node.text);
 					$("#headTitle").text(node.text);
 					if(node){
-						main.totalPage=Math.ceil(node.length/main.rows);
+						if(node.nodes)
+							main.totalPage=Math.ceil(node.nodes.length/main.rows);
+						else
+                            main.totalPage=1
 						showMsg(node.nodes);
 					}
 				},
@@ -208,6 +210,7 @@
 		var parentNode = $('#left-tree').treeview('getSelected');
 		$.each(list,function(data,val){
 			$tr = $("<tr></tr>");
+            row0 = "<td>"+val.id+"</td>"; $tr.append(row0)
 			row1 = "<td>"+getParents(parentNode,[parentNode[0].text])+"</td>"; $tr.append(row1)
 			row2 = "<td>"+val.text+"</td>"; $tr.append(row2)
 			row3 = "<td>"+timestampToTime(val.createTime)+"</td>"; $tr.append(row3)
@@ -249,7 +252,7 @@
 		$('#Edit').click(function(){
 			var node = $('#left-tree').treeview('getSelected');
 			if(node.length==0){
-				$.showMsgText("请选择一学科")
+				$.showMsgText("请选择一学科")
 			}
 			updateNode(updateApi,node);
 		});
@@ -257,7 +260,7 @@
 		$("#btnAdd").click(function(){
 			var node = $('#left-tree').treeview('getSelected');
 			if (node.length == 0) {
-				$.showMsgText('请选择节点');
+				$.showMsgText('请选择一门学科');
 				return;
 			}
 			$('#addName').val('');
@@ -369,19 +372,29 @@
             }
         });
 
-	$("#logout").click(function(){
-		console.log(1);
-		$.ajax({
-			url:logoutApi,
-			type:'get',
-			success:function() {
-                window.location.href = 'entrance.html';
-            },
-			error:function(){
-				$.showMsgText("错误-500");
+		$("#logout").click(function(){
+			console.log(1);
+			$.ajax({
+				url:logoutApi,
+				type:'get',
+				success:function() {
+					window.location.href = 'entrance.html';
+				},
+				error:function(){
+					$.showMsgText("错误-500");
+				}
+			})
+		});
+        $('#input-select-node').change(function(){
+            val = $('#input-select-node').val()
+			if(val==""){
+                $('#left-tree').treeview('clearSearch');
 			}
-		})
-	});
+		});
+		$("#query").click(function(){
+            result = $('#left-tree').treeview('search', [ $('#input-select-node').val(), { ignoreCase: true, exactMatch: false } ]);
+			console.log(result);
+		});
 
 	}
 

+ 23 - 6
target/classes/static/manage.html

@@ -114,12 +114,23 @@
           <button id="btnAdd" type="button" class="btn btn-primary btn-md " >
             <span class="glyphicon glyphicon-plus"></span> 新增子学科
           </button>
+
+
+            <form class="navbar-form navbar-right">
+              <input id="input-select-node" type="text" class="form-control" placeholder="课程学科名称">
+              <button id="query" type="button" class="btn btn-default btn-sm">
+                <span class="glyphicon glyphicon-search"></span> Search
+              </button>
+            </form>
+
+
           <h2 class="sub-header"></h2>
           <div class="table-responsive">
             <table class="table table-hover">
-              <caption style="text-align: center;">子课程学科详情</caption>
+              <caption style="text-align: center;font-size: 25px;">子课程学科详情</caption>
               <thead>
                 <tr>
+                  <th>id</th>
                   <th>学科范畴</th>
                   <th>课程学科名</th>
                   <th>创建时间</th>
@@ -132,15 +143,21 @@
               </tbody>
             </table>
 
-                <ul class="pager">
-                  <li  id="pre"><a href="#">上一页</a></li>
-                  <li>当前页:<span id="viewpage">1</span></li>
-                  <li  id="next"><a href="#">下一页</a></li>
-                </ul>
+            <ul class="pager">
+              <li  id="pre"><a href="#">上一页</a></li>
+              <li>当前页:<span id="viewpage">1</span></li>
+              <li  id="next"><a href="#">下一页</a></li>
+            </ul>
 
           </div>
+          <footer class="navbar-fixed-bottom">
+            <p align="center" style="margin-top: 20px;color:#878B91;">
+              课程学科管理系统 &copy;2018 Unow
+            </p>
+          </footer>
         </div>
       </div>
+
     </div>
     <!--弹出框 新增权限 start-->
     <div class="modal fade" id="addOperation-dialog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">

+ 1 - 1
target/classes/static/public/css/style.css

@@ -1,7 +1,7 @@
 body {
     margin: 0;
     padding: 0;
-    background: -webkit-radial-gradient(top, circle cover, #3c3b52 0%, #252233 80%)
+    background: -webkit-radial-gradient(top, circle cover, #fbfff7 0%, #6eade8 80%)
 }
 
 a {

+ 30 - 17
target/classes/static/public/js/mainFunction.js

@@ -63,7 +63,6 @@
 			sendRequest(url,{pid:pid},true,'get'
 			,function(data){
 				$.each(data,function(index,val){
-
 					if(show){
 						$('#left-tree').treeview('addNode',[val,parentNode]);
 						$('#editName').val(parentNode[0].text);
@@ -75,7 +74,7 @@
 					}
 				});             
 			},function(failue){
-				$.showMsgText(failure);
+				$.showMsgText(failue.msg);
 			});
 		}
 	}
@@ -184,7 +183,10 @@
 					$('#editName').val(node.text);
 					$("#headTitle").text(node.text);
 					if(node){
-						main.totalPage=Math.ceil(node.length/main.rows);
+						if(node.nodes)
+							main.totalPage=Math.ceil(node.nodes.length/main.rows);
+						else
+                            main.totalPage=1
 						showMsg(node.nodes);
 					}
 				},
@@ -208,6 +210,7 @@
 		var parentNode = $('#left-tree').treeview('getSelected');
 		$.each(list,function(data,val){
 			$tr = $("<tr></tr>");
+            row0 = "<td>"+val.id+"</td>"; $tr.append(row0)
 			row1 = "<td>"+getParents(parentNode,[parentNode[0].text])+"</td>"; $tr.append(row1)
 			row2 = "<td>"+val.text+"</td>"; $tr.append(row2)
 			row3 = "<td>"+timestampToTime(val.createTime)+"</td>"; $tr.append(row3)
@@ -249,7 +252,7 @@
 		$('#Edit').click(function(){
 			var node = $('#left-tree').treeview('getSelected');
 			if(node.length==0){
-				$.showMsgText("请选择一学科")
+				$.showMsgText("请选择一学科")
 			}
 			updateNode(updateApi,node);
 		});
@@ -257,7 +260,7 @@
 		$("#btnAdd").click(function(){
 			var node = $('#left-tree').treeview('getSelected');
 			if (node.length == 0) {
-				$.showMsgText('请选择节点');
+				$.showMsgText('请选择一门学科');
 				return;
 			}
 			$('#addName').val('');
@@ -369,19 +372,29 @@
             }
         });
 
-	$("#logout").click(function(){
-		console.log(1);
-		$.ajax({
-			url:logoutApi,
-			type:'get',
-			success:function() {
-                window.location.href = 'entrance.html';
-            },
-			error:function(){
-				$.showMsgText("错误-500");
+		$("#logout").click(function(){
+			console.log(1);
+			$.ajax({
+				url:logoutApi,
+				type:'get',
+				success:function() {
+					window.location.href = 'entrance.html';
+				},
+				error:function(){
+					$.showMsgText("错误-500");
+				}
+			})
+		});
+        $('#input-select-node').change(function(){
+            val = $('#input-select-node').val()
+			if(val==""){
+                $('#left-tree').treeview('clearSearch');
 			}
-		})
-	});
+		});
+		$("#query").click(function(){
+            result = $('#left-tree').treeview('search', [ $('#input-select-node').val(), { ignoreCase: true, exactMatch: false } ]);
+			console.log(result);
+		});
 
 	}