From 2e1c47e4702734addd044849adca486b26fdf15e Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Thu, 9 Aug 2018 18:54:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2018/8/9=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/sys/controller/UserController.java | 29 +++++++++++ src/main/java/com/pro/sys/entity/Role.java | 37 ++++++++++++++ .../java/com/pro/sys/mapper/UserMapper.java | 12 +++++ .../java/com/pro/sys/service/UserService.java | 15 ++++++ .../pro/sys/service/impl/UserServiceImpl.java | 25 +++++++++ src/main/resources/mapper/sys/UserMapper.xml | 31 +++++++++++ src/main/web/WEB-INF/views/sys/home.jsp | 6 +-- src/main/web/WEB-INF/views/sys/user.jsp | 30 ++++++++++- src/main/web/WEB-INF/views/sys/userRole.jsp | 51 +++++++++++++++++++ 9 files changed, 232 insertions(+), 4 deletions(-) create mode 100644 src/main/web/WEB-INF/views/sys/userRole.jsp diff --git a/src/main/java/com/pro/sys/controller/UserController.java b/src/main/java/com/pro/sys/controller/UserController.java index e56c6f3..caa8c08 100644 --- a/src/main/java/com/pro/sys/controller/UserController.java +++ b/src/main/java/com/pro/sys/controller/UserController.java @@ -3,10 +3,12 @@ package com.pro.sys.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pro.sys.entity.Result; +import com.pro.sys.entity.Role; import com.pro.sys.entity.User; import com.pro.sys.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import java.util.HashMap; @@ -110,6 +112,33 @@ public class UserController { return userService.updateUsersStatus(u_ids,u_status); } + /*** + * 根据用户id 获取角色列表 + * @param u_id + * @param model + * @return + */ + @RequestMapping(value = "getUserRole/{u_id}",method = RequestMethod.GET) + public String toUserRole(@PathVariable String u_id, Model model){ + List roles = userService.getUserRole(u_id); + model.addAttribute("roleList",roles); + model.addAttribute("u_id",u_id); + return "sys/userRole"; + } + + /*** + * 用户分配角色，先删除后添加 + * @param r_ids + * @param u_id + * @return + */ + @RequestMapping( + value="setUserRole/{u_id}", + method=RequestMethod.PUT) + @ResponseBody + public Result setUserRole(@RequestBody Integer[] r_ids, @PathVariable String u_id){ + return userService.setUserRole(r_ids,u_id); + } } diff --git a/src/main/java/com/pro/sys/entity/Role.java b/src/main/java/com/pro/sys/entity/Role.java index 01d5915..99eef29 100644 --- a/src/main/java/com/pro/sys/entity/Role.java +++ b/src/main/java/com/pro/sys/entity/Role.java @@ -2,6 +2,11 @@ package com.pro.sys.entity; public class Role { + private Integer r_id; + private String r_name; + private String u_id; + private boolean checked; + /** * 角色Id */ @@ -51,6 +56,38 @@ public class Role { this.ro_status = ro_status; } + public Integer getR_id() { + return r_id; + } + + public void setR_id(Integer r_id) { + this.r_id = r_id; + } + + public String getR_name() { + return r_name; + } + + public void setR_name(String r_name) { + this.r_name = r_name; + } + + public String getU_id() { + return u_id; + } + + public void setU_id(String u_id) { + this.u_id = u_id; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + @Override public String toString() { return "Role{" + diff --git a/src/main/java/com/pro/sys/mapper/UserMapper.java b/src/main/java/com/pro/sys/mapper/UserMapper.java index 2507bc2..aa1488f 100644 --- a/src/main/java/com/pro/sys/mapper/UserMapper.java +++ b/src/main/java/com/pro/sys/mapper/UserMapper.java @@ -1,5 +1,6 @@ package com.pro.sys.mapper; +import com.pro.sys.entity.Role; import com.pro.sys.entity.User; import org.apache.ibatis.annotations.Param; import org.mybatis.spring.annotation.MapperScan; @@ -49,4 +50,15 @@ public interface UserMapper { * @return */ int updateUsersStatus(@Param(value = "u_ids") String[] u_ids,@Param("u_status") String u_status); + + /*** + * 根据用户编号获得角色列表 + * @param u_id + * @return + */ + List getUserRole(String u_id); + + int deleteAllRoleOfUser(String u_id); + + int insertUserRole(@Param("u_id") String u_id,@Param("r_ids") Integer[] r_ids); } diff --git a/src/main/java/com/pro/sys/service/UserService.java b/src/main/java/com/pro/sys/service/UserService.java index b780051..b71638d 100644 --- a/src/main/java/com/pro/sys/service/UserService.java +++ b/src/main/java/com/pro/sys/service/UserService.java @@ -1,6 +1,7 @@ package com.pro.sys.service; import com.pro.sys.entity.Result; +import com.pro.sys.entity.Role; import com.pro.sys.entity.User; import java.util.List; @@ -43,5 +44,19 @@ public interface UserService { */ Result updateUsersStatus(String[] u_ids, String u_status); + /*** + * 根据用户编号获取角色列表 + * @param u_id + * @return + */ + List getUserRole(String u_id); + + /*** + * 给用户分配角色 + * @param r_ids + * @param u_id + */ + Result setUserRole(Integer[] r_ids, String u_id); + } diff --git a/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java b/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java index d56b056..da105fb 100644 --- a/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java +++ b/src/main/java/com/pro/sys/service/impl/UserServiceImpl.java @@ -1,6 +1,7 @@ package com.pro.sys.service.impl; import com.pro.sys.entity.Result; +import com.pro.sys.entity.Role; import com.pro.sys.entity.User; import com.pro.sys.mapper.UserMapper; import com.pro.sys.service.UserService; @@ -81,4 +82,28 @@ public class UserServiceImpl implements UserService { } return Result.failResult("用户信息修改失败"); } + + /*** + * 根据用户编号获得角色列表 + * @param u_id + * @return + */ + @Override + public List getUserRole(String u_id) { + return userMapper.getUserRole(u_id); + } + + /*** + * 给用户分配角色，先删除，再添加 + * @param r_ids + * @param u_id + * @return + */ + @Override + public Result setUserRole(Integer[] r_ids, String u_id) { + if(userMapper.deleteAllRoleOfUser(u_id)>0 || userMapper.insertUserRole(u_id,r_ids)>0){ + return Result.successResult("用户权限分配成功"); + } + return Result.failResult("用户权限分配失败"); + } } diff --git a/src/main/resources/mapper/sys/UserMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml index a6c9c27..07bdf8b 100644 --- a/src/main/resources/mapper/sys/UserMapper.xml +++ b/src/main/resources/mapper/sys/UserMapper.xml @@ -68,4 +68,35 @@ + + + + + delete from sys_ur where u_id=#{u_id} + + + + insert into + + sys_ur(u_id,ro_id) + + values + + (#{u_id},#{ro_id}) + + + \ No newline at end of file diff --git a/src/main/web/WEB-INF/views/sys/home.jsp b/src/main/web/WEB-INF/views/sys/home.jsp index e253bff..b9582a1 100644 --- a/src/main/web/WEB-INF/views/sys/home.jsp +++ b/src/main/web/WEB-INF/views/sys/home.jsp @@ -33,21 +33,21 @@
-
-
-
diff --git a/src/main/web/WEB-INF/views/sys/user.jsp b/src/main/web/WEB-INF/views/sys/user.jsp index 6c1e091..86d4885 100644 --- a/src/main/web/WEB-INF/views/sys/user.jsp +++ b/src/main/web/WEB-INF/views/sys/user.jsp @@ -104,10 +104,12 @@ {{# }else if(d.u_status == '22' || d.u_status == '77' ){ }} 启用 + 权限 {{# }else if(d.u_status == '55' ){ }} 禁用 + 权限 {{# } }} @@ -252,7 +254,33 @@ }); - } + }else if(layEvent === 'user_role'){ //权限 + + var index = layer.load(1); + + $.ajax({ + url:'getUserRole/' + data.u_id, + method:'get', + dataType:'html' + }).done(function(html){ + + layer.open({ + type : 1, + title : data.u_name+'的权限', + area : [ '800px', '540px' ], + content : html, + zIndex:100,//将层次降低，以使sweetalert能够在layer之上 + success: function(layero, index){ + form.render(null, 'form-user-role');//手动渲染表单 + } + + }); + + layer.close(index); + + }); + + } diff --git a/src/main/web/WEB-INF/views/sys/userRole.jsp b/src/main/web/WEB-INF/views/sys/userRole.jsp new file mode 100644 index 0000000..bcafc9b --- /dev/null +++ b/src/main/web/WEB-INF/views/sys/userRole.jsp @@ -0,0 +1,51 @@ +<%-- + Created by IntelliJ IDEA. + User: longda + Date: 2018/8/9 + Time: 15:34 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +
+
+ +
+ +
+ + + + +
+
+
+
+ + +
+
+
+
+ \ No newline at end of file -- Gitee From 31223d755761e4fcd5c75da23b38ce89bb59d287 Mon Sep 17 00:00:00 2001 From: longda <17868877553@163.com> Date: Fri, 10 Aug 2018 18:40:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2018/8/10=E5=9D=AF=E5=B8=83=E5=87=86?= =?UTF-8?q?=E5=A4=87=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/bus/controller/ProcessController.java | 83 ++++ .../com/pro/bus/controller/controller.java | 4 - .../com/pro/bus/mapper/ProcessMapper.java | 51 +++ .../com/pro/bus/service/ProcessService.java | 38 ++ .../bus/service/impl/ProcessServiceImpl.java | 81 ++++ .../com/pro/bus/service/impl/serviceimpl.java | 4 - .../resources/mapper/bus/ProcessMapper.xml | 96 +++++ src/main/resources/mapper/bus/mapper.xml | 7 - src/main/resources/mapper/sys/UserMapper.xml | 5 +- src/main/web/WEB-INF/views/bus/bus.jsp | 16 - src/main/web/WEB-INF/views/bus/process.jsp | 372 ++++++++++++++++++ src/main/web/WEB-INF/views/info/color.jsp | 1 - src/main/web/WEB-INF/views/sys/user.jsp | 1 - src/main/web/static/js/common.js | 57 ++- 14 files changed, 764 insertions(+), 52 deletions(-) create mode 100644 src/main/java/com/pro/bus/controller/ProcessController.java delete mode 100644 src/main/java/com/pro/bus/controller/controller.java create mode 100644 src/main/java/com/pro/bus/mapper/ProcessMapper.java create mode 100644 src/main/java/com/pro/bus/service/ProcessService.java create mode 100644 src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java delete mode 100644 src/main/java/com/pro/bus/service/impl/serviceimpl.java create mode 100644 src/main/resources/mapper/bus/ProcessMapper.xml delete mode 100644 src/main/resources/mapper/bus/mapper.xml delete mode 100644 src/main/web/WEB-INF/views/bus/bus.jsp create mode 100644 src/main/web/WEB-INF/views/bus/process.jsp diff --git a/src/main/java/com/pro/bus/controller/ProcessController.java b/src/main/java/com/pro/bus/controller/ProcessController.java new file mode 100644 index 0000000..17b6547 --- /dev/null +++ b/src/main/java/com/pro/bus/controller/ProcessController.java @@ -0,0 +1,83 @@ +package com.pro.bus.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.pro.bus.entity.Plan; +import com.pro.bus.entity.Process; +import com.pro.bus.service.ProcessService; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; +import com.pro.sys.entity.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/bus") +public class ProcessController { + @Autowired + private ProcessService processService; + /*** + * 去坯布准备页面 + * @return + */ + @RequestMapping("rawcloth") + public String toProcess(Model model){ + List colors = processService.getColorName(); + List customers = processService.getCustomerName(); + List standards = processService.getStandardName(); + List plans = processService.getPlanId(); + model.addAttribute("colors",colors); + model.addAttribute("customers",customers); + model.addAttribute("standards",standards); + model.addAttribute("plans",plans); + return "bus/process"; + } + + /*** + * 获取坯布准备信息 + * @param page + * @param limit + * @param process + * @return + */ + @RequestMapping(value = "getProcess",method = RequestMethod.GET) + @ResponseBody + public Map getProcess(@RequestParam(value = "page",defaultValue = "1") Integer page, @RequestParam(value = "limit") Integer limit, Process process){ + PageHelper.startPage(page,limit); + List processes = processService.getProcess(process); + Map map = new HashMap(); + PageInfo pageInfo = new PageInfo(processes); + map.put("code",0); + map.put("data",pageInfo.getList()); + map.put("count",pageInfo.getTotal()); + map.put("msg",""); + return map; + } + + /** + * 添加,修改 + */ + @RequestMapping(value = "save", method = RequestMethod.POST) + @ResponseBody + public Result save(Process process){ + return processService.save(process); + } + + /*** + * 根据id获得坯布准备信息 + * @param process_id + * @return + */ + @RequestMapping(value = "getProcessById/{process_id}",method = RequestMethod.GET) + @ResponseBody + public Process getProcessById(@PathVariable("process_id") Integer process_id){ + return processService.getProcessById(process_id); + } +} diff --git a/src/main/java/com/pro/bus/controller/controller.java b/src/main/java/com/pro/bus/controller/controller.java deleted file mode 100644 index e2fe399..0000000 --- a/src/main/java/com/pro/bus/controller/controller.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.bus.controller; - -public class controller { -} diff --git a/src/main/java/com/pro/bus/mapper/ProcessMapper.java b/src/main/java/com/pro/bus/mapper/ProcessMapper.java new file mode 100644 index 0000000..2ea909f --- /dev/null +++ b/src/main/java/com/pro/bus/mapper/ProcessMapper.java @@ -0,0 +1,51 @@ +package com.pro.bus.mapper; + +import com.pro.bus.entity.Plan; +import com.pro.bus.entity.Process; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; +import org.apache.ibatis.annotations.Select; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +@MapperScan +public interface ProcessMapper { + /*** + * 获取坯布准备列表 + * @param process + * @return + */ + List getProcess(Process process); + + @Select("select co_id,co_name from info_color where co_status=55") + List getColorName(); + @Select("select cus_id,cus_name from info_customer where cus_status=55") + List getCustomerName(); + @Select("select standard_id,standard_name from info_standard where standard_status=55") + List getStandardName(); + @Select("select plan_id from bus_plan where plan_status=1") + List getPlanId(); + + /*** + * 添加坯布准备 + * @param process + * @return + */ + int save(Process process); + + /*** + * 根据id获得单条坯布准备信息 + * @param process_id + * @return + */ + Process getProcessById(Integer process_id); + + /*** + * 修改坯布准备信息 + * @param process + * @return + */ + int update(Process process); +} diff --git a/src/main/java/com/pro/bus/service/ProcessService.java b/src/main/java/com/pro/bus/service/ProcessService.java new file mode 100644 index 0000000..2938e9e --- /dev/null +++ b/src/main/java/com/pro/bus/service/ProcessService.java @@ -0,0 +1,38 @@ +package com.pro.bus.service; + +import com.pro.bus.entity.Plan; +import com.pro.bus.entity.Process; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; +import com.pro.sys.entity.Result; + +import java.util.List; + +public interface ProcessService { + /*** + * 获取坯布准备列表 + * @param process + * @return + */ + List getProcess(Process process); + List getColorName(); + List getCustomerName(); + List getStandardName(); + List getPlanId(); + + /*** + * 添加坯布准备 + * @param process + * @return + */ + Result save(Process process); + + /*** + * 根据id获得单条坯布准备信息 + * @param process_id + * @return + */ + Process getProcessById(Integer process_id); + +} diff --git a/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java new file mode 100644 index 0000000..656bd3e --- /dev/null +++ b/src/main/java/com/pro/bus/service/impl/ProcessServiceImpl.java @@ -0,0 +1,81 @@ +package com.pro.bus.service.impl; + +import com.pro.bus.entity.Plan; +import com.pro.bus.entity.Process; +import com.pro.bus.mapper.ProcessMapper; +import com.pro.bus.service.ProcessService; +import com.pro.info.entity.Color; +import com.pro.info.entity.Customer; +import com.pro.info.entity.Standard; +import com.pro.sys.entity.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ProcessServiceImpl implements ProcessService { + @Autowired + private ProcessMapper processMapper; + + /*** + * 获取坯布准备列表 + * @param process + * @return + */ + @Override + public List getProcess(Process process) { + return processMapper.getProcess(process); + } + + @Override + public List getColorName() { + return processMapper.getColorName(); + } + + @Override + public List getCustomerName() { + return processMapper.getCustomerName(); + } + + @Override + public List getStandardName() { + return processMapper.getStandardName(); + } + + @Override + public List getPlanId() { + return processMapper.getPlanId(); + } + + /*** + * 添加坯布准备信息 + * @param process + * @return + */ + @Override + public Result save(Process process) { + if(process.getProcess_id()!=null){ + if(processMapper.update(process)>0){ + return Result.successResult("修改成功"); + } + return Result.failResult("修改失败"); + }else{ + if(processMapper.save(process)>0){ + return Result.successResult("添加成功"); + } + return Result.failResult("添加失败"); + } + + } + + /*** + * 根据id获得单条坯布准备信息 + * @param process_id + * @return + */ + @Override + public Process getProcessById(Integer process_id) { + return processMapper.getProcessById(process_id); + } +} diff --git a/src/main/java/com/pro/bus/service/impl/serviceimpl.java b/src/main/java/com/pro/bus/service/impl/serviceimpl.java deleted file mode 100644 index 5df854a..0000000 --- a/src/main/java/com/pro/bus/service/impl/serviceimpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pro.bus.service.impl; - -public class serviceimpl { -} diff --git a/src/main/resources/mapper/bus/ProcessMapper.xml b/src/main/resources/mapper/bus/ProcessMapper.xml new file mode 100644 index 0000000..22b537b --- /dev/null +++ b/src/main/resources/mapper/bus/ProcessMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + select ifnull(max(process_id),0)+1 from bus_process + + insert into bus_process values + (#{process_id},#{plan_id},#{process_cus},#{process_std},#{process_color},#{group_num}, + #{group_date},#{group_person},#{pretreat_num},#{pretreat_date},#{pretreat_person},#{dye_num}, + #{dye_date},#{dye_person},#{print_num},#{print_date},#{print_person},#{arrange_num}, + #{arrange_date},#{arrange_person},#{check_num},#{check_date},#{check_person},'00') + + + + + update bus_process + + + process_id = #{process_id}, + + plan_id = #{plan_id}, + + process_cus = #{process_cus}, + + + process_std = #{process_std}, + + + process_color = #{process_color}, + + + group_num = #{group_num}, + + + group_date = #{group_date}, + + + group_person = #{group_person}, + + + pretreat_num = #{pretreat_num}, + + + pretreat_date = #{pretreat_date}, + + + pretreat_person = #{pretreat_person}, + + + dye_num = #{dye_num}, + + + dye_date = #{dye_date}, + + + dye_person = #{dye_person}, + + + print_num = #{print_num}, + + + print_date = #{print_date}, + + + print_person = #{print_person}, + + + arrange_num = #{arrange_num}, + + + arrange_date = #{arrange_date}, + + + arrange_person = #{arrange_person}, + + + check_num = #{check_num}, + + + check_date = #{check_date}, + + + check_person = #{check_person}, + + + where process_id = #{process_id} + + \ No newline at end of file diff --git a/src/main/resources/mapper/bus/mapper.xml b/src/main/resources/mapper/bus/mapper.xml deleted file mode 100644 index 8cbf9de..0000000 --- a/src/main/resources/mapper/bus/mapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/sys/UserMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml index 07bdf8b..e2820eb 100644 --- a/src/main/resources/mapper/sys/UserMapper.xml +++ b/src/main/resources/mapper/sys/UserMapper.xml @@ -73,11 +73,10 @@ SELECT r.ro_id r_id,r.ro_name r_name,ur.u_id FROM - sys_role r JOIN sys_role sr on sr.ro_id = r.ro_id + sys_role r left JOIN (select u_id,ro_id from sys_ur where u_id=#{u_id}) ur ON r.ro_id= ur.ro_id WHERE - r.ro_status=55 and - sr.ro_status=55 + r.ro_status=55 ORDER BY r.ro_id diff --git a/src/main/web/WEB-INF/views/bus/bus.jsp b/src/main/web/WEB-INF/views/bus/bus.jsp deleted file mode 100644 index f84c64f..0000000 --- a/src/main/web/WEB-INF/views/bus/bus.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: lenovo - Date: 2018/8/2 - Time: 15:40 - To change this template use File | Settings | File Templates. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Title - - - - - diff --git a/src/main/web/WEB-INF/views/bus/process.jsp b/src/main/web/WEB-INF/views/bus/process.jsp new file mode 100644 index 0000000..60b4600 --- /dev/null +++ b/src/main/web/WEB-INF/views/bus/process.jsp @@ -0,0 +1,372 @@ +<%-- + Created by IntelliJ IDEA. + User: longda + Date: 2018/8/10 + Time: 10:30 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + Title + + + + + + +
+ +
+
+ + + + + + + + + + + + + + diff --git a/src/main/web/WEB-INF/views/info/color.jsp b/src/main/web/WEB-INF/views/info/color.jsp index fed76de..2af8e6b 100644 --- a/src/main/web/WEB-INF/views/info/color.jsp +++ b/src/main/web/WEB-INF/views/info/color.jsp @@ -187,7 +187,6 @@ //第一个实例 var colTable = table.render({ elem: '#color-table' - , height: 315 , url: 'colors' //数据接口 , page: true , size: 'sm' diff --git a/src/main/web/WEB-INF/views/sys/user.jsp b/src/main/web/WEB-INF/views/sys/user.jsp index 86d4885..7bfda6a 100644 --- a/src/main/web/WEB-INF/views/sys/user.jsp +++ b/src/main/web/WEB-INF/views/sys/user.jsp @@ -152,7 +152,6 @@ //第一个实例 var userTable = table.render({ elem: '#user-table' - , height: 315 , url: 'users' //数据接口 , page: true , size: 'sm' diff --git a/src/main/web/static/js/common.js b/src/main/web/static/js/common.js index 8aa18b7..c74f599 100644 --- a/src/main/web/static/js/common.js +++ b/src/main/web/static/js/common.js @@ -42,6 +42,7 @@ opr.ajax=function(options){ var ajaxUrl = options.url?options.url:''; var ajaxMethod = options.method?options.method:'GET'; var ajaxData = options.data?options.data:undefined; + var ajaxDataType = options.dataType?options.dataType:'JSON'; var ajaxContentType = options.contentType?options.contentType:undefined; var layer = options.layer?options.layer:undefined; @@ -59,36 +60,60 @@ opr.ajax=function(options){ data:ajaxData, method : ajaxMethod, contentType:ajaxContentType, - dataType : 'json', + dataType : ajaxDataType, }).done(function(result) { layer.close(index); - if(_this.responseOkHandler){ - if(!_this.responseOkHandler(result)){ - return; - } + try{ - } + if(_this.responseOkHandler){ + var executeNext = _this.responseOkHandler(result); - if (result.success) { - swal({ - text: result.message, - icon: "success", - buttons:false, - timer:1500 - }); - if(layuiTableIns)layuiTableIns.reload(); + if(ajaxDataType.toUpperCase()!='JSON'){ + return; + } + + if(!executeNext){ + return; + } + + } - } else { + if(ajaxDataType.toUpperCase()!='JSON'){ + return; + } + + if (result.success) { + swal({ + text: result.message, + icon: "success", + buttons:false, + timer:1500 + }); + if(layuiTableIns)layuiTableIns.reload(); + + } else { + swal({ + title: result.message, + icon: "error", + button: "确定" + }); + } + + }catch(e){ + console.log(e); swal({ - title: result.message, + title: '处理响应数据错误！', + text:'可能是您的JavaScript程序出问题了。', icon: "error", button: "确定" }); } + + }).fail(function(xhr) { layer.close(index); swal({ -- Gitee