From 508c18d5059f017202d08f13cdac983705a7bb1b Mon Sep 17 00:00:00 2001 From: erdanergou Date: Sat, 19 Nov 2022 16:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryController.java | 3 - src/main/resources/application-test.yml | 6 +- .../templates/pages/chart/chart-in_back.html | 4 - .../pages/depository/table-stock.html | 1 - .../pages/material/selectMaterial.html | 1 - .../pages/scanQrCode/ScanBarCodeOut.html | 1 - target/classes/application-test.yml | 6 +- .../js/lay-module/layuimini/miniMenu.js | 111 +++++++++++++----- 8 files changed, 87 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index dd164880..19c421c5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -157,7 +157,6 @@ public class DepositoryController { Map map = new HashMap<>(); // 只获取当天 List toDayInventoryByDNameTest = depositoryService.getToDayInventoryByDNameTest(); - System.out.println("当前仓库中的库存记录为："+JSONObject.toJSONString(toDayInventoryByDNameTest)); if (weekDay == 1) { while (it.hasNext()) { int i; @@ -189,7 +188,6 @@ public class DepositoryController { Integer inventoryByDname = getInventoryByDname(dname, toDayInventoryByDNameTest); result.add(inventoryByDname); // 判断当天是否有出入口记录 - System.out.println("当前进行运算的仓库："+key+"此时的库存为"+inventoryByDname); Calendar IsInOut = Calendar.getInstance(); Long start = DateUtil.DateTimeByMonthToTimeStamp(formatter.format(IsInOut.getTime())); @@ -226,7 +224,6 @@ public class DepositoryController { Integer warehouserCount1 = (int)aDouble - depositoryRecordByDateByIn1 + depositoryRecordByDateByOut1; result.add(warehouserCount1); } - System.out.println("当前仓库本周的库存"+result); Collections.reverse(result); map.put(key.toString(), ((ArrayList) result).clone()); result.clear(); diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 2b02ef35..c91f16b3 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -79,9 +79,9 @@ mybatis: log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-prefix: mapper. -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl file: uploadPath: D:/upLoad \ No newline at end of file diff --git a/src/main/resources/templates/pages/chart/chart-in_back.html b/src/main/resources/templates/pages/chart/chart-in_back.html index af3cbc6a..0079bf98 100644 --- a/src/main/resources/templates/pages/chart/chart-in_back.html +++ b/src/main/resources/templates/pages/chart/chart-in_back.html @@ -314,7 +314,6 @@ success: function (result) { layer.close(this.layerIndex); if (result.code === 0) { - console.log(result) echartsRecords.setOption(optionRecords); echartsPies.setOption(optionPies); @@ -460,9 +459,6 @@ series: optionPiesSeries }; - console.log(result) - console.log(optionRecords) - console.log(optionPies) echartsRecords.setOption(optionRecords); echartsPies.setOption(optionPies); echartsDataset.setOption(optionDataset); diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index 5a05266f..b4a63a9c 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -247,7 +247,6 @@ table.on('tool(currentTableFilter)', function (obj) { let data = obj.data; - console.log(data) if (obj.event === 'applicationIn') { // 入库申请 var index = layer.open({ diff --git a/src/main/resources/templates/pages/material/selectMaterial.html b/src/main/resources/templates/pages/material/selectMaterial.html index 9a6bc0c7..1c31dcb9 100644 --- a/src/main/resources/templates/pages/material/selectMaterial.html +++ b/src/main/resources/templates/pages/material/selectMaterial.html @@ -49,7 +49,6 @@ success: function (d) { layer.close(this.layerIndex); var data2 = d.data; - console.log(data2) test.reload({ data: data2 }); diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html index fbd16129..53ea4320 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html @@ -62,7 +62,6 @@ } }) }else{ - console.log("条形码",decodedText); // 如果是条形码 barCodeList.push(decodedText); } diff --git a/target/classes/application-test.yml b/target/classes/application-test.yml index 2b02ef35..c91f16b3 100644 --- a/target/classes/application-test.yml +++ b/target/classes/application-test.yml @@ -79,9 +79,9 @@ mybatis: log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-prefix: mapper. -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl file: uploadPath: D:/upLoad \ No newline at end of file diff --git a/target/classes/static/js/lay-module/layuimini/miniMenu.js b/target/classes/static/js/lay-module/layuimini/miniMenu.js index 7cd34c2a..3a12b295 100644 --- a/target/classes/static/js/lay-module/layuimini/miniMenu.js +++ b/target/classes/static/js/lay-module/layuimini/miniMenu.js @@ -115,6 +115,24 @@ layui.define(["element", "laytpl", "jquery"], function (exports) { }); return leftMenusHtml; }, + /** + * 判断是否为手机 + * @returns {boolean} + */ + checkMobile:function () { + var ua = navigator.userAgent.toLocaleLowerCase(); + var pf = navigator.platform.toLocaleLowerCase(); + var isAndroid = (/android/i).test(ua) || ((/iPhone|iPod|iPad/i).test(ua) && (/linux/i).test(pf)) + || (/ucweb.*linux/i.test(ua)); + var isIOS = (/iPhone|iPod|iPad/i).test(ua) && !isAndroid; + var isWinPhone = (/Windows Phone|ZuneWP7/i).test(ua); + var clientWidth = document.documentElement.clientWidth; + if (!isAndroid && !isIOS && !isWinPhone && clientWidth > 1024) { + return false; + } else { + return true; + } + }, /** * 多模块 * @param menuList 菜单数据 @@ -131,35 +149,69 @@ layui.define(["element", "laytpl", "jquery"], function (exports) { headerMenuCheckDefault = 'layui-this'; if (menuChildOpen) childOpenClass = ' layui-nav-itemed'; - var headerMenuHtml = this.each(menuList, function (index, val) { //顶部菜单渲染 - var menu = 'multi_module_' + index; - var id = menu + "HeaderId"; - var topMenuItemHtml = ""; - topMenuItemHtml = me.compileMenu({ - className: headerMenuCheckDefault, - menu: menu, - id: id, - title: val.title, - href: "", - target: "", - children: "" - }); - leftMenuHtml += me.renderLeftMenu(val.child, { - parentMenuId: menu, - childOpenClass: childOpenClass, - leftMenuCheckDefault: leftMenuCheckDefault - }); - headerMobileMenuHtml += me.compileMenu({ - id: id, - menu: menu, - id: id, - icon: val.icon, - title: val.title, - }, true); - headerMenuCheckDefault = ""; - leftMenuCheckDefault = "layui-hide"; - return topMenuItemHtml; - }).join(""); + if(miniMenu.checkMobile()){ + headerMenuHtml = this.each(menuList, function (index, val) { //顶部菜单渲染 + leftMenuCheckDefault = 'layui-hide'; + var menu = 'multi_module_' + index; + let title = val.title; + if(title === '仓库管理'){ + leftMenuCheckDefault = 'layui-this'; + } + var id = menu + "HeaderId"; + var topMenuItemHtml = ""; + topMenuItemHtml = me.compileMenu({ + className: headerMenuCheckDefault, + menu: menu, + id: id, + title: title, + href: "", + target: "", + children: "" + }); + leftMenuHtml += me.renderLeftMenu(val.child, { + parentMenuId: menu, + childOpenClass: childOpenClass, + leftMenuCheckDefault: leftMenuCheckDefault + }); + headerMobileMenuHtml += me.compileMenu({ + id: id, + menu: menu, + icon: val.icon, + title: title, + }, true); + headerMenuCheckDefault = ""; + return topMenuItemHtml; + }).join(""); + }else{ + headerMenuHtml = this.each(menuList, function (index, val) { //顶部菜单渲染 + var menu = 'multi_module_' + index; + var id = menu + "HeaderId"; + var topMenuItemHtml = ""; + topMenuItemHtml = me.compileMenu({ + className: headerMenuCheckDefault, + menu: menu, + id: id, + title: val.title, + href: "", + target: "", + children: "" + }); + leftMenuHtml += me.renderLeftMenu(val.child, { + parentMenuId: menu, + childOpenClass: childOpenClass, + leftMenuCheckDefault: leftMenuCheckDefault + }); + headerMobileMenuHtml += me.compileMenu({ + id: id, + menu: menu, + icon: val.icon, + title: val.title, + }, true); + headerMenuCheckDefault = ""; + leftMenuCheckDefault = "layui-hide"; + return topMenuItemHtml; + }).join(""); + } $('.layui-layout-body').addClass('layuimini-multi-module'); //多模块标识 $('.layuimini-menu-header-pc').html(headerMenuHtml); //电脑 $('.layuimini-menu-left').html(leftMenuHtml); @@ -224,7 +276,6 @@ layui.define(["element", "laytpl", "jquery"], function (exports) { // $(".menu-li").each(function (idx,el) { // $(el).addClass("hidden-sub-menu"); // }); - } else { // 正常 $('.layuimini-tool [data-side-fold]').attr('data-side-fold', 1); $('.layuimini-tool [data-side-fold]').attr('class', 'fa fa-outdent');