Browse Source

解决方案

gesofts 6 years ago
parent
commit
858d8ec915

+ 1 - 1
enterprise.sql

@@ -186,7 +186,7 @@ INSERT INTO `t_menu` VALUES ('114', '6', '/manage/friendLinks/selectList?init=y'
 INSERT INTO `t_menu` VALUES ('115', '1', '/manage/backups/backupsList', '数据备份', '5', 'page', null);
 INSERT INTO `t_menu` VALUES ('116', '6', '/manage/contact/selectList', '联系我们', '7', 'page', null);
 INSERT INTO `t_menu` VALUES ('117', '6', '/manage/about/selectList', '关于我们', '8', 'page', null);
-INSERT INTO `t_menu` VALUES ('118', '6', '/manage/service/selectList', '服务领域', '9', 'page', null);
+INSERT INTO `t_menu` VALUES ('118', '6', '/manage/service/selectList', '解决方案', '9', 'page', null);
 
 -- ----------------------------
 -- Table structure for t_messages

+ 1 - 1
src/main/java/com/enterprise/cache/FrontCache.java

@@ -151,7 +151,7 @@ public class FrontCache implements ServletContextAware {
 	}
 
 	/**
-	 * 加载服务领域
+	 * 加载解决方案
 	 * @throws Exception
      */
 	public void loadService() throws Exception{

+ 2 - 2
src/main/java/com/enterprise/controller/front/ServiceAction.java

@@ -9,14 +9,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * 服务领域
+ * 解决方案
  * Created by Cesiumai on 2016/7/26.
  */
 @Controller("serviceActionController")
 @RequestMapping("/")
 public class ServiceAction {
     /**
-     * 跳转到“服务领域
+     * 跳转到“解决方案
      * @return
      * @throws Exception
      */

+ 1 - 1
src/main/java/com/enterprise/controller/manage/BackupAction.java

@@ -44,7 +44,7 @@ public class BackupAction{
         backupList.add(new BackUp("友情链接","t_friendlinks"));
         backupList.add(new BackUp("文章表", "t_article"));
         backupList.add(new BackUp("文章分类表", "t_articlecategory"));
-        backupList.add(new BackUp("服务领域", "t_service"));
+        backupList.add(new BackUp("解决方案", "t_service"));
         backupList.add(new BackUp("联系我们", "t_contact"));
         backupList.add(new BackUp("关于我们", "t_about"));
         model.addAttribute("backupList",backupList);

+ 1 - 1
src/main/java/com/enterprise/controller/manage/ServiceAction.java

@@ -14,7 +14,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * 服务领域 管理
+ * 解决方案 管理
  * Created by Cesiumai on 2016/7/26.
  */
 @Controller

+ 1 - 1
src/main/java/com/enterprise/core/SystemManage.java

@@ -130,7 +130,7 @@ public class SystemManage {
         putCacheObject("abouts",(Serializable)(abouts));
     }
 
-    //服务领域
+    //解决方案
     public List<Service> getService(){
         return getCacheObject("services");
     }

+ 1 - 1
src/main/java/com/enterprise/entity/Service.java

@@ -5,7 +5,7 @@ import com.enterprise.entity.page.PageModel;
 import java.io.Serializable;
 
 /**
- * 服务领域实体类
+ * 解决方案实体类
  * Created by Cesiumai on 2016/7/15.
  */
 public class Service extends PageModel implements Serializable{

+ 4 - 4
src/main/webapp/front/common/navigation.jsp

@@ -49,10 +49,7 @@
                 <a href="<%=path%>/index">首 页</a>
             </li>
             <li>
-                <a href="<%=path%>/about">关于我们</a>
-            </li>
-            <li>
-                <a href="<%=path%>/service">服务领域</a>
+                <a href="<%=path%>/service">解决方案</a>
             </li>
             <li>
                 <a href="<%=path%>/article">新闻动态</a>
@@ -64,6 +61,9 @@
                 <a href="<%=path%>/message">在线留言</a>
             </li>
             <li>
+                <a href="<%=path%>/about">关于我们</a>
+            </li>
+            <li>
                 <a href="<%=path%>/contact">联系我们</a>
             </li>
         </ul>

+ 1 - 1
src/main/webapp/front/index.jsp

@@ -56,7 +56,7 @@
         <li class="banners_li">
             <a href="<%=path%>/service">
                 <div>
-                    <h3>服务领域</h3>
+                    <h3>解决方案</h3>
                     <p>别墅装修,校区装修</p>
                 </div>
             </a>

+ 4 - 6
src/main/webapp/front/service/serviceList.jsp

@@ -17,7 +17,7 @@
 <div class="warp_main">
     <div class="warp_left">
         <div class="warp_left_box">
-            <h3>服务领域</h3>
+            <h3>解决方案</h3>
             <ul>
                 <c:forEach var="item" items="<%=SystemManage.getInstance().getService()%>">
                     <li <c:if test="${!empty id && id eq item.id}">class="active"</c:if> ><a href="<%=path%>/service/${item.id}">${item.title}</a></li>
@@ -29,7 +29,7 @@
         <div class="breadcrumb">
             <a href="<%=path%>/index">首页</a>
             >
-            <a href="<%=path%>/service">服务领域</a>
+            <a href="<%=path%>/service">解决方案</a>
             <%
                 String id = (String)request.getAttribute("id");
                     for (Service ac : SystemManage.getInstance().getService()) {
@@ -48,15 +48,13 @@
                 <%
                     for (Service ac : SystemManage.getInstance().getService()) {
                         System.out.println(id);
+                        System.out.println(ac.getId());
                         if ((String.valueOf(ac.getId())).equals(id)) {
                 %>
                         <%=ac.getContentHtml()%>
                 <%
                             break;
-                        }else{%>
-                <%=ac.getContentHtml()%>
-                <% break;
-                            }
+                        }
                     }
                 %>
             </div>

+ 1 - 1
src/main/webapp/manage/service/serviceList.jsp

@@ -8,7 +8,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
          pageEncoding="UTF-8" %>
 <%@ include file="/manage/system/pageBase.jsp" %>
-<%@ page info="服务领域" %>
+<%@ page info="解决方案" %>
 
 <form action="<%=path%>/manage/service" method="post">
     <div style="height:auto!important;height:550px;min-height:550px;">

+ 1 - 1
src/main/webapp/manage/systemsetting/systemSettingEdit.jsp

@@ -230,7 +230,7 @@
                 <td style="text-align: right; width: 100px"></td>
                 <td style="text-align: left;">
                     <button class="btn btn-info" style="padding: 2px 22px;">
-                        提交
+                        提交2
                     </button>
                 </td>
             </tr>