From f051971d23cf94dd98d7bb6289a8ec935ae4d8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Sat, 26 Jul 2025 18:38:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/tool/ReportController.java | 13 ++++++++----- .../src/views/business/materialCheck/index.vue | 2 +- .../src/views/business/materialPicking/index.vue | 4 ++-- .../src/views/business/pickingReturn/index.vue | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java b/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java index 6a2508a..11f264d 100644 --- a/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java +++ b/maintain-admin/src/main/java/com/maintain/web/controller/tool/ReportController.java @@ -1,10 +1,13 @@ package com.maintain.web.controller.tool; -import org.springframework.beans.factory.annotation.Autowired; +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.maintain.common.utils.ip.IpUtils; +import groovy.transform.AnnotationCollector; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Autowired; @RestController @@ -17,24 +20,24 @@ public class ReportController { //报表设计 @GetMapping(value = "/reportList") public String ReportList(){ - return "http://10.100.102.82:" + environment.getProperty("server.port") + "/jmreport/list"; + return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/jmreport/list"; } //报表查看 @GetMapping(value = "/reportView") public String ReportView(){ - return "http://10.100.102.82:" + environment.getProperty("server.port") + "/jmreport/view"; + return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/jmreport/view"; } //报表查看 @GetMapping(value = "/biList") public String bi(){ - return "http://10.100.102.82:" + environment.getProperty("server.port") + "/drag/list"; + return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/drag/list"; } //报表查看 @GetMapping(value = "/biView") public String biView(){ - return "http://10.100.102.82:" + environment.getProperty("server.port") + "/drag/share/view"; + return "http://" + IpUtils.getHostIp() + ":" + environment.getProperty("server.port") + "/drag/share/view"; } } diff --git a/maintain-ui/src/views/business/materialCheck/index.vue b/maintain-ui/src/views/business/materialCheck/index.vue index 21cbca7..c814338 100644 --- a/maintain-ui/src/views/business/materialCheck/index.vue +++ b/maintain-ui/src/views/business/materialCheck/index.vue @@ -647,7 +647,7 @@ export default { taskName: undefined, taskUserId: undefined, taskUserName: undefined, - taskStartTime: undefined, + taskStartTime: formatDate(new Date().getTime()), taskEndTime: undefined, warehouseId: undefined, warehouseName: undefined, diff --git a/maintain-ui/src/views/business/materialPicking/index.vue b/maintain-ui/src/views/business/materialPicking/index.vue index df40aee..aff982c 100644 --- a/maintain-ui/src/views/business/materialPicking/index.vue +++ b/maintain-ui/src/views/business/materialPicking/index.vue @@ -210,7 +210,7 @@ - + @@ -633,7 +633,7 @@ export default { receiveUserName: undefined, receiveTime: undefined, state: undefined, - outTime: undefined, + outTime: formatDate(new Date().getTime()), createBy: this.$store.state.user.userInfo.userName, createTime: formatDate(new Date().getTime()), pickingInfoList: [] diff --git a/maintain-ui/src/views/business/pickingReturn/index.vue b/maintain-ui/src/views/business/pickingReturn/index.vue index 9e2ebc8..c7c1615 100644 --- a/maintain-ui/src/views/business/pickingReturn/index.vue +++ b/maintain-ui/src/views/business/pickingReturn/index.vue @@ -134,14 +134,14 @@ - + - + -- 2.22.0