Skip to content

B
bpm
Commit ad5cb549 by Java-曹文达
Options

页面优化 代码修改

parent 6acd0588
Showing with 70 additions and 56 deletions
src/main/java/com/bbd/bpm/activiti/ModelCreateController.java
......@@ -22,9 +22,14 @@ import javax.servlet.http.HttpServletResponse;
public class ModelCreateController {
@GetMapping("createNew")
public void createNewModel(HttpServletRequest request, HttpServletResponse response) {
public void createNewModel(HttpServletRequest request, HttpServletResponse response,Integer newID) {
try {
response.sendRedirect(request.getContextPath() + "/modeler.html?modelId=newID");
if(newID!=null){
response.sendRedirect(request.getContextPath() + "/modeler.html?modelId="+newID);
}else {
response.sendRedirect(request.getContextPath() + "/modeler.html?modelId=newID");
}
} catch (Exception e) {
e.printStackTrace();
}
......
src/main/java/com/bbd/bpm/controller/deployment/DeploymentController.java
......@@ -56,7 +56,7 @@ public class DeploymentController {
@ApiOperation(value = "查询流程列表")
@RequestMapping(value = "/modelList")
@PostMapping("/modelList")
public BpmResponse modelList(PageBean pageBean,String modelName) {
BpmResponse resp = new BpmResponse();
try{
......@@ -83,7 +83,7 @@ public class DeploymentController {
@ApiOperation(value = "删除流程")
@RequestMapping("/deleteModel")
@PostMapping("/deleteModel")
public BpmResponse deleteModel(String modelId) {
BpmResponse resp = new BpmResponse();
try{
......@@ -133,7 +133,7 @@ public class DeploymentController {
@ApiOperation(value = "部署流程")
@RequestMapping("/deploymentModel")
@PostMapping("/deploymentModel")
public BpmResponse deploymentModel(final String modelId) {
BpmResponse resp = new BpmResponse();
resp.setSuccess(true);
......@@ -162,7 +162,7 @@ public class DeploymentController {
}
@ApiOperation(value = "删除部署")
@RequestMapping("/deleteDeployment")
@PostMapping("/deleteDeployment")
public BpmResponse deleteDeployment(String deploymentId) {
BpmResponse resp = new BpmResponse();
// processEngine.getRepositoryService().deleteDeployment(deploymentId, true);
......
src/main/java/com/bbd/bpm/controller/user/UserApiController.java
......@@ -10,13 +10,18 @@ import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
/**
* 用户功能模块接口
* @Author:cwd
* @Description:用户功能模块接口
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Controller
@RequestMapping(value = "bpm/user")
public class UserApiController {
......@@ -35,8 +40,7 @@ public class UserApiController {
* @date: 2019/3/4
* @time: 11:03
*/
@RequestMapping(value = "/userList")
@PostMapping("userList")
@ResponseBody
public Result userList(Integer id,PageBean pageBean,String userName){
if(pageBean.getPageNum()==0){
......@@ -58,7 +62,7 @@ public class UserApiController {
* @param id
* @return Result
**/
@RequestMapping(value = "getOrganizationInfo")
@PostMapping("getOrganizationInfo")
@ResponseBody
public Result getOrganizationInfo(Integer id){
Result result= userInfoService.getOrganizationInfo(id);
......@@ -75,7 +79,7 @@ public class UserApiController {
* @param name
* @return Result
**/
@RequestMapping(value = "getOrganization")
@PostMapping("getOrganization")
@ResponseBody
public Result getOrganization(PageBean pageBean,Integer id,Integer pId,String name){
if(pageBean.getPageNum()==0){
......@@ -96,7 +100,7 @@ public class UserApiController {
* @Date: 2019/03/04 22:53
* @return Result
**/
@RequestMapping(value = "getOrganizationList")
@PostMapping("getOrganizationList")
@ResponseBody
public Result getOrganization(){
Result result = userInfoService.getOrganizationList();
......@@ -113,7 +117,7 @@ public class UserApiController {
* @param name
* @return
**/
@RequestMapping(value = "addOrganization")
@PostMapping("addOrganization")
@ResponseBody
public Result addOrganization(String name, String abbreviationName, Long pId, Integer id){
//获取session中的值
......@@ -134,7 +138,7 @@ public class UserApiController {
* @param type
* @return Result
**/
@RequestMapping(value = "addOrganizationMember")
@PostMapping("addOrganizationMember")
@ResponseBody
public Result addOrganizationMember(String name, String position, Long pId, Integer id,Integer department,Integer type){
//获取session中的值
......@@ -152,7 +156,7 @@ public class UserApiController {
* @param id
* @return Result
**/
@RequestMapping(value = "editOrganization")
@PostMapping("editOrganization")
@ResponseBody
public Result editOrganization(String name, String abbreviationName,Integer id){
Result result = userInfoService.editOrganization(name,abbreviationName,id);
......@@ -169,7 +173,7 @@ public class UserApiController {
* @param pId
* @return Result
*/
@RequestMapping(value = "deleteOrganization")
@PostMapping("deleteOrganization")
@ResponseBody
public Result deleteOrganization(Long id,Integer pId){
Result result = userInfoService.deleteOrganization(id,pId);
......@@ -182,7 +186,7 @@ public class UserApiController {
* @param id
* @return Result
*/
@RequestMapping(value = "getAreaAll")
@PostMapping("getAreaAll")
@ResponseBody
public Result getAreaAll(Integer id){
Result areaList = userInfoService.getAreaAll(id);
......@@ -196,7 +200,7 @@ public class UserApiController {
* @Date: 2019.3.7
* @return Result
*/
@RequestMapping(value = "/menuList",method = RequestMethod.GET)
@GetMapping("/menuList")
@ResponseBody
public Result menuList(){
Result result= userInfoService.getMenuList();
......@@ -211,7 +215,7 @@ public class UserApiController {
* @Date: 2019.4.4
* @return Result
*/
@RequestMapping(value = "/addUser",method = RequestMethod.POST)
@PostMapping("/addUser")
@ResponseBody
public Result addUser(User user){
Result result= userInfoService.addUser(user);
......@@ -225,7 +229,7 @@ public class UserApiController {
* @param user
* @return
*/
@RequestMapping(value = "/deleteUser",method = RequestMethod.POST)
@PostMapping("/deleteUser")
@ResponseBody
public Result deleteUser(User user){
Result result= userInfoService.deleteUser(user);
......
src/main/java/com/bbd/bpm/controller/user/UserWebController.java
......@@ -5,10 +5,15 @@ import com.bbd.bpm.result.Result;
import com.bbd.bpm.service.UserInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
/**
* 用户功能模块管理
* @Author:cwd
* @Description:用户功能模块管理
* @Date: 2019/03/04 22:53
* @Param:
* @return
**/
@Controller
@RequestMapping(value = "/web/bpm/user")
public class UserWebController {
......@@ -19,7 +24,7 @@ public class UserWebController {
* @Param:
* @return
**/
@RequestMapping(value = "toIndex")
@GetMapping(value = "toIndex")
public String toIndex(){
return "bpm/index";
}
......@@ -31,7 +36,7 @@ public class UserWebController {
* @Param:
* @return
**/
@RequestMapping(value = "welcome")
@GetMapping(value = "welcome")
public String welcome(){
return "bpm/welcome";
}
......@@ -44,7 +49,7 @@ public class UserWebController {
* @Param:
* @return
**/
@RequestMapping(value = "toOrganization")
@GetMapping(value = "toOrganization")
public String toOrganization(){
return "user/organizationList";
}
......@@ -56,7 +61,7 @@ public class UserWebController {
* @Param:
* @return
**/
@RequestMapping(value = "toDeployment")
@GetMapping(value = "toDeployment")
public String toDeployment(){
return "deployment/deplymentList";
}
......@@ -68,7 +73,7 @@ public class UserWebController {
* @Param:
* @return
**/
@RequestMapping(value = "toUserList")
@GetMapping(value = "toUserList")
public String toUserList(){
return "user/userList";
}
......@@ -80,7 +85,7 @@ public class UserWebController {
* @Param:
* @return
**/
@RequestMapping(value = "addUser")
@PostMapping(value = "addUser")
public String toRegister(){
return "user/addUser";
}
......
src/main/resources/static/editor-app/libs/angular_1.2.13/angular.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/templates/bpm/index.html
......@@ -32,7 +32,6 @@
}
.nav-icon span{
display: inline-block;
line-height: ;
}
.nav-icon i{
width: 1.875rem;
......
src/main/resources/templates/deployment/deplymentList.html
......@@ -162,9 +162,9 @@
},'json')
}
/*跳转活动详情页 */
/*查看流程 */
function toActivityDetail(id) {
location.href="/activityManage/toActivityInfo?activityId="+id+"&type=1";
location.href="/model/createNew?newID="+id
}
......@@ -175,11 +175,13 @@
modelId:id
},function (data) {
if(data.code==200){
layer.msg('部署成功');
location.reload();
layer.msg('部署成功',{time:1000},function () {
location.reload();
});
}else {
layer.msg('部署失败');
location.reload();
layer.msg('部署失败',{time:1000},function () {
location.reload();
});
}
},'json')
}
......@@ -187,17 +189,18 @@
/*跳转活动人员列表 */
function deleteDeployMent(id) {
alert(id)
$.post("/api/bpm/model/deleteModel",
{
modelId:id
},function (data) {
if(data.code==200){
layer.msg('删除成功');
location.reload();
layer.msg('删除成功',{time:1000},function () {
location.reload();
});
}else {
layer.msg('删除失败');
location.reload();
layer.msg('删除失败',{time:1000},function () {
location.reload();
});
}
},'json')
}
......
src/main/resources/templates/user/organizationList.html
......@@ -44,7 +44,7 @@
margin-top: -7px;
width: 50px;
height:50px;
background: url("../../js/plugins/ztree/img/left_menuForOutLook.png")no-repeat;
background: url("../../../js/plugins/ztree/img/left_menuForOutLook.png")no-repeat;
}
.ztree li span.button.switch.level0 {width: 20px; height:20px}
.ztree li span.button.switch.level1 {width: 20px; height:20px}
......@@ -81,7 +81,7 @@
<p class="title">筛选查询</p>
<p class="search_pro" style="height: auto;overflow: hidden;display: block; padding: 0;">
<span ><b id="spanB">组织名称：</b><input type="text" value="" placeholder="请输入" name="name" style="color: black"/></span>
<span style="width: 200px;"><button style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="queryDeviceRecords()">查询</button></span><span style="width: 67px;float: right" id="add">
<span style="width: 200px;"><button style=" border: 1px solid #000000;background-color: #2b2b2b;width: 64px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="queryDeviceRecords()">查询</button></span><span style="width: 67px;float: right">
<button id="addOr" style=" border: 1px solid #000000;background-color: #2b2b2b;width: 70px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;margin-left: -1px;" onclick="add(1)">添加组织</button></span>
<button id="addMe" style="float: right;margin-top: 7px; border: 1px solid #000000;background-color: #2b2b2b;width: 70px;height: 35px;color: white;border-radius: 0px;text-align: center;line-height: 30px;" onclick="add(2)">添加人员</button></span>
......@@ -219,13 +219,13 @@
function beforeClick(treeId, treeNode) {
$("#pid").val(treeNode.pId);
$("#id").val(treeNode.id);
if (treeNode.pId==null){
$("#add").show();
}else if (treeNode.pId==1){
$("#add").show();
}else {
$("#add").hide();
}
// if (treeNode.pId==null){
// $("#add").show();
// }else if (treeNode.pId==1){
// $("#add").show();
// }else {
// $("#add").hide();
// }
$.post(
"/bpm/user/getOrganization",
{
......@@ -289,13 +289,11 @@
$("#addMe").show();
$("#addOr").show();
$("#spanB").html("人员信息：")
$("#type").val(1);
content += "<tr><th>人员编号</th><th>人员名称</th><th>职位</th><th>部门</th><th>所属组织编码</th><th>加入时间</th><th >操作</th></tr>";
}else {
$("#addOr").show();
$("#addMe").hide();
$("#spanB").html("组织名称：")
$("#type").val(2);
content += "<tr><th>序号</th><th>组织名称</th><th>上级组织</th><th >操作</th></tr>";
}
if(data!=null){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment