From a77fba09924d4c8a5240acae5e7740dad7476cd2 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 21 九月 2020 15:57:51 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/console.css | 4 ++--
src/main/java/com/zy/asrs/controller/CrnController.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index b2266ca..5bde266 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -148,7 +148,7 @@
}
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
if (null != crnError) {
vo.setError(crnError.getErrName());
}
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 5b7814e..15ab496 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -166,7 +166,7 @@
/* 杞ㄩ亾 */
.car-track {
position: absolute;
- background: url(../image/bg.jpg);
+ /*background: url(../image/bg.jpg);*/
}
#car-track-1 {
text-align: center;
@@ -178,7 +178,7 @@
#car-track-1 div {
height: 100%;
display: inline-block;
- width: 97%;
+ width: 75%;
border-left: 5px solid #313131;
border-right: 5px solid #313131;
}
--
Gitblit v1.9.1