#增加许可证

Junjie

3 天以前 bdb924aaaef6a8d282ed2d34850cfd229d5865c7

 src/main/webapp/views/console.html

@@ -169,43 +169,43 @@
                  <span class="lift-offline">离线</span>
               </div>
            </div>
            <!-- 输送线状态 -->
            <div class="line-status">
               <div class="body-head">输送线状态</div>
               <div class="state states">
                  <span>运输线总数</span>
                  <span class="line-ss">9</span>
               </div>
               <div class="allStatus"><span>所有状态</span></div>
               <div class="allStatus item-group">
                  <span class="site-auto-run-id">自动+有物+ID</span>
                  <span class="site-auto-run">自动+有物</span>
                  <span class="site-auto-id">自动+ID</span>
                  <span class="site-auto">自动</span>
                  <span class="site-unauto">非自动/手动</span>
               </div>
            </div>
            <!-- 条码表格 -->
            <div class="bar-code">
               <div class="body-head" id="code">条码扫描器</div>
               <div class="tablebox">
                  <div class="table-head">
                     <li><span>条码名称</span><span class="right">扫码时间</span></li>
                  </div>
                  <div id="barcode1" class="table-body">
                     <li v-for="(item,index) in codeList1" :key="index"><span>{{item.barcode}}</span><span class="right">{{item.time}}</span></li>
                  </div>
               </div>
               <div class="tablebox">
                  <div class="table-head">
                     <li><span>条码名称</span><span class="right">扫码时间</span></li>
                  </div>
                  <div id="barcode2" class="table-body">
                     <li v-for="(item,index) in codeList2" :key="index"><span>{{item.barcode}}</span><span class="right">{{item.time}}</span></li>
                  </div>
               </div>
            </div>
         </div>
<!--            &lt;!&ndash; 输送线状态 &ndash;&gt;-->
<!--            <div class="line-status">-->
<!--               <div class="body-head">输送线状态</div>-->
<!--               <div class="state states">-->
<!--                  <span>运输线总数</span>-->
<!--                  <span class="line-ss">9</span>-->
<!--               </div>-->
<!--               <div class="allStatus"><span>所有状态</span></div>-->
<!--               <div class="allStatus item-group">-->
<!--                  <span class="site-auto-run-id">自动+有物+ID</span>-->
<!--                  <span class="site-auto-run">自动+有物</span>-->
<!--                  <span class="site-auto-id">自动+ID</span>-->
<!--                  <span class="site-auto">自动</span>-->
<!--                  <span class="site-unauto">非自动/手动</span>-->
<!--               </div>-->
<!--            </div>-->
<!--            &lt;!&ndash; 条码表格 &ndash;&gt;-->
<!--            <div class="bar-code">-->
<!--               <div class="body-head" id="code">条码扫描器</div>-->
<!--               <div class="tablebox">-->
<!--                  <div class="table-head">-->
<!--                     <li><span>条码名称</span><span class="right">扫码时间</span></li>-->
<!--                  </div>-->
<!--                  <div id="barcode1" class="table-body">-->
<!--                     <li v-for="(item,index) in codeList1" :key="index"><span>{{item.barcode}}</span><span class="right">{{item.time}}</span></li>-->
<!--                  </div>-->
<!--               </div>-->
<!--               <div class="tablebox">-->
<!--                  <div class="table-head">-->
<!--                     <li><span>条码名称</span><span class="right">扫码时间</span></li>-->
<!--                  </div>-->
<!--                  <div id="barcode2" class="table-body">-->
<!--                     <li v-for="(item,index) in codeList2" :key="index"><span>{{item.barcode}}</span><span class="right">{{item.time}}</span></li>-->
<!--                  </div>-->
<!--               </div>-->
<!--            </div>-->
<!--         </div>-->

         <!-- 输送设备弹窗 -->
         <div id="siteWindow" :style="{display:siteWindow?'block':'none'}" class="animate__animated animate__fadeIn">
@@ -358,17 +358,13 @@
            },
            methods: {
               init() {
                  this.ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
                  this.ws.onopen = this.webSocketOnOpen
                  this.ws.onerror = this.webSocketOnError
                  this.ws.onmessage = this.webSocketOnMessage
                  this.ws.onclose = this.webSocketClose

                  this.getMap(this.currentLev)
                  this.getSystemRunningStatus() //获取系统运行状态
                  this.initLev()//初始化楼层信息

                  this.consoleInterval = setInterval(() => {
                     this.websocketConnect()

                     this.getShuttleStateInfo() //获取四向穿梭车信息
                     this.getLiftStateInfo() //获取提升机信息
                     this.getSiteInfo() //获取输送站点数据
@@ -709,10 +705,20 @@
                     }
                  }
               },
               websocketConnect() {
                  if (this.ws == null) {
                     this.ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
                     this.ws.onopen = this.webSocketOnOpen
                     this.ws.onerror = this.webSocketOnError
                     this.ws.onmessage = this.webSocketOnMessage
                     this.ws.onclose = this.webSocketClose
                  }
               },
               webSocketOnOpen(e) {
                  console.log("open");
               },
               webSocketOnError(e) {
                  this.ws = null;
                  console.log(e);
               },
               webSocketOnMessage(e) {
@@ -730,11 +736,16 @@
                  }
               },
               webSocketClose(e) {
                  this.ws = null;
                  console.log("close");
               },
               sendWs(message) {
                  if (this.ws == null) {
                     return;
                  }

                  if (this.ws.readyState == WebSocket.OPEN) {
                     this.ws.send(message)
                     this.ws.send(message);
                  }
               }
            }