diff --git a/src/main/java/com/pro/mobile/controller/MobileHomeController.java b/src/main/java/com/pro/mobile/controller/MobileHomeController.java index a4ce931e8de3b8a937955234d6cedbd100efb563..f55c7df3db3033c450579c4fa55c61fbdbc2c67c 100644 --- a/src/main/java/com/pro/mobile/controller/MobileHomeController.java +++ b/src/main/java/com/pro/mobile/controller/MobileHomeController.java @@ -2,7 +2,6 @@ package com.pro.mobile.controller; import com.pro.mobile.service.MobileHomeService; import com.pro.sys.entity.Module; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -19,15 +18,13 @@ public class MobileHomeController { @RequestMapping("home") public String toHome(){ - return "mobile/home1"; + return "mobile/home"; } - @RequiresPermissions("/sys/home") + @RequestMapping("module") @ResponseBody public List getModule(Model model){ - return mobileHomeService.getModule(); - } } diff --git a/src/main/web/WEB-INF/views/mobile/home.jsp b/src/main/web/WEB-INF/views/mobile/home.jsp index 410e4fc311097af776b6b925bc811c590e3112fd..909247b751cb4bc67823f98865e08a3f330cdd43 100644 --- a/src/main/web/WEB-INF/views/mobile/home.jsp +++ b/src/main/web/WEB-INF/views/mobile/home.jsp @@ -1,12 +1,11 @@ <%-- Created by IntelliJ IDEA. - User: lenovo + User: Administrator Date: 2018/8/14 - Time: 14:38 + Time: 18:32 To change this template use File | Settings | File Templates. --%> -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> @@ -16,78 +15,65 @@ 生产过程信息系统-首页 -
- - -
- +
+ - - - + - - - + + - 工作 + 菜单 - - + + + tab2 + + 我的 - -
- - - - - diff --git a/src/main/web/WEB-INF/views/mobile/home1.jsp b/src/main/web/WEB-INF/views/mobile/home1.jsp deleted file mode 100644 index 31a0f9b012a04374a2c1e4bbe2095c5975487826..0000000000000000000000000000000000000000 --- a/src/main/web/WEB-INF/views/mobile/home1.jsp +++ /dev/null @@ -1,129 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: Administrator - Date: 2018/8/14 - Time: 18:32 - To change this template use File | Settings | File Templates. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - - - - 生产过程信息系统-首页 - - - - -
- - - - - - - - - - - - - 菜单 - - - - tab2 - - - - 我的 - - - - - -
- - - - - -