Переглянути джерело

fix:咨询服务内容为空时,查看更多置灰

414057798 5 роки тому
батько
коміт
9763385ecb

+ 105 - 49
.idea/workspace.xml

@@ -7,13 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5e0a6283-3bb9-4464-9eb8-7061908be2e9" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/text.share/cas" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/text.share/config" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/text/open/config" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/config.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/log4j.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/pages/open/EntrepreneurshipTutoring/index.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/pages/open/EntrepreneurshipTutoring/index.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,16 +42,18 @@
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="D:/maven/apache-maven-3.6.1" />
+        <option name="userSettingsFile" value="D:\maven\apache-maven-3.6.1\conf\settings.xml" />
+      </MavenGeneralSettings>
+    </option>
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="importAutomatically" value="true" />
       </MavenImportingSettings>
     </option>
   </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
-  </component>
   <component name="ProjectId" id="1YeXFSQMCuc7Ew6NW28UfdCrHuR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -64,13 +63,14 @@
     <option name="showMembers" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RunManager">
     <configuration default="true" type="Application" factoryName="Application">
@@ -96,11 +96,14 @@
       </method>
     </configuration>
     <configuration name="tomcat8" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.31" ALTERNATIVE_JRE_ENABLED="false">
-      <option name="UPDATING_POLICY" value="restart-server" />
+      <option name="BROWSER_ID" value="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
+      <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=utf-8" />
+      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
+      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
       <deployment>
         <artifact name="hsdataportal:war exploded">
           <settings>
-            <option name="CONTEXT_PATH" value="/hsdataportal_war_exploded" />
+            <option name="CONTEXT_PATH" value="/hsdataportal" />
           </settings>
         </artifact>
       </deployment>
@@ -171,8 +174,8 @@
   <component name="SbtLocalSettings">
     <option name="projectSyncType">
       <map>
-        <entry key="$PROJECT_DIR$/../../../../DCW/BigData/GIT/NewSparkApp-MySQL" value="PREVIEW" />
-        <entry key="$PROJECT_DIR$/../../../../DCW/大数据平台/GIT/NewSparkApp-MySQL" value="PREVIEW" />
+        <entry key="D:/../DCW/BigData/GIT/NewSparkApp-MySQL" value="PREVIEW" />
+        <entry key="D:/../DCW/大数据平台/GIT/NewSparkApp-MySQL" value="PREVIEW" />
       </map>
     </option>
   </component>
@@ -189,7 +192,7 @@
               <path>
                 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
                 <item name="Tomcat Server" type="7427dc5b:ServiceModel$ServiceGroupNode" />
-                <item name="Finished" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+                <item name="Running" type="7427dc5b:ServiceModel$ServiceGroupNode" />
               </path>
             </expand>
             <select />
@@ -214,6 +217,10 @@
       <workItem from="1575597045187" duration="123000" />
       <workItem from="1583303931371" duration="2233000" />
       <workItem from="1583373953901" duration="2325000" />
+      <workItem from="1583818992805" duration="2697000" />
+      <workItem from="1583821886251" duration="191000" />
+      <workItem from="1583822114539" duration="144000" />
+      <workItem from="1583822528854" duration="1371000" />
     </task>
     <servers />
   </component>
@@ -221,100 +228,133 @@
     <option name="version" value="1" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="104" y="52" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583374099371">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state x="104" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583822612694">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state x="104" y="0" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1280.680@0.0.1280.680" timestamp="1583822612694" />
     <state x="104" y="52" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1280.735@0.23.1280.735" timestamp="1583374099371" />
     <state x="353" y="200" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1583375590595">
       <screen x="0" y="23" width="1280" height="735" />
     </state>
     <state x="353" y="200" key="#com.intellij.fileTypes.FileTypeChooser/0.23.1280.735@0.23.1280.735" timestamp="1583375590595" />
