From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

---
 src/main/webapp/views/realtimeWatch/crn2.html |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/views/realtimeWatch/crn2.html b/src/main/webapp/views/realtimeWatch/crn2.html
index ad83a14..fffb4f9 100644
--- a/src/main/webapp/views/realtimeWatch/crn2.html
+++ b/src/main/webapp/views/realtimeWatch/crn2.html
@@ -71,24 +71,24 @@
           <!--            <span>&nbsp;</span>-->
           <input id="crn3" disabled="disabled">
         </div>
-        <div class="crn-command-item">
-          <label>4#</label>
-<!--          <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
-          <!--            <span>&nbsp;</span>-->
-          <input id="crn4" disabled="disabled">
-        </div>
-        <div class="crn-command-item">
-          <label>5#</label>
-<!--          <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
-          <!--            <span>&nbsp;</span>-->
-          <input id="crn5" disabled="disabled">
-        </div>
-        <div class="crn-command-item">
-          <label>6#</label>
-<!--          <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
-          <!--            <span>&nbsp;</span>-->
-          <input id="crn6" disabled="disabled">
-        </div>
+<!--        <div class="crn-command-item">-->
+<!--          <label>4#</label>-->
+<!--&lt;!&ndash;          <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
+<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--          <input id="crn4" disabled="disabled">-->
+<!--        </div>-->
+<!--        <div class="crn-command-item">-->
+<!--          <label>5#</label>-->
+<!--&lt;!&ndash;          <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
+<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--          <input id="crn5" disabled="disabled">-->
+<!--        </div>-->
+<!--        <div class="crn-command-item">-->
+<!--          <label>6#</label>-->
+<!--&lt;!&ndash;          <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
+<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--          <input id="crn6" disabled="disabled">-->
+<!--        </div>-->
       </div>
       <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
       <div class="crn-state">

--
Gitblit v1.9.1