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 6a2508acacb7339c609194b8d202f04aa66d4689..11f264d4f60371e297f1712d23fdfbdf17c38b8b 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 21cbca7f95a3d2915ce08bab366b227dfd1f122a..c814338812942306143e7508812b4805840b64c2 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 df40aeefc55b76de465121ab16a45490dc37e25c..aff982cc00a5670a553bcaedba61c09b860c052e 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 9e2ebc85f71a530d061f0a22f4f3c35cca392a58..c7c1615cd130f87835c805bc57c02fe822fb6dc8 100644 --- a/maintain-ui/src/views/business/pickingReturn/index.vue +++ b/maintain-ui/src/views/business/pickingReturn/index.vue @@ -134,14 +134,14 @@ - + - +