-    <state width="846" height="183" key="GridCell.Tab.0.bottom" timestamp="1583376074488">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state x="241" y="2" key="#com.intellij.j2ee.appServerIntegrations.ApplicationServersConfigurable" timestamp="1583819501488">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="241" y="2" key="#com.intellij.j2ee.appServerIntegrations.ApplicationServersConfigurable/0.0.1280.680@0.0.1280.680" timestamp="1583819501488" />
+    <state x="264" y="0" key="CommitChangelistDialog2" timestamp="1583823996830">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="264" y="0" key="CommitChangelistDialog2/0.0.1280.680@0.0.1280.680" timestamp="1583823996830" />
+    <state x="121" y="56" key="DiffContextDialog" timestamp="1583823922138">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="121" y="56" key="DiffContextDialog/0.0.1280.680@0.0.1280.680" timestamp="1583823922138" />
+    <state x="421" y="99" key="FileChooserDialogImpl" timestamp="1583819114280">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state x="421" y="99" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1583819114280" />
+    <state width="845" height="231" key="GridCell.Tab.0.bottom" timestamp="1583822556293">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="845" height="231" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583822556293" />
     <state width="1238" height="228" key="GridCell.Tab.0.bottom/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
     <state width="846" height="183" key="GridCell.Tab.0.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
     <state width="846" height="183" key="GridCell.Tab.0.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.0.center" timestamp="1583376074488">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="231" key="GridCell.Tab.0.center" timestamp="1583822556292">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="231" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1583822556292" />
     <state width="1238" height="228" key="GridCell.Tab.0.center/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
     <state width="846" height="183" key="GridCell.Tab.0.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
     <state width="846" height="183" key="GridCell.Tab.0.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.0.left" timestamp="1583376074487">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="231" key="GridCell.Tab.0.left" timestamp="1583822556291">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="231" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1583822556291" />
     <state width="1238" height="228" key="GridCell.Tab.0.left/0.23.1280.734@0.23.1280.734" timestamp="1583304010600" />
     <state width="846" height="183" key="GridCell.Tab.0.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074487" />
     <state width="846" height="183" key="GridCell.Tab.0.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363192" />
-    <state width="846" height="183" key="GridCell.Tab.0.right" timestamp="1583376074488">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="231" key="GridCell.Tab.0.right" timestamp="1583822556292">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="231" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1583822556292" />
     <state width="1238" height="228" key="GridCell.Tab.0.right/0.23.1280.734@0.23.1280.734" timestamp="1583304010601" />
     <state width="846" height="183" key="GridCell.Tab.0.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074488" />
     <state width="846" height="183" key="GridCell.Tab.0.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.1.bottom" timestamp="1583376074490">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.bottom" timestamp="1583822257938">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583822257938" />
     <state width="1238" height="228" key="GridCell.Tab.1.bottom/0.23.1280.734@0.23.1280.734" timestamp="1583304010603" />
     <state width="846" height="183" key="GridCell.Tab.1.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
     <state width="846" height="183" key="GridCell.Tab.1.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.1.center" timestamp="1583376074490">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.center" timestamp="1583822257937">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1583822257937" />
     <state width="1238" height="228" key="GridCell.Tab.1.center/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
     <state width="846" height="183" key="GridCell.Tab.1.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
     <state width="846" height="183" key="GridCell.Tab.1.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.1.left" timestamp="1583376074489">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.left" timestamp="1583822257937">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1583822257937" />
     <state width="1238" height="228" key="GridCell.Tab.1.left/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
     <state width="846" height="183" key="GridCell.Tab.1.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074489" />
     <state width="846" height="183" key="GridCell.Tab.1.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363193" />
-    <state width="846" height="183" key="GridCell.Tab.1.right" timestamp="1583376074490">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.1.right" timestamp="1583822257937">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1583822257937" />
     <state width="1238" height="228" key="GridCell.Tab.1.right/0.23.1280.734@0.23.1280.734" timestamp="1583304010602" />
     <state width="846" height="183" key="GridCell.Tab.1.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074490" />
     <state width="846" height="183" key="GridCell.Tab.1.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.2.bottom" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.bottom" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.2.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.2.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.2.center" timestamp="1583376074491">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.center" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.2.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
     <state width="846" height="183" key="GridCell.Tab.2.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.2.left" timestamp="1583376074491">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.left" timestamp="1583821702922">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1583821702922" />
     <state width="846" height="183" key="GridCell.Tab.2.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
     <state width="846" height="183" key="GridCell.Tab.2.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363194" />
