From 7012a007ee770615910dec41e14216eb5bcd7a7e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 28 六月 2023 15:59:27 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html                |    7 +++++++
 src/main/java/com/zy/asrs/entity/BasDevp.java |    6 +-----
 src/main/resources/application.yml            |    3 +--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 5c07d29..1e3d022 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -228,13 +228,9 @@
             case 0:
                 return "鏈煡";
             case 1:
-                return "杈冧綆搴撲綅";
-            case 2:
                 return "浣庡簱浣�";
-            case 3:
+            case 2:
                 return "楂樺簱浣�";
-            case 4:
-                return "鐗归珮搴撲綅";
             default:
                 return String.valueOf(this.locType1);
         }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 241fd32..d0ea60a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,6 @@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxjmasrs
-#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=nbjfasrs
     username: sa
     password: sa@123
   mvc:
@@ -85,7 +84,7 @@
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
-    id: 1
+    id: 2
     ip: 10.10.10.120
     port: 102
     rack: 0
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index f63cbf3..140098c 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -59,6 +59,12 @@
                     <!--            <span>&nbsp;</span>-->
                     <input id="crn1" disabled="disabled">
                 </div>
+                <div class="crn-command-item">
+                    <label>2#</label>
+                    <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
+                    <!--            <span>&nbsp;</span>-->
+                    <input id="crn2" disabled="disabled">
+                </div>
 
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -126,6 +132,7 @@
                     <span class="select-title">鍫嗗灈鏈哄彿</span>
                     <div class="select-container" style="padding: 20px 0;">
                         <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
+                        <label><input type="radio" name="crnSelect" value="2">2鍙峰爢鍨涙満</label>
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->

--
Gitblit v1.9.1