From 790cfb225efc0a377c6f602081681b93509cd96b Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 15 十月 2022 14:44:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 12 ++++++++++++
src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java | 5 +++++
src/main/webapp/views/index.html | 29 ++++++++++++++++++++++++-----
3 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index e5ea794..9fdb831 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -320,6 +320,18 @@
}
return R.error();
}
+ @PostMapping("/loc/detail2")
+ @ManagerAuth(memo = "0101804搴撲綅鏁版嵁璇︽儏")
+ public R locDetail2(@RequestParam String locNo) {
+ if (Cools.isEmpty(locNo)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo));
+ LocDetailVo vo = new LocDetailVo();
+ vo.setChannel(locMast.getChannel());
+ vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus()));
+ return R.ok().add(vo);
+ }
@Deprecated
@PostMapping("/site/update")
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java
index 53c3518..d7d069f 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java
@@ -27,4 +27,9 @@
PACK鐮�
*/
private String zpallet;
+
+ /*
+ 閫氶亾
+ */
+ private Integer channel;
}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 69e2a39..7782378 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -23,8 +23,8 @@
<div class="sidebar">
<div class="nav">
<ul class="cl-effect-4">
- <li><button id="fire" style="background-color: #00FF00;border-radius: 30px">娑堥槻</button></li>
- <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
+ <li><button id="fire" style="border-radius: 30px">娑堥槻</button><br>
+ <a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
</ul>
@@ -52,12 +52,12 @@
window.location.href = baseUrl + "/login";
}
$.ajax({
- url: baseUrl + "/console/crn/detail",
+ url: "/ynwcs" + "/console/crn/detail",
headers: {
'token': localStorage.getItem('token')
},
data: {
- crnNo: id
+ crnNo: 1
},
method: 'post',
success: function (res) {
@@ -70,7 +70,26 @@
}
}
}
-
+ })
+ $.ajax({
+ url: "/ynwcs" + "/console/loc/detail2",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ locNo: "0101804"
+ },
+ method: 'post',
+ success: function (res) {
+ console.log(res);
+ if (res.code === 200) {
+ if (res.data.channel<=10240){
+ $("#fire").attr("style", "background-color: #00FF00;border-radius: 30px");
+ }else {
+ $("#fire").attr("style", "background-color: #FD482C;border-radius: 30px");
+ }
+ }
+ }
})
// 绯荤粺杩愯鐘舵��
var systemRunning = true;
--
Gitblit v1.9.1