From 7abaf002f0c831a76c9b4e49db7ee1548940d487 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 16 九月 2025 09:43:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/TVController.java | 8 ++------
src/main/webapp/views/login.html | 6 +++---
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 1cc149f..65dd4ce 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -374,12 +374,8 @@
continue;
}
HashMap<String, Object> map = new HashMap<>();
- if (Cools.isEmpty(shuttleProtocol.getErrorCode())) {
- continue;
- }
- int i = Integer.parseInt(shuttleProtocol.getErrorCode());
- if (i > 0) {
- BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(i);
+ if (!Cools.isEmpty(shuttleProtocol.getErrorCode()) && Integer.parseInt(shuttleProtocol.getErrorCode()) > 0 && !Cools.isEmpty(shuttleProtocol.getErrorCode())) {
+ BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(Integer.parseInt(shuttleProtocol.getErrorCode()));
String errName = basShuttleErr == null ? "鏈煡寮傚父" : basShuttleErr.getErrName();
//鏁呴殰涓�
map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 57329ed..d41fc5e 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -120,7 +120,7 @@
<label class="layui-icon layui-icon-password layadmin-user-login-icon"></label>
<input id="password" class="layui-input" type="password" name="password" lay-verify="password" placeholder="瀵嗙爜">
</div>
- <div id="code-box" class="layui-form-item" style="">
+ <div id="code-box" class="layui-form-item" style="display: none">
<label id="code-label" class="layui-icon layui-icon-vercode layadmin-user-login-icon"></label>
<input id="code" class="layui-input" type="text" name="password" lay-verify="code" placeholder="楠岃瘉鐮�">
<img id="codeImg" title="鐪嬩笉娓咃紵鐐瑰嚮鎹竴寮犮��">
@@ -141,12 +141,12 @@
<script type="text/javascript">
// 楠岃瘉鐮佸紑鍏�
- var codeSwitch = 'Y';
+ var codeSwitch = 'N';
$.ajax({
url: baseUrl+"/code/switch.action",
async: false,
success: function (res) {
- if (res.data === 'N'){
+ if (res.data === 'Y'){
codeSwitch = res.data;
$('#code-box').css("display", "none");
}
--
Gitblit v1.9.1