diff --git a/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue b/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue index 8da6c01..9109ca5 100644 --- a/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue +++ b/ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue @@ -108,7 +108,6 @@ <script> var prefix = "/location/locationMonitor"; var grid_row; -var grid_row_first; var grid_line; var grid_layer; var list_info; @@ -208,7 +207,6 @@ export default { }, success: function (res) { grid_row = res.result.maxRow; - grid_row_first = res.result.minRow; grid_line = res.result.maxLine; grid_layer = res.result.maxLayer; } @@ -216,7 +214,7 @@ export default { let num = $("#editable-select").val(); $("#editable-num").children().remove(); if (num === "row") { - for (let i = grid_row_first; i <= grid_row; i++) { + for (let i = 1; i <= grid_row; i++) { $("#editable-num").append("<option value='" + i + "'>" + i + "</option>") } } else if (num === "line") { @@ -239,7 +237,7 @@ export default { let num = $("#editable-select").val(); $("#editable-num").children().remove(); if (num === "row") { - for (let i = grid_row_first; i <= grid_row; i++) { + for (let i = 1; i <= grid_row; i++) { $("#editable-num").append("<option value='" + i + "'>" + i + "</option>") } } else if (num === "line") { @@ -259,7 +257,6 @@ export default { }); }, - //边框高度 border() { let box_height = $("#borderCol").offset().top; @@ -551,7 +548,6 @@ export default { }, success: function (res) { grid_row = res.result.maxRow; - grid_row_first = res.result.minRow; grid_line = res.result.maxLine; grid_layer = res.result.maxLayer; //初始格子 @@ -567,7 +563,7 @@ export default { let num = $("#editable-select").val(); $("#editable-num").children().remove(); if (num === "row") { - for (let i = grid_row_first; i <= grid_row; i++) { + for (let i = 1; i <= grid_row; i++) { $("#editable-num").append("<option value='" + i + "'>" + i + "</option>") } } else if (num === "line") { @@ -584,71 +580,15 @@ export default { } }); }, - - - //页面初始化请求 - resetAjaxs(type) { - var _this = this; - $.ajax({ - url: window._CONFIG['domianURL'] + prefix + "/getAllLocation", - type: "post", - data: { - type: type - }, - headers: { - "X-Access-Token": Vue.ls.get(ACCESS_TOKEN) - }, - success: function (res) { - grid_row = res.result.maxRow; - grid_row_first = res.result.minRow; - grid_line = res.result.maxLine; - grid_layer = res.result.maxLayer; - //初始格子 - // $("#location").children().remove(); - // for (let i = 1; i <= grid_layer; i++) { - // // var index=i+1;<span style='margin-top:30px'>第"+ index +"行</span> - // $(".location").append("<br>"); - // for (let j = 1; j <= grid_line; j++) { - // // $(".location").append("<img data-i='1' data-j="+j+" data-k="+ i +" class='grid'>"); - // $(".location").append("<img v-html data-i='1' data-j="+j+" data-k="+ i +" class='grid' onmouseove='lays(this)' onmouseout='Mclose(this)' onclick='gridMsg(this)'>"); - // } - // } - // let num=$("#editable-select").val(); - // $("#editable-num").children().remove(); - // if (num === "row") { - // for (let i = grid_row_first; i <= grid_row; i++) { - // $("#editable-num").append("<option value='"+i+"'>"+i+"</option>") - // } - // } - // else if (num === "line") { - // for (let i = 1; i <= grid_line; i++) { - // $("#editable-num").append("<option value='"+i+"'>"+i+"</option>") - // } - // } - // else if (num === "layer") { - // for (let i = 1; i <= grid_layer; i++) { - // $("#editable-num").append("<option value='"+i+"'>"+i+"</option>") - // } - // } - // _this.changeMargin(); - } - }); - }, - - //搜索平面库位 Search() { - - // this.resetAjaxs(this.zoneCode); this.spinning = true; this.showPrise = false; this.loading = true; let index = $("#editable-select").val(); let num = $("#editable-num").val(); - let zoneCode = ""; - $("#code").val(""); $("#containerCode").val(""); $("#material").children().remove(); @@ -689,9 +629,6 @@ export default { this.changeMargin(); this.ajaxGrid(index, data); } - ; - - }, seachZone() { let _this = this diff --git a/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java b/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java index 112e312..ea602e2 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/LogRecordAspect.java @@ -33,11 +33,11 @@ public class LogRecordAspect { String url = request.getRequestURL().toString(); String className = point.getTarget().getClass().getSimpleName(); String methodName = point.getSignature().getName(); - log.info("[{}] {} [{}.{}] [{}]", request.getMethod(), url, className, methodName, ApiLoggerAspect.getIpAddr(request)); + log.info(">>>[{}] {} [{}.{}][{}]>>>", request.getMethod(), url, className, methodName, ApiLoggerAspect.getIpAddr(request)); // result的值就是被拦截方法的返回值 Object result = point.proceed(); long callTime = System.currentTimeMillis() - startTime; - log.info("[{}] {} [{}.{}] [{}ms]", request.getMethod(), url, className, methodName, callTime); + log.info("<<<[{}] {} [cost:{}ms]<<<", request.getMethod(), url, callTime); return result; } } \ No newline at end of file