Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

zjj

2024-01-10 b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb

 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">