-    <state width="846" height="183" key="GridCell.Tab.2.right" timestamp="1583376074491">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.2.right" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.2.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074491" />
     <state width="846" height="183" key="GridCell.Tab.2.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.3.bottom" timestamp="1583376074493">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.bottom" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.bottom/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.bottom/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
     <state width="846" height="183" key="GridCell.Tab.3.bottom/0.23.1280.736@0.23.1280.736" timestamp="1583374363197" />
-    <state width="846" height="183" key="GridCell.Tab.3.center" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.center" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.center/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.center/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.3.center/0.23.1280.736@0.23.1280.736" timestamp="1583374363196" />
-    <state width="846" height="183" key="GridCell.Tab.3.left" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.left" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.left/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.left/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.3.left/0.23.1280.736@0.23.1280.736" timestamp="1583374363195" />
-    <state width="846" height="183" key="GridCell.Tab.3.right" timestamp="1583376074492">
-      <screen x="0" y="23" width="1280" height="735" />
+    <state width="845" height="285" key="GridCell.Tab.3.right" timestamp="1583821702923">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
+    <state width="845" height="285" key="GridCell.Tab.3.right/0.0.1280.680@0.0.1280.680" timestamp="1583821702923" />
     <state width="846" height="183" key="GridCell.Tab.3.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074492" />
     <state width="846" height="183" key="GridCell.Tab.3.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363196" />
     <state width="846" height="183" key="GridCell.Tab.4.bottom" timestamp="1583376074494">
@@ -337,6 +377,22 @@
     </state>
     <state width="846" height="183" key="GridCell.Tab.4.right/0.23.1280.735@0.23.1280.735" timestamp="1583376074493" />
     <state width="846" height="183" key="GridCell.Tab.4.right/0.23.1280.736@0.23.1280.736" timestamp="1583374363198" />
+    <state x="420" y="54" key="RollbackChangesDialog" timestamp="1583821674962">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="420" y="54" key="RollbackChangesDialog/0.0.1280.680@0.0.1280.680" timestamp="1583821674962" />
+    <state x="144" y="0" key="SettingsEditor" timestamp="1583819141799">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="144" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1583819141799" />
+    <state x="337" y="169" key="com.intellij.ide.util.TipDialog" timestamp="1583822529539">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="337" y="169" key="com.intellij.ide.util.TipDialog/0.0.1280.680@0.0.1280.680" timestamp="1583822529539" />
+    <state x="400" y="42" width="617" height="490" key="find.popup" timestamp="1583822811714">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="400" y="42" width="617" height="490" key="find.popup/0.0.1280.680@0.0.1280.680" timestamp="1583822811714" />
   </component>
   <component name="masterDetails">
     <states>

+ 9 - 1
src/main/webapp/pages/open/EntrepreneurshipTutoring/index.jsp

@@ -74,7 +74,15 @@
     <div class="bb-mid">
         <div class="bb-top1">
             <div class="bb-font">咨询服务</div>
-            <div class="bb-gengduo"><a href="<%=basePath%>/open/EntrepreneurshipTutoring/openClassList.action">查看更多</a></div>
+            <div class="bb-gengduo">
+                <c:if test="${openClassList.size()>0}">
+                    <a href="<%=basePath%>/open/EntrepreneurshipTutoring/openClassList.action">查看更多</a>
+                </c:if>
+                <c:if test="${openClassList.size()<1}">
+                    <i href="javascript:void(0)" style="text-decoration:none; cursor: default;"><i class="edit" style="opacity: 0.2"></i>查看更多</i>
+                </c:if>
+
+            </div>
             <div class="clearfix"></div>
             <div>
                 <img src="<%=resourcePath%>/images/icon_zuo.png" alt="" class="bb-zuo">