From b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

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

diff --git a/src/main/webapp/views/realtimeWatch/crn2.html b/src/main/webapp/views/realtimeWatch/crn2.html
index ad83a14..797c73e 100644
--- a/src/main/webapp/views/realtimeWatch/crn2.html
+++ b/src/main/webapp/views/realtimeWatch/crn2.html
@@ -51,45 +51,45 @@
       <!-- 鎵ц鍛戒护 -->
 
       <!-- 鎵ц鍛戒护 -->
-      <div class="command-log" style="overflow: auto;">
-        <h3>鎵ц涓殑鍛戒护</h3>
-        <div class="crn-command-item">
-          <label>1#</label>
-<!--          <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
-          <!--            <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 class="crn-command-item">
-          <label>3#</label>
-<!--          <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
-          <!--            <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>
+<!--      <div class="command-log" style="overflow: auto;">-->
+<!--        <h3>鎵ц涓殑鍛戒护</h3>-->
+<!--        <div class="crn-command-item">-->
+<!--          <label>1#</label>-->
+<!--&lt;!&ndash;          <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
+<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--          <input id="crn1" disabled="disabled">-->
+<!--        </div>-->
+<!--        <div class="crn-command-item">-->
+<!--          <label>2#</label>-->
+<!--&lt;!&ndash;          <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
+<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--          <input id="crn2" disabled="disabled">-->
+<!--        </div>-->
+<!--        <div class="crn-command-item">-->
+<!--          <label>3#</label>-->
+<!--&lt;!&ndash;          <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>&ndash;&gt;-->
+<!--          &lt;!&ndash;            <span>&nbsp;</span>&ndash;&gt;-->
+<!--          <input id="crn3" 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">
         <table id="crn-state-table">

--
Gitblit v1.9.1