Browse Source

优化部分移动端页面

lwx_dev
erdanergou 3 years ago
parent
commit
508c18d505
  1. 3
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java
  2. 6
      src/main/resources/application-test.yml
  3. 4
      src/main/resources/templates/pages/chart/chart-in_back.html
  4. 1
      src/main/resources/templates/pages/depository/table-stock.html
  5. 1
      src/main/resources/templates/pages/material/selectMaterial.html
  6. 1
      src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html
  7. 6
      target/classes/application-test.yml
  8. 57
      target/classes/static/js/lay-module/layuimini/miniMenu.js

3
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java

@ -157,7 +157,6 @@ public class DepositoryController {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
// 只获取当天 // 只获取当天
List<InventoryByDname> toDayInventoryByDNameTest = depositoryService.getToDayInventoryByDNameTest(); List<InventoryByDname> toDayInventoryByDNameTest = depositoryService.getToDayInventoryByDNameTest();
System.out.println("当前仓库中的库存记录为:"+JSONObject.toJSONString(toDayInventoryByDNameTest));
if (weekDay == 1) { if (weekDay == 1) {
while (it.hasNext()) { while (it.hasNext()) {
int i; int i;
@ -189,7 +188,6 @@ public class DepositoryController {
Integer inventoryByDname = getInventoryByDname(dname, toDayInventoryByDNameTest); Integer inventoryByDname = getInventoryByDname(dname, toDayInventoryByDNameTest);
result.add(inventoryByDname); result.add(inventoryByDname);
// 判断当天是否有出入口记录 // 判断当天是否有出入口记录
System.out.println("当前进行运算的仓库:"+key+"此时的库存为"+inventoryByDname);
Calendar IsInOut = Calendar.getInstance(); Calendar IsInOut = Calendar.getInstance();
Long start = DateUtil.DateTimeByMonthToTimeStamp(formatter.format(IsInOut.getTime())); Long start = DateUtil.DateTimeByMonthToTimeStamp(formatter.format(IsInOut.getTime()));
@ -226,7 +224,6 @@ public class DepositoryController {
Integer warehouserCount1 = (int)aDouble - depositoryRecordByDateByIn1 + depositoryRecordByDateByOut1; Integer warehouserCount1 = (int)aDouble - depositoryRecordByDateByIn1 + depositoryRecordByDateByOut1;
result.add(warehouserCount1); result.add(warehouserCount1);
} }
System.out.println("当前仓库本周的库存"+result);
Collections.reverse(result); Collections.reverse(result);
map.put(key.toString(), ((ArrayList<Integer>) result).clone()); map.put(key.toString(), ((ArrayList<Integer>) result).clone());
result.clear(); result.clear();

6
src/main/resources/application-test.yml

@ -79,9 +79,9 @@ mybatis:
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
log-prefix: mapper. log-prefix: mapper.
mybatis-plus: #mybatis-plus:
configuration: # configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
file: file:
uploadPath: D:/upLoad uploadPath: D:/upLoad

4
src/main/resources/templates/pages/chart/chart-in_back.html

@ -314,7 +314,6 @@
success: function (result) { success: function (result) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if (result.code === 0) { if (result.code === 0) {
console.log(result)
echartsRecords.setOption(optionRecords); echartsRecords.setOption(optionRecords);
echartsPies.setOption(optionPies); echartsPies.setOption(optionPies);
@ -460,9 +459,6 @@
series: optionPiesSeries series: optionPiesSeries
}; };
console.log(result)
console.log(optionRecords)
console.log(optionPies)
echartsRecords.setOption(optionRecords); echartsRecords.setOption(optionRecords);
echartsPies.setOption(optionPies); echartsPies.setOption(optionPies);
echartsDataset.setOption(optionDataset); echartsDataset.setOption(optionDataset);

1
src/main/resources/templates/pages/depository/table-stock.html

@ -247,7 +247,6 @@
table.on('tool(currentTableFilter)', function (obj) { table.on('tool(currentTableFilter)', function (obj) {
let data = obj.data; let data = obj.data;
console.log(data)
if (obj.event === 'applicationIn') { if (obj.event === 'applicationIn') {
// 入库申请 // 入库申请
var index = layer.open({ var index = layer.open({

1
src/main/resources/templates/pages/material/selectMaterial.html

@ -49,7 +49,6 @@
success: function (d) { success: function (d) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
var data2 = d.data; var data2 = d.data;
console.log(data2)
test.reload({ test.reload({
data: data2 data: data2
}); });

1
src/main/resources/templates/pages/scanQrCode/ScanBarCodeOut.html

@ -62,7 +62,6 @@
} }
}) })
}else{ }else{
console.log("条形码",decodedText);
// 如果是条形码 // 如果是条形码
barCodeList.push(decodedText); barCodeList.push(decodedText);
} }

6
target/classes/application-test.yml

@ -79,9 +79,9 @@ mybatis:
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
log-prefix: mapper. log-prefix: mapper.
mybatis-plus: #mybatis-plus:
configuration: # configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
file: file:
uploadPath: D:/upLoad uploadPath: D:/upLoad

57
target/classes/static/js/lay-module/layuimini/miniMenu.js

@ -115,6 +115,24 @@ layui.define(["element", "laytpl", "jquery"], function (exports) {
}); });
return leftMenusHtml; 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 菜单数据 * @param menuList 菜单数据
@ -131,15 +149,21 @@ layui.define(["element", "laytpl", "jquery"], function (exports) {
headerMenuCheckDefault = 'layui-this'; headerMenuCheckDefault = 'layui-this';
if (menuChildOpen) childOpenClass = ' layui-nav-itemed'; if (menuChildOpen) childOpenClass = ' layui-nav-itemed';
var headerMenuHtml = this.each(menuList, function (index, val) { //顶部菜单渲染 if(miniMenu.checkMobile()){
headerMenuHtml = this.each(menuList, function (index, val) { //顶部菜单渲染
leftMenuCheckDefault = 'layui-hide';
var menu = 'multi_module_' + index; var menu = 'multi_module_' + index;
let title = val.title;
if(title === '仓库管理'){
leftMenuCheckDefault = 'layui-this';
}
var id = menu + "HeaderId"; var id = menu + "HeaderId";
var topMenuItemHtml = ""; var topMenuItemHtml = "";
topMenuItemHtml = me.compileMenu({ topMenuItemHtml = me.compileMenu({
className: headerMenuCheckDefault, className: headerMenuCheckDefault,
menu: menu, menu: menu,
id: id, id: id,
title: val.title, title: title,
href: "", href: "",
target: "", target: "",
children: "" children: ""
@ -152,7 +176,34 @@ layui.define(["element", "laytpl", "jquery"], function (exports) {
headerMobileMenuHtml += me.compileMenu({ headerMobileMenuHtml += me.compileMenu({
id: id, id: id,
menu: menu, 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, 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, icon: val.icon,
title: val.title, title: val.title,
}, true); }, true);
@ -160,6 +211,7 @@ layui.define(["element", "laytpl", "jquery"], function (exports) {
leftMenuCheckDefault = "layui-hide"; leftMenuCheckDefault = "layui-hide";
return topMenuItemHtml; return topMenuItemHtml;
}).join(""); }).join("");
}
$('.layui-layout-body').addClass('layuimini-multi-module'); //多模块标识 $('.layui-layout-body').addClass('layuimini-multi-module'); //多模块标识
$('.layuimini-menu-header-pc').html(headerMenuHtml); //电脑 $('.layuimini-menu-header-pc').html(headerMenuHtml); //电脑
$('.layuimini-menu-left').html(leftMenuHtml); $('.layuimini-menu-left').html(leftMenuHtml);
@ -224,7 +276,6 @@ layui.define(["element", "laytpl", "jquery"], function (exports) {
// $(".menu-li").each(function (idx,el) { // $(".menu-li").each(function (idx,el) {
// $(el).addClass("hidden-sub-menu"); // $(el).addClass("hidden-sub-menu");
// }); // });
} else { // 正常 } else { // 正常
$('.layuimini-tool [data-side-fold]').attr('data-side-fold', 1); $('.layuimini-tool [data-side-fold]').attr('data-side-fold', 1);
$('.layuimini-tool [data-side-fold]').attr('class', 'fa fa-outdent'); $('.layuimini-tool [data-side-fold]').attr('class', 'fa fa-outdent');

Loading…
Cancel
Save