diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 8869520b..176e6211 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -314,13 +314,75 @@ public class PageController { if (b) { mv.setViewName("pages/other/welcome_mobile"); } else { + Map paramForTask = new HashMap<>(); + paramForTask.put("isDone", 0); + paramForTask.put("userId", userToken.getId()); + paramForTask.put("departmentHead", userToken.getNumber()); + + // 定义任务列表 + List list = new ArrayList<>(); + + // 查询出库任务 + List myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userToken); + + for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) { + SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); + list.add(simpleTaskP); + } + // 查询盘点任务 + List task = stockTakingService.findMyTask(paramForTask, request); + for (SimpleStockTakingP simpleStockTakingP : task) { + SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP); + list.add(simpleTaskP); + } + + // 查询入库任务 + List myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userToken); + for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) { + SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); + list.add(simpleTaskP); + } + + String key = "user:" + userToken.getId().toString(); + String minRecord = (String) redisTemplateForHash.opsForHash().get(key, "minRecord"); + if (minRecord != null) { + // 获取子订单键值 + String[] split = minRecord.replace("[", "").replace("]", "").split(","); + for (String s : split) { + if ("".equals(s)) { + continue; + } + Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); + ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); + ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken); + applicationOutRecordPById.setApplicantName(userByPort.getName()); + SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById); + list.add(simpleTaskP); + } + } mv.setViewName("pages/other/welcome"); + mv.addObject("myTaskList", list); - } - Map map = new HashMap<>(); - map.put("begin", 0); - map.put("size", 6); + Map map = new HashMap<>(); + map.put("begin", 0); + map.put("size", 6); + /** + * 获取当天日期 + */ + Calendar instance = Calendar.getInstance(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + List days = new ArrayList<>(); + instance.add(Calendar.DATE, 1); + days.add(formatter.format(instance.getTime())); + instance.add(Calendar.DATE, -1); + days.add(formatter.format(instance.getTime())); + map.put("startDate", days.get(1)); + map.put("endDate", days.get(0)); + map.put("userAgent", Md5.crypt(header)); + mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken)); + } // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); // 查询当前用户部门拥有的仓库 @@ -345,76 +407,13 @@ public class PageController { } mv.addObject("allPrice", (int) (inventoryCountByDepository / 100)); mv.addObject("allMaterial", materialService.findMaterialCount(new HashMap<>())); - /** - * 获取当天日期 - */ - Calendar instance = Calendar.getInstance(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - List days = new ArrayList<>(); - instance.add(Calendar.DATE, 1); - days.add(formatter.format(instance.getTime())); - instance.add(Calendar.DATE, -1); - days.add(formatter.format(instance.getTime())); - map.put("startDate", days.get(1)); - map.put("endDate", days.get(0)); + int warehouseRecord = 0; Map param = new HashMap<>(); Integer applicationOut = depositoryRecordService.findApplicationOutRecordPCountByCondition(param); Integer applicationIn = depositoryRecordService.findApplicationInRecordPCountByCondition(param); warehouseRecord = applicationIn + applicationOut; mv.addObject("warehouseRecord", warehouseRecord); - map.put("userAgent", Md5.crypt(header)); - mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken)); - - - Map paramForTask = new HashMap<>(); - paramForTask.put("isDone", 0); - paramForTask.put("userId", userToken.getId()); - paramForTask.put("departmentHead", userToken.getNumber()); - - // 定义任务列表 - List list = new ArrayList<>(); - - // 查询出库任务 - List myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userToken); - - for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) { - SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); - list.add(simpleTaskP); - } - // 查询盘点任务 - List task = stockTakingService.findMyTask(paramForTask, request); - for (SimpleStockTakingP simpleStockTakingP : task) { - SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP); - list.add(simpleTaskP); - } - - // 查询入库任务 - List myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userToken); - for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) { - SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); - list.add(simpleTaskP); - } - - String key = "user:" + userToken.getId().toString(); - String minRecord = (String) redisTemplateForHash.opsForHash().get(key, "minRecord"); - if (minRecord != null) { - // 获取子订单键值 - String[] split = minRecord.replace("[", "").replace("]", "").split(","); - for (String s : split) { - if ("".equals(s)) { - continue; - } - Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); - ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); - ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userToken); - applicationOutRecordPById.setApplicantName(userByPort.getName()); - SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById); - list.add(simpleTaskP); - } - } - Integer role = userToken.getIsadmin(); if (role == null) { role = 1; @@ -424,7 +423,7 @@ public class PageController { } else { mv.addObject("display", "none"); } - mv.addObject("myTaskList", list); + return mv; } @@ -2356,11 +2355,12 @@ public class PageController { /** * 用于跳转到个人信息页 + * * @param request * @return */ @GetMapping("/userInfo") - public ModelAndView userInfo(HttpServletRequest request){ + public ModelAndView userInfo(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/userInfo"); String token = request.getHeader("user-token"); @@ -2370,13 +2370,14 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); Administration company = LinkInterfaceUtil.getCompany(userToken.getMaindeparment(), userToken); userToken.setMaindeparmentname(company.getName()); - mv.addObject("userInfo",userToken); + mv.addObject("userInfo", userToken); return mv; } /** * 用于查看用户具体信息 + * * @param request * @return */ diff --git a/src/main/resources/static/js/lay-module/layuimini/miniTab.js b/src/main/resources/static/js/lay-module/layuimini/miniTab.js index 7d62b172..378ca346 100644 --- a/src/main/resources/static/js/lay-module/layuimini/miniTab.js +++ b/src/main/resources/static/js/lay-module/layuimini/miniTab.js @@ -323,11 +323,16 @@ layui.define(["element", "layer", "jquery"], function (exports) { * 在iframe子菜单上打开新窗口 */ $('body').on('click', '[layuimini-content-href]', function () { + var loading = parent.layer.load(0, {shade: false, time: 2 * 1000}); var tabId = $(this).attr('layuimini-content-href'), href = $(this).attr('layuimini-content-href'), title = $(this).attr('data-title'), target = $(this).attr('target'); + let footer = $(this).attr("footer"); + if(footer === "1" || footer === 1){ + miniTab.renderHome({"href":href,"title":title}) + } if (target === '_blank') { parent.layer.close(loading); window.open(href, "_blank"); @@ -695,7 +700,18 @@ layui.define(["element", "layer", "jquery"], function (exports) { scrollLeft: left + 450 }, 200); } - } + }, + + /** + * 初始化首页 + * @param data + */ + renderHome: function (data) { + sessionStorage.setItem('layuiminiHomeHref', data.href); + $('#layuiminiHomeTabId').html('' + data.title + 'ဆ'); + $('#layuiminiHomeTabId').attr('lay-id', data.href); + $('#layuiminiHomeTabIframe').html(''); + }, }; diff --git a/src/main/resources/templates/index_mobile.html b/src/main/resources/templates/index_mobile.html index ddc3a955..adde7dbf 100644 --- a/src/main/resources/templates/index_mobile.html +++ b/src/main/resources/templates/index_mobile.html @@ -110,24 +110,24 @@
- +
- 首页
- 功能
- +
@@ -136,17 +136,17 @@
- +
- 消息
- 我的 @@ -210,7 +210,6 @@ miniAdmin = layui.miniAdmin; - var dataByConfig; var uid = $("#uid").text(); var options = { clearUrl: "/static/api/clear.json", // 缓存清理接口 diff --git a/src/main/resources/templates/pages/message/message.html b/src/main/resources/templates/pages/message/message.html new file mode 100644 index 00000000..53ebc2de --- /dev/null +++ b/src/main/resources/templates/pages/message/message.html @@ -0,0 +1,367 @@ + + + + + 首页二 + + + + + + + + + +
+
+
+
+
+
+ 系统公告 + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ 我的任务 + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + diff --git a/src/main/resources/templates/pages/other/welcome_mobile.html b/src/main/resources/templates/pages/other/welcome_mobile.html index 53a88da9..c9c0a358 100644 --- a/src/main/resources/templates/pages/other/welcome_mobile.html +++ b/src/main/resources/templates/pages/other/welcome_mobile.html @@ -291,43 +291,6 @@
- -
-
-
- 系统公告 - -
-
-
- -
-
-
-
-
-
-
-
-
-
-
- 我的任务 - -
-
-
-
-
-
-
-
-
-
-
-
diff --git a/target/classes/static/js/lay-module/layuimini/miniTab.js b/target/classes/static/js/lay-module/layuimini/miniTab.js index 7d62b172..378ca346 100644 --- a/target/classes/static/js/lay-module/layuimini/miniTab.js +++ b/target/classes/static/js/lay-module/layuimini/miniTab.js @@ -323,11 +323,16 @@ layui.define(["element", "layer", "jquery"], function (exports) { * 在iframe子菜单上打开新窗口 */ $('body').on('click', '[layuimini-content-href]', function () { + var loading = parent.layer.load(0, {shade: false, time: 2 * 1000}); var tabId = $(this).attr('layuimini-content-href'), href = $(this).attr('layuimini-content-href'), title = $(this).attr('data-title'), target = $(this).attr('target'); + let footer = $(this).attr("footer"); + if(footer === "1" || footer === 1){ + miniTab.renderHome({"href":href,"title":title}) + } if (target === '_blank') { parent.layer.close(loading); window.open(href, "_blank"); @@ -695,7 +700,18 @@ layui.define(["element", "layer", "jquery"], function (exports) { scrollLeft: left + 450 }, 200); } - } + }, + + /** + * 初始化首页 + * @param data + */ + renderHome: function (data) { + sessionStorage.setItem('layuiminiHomeHref', data.href); + $('#layuiminiHomeTabId').html('' + data.title + 'ဆ'); + $('#layuiminiHomeTabId').attr('lay-id', data.href); + $('#layuiminiHomeTabIframe').html(''); + }, }; diff --git a/target/classes/templates/index_mobile.html b/target/classes/templates/index_mobile.html index ddc3a955..adde7dbf 100644 --- a/target/classes/templates/index_mobile.html +++ b/target/classes/templates/index_mobile.html @@ -110,24 +110,24 @@
- +
- 首页
- 功能
- +
@@ -136,17 +136,17 @@
- +
- 消息
- 我的 @@ -210,7 +210,6 @@ miniAdmin = layui.miniAdmin; - var dataByConfig; var uid = $("#uid").text(); var options = { clearUrl: "/static/api/clear.json", // 缓存清理接口 diff --git a/target/classes/templates/pages/other/welcome_mobile.html b/target/classes/templates/pages/other/welcome_mobile.html index 53a88da9..c9c0a358 100644 --- a/target/classes/templates/pages/other/welcome_mobile.html +++ b/target/classes/templates/pages/other/welcome_mobile.html @@ -291,43 +291,6 @@
- -
-
-
- 系统公告 - -
-
-
- -
-
-
-
-
-
-
-
-
-
-
- 我的任务 - -
-
-
-
-
-
-
-
-
-
-
-