From 84e959cd1b213e0706b884d54903fe6f3dd7079d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 12 一月 2025 14:52:52 +0800
Subject: [PATCH] #

---
 /dev/null                                             |  909 --------------------------------------------------------
 src/main/java/com/zy/common/web/RouterController.java |    9 
 2 files changed, 0 insertions(+), 918 deletions(-)

diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 0b83bb3..ad57dfa 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -34,15 +34,6 @@
         }
     }
 
-    @RequestMapping("/control")
-    public void control(HttpServletResponse response) {
-        try{
-            response.sendRedirect(contextPath+"/views/control.html");
-        } catch (Exception ex){
-            ex.printStackTrace();
-        }
-    }
-
     @RequestMapping("/monitor/{cnrId}/{ledId}")
     public void monitor(@PathVariable("cnrId") Integer cnrId,
                         @PathVariable("ledId") Integer ledId,
diff --git a/src/main/webapp/views/control.html b/src/main/webapp/views/control.html
deleted file mode 100644
index 8cff09c..0000000
--- a/src/main/webapp/views/control.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>WCS鐩戞帶</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="../static/css/common.css">
-    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
-    <script type="text/javascript" src="../static/js/common.js"></script>
-    <style>
-        footer {
-            border-top: 1px solid #e3e3e3;
-            position: fixed;
-            bottom: 0;
-            right: 0;
-            left: 0;
-            text-align: center;
-            font: 14px Helvetica Neue,Helvetica,PingFang SC,\5FAE\8F6F\96C5\9ED1,Tahoma,Arial,sans-serif;
-            box-shadow: 0 -1px 2px 0 rgba(0,0,0,.0);
-            box-sizing: border-box;
-            background-color: #fff;
-            z-index: 999;
-            height: 30px;
-            font-size: 13px;
-            line-height: 30px;
-        }
-        footer a {
-            color: #3573ab;
-            font-weight: bold;
-            text-decoration: none;
-            cursor: pointer;
-        }
-        body {
-            background-color: #e5e5e5;
-            padding: 10px;
-        }
-
-        header {
-            border-radius: 5px;
-            box-shadow: 0 0 3px rgba(0,0,0,.3);
-            background-color: #fff;
-            height: 29%;
-            position: relative;
-            padding: 10px 20px;
-        }
-
-        main{
-            margin-top: 10px;
-            border-radius: 5px;
-            box-shadow: 0 0 3px rgba(0,0,0,.3);
-            background-color: #fff;
-            height: 67%;
-            position: relative;
-        }
-
-        .main-item {
-            float: left;
-            width: 50%;
-            height: 100%;
-        }
-        .main-item:last-child {
-            border-left: 1px solid rgba(0, 0, 0, 0.3);
-        }
-    </style>
-</head>
-<body>
-
-    <header>
-        <div style="font-size: 180px">鍫嗗灈鏈鸿椹堕�熷害</div>
-    </header>
-
-    <main>
-        <div class="main-item">
-
-        </div>
-
-        <div class="main-item">
-
-        </div>
-    </main>
-
-    <footer class="footer">
-        Copyright 漏 2015 All Rights Reserved. 娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙� 淇濈暀鎵�鏈夋潈鍒�
-    </footer>
-
-</body>
-</html>
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
deleted file mode 100644
index 8fa4b8c..0000000
--- a/src/main/webapp/views/crn.html
+++ /dev/null
@@ -1,622 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>鍫嗗灈鏈虹洃鎺х鐞�</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="../static/css/common.css">
-    <link rel="stylesheet" type="text/css" href="../static/css/crn.css">
-    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-    <script type="text/javascript" src="../static/js/common.js"></script>
-    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
-    <style>
-        .demoBtn {
-            vertical-align: middle;
-            width: 20%;
-            height: 25px;
-            left: 0;
-            top: 0;
-            text-shadow: inherit;
-            font-size: 15px;
-            margin-left: 5px;
-            margin-right: 5px;
-            display: inline-block;
-            background-color: #FF5722;
-            border: none;
-            color: #FFF;
-            box-shadow: 1px 1px 5px #B6B6B6;
-            border-radius: 3px;
-            cursor: pointer;
-        }
-
-        .demoBtn:hover {
-            opacity: 0.8
-        }
-        .demoBtn:focus {
-            outline: 0;
-        }
-    </style>
-</head>
-<body>
-<div style="padding: 10px;height: 100%;float: left;width: 6%">
-    <div class="button-window"></div>
-</div>
-<div style="height: 100%;padding-left: 6%">
-    <div style="padding: 10px;height: 100%">
-        <!-- 鏃ュ織鐩戞帶鏉� -->
-        <div class="log-board">
-            <!-- 鎵ц鍛戒护 -->
-
-            <!-- 鎵ц鍛戒护 -->
-            <div class="command-log">
-                <h3>鎵ц涓殑鍛戒护</h3>
-                <div class="crn-command-item">
-                    <label>1#</label>
-                    <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)" disabled> - </button>
-                    <!--            <span>&nbsp;</span>-->
-                    <input id="crn1" disabled="disabled">
-                </div>
-            </div>
-            <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
-            <div class="crn-state">
-                <table id="crn-state-table">
-                    <thead>
-                    <tr>
-                        <th>鍫嗗灈鏈�</th>
-                        <th>妯″紡</th>
-                        <th>鐘舵��</th>
-                        <th>鏈夌墿</th>
-                        <th>鍒�</th>
-                        <th>灞�</th>
-                        <th>璐у弶瀹氫綅</th>
-                        <th>杞借揣鍙板畾浣�</th>
-                        <th>璧拌鍦ㄥ畾浣�</th>
-                        <th>鏁呴殰浠g爜</th>
-                        <th>鏁呴殰鎻忚堪</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <!-- 鍫嗗灈鏈虹姸鎬� -->
-        <div class="crn-msg">
-            <table id="crn-msg-table">
-                <thead>
-                <tr>
-                    <th>鍫嗗灈鏈�</th>
-                    <th>宸ヤ綔鍙�</th>
-                    <th>鐘舵��</th>
-                    <th>婧愮珯</th>
-                    <th>鐩爣绔�</th>
-                    <th>婧愬簱浣�</th>
-                    <th>鐩爣搴撲綅</th>
-                    <th>璧拌閫熷害锛坢/min)</th>
-                    <th>鍗囬檷閫熷害锛坢/min)</th>
-                    <th>鍙夌墮閫熷害锛坢/min)</th>
-                    <th>璧拌璺濈(m)</th>
-                    <th>鍗囬檷璺濈(m)</th>
-                    <th>璧拌鏃堕暱(s)</th>
-                    <th>鍗囬檷鏃堕暱(s)</th>
-                </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-        <!-- 鎵嬪姩鎿嶄綔 -->
-        <div class="crn-operation">
-
-            <!-- 閬僵灞� -->
-            <div class="crn-operation-shade">
-                <span class="crn-operation-shade-span">
-                    WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
-                </span>
-            </div>
-
-            <!-- 璁惧浠诲姟閫夋嫨 -->
-            <div class="task-select">
-                <!-- 鍫嗗灈鏈洪�夋嫨 -->
-                <div id="crn-select" class="operator-item">
-                    <span class="select-title">鍫嗗灈鏈哄彿</span>
-                    <div class="select-container">
-                        <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
-                    </div>
-                </div>
-                <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
-                <div id="source-select" class="operator-item">
-                    <span class="select-title">婧愮珯/婧愬簱浣�</span>
-                    <div class="select-container">
-                        <div class="select-container-item">
-                            <span>绔�</span>
-                            <label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
-                        </div>
-                        <div class="select-container-item">
-                            <span>鎺�</span>
-                            <label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
-                        </div>
-                        <div class="select-container-item">
-                            <span>鍒�</span>
-                            <label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
-                        </div>
-                        <div class="select-container-item">
-                            <span>灞�</span>
-                            <label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
-                        </div>
-                    </div>
-                </div>
-                <!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
-                <div id="target-select" class="operator-item">
-                    <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
-                    <div class="select-container">
-                        <div class="select-container-item">
-                            <span>绔�</span>
-                            <label><input id="staNo" type="number" name="points" min="0" /></label>
-                        </div>
-                        <div class="select-container-item">
-                            <span>鎺�</span>
-                            <label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
-                        </div>
-                        <div class="select-container-item">
-                            <span>鍒�</span>
-                            <label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
-                        </div>
-                        <div class="select-container-item">
-                            <span>灞�</span>
-                            <label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- 璁惧浠诲姟鎿嶄綔 -->
-            <div class="task-operator">
-                <fieldset>
-                    <legend>鎵嬪姩鎿嶄綔</legend>
-                    <div class="button-group">
-                        <button class="item" onclick="put()">鍏ュ簱</button>
-                        <button class="item" onclick="take()">鍑哄簱</button>
-                        <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
-                        <button class="item" onclick="steMove()">绉昏溅</button>
-                        <button class="item" onclick="siteMove()">绔欏埌绔�</button>
-                        <!--                <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
-                        <!--                <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
-                        <!--                <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
-                        <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
-                        <!--                <button class="item" onclick="pause()">鏆傚仠</button>-->
-                        <!--                <button class="item" onclick="boot()">鍚姩</button>-->
-                        <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
-                        <button class="item" onclick="handleReset()">澶嶄綅</button>
-                    </div>
-                </fieldset>
-            </div>
-
-        </div>
-        <!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
-        <div class="crn-output-board">
-            <textarea id="crn-output"></textarea>
-        </div>
-    </div>
-</div>
-</body>
-<script>
-    // 绌虹櫧琛屾暟
-    var crnStateTableBlankRows = 0;
-    var crnMsgTableBlankRows = 0;
-    // 瀹為檯琛屾暟
-    var crnStateTableFullRows = 0;
-    var crnMsgTableFullRows = 0;
-    // 鍒濆鍖�
-    var crnOutputDom = document.getElementById("crn-output");
-    $(document).ready(function() {
-        getCommandLog();
-        initCrnStateTable();
-        getCrnStateInfo();
-        initCrnMsgTable();
-        getCrnMsgInfo();
-        operatorBlockShow();
-    });
-    // 鏁版嵁鏇存柊
-    setInterval(function () {
-        getCrnStateInfo();
-        getCrnMsgInfo();
-        getCommandLog();
-    },1000);
-    setInterval(function () {
-        getCrnOutput();
-        operatorBlockShow();
-        initDemo();
-    },500);
-
-    // 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
-    function operatorBlockShow() {
-        if (parent.systemRunning) {
-            $('.crn-operation').css("opacity", "0.5");
-            $('.crn-operation-shade').show();
-            $('.crn-operation-shade-span').show();
-        }  else {
-            $('.crn-operation').css("opacity", "1");
-            $('.crn-operation-shade').hide();
-            $('.crn-operation-shade-span').hide();
-        }
-    }
-
-    // 鑾峰彇鍫嗗灈鏈烘墽琛屼腑鐨勫懡浠�
-    function getCommandLog() {
-        $.ajax({
-            url: baseUrl + "/crn/command/ongoing",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200) {
-                    var commands = res.data;
-                    for (var i=0; i<commands.length;i++){
-                        $("#crn"+commands[i].crnNo).val(commands[i].command);
-                    }
-                } else if (res.code === 403) {
-                    window.location.href = baseUrl + "/login";
-                } else {
-                    console.log(res.msg);
-                }
-            }
-        })
-    }
-
-    // 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
-    function getCrnStateInfo() {
-        var tableEl = $('#crn-state-table');
-        $.ajax({
-            url: baseUrl+ "/crn/table/crn/state",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200){
-                    var table = res.data;
-                    if (table.length > crnStateTableBlankRows && table.length !== crnStateTableFullRows) {
-                        initCrnStateTable(table.length-crnStateTableBlankRows);
-                        crnStateTableFullRows = table.length;
-                    }
-                    for (var i=1;i<=table.length;i++){
-                        var tr = tableEl.find("tr").eq(i);
-                        setVal(tr.children("td").eq(0), table[i-1].crnNo);
-                        setVal(tr.children("td").eq(1), table[i-1].statusType);
-                        setVal(tr.children("td").eq(2), table[i-1].status);
-                        setVal(tr.children("td").eq(3), table[i-1].loading);
-                        setVal(tr.children("td").eq(4), table[i-1].bay);
-                        setVal(tr.children("td").eq(5), table[i-1].lev);
-                        setVal(tr.children("td").eq(6), table[i-1].forkOffset);
-                        setVal(tr.children("td").eq(7), table[i-1].liftPos);
-                        setVal(tr.children("td").eq(8), table[i-1].walkPos);
-                        setVal(tr.children("td").eq(9), table[i-1].warnCode);
-                        setVal(tr.children("td").eq(10), table[i-1].alarm);
-                    }
-                } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
-                }  else {
-                    console.log(res.msg);
-                }
-            }
-        });
-    }
-
-    // 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
-    function getCrnMsgInfo() {
-        var tableEl = $('#crn-msg-table');
-        $.ajax({
-            url: baseUrl+ "/crn/table/crn/msg",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200){
-                    var table = res.data;
-                    if (table.length > crnStateTableBlankRows && table.length !== crnMsgTableFullRows) {
-                        initCrnStateTable(table.length-crnStateTableBlankRows);
-                        crnMsgTableFullRows = table.length;
-                    }
-                    for (var i=1;i<=table.length;i++){
-                        var tr = tableEl.find("tr").eq(i);
-                        setVal(tr.children("td").eq(0), table[i-1].crnNo);
-                        setVal(tr.children("td").eq(1), table[i-1].workNo);
-                        setVal(tr.children("td").eq(2), table[i-1].status);
-                        setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
-                        setVal(tr.children("td").eq(4), table[i-1].staNo);
-                        setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
-                        setVal(tr.children("td").eq(6), table[i-1].locNo);
-                        setVal(tr.children("td").eq(7), table[i-1].xspeed);
-                        setVal(tr.children("td").eq(8), table[i-1].yspeed);
-                        setVal(tr.children("td").eq(9), table[i-1].zspeed);
-                        setVal(tr.children("td").eq(10), table[i-1].xdistance);
-                        setVal(tr.children("td").eq(11), table[i-1].ydistance);
-                        setVal(tr.children("td").eq(12), table[i-1].xduration);
-                        setVal(tr.children("td").eq(13), table[i-1].yduration);
-                    }
-                } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
-                }  else {
-                    console.log(res.msg);
-                }
-            }
-        });
-    }
-
-    // 鍫嗗灈鏈烘墜鍔ㄦ搷浣滃尯 -----------------------------------------------------------------------
-
-    function getReqParam() {
-        var crnNo = $('input[name="crnSelect"]:checked').val();
-        var sourceStaNo = $('#sourceStaNo').val();
-        var sourceRow = $('#sourceRow').val();
-        var sourceBay = $('#sourceBay').val();
-        var sourceLev = $('#sourceLev').val();
-        var staNo = $('#staNo').val();
-        var row = $('#row').val();
-        var bay = $('#bay').val();
-        var lev = $('#lev').val();
-        return {
-            crnNo: crnNo,
-            sourceStaNo: sourceStaNo,
-            sourceRow: sourceRow,
-            sourceBay: sourceBay,
-            sourceLev: sourceLev,
-            staNo: staNo,
-            row: row,
-            bay: bay,
-            lev: lev
-        };
-    }
-
-    // 鍏ュ簱
-    function put() {
-        http.post(baseUrl+"/crn/operator/put", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鍑哄簱
-    function take() {
-        http.post(baseUrl+"/crn/operator/take", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 搴撲綅杞Щ
-    function stockMove() {
-        http.post(baseUrl+"/crn/operator/stockMove", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    function steMove() {
-        http.post(baseUrl+"/crn/operator/steMove", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 绔欏埌绔�
-    function siteMove() {
-        http.post(baseUrl+"/crn/operator/siteMove", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鍧愭爣绉诲姩
-    function coorMove() {
-        http.post(baseUrl+"/crn/operator/coorMove", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鍥炲師鐐�
-    function bacOrigin() {
-        http.post(baseUrl+"/crn/operator/bacOrigin", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鍥炲師鐐�
-    function reverseOrigin() {
-        http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 浠诲姟瀹屾垚
-    function taskComplete() {
-        http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鏆傚仠
-    function pause() {
-        http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鍚姩
-    function boot() {
-        http.post(baseUrl+"/crn/operator/boot", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 娓呴櫎鍛戒护
-    function clearCommand() {
-        http.post(baseUrl+"/crn/operator/clearCommand", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 鎵嬪姩澶嶄綅
-    function handleReset() {
-        http.post(baseUrl+"/crn/operator/handleReset", getReqParam(), function (res) {
-            layer.msg(res.msg);
-        });
-    }
-
-    // 杈撻�佽澶囨棩蹇楄緭鍑� -----------------------------------------------------------------------
-    function getCrnOutput() {
-        $.ajax({
-            url: baseUrl + "/crn/output/site",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200) {
-                    crnOutput(res.data);
-                } else if (res.code === 403) {
-                    window.location.href = baseUrl + "/login";
-                } else {
-                    console.log(res.msg);
-                }
-            }
-        })
-    }
-
-    // ------------------------------------------------------------------------------------------------
-
-    // 鍫嗗灈鏈轰俊鎭〃鑾峰彇  ----- 琛ㄤ竴
-    function initCrnStateTable(row) {
-        var line;
-        if (row === undefined){
-            var one = $('#crn-state-table thead').height();
-            var total = $('.crn-state').height();
-            var count = total / one;
-            count = parseInt(count) - 1;
-            crnStateTableBlankRows = count;
-            line = count;
-        } else {
-            line = row;
-        }
-        var html = "";
-        for (var i = 0; i < line; i ++){
-            html += " <tr>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "     </tr>\n";
-        }
-        $('#crn-state-table tbody').after(html);
-    }
-
-    // 鍫嗗灈鏈烘暟鎹〃鑾峰彇  ----- 琛ㄤ簩
-    function initCrnMsgTable(row) {
-        var line;
-        if (row === undefined){
-            var one = $('#crn-msg-table thead').height();
-            var total = $('.crn-msg').height();
-            var count = total / one;
-            count = parseInt(count) - 1;
-            crnMsgTableBlankRows = count;
-            line = count;
-        } else {
-            line = row;
-        }
-        var html = "";
-        for (var i = 0; i < line; i ++){
-            html += " <tr>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "     </tr>\n";
-        }
-        $('#crn-msg-table tbody').after(html);
-    }
-
-    // 鏃ュ織杈撳嚭妗�
-    function crnOutput(content){
-        crnOutputDom.value += content;
-        crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
-    }
-
-
-    var crnDemoData;
-    function initDemo() {
-        $.ajax({
-            url: baseUrl+"/crn/demo/status",
-            async: false,
-            method: 'GET',
-            success: function (res) {
-                if (res.code === 200) {
-                    crnDemoData = res.data;
-                    crnDemoData.forEach(function (e) {
-                        $("#demoBtn-"+e.crnNo).html(e.demo?'鍋滄':'婕旂ず');
-                    })
-                } else if (res.code === 403){
-                    parent.location.href = baseUrl+"/login";
-                }  else {
-                    layer.msg(res.msg, {icon: 2});
-                }
-            }
-        })
-    }
-
-    function demoSwitch(el) {
-        var crnId = el.split("-")[1];
-        var opt;
-        if (crnDemoData == null) {
-            initDemo();
-        }
-        for (var i = 0; i<crnDemoData.length; i++) {
-            if (Number(crnDemoData[i].crnNo) === Number(crnId)) {
-                opt = !crnDemoData[i].demo;
-            }
-        }
-        layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
-            doDemo(crnId, 'root', opt); // 鍋滄wcs绯荤粺
-        });
-    }
-
-    function doDemo(crnId, password, opt) {
-        // 鍔犺浇tips
-        var index = layer.load(1, {
-            shade: [0.1,'#fff']
-        });
-        $.ajax({
-            url: baseUrl+ "/crn/demo/switch",
-            headers: {'token': localStorage.getItem('token')},
-            // async: false,
-            data: {
-                crnId: Number(crnId),
-                password: password,
-                opt: opt
-            },
-            method: 'POST',
-            success: function (res) {
-                layer.close(index);
-                if (res.code === 200){
-                    layer.msg(res.msg, {icon: 1});
-                } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
-                }  else {
-                    layer.msg(res.msg, {icon: 2});
-                }
-            }
-        });
-
-    }
-
-</script>
-</html>
diff --git a/src/main/webapp/views/ess.html b/src/main/webapp/views/ess.html
deleted file mode 100644
index 025cca0..0000000
--- a/src/main/webapp/views/ess.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>ESS</title>
-    <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="../static/css/common.css">
-    <link rel="stylesheet" type="text/css" href="../static/layui/css/layui.css">
-    <link rel="stylesheet" href="../static/css/shuttle.css">
-    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
-    <script type="text/javascript" src="../static/layui/layui.js"></script>
-    <script type="text/javascript" src="../static/js/common.js"></script>
-</head>
-<body>
-<div style="padding: 10px;height: 100%;float: left;width: 6%">
-    <div class="button-window"></div>
-</div>
-<div style="height: 100%;padding-left: 6%">
-    <iframe
-            allowfullscreen
-            src="http://10.10.10.182:9003/#/?appid=hairou&appsecret=hairou&method=monitor"
-            frameborder="0"
-            width="100%"
-            height="100%"
-    ></iframe>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/plc2.html b/src/main/webapp/views/plc2.html
deleted file mode 100644
index f20589d..0000000
--- a/src/main/webapp/views/plc2.html
+++ /dev/null
@@ -1,661 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="UTF-8">
-	<title>WCS鎺у埗涓績</title>
-	<link rel="stylesheet" href="../static/css/animate.min.css">
-	<link rel="stylesheet" href="../static/vue/element/element.css">
-	<link rel="stylesheet" href="../static/css/console_vue.css">
-	<link rel="stylesheet" href="../static/css/toggle-switch.css">
-	<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-	<script type="text/javascript" src="../static/layui/layui.js"></script>
-	<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
-	<script type="text/javascript" src="../static/js/common.js"></script>
-	<script type="text/javascript" src="../static/vue/js/vue.min.js"></script>
-	<script type="text/javascript" src="../static/vue/element/element.js"></script>
-</head>
-<body>
-<div id="app">
-	<div style="display: flex;justify-content: center;align-items: center;width: 100%;margin-top: 150px;">
-		<div id="mapDataId" style="zoom: 0.7;position: relative;">
-			<div class="pointContainer" v-for="(row,index) in map" :key="index">
-				<div v-for="(col,idx) in row" :key="idx">
-					<div v-if="col.value == 0">
-						<!-- 瀛愯建閬� 璺緞涓虹┛姊溅棰勮璺緞鍒欐樉绀虹┛姊溅棰滆壊鍜岀┛姊溅鍙� -->
-						<div :style="{background: checkAdvancePath(index,idx).length == 0 ? '':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item" v-if="col.data.length > 0">{{col.data}}</div>
-						<div :style="{background: checkAdvancePath(index,idx).length == 0 ? '':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item" v-else>{{checkAdvancePath(index,idx).length == 0 ? idx:checkAdvancePath(index,idx)}}</div>
-					</div>
-					<div v-else-if="col.value == 3">
-						<!-- 姣嶈建閬� 璺緞涓虹┛姊溅棰勮璺緞鍒欐樉绀虹┛姊溅棰滆壊鍜岀┛姊溅鍙� -->
-						<div :style="{background: checkAdvancePath(index,idx).length == 0 ? '#5af':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item">{{checkAdvancePath(index,idx).length == 0 ? '&#x21c5;&#x21c4;':checkAdvancePath(index,idx)}}</div>
-					</div>
-					<div v-else-if="col.value == 4">
-						<!-- 绔欑偣 -->
-						<div class="site" :id="'site-' + col.data" @click="openSite(col.data)">{{col.data}}</div>
-					</div>
-					<div v-else-if="col.value == 5">
-						<!-- 鍏呯數妗� -->
-						<div class="item" style="font-size: 24px">&#9889;</div>
-					</div>
-					<div v-else-if="col.value == -999">
-						<!-- 璺緞鍗犵敤鍖哄煙 -->
-						<div class="item" style="background:#f83333;color: #fff;">{{idx}}</div>
-					</div>
-					<div v-else-if="col.value < 0">
-						<!-- 绂佹鏄剧ず鍖哄煙 -->
-						<div class="item" style="visibility: hidden">{{idx}}</div>
-					</div>
-					<div v-else>
-						<div class="item" v-if="col.data.length > 0">{{col.data}}</div>
-						<div class="item" v-else>{{idx}}-{{col.value}}</div>
-					</div>
-				</div>
-			</div>
-
-		</div>
-	</div>
-
-	<div class="footer">
-		<!-- 鎬诲紑鍏� -->
-		<div class="line-status">
-			<div class="body-head">鎬诲紑鍏�</div>
-			<div class="switch" @click="systemSwitch">
-				<label id="system-toggle" class="toggle-switch" style="margin-left: 20px;">
-					<input id="system-toggle-checked" disabled type="checkbox">
-					<div class="button">
-						<div class="light"></div>
-						<div class="dots"></div>
-						<div class="characters"></div>
-						<div class="shine"></div>
-						<div class="shadow"></div>
-					</div>
-				</label>
-
-				<div class="switch_r">
-					<p>绯荤粺鐘舵��</p>
-					<p id="system-run-desc">绯荤粺杩愯涓�</p>
-				</div>
-			</div>
-		</div>
-		<!-- 鍥涘悜绌挎杞︾姸鎬� -->
-		<div class="line-status">
-			<div class="body-head">绌挎杞︾姸鎬�</div>
-			<div class="shuttle-status-box">
-				<div v-for="(item,idx) in shuttleList" class="state">
-					<span :style="{color: shuttleColorList[item.shuttleNo]}">鍥涘悜绌挎杞� {{item.shuttleNo}}</span>
-					<span v-if="item.protocolStatus == 1"
-						  class="state-ss shuttle-idle">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 2"
-						  class="state-ss shuttle-working">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 3"
-						  class="state-ss shuttle-waiting">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 4"
-						  class="state-ss shuttle-charging">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 5"
-						  class="state-ss shuttle-charging-waiting">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 6"
-						  class="state-ss shuttle-fixing">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 7"
-						  class="state-ss shuttle-offline">{{item.protocolStatus$}}</span>
-					<span v-else class="state-ss shuttle-offline">{{item.protocolStatus$}}</span>
-				</div>
-			</div>
-			<div class="allStatus"><span>鎵�鏈夌姸鎬�</span></div>
-			<div class="allStatus item-group">
-				<span class="shuttle-idle">绌洪棽</span>
-				<span class="shuttle-working">浣滀笟涓�</span>
-				<span class="shuttle-waiting">绛夊緟纭</span>
-				<span class="shuttle-charging">鍏呯數涓�</span>
-				<span class="shuttle-charging-waiting">鍏呯數浠诲姟绛夊緟纭</span>
-				<span class="shuttle-fixing">鏁呴殰淇涓�</span>
-				<span class="shuttle-offline">绂荤嚎</span>
-			</div>
-		</div>
-		<!-- 鎻愬崌鏈虹姸鎬� -->
-		<div class="line-status">
-			<div class="body-head">鎻愬崌鏈虹姸鎬�</div>
-			<div class="lift-status-box">
-				<div v-for="(item,idx) in liftList" class="state states">
-					<span>鎻愬崌鏈� {{item.liftNo}}</span>
-					<span v-if="item.protocolStatus == 1"
-						  class="state-ss lift-idle">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 2"
-						  class="state-ss lift-working">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 3"
-						  class="state-ss lift-waiting">{{item.protocolStatus$}}</span>
-					<span v-else-if="item.protocolStatus == 4"
-						  class="state-ss lift-offline">{{item.protocolStatus$}}</span>
-					<span v-else class="state-ss lift-offline">{{item.protocolStatus$}}</span>
-				</div>
-			</div>
-			<div class="allStatus"><span>鎵�鏈夌姸鎬�</span></div>
-			<div class="allStatus item-group">
-				<span class="lift-idle">绌洪棽</span>
-				<span class="lift-working">浣滀笟涓�</span>
-				<span class="lift-waiting">绛夊緟纭</span>
-				<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>
-
-	<!-- 杈撻�佽澶囧脊绐� -->
-	<div id="siteWindow" :style="{display:siteWindow?'block':'none'}" class="animate__animated animate__fadeIn">
-		<!-- 琛ㄥご -->
-		<div id="siteWindow-head">
-			<div class="detailed"></div>
-			<button @click="siteWindow = false"></button>
-		</div>
-		<!-- 琛ㄥ唴瀹� -->
-		<div class="siteWindow-body">
-			<form>
-				<!-- 璁惧鍙� -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>璁惧鍙凤細</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="siteId" value="">
-					</div>
-				</div>
-				<!-- 宸ヤ綔鍙� -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>宸ヤ綔鍙凤細</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="workNo" value="">
-					</div>
-				</div>
-				<!-- 宸ヤ綔鐘舵�� -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>宸ヤ綔鐘舵�侊細</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="wrkSts" value="">
-					</div>
-				</div>
-				<div class="form-item">
-					<!-- 鑷姩 -->
-					<div class="form-item-checkbox">
-						<div class="form-item-label-checkbox">
-							<span>鑷姩</span>
-						</div>
-						<div class="form-item-input-checkbox">
-							<input type="checkbox" name="autoing">
-						</div>
-					</div>
-					<!-- 鏈夌墿 -->
-					<div class="form-item-checkbox">
-						<div class="form-item-label-checkbox">
-							<span>鏈夌墿</span>
-						</div>
-						<div class="form-item-input-checkbox">
-							<input type="checkbox" name="loading">
-						</div>
-					</div>
-					<!-- 鑳藉叆 -->
-					<div class="form-item-checkbox">
-						<div class="form-item-label-checkbox">
-							<span>鑳藉叆</span>
-						</div>
-						<div class="form-item-input-checkbox">
-							<input type="checkbox" name="canining">
-						</div>
-					</div>
-					<!-- 鑳藉嚭 -->
-					<div class="form-item-checkbox">
-						<div class="form-item-label-checkbox">
-							<span>鑳藉嚭</span>
-						</div>
-						<div class="form-item-input-checkbox">
-							<input type="checkbox" name="canouting">
-						</div>
-					</div>
-				</div>
-				<!-- 鍑哄叆绫诲瀷 -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>鍑哄叆绫诲瀷锛�</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="ioType" value="">
-					</div>
-				</div>
-				<!-- 婧愮珯 -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>婧愮珯锛�</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="sourceStaNo" value="">
-					</div>
-				</div>
-				<!-- 鐩爣绔� -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>鐩爣绔欙細</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="staNo" value="">
-					</div>
-				</div>
-				<!-- 婧愬簱浣� -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>婧愬簱浣嶏細</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="sourceLocNo" value="">
-					</div>
-				</div>
-				<!-- 鐩爣搴撲綅 -->
-				<div class="form-item">
-					<div class="form-item-label">
-						<span>鐩爣搴撲綅锛�</span>
-					</div>
-					<div class="form-item-input">
-						<input type="text" name="locNo" value="">
-					</div>
-				</div>
-			</form>
-		</div>
-	</div>
-
-</div>
-<script>
-	var app = new Vue({
-		el: '#app',
-		data: {
-			map: [],//鍦板浘鏁版嵁
-			currentLev: 1,//鍦板浘褰撳墠妤煎眰
-			siteWindow: false, //绔欑偣寮圭獥鏄剧ず榛樿涓嶆樉绀�
-			floorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], //褰撳墠椤圭洰妤煎眰
-			shuttleList: [], //鍥涘悜绌挎杞﹂泦鍚�
-			currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
-			shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
-			liftList: [], //鎻愬崌鏈洪泦鍚�
-			systemStatus: true,//绯荤粺杩愯鐘舵��
-			consoleInterval: null,//瀹氭椂鍣ㄥ瓨鍌ㄥ彉閲�
-			codeList1: [],//鏉$爜List
-			codeList2: [],//鏉$爜List
-		},
-		created() {
-			this.init()
-		},
-		watch: {
-
-		},
-		methods: {
-			init() {
-				this.getMap(this.currentLev)
-				this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
-
-				this.consoleInterval = setInterval(() => {
-					this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
-					this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
-					this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
-					this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
-					this.getCodeData()//鑾峰彇鏉$爜
-				}, 1000)
-			},
-			//鑾峰彇鍦板浘鏁版嵁
-			getMap(lev) {
-				$.ajax({
-					type: "get",
-					url: baseUrl + "/console/plc2/auth",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					success: (res) => {
-						let data = res.data
-						let tmp = []
-						for (let i = 1; i < data.length - 1; i++) {
-							tmp.push(data[i])
-						}
-						// console.log(tmp)
-						this.map = tmp
-					}
-				})
-			},
-			openSite(id) {
-				this.siteWindow = true; //鎵撳紑绔欑偣淇℃伅寮圭獥
-				$(".detailed").empty();
-				$('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
-				$.ajax({
-					url: baseUrl + "/console/site/detail",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					data: {
-						siteId: id
-					},
-					method: 'post',
-					success: function(res) {
-						for (var val in res.data) {
-							var find = $("#siteWindow").find(":input[name='" + val + "']");
-							if (find[0].type === 'text') {
-								find.val(res.data[val]);
-							} else if (find[0].type === 'checkbox') {
-								find.attr("checked", res.data[val] === 'Y');
-							}
-						}
-					}
-
-				})
-			},
-			getSiteInfo() {
-				//鑾峰彇杈撻�佺珯鐐规暟鎹�
-				$.ajax({
-					url: baseUrl+ "/console/latest/data/site",
-					headers: {'token': localStorage.getItem('token')},
-					method: 'POST',
-					success: function (res) {
-						if (res.code === 200){
-							var sites = res.data;
-							for (var i = 0; i < sites.length; i++){
-								var siteEl = $("#site-"+sites[i].siteId);
-								siteEl.attr("class", "site " + sites[i].siteStatus);
-								if (sites[i].workNo != null && sites[i].workNo>0) {
-									siteEl.html(sites[i].siteId + "[" + sites[i].workNo + "]");
-								} else {
-									siteEl.html(sites[i].siteId);
-								}
-							}
-						} else if (res.code === 403){
-							parent.location.href = baseUrl+"/login";
-						}  else {
-							console.log(res.msg);
-						}
-					}
-				});
-			},
-			changFloor(lev) {
-				this.currentLev = lev
-				this.currentLevShuttleList = []
-				this.getMap(lev)
-			},
-			getShuttleStateInfo() {
-				// 鍥涘悜绌挎杞︿俊鎭〃鑾峰彇
-				let that = this
-				$.ajax({
-					url: baseUrl + "/shuttle/table/shuttle/state",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					method: 'POST',
-					success: function(res) {
-						if (res.code == 200) {
-							let currentLevShuttle = []//褰撳墠妤煎眰灏忚溅闆嗗悎
-							res.data.forEach((item,idx) => {
-								if (item != null && item.point != undefined && item.point != null) {
-									if (item.point.z == that.currentLev) {
-										currentLevShuttle.push(item);
-									}
-								}
-							})
-							that.currentLevShuttleList = currentLevShuttle
-							that.shuttleList = res.data
-
-							if (that.shuttleColorList.length == 0) {
-								let colorList = []//闅忔満灏忚溅棰滆壊
-								res.data.forEach((item,idx) => {
-									colorList[item.shuttleNo] = that.colorRGB()
-								})
-								that.shuttleColorList = colorList
-							}
-						}
-					}
-				});
-			},
-			getLiftStateInfo() {
-				// 鎻愬崌鏈轰俊鎭〃鑾峰彇
-				let that = this
-				$.ajax({
-					url: baseUrl + "/lift/table/lift/state",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					method: 'POST',
-					success: function(res) {
-						if (res.code == 200) {
-							that.liftList = res.data
-						}
-					}
-				});
-			},
-			systemSwitch() {
-				// 绯荤粺寮�鍏�
-				let that = this
-				if (this.systemStatus) {
-					this.$prompt('璇疯緭鍏ュ彛浠わ紝骞跺仠姝CS绯荤粺', '鎻愮ず', {
-						confirmButtonText: '纭畾',
-						cancelButtonText: '鍙栨秷',
-					}).then(({
-								 value
-							 }) => {
-						that.doSwitch(0, value)
-					}).catch(() => {
-
-					});
-				} else {
-					this.doSwitch(1)
-				}
-			},
-			doSwitch(operatorType, password) {
-				let that = this
-				$.ajax({
-					url: baseUrl + "/console/system/switch",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					data: {
-						operatorType: operatorType,
-						password: password
-					},
-					method: 'POST',
-					success: function(res) {
-						if (res.code === 200) {
-							if (res.data.status) {
-								$('#system-toggle-checked').attr("checked", true);
-								$('#system-run-desc').html("绯荤粺杩愯涓�...");
-								that.systemStatus = true;
-								parent.systemRunning = true;
-							} else {
-								$('#system-toggle-checked').attr("checked", false);
-								$('#system-run-desc').html("绯荤粺宸插仠姝�!");
-								that.systemStatus = false;
-								parent.systemRunning = false;
-							}
-						} else if (res.code === 403) {
-							parent.location.href = baseUrl + "/login";
-						} else {
-							that.$message({
-								message: res.msg,
-								type: 'error'
-							});
-						}
-					}
-				});
-			},
-			getSystemRunningStatus() {
-				// 鑾峰彇wcs绯荤粺杩愯鐘舵��
-				let that = this
-				$.ajax({
-					url: baseUrl + "/console/system/running/status",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					method: 'POST',
-					success: function(res) {
-						if (res.code === 200) {
-							if (res.data.status) {
-								$('#system-toggle-checked').attr("checked", true);
-								$('#system-run-desc').html("绯荤粺杩愯涓�...");
-								that.systemStatus = true;
-								parent.systemRunning = true;
-							} else {
-								$('#system-toggle-checked').attr("checked", false);
-								$('#system-run-desc').html("绯荤粺宸插仠姝�!");
-								that.systemStatus = false;
-								parent.systemRunning = false;
-							}
-						} else if (res.code === 403) {
-							parent.location.href = baseUrl + "/login";
-						} else {
-							that.$message({
-								message: res.msg,
-								type: 'error'
-							});
-						}
-					}
-				});
-			},
-			getCarPosition(x,y) {
-				//璁$畻鍥涘悜绌挎杞﹀浘鏍囦綅缃�
-				let top = (x * 35 - 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犻珮搴�
-				let left = (y * 35) + "px" //闇�瑕佸噺鍘诲皬杞﹁嚜宸辨墍鍗犲搴�
-				return [top,left];
-			},
-			testMove() {
-				let that = this
-				clearInterval(this.consoleInterval)//娓呯悊瀹氭椂鍣�
-
-				let shuttleList = this.currentLevShuttleList
-				$.ajax({
-					url: baseUrl + "/static/testMoveData.json",
-					headers: {
-						'token': localStorage.getItem('token')
-					},
-					method: 'GET',
-					success: function(res) {
-						shuttleList[0].moveAdvancePath = res
-						that.currentLevShuttleList = shuttleList
-
-						let index = 0
-						let tmp = null
-						tmp = setInterval(() => {
-							if (index < res.length) {
-								that.currentLevShuttleList[0].wcsPoint.y = res[index].y
-								that.currentLevShuttleList[0].wcsPoint.x = res[index].x
-								index++
-							}else {
-								clearInterval(tmp)
-								that.init()
-							}
-						},1000)
-					}
-				});
-			},
-			colorRGB(){
-				//闅忔満棰滆壊
-				const r = Math.floor(Math.random()*256);
-				const g = Math.floor(Math.random()*256);
-				const b = Math.floor(Math.random()*256);
-				return `rgb(${r},${g},${b})`;
-			},
-			checkAdvancePath(x,y) {
-				//妫�娴嬭矾寰勬槸鍚︿负绌挎杞﹂璁¤矾寰勶紝濡倄鍜寉璺緞鏄┛姊溅棰勮璺緞锛屽垯杩斿洖灏忚溅鍙�
-				this.currentLevShuttleList.forEach((item,idx) => {
-					if (item.moveAdvancePath != null) {
-						item.moveAdvancePath.forEach((path,index) => {
-							if (path.x === x && path.y === y) {
-								return item.shuttleNo;
-							}
-						})
-					}
-				})
-				let data = []
-				let shuttleList = this.currentLevShuttleList;
-				for (var i = 0; i < shuttleList.length; i++) {
-					let shuttle = shuttleList[i]
-					let moveAdvancePath = shuttle.moveAdvancePath
-					if (moveAdvancePath != null) {
-						for (var j = 0; j < moveAdvancePath.length; j++) {
-							let path = moveAdvancePath[j]
-							if (path.x-1 === x && path.y === y) {//璺緞绗﹀悎
-								data.push(shuttle.shuttleNo)
-								continue;
-							}
-						}
-					}
-				}
-				return data;//杩斿洖灏忚溅鍙烽泦鍚�
-			},
-			resetMap() {
-				//閲嶇疆鍦板浘
-				let that = this
-				$.ajax({
-					url:baseUrl+"/console/map/resetMap/auth",
-					headers:{
-						'token': localStorage.getItem('token')
-					},
-					data:{},
-					method:'get',
-					success:function (res) {
-						that.$message({
-							message: '閲嶇疆瀹屾垚',
-							type: 'success'
-						});
-					}
-				})
-			},
-			getCodeData(){
-				let that = this
-				$.ajax({
-					url:baseUrl +'/console/barcode/output/site',
-					method:'GET',
-					success:function (res) {
-						if(res.code === 200){
-							let data = JSON.parse(res.data)
-							if(data.length<=5){
-								that.codeList1 = data
-							} else {
-								tData1 = data.slice(0,5)
-								tData2 = data.splice(5,10)
-							}
-						}
-					}
-				})
-			}
-		}
-	})
-</script>
-</body>
-</html>
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
deleted file mode 100644
index 153d040..0000000
--- a/src/main/webapp/views/ste.html
+++ /dev/null
@@ -1,909 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>绌挎杞︾洃鎺х鐞�</title>
-    <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="../static/css/common.css">
-    <link rel="stylesheet" type="text/css" href="../static/layui/css/layui.css">
-    <link rel="stylesheet" href="../static/css/ste.css">
-    <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
-    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
-    <script type="text/javascript" src="../static/layui/layui.js"></script>
-    <script type="text/javascript" src="../static/js/common.js"></script>
-</head>
-<body>
-    <div style="padding: 10px;height: 100%;float: left;width: 6%">
-        <div class="button-window"></div>
-    </div>
-    <div style="height: 100%;padding-left: 6%">
-        <div style="padding: 10px;height: 100%">
-            <!-- 鏃ュ織鐩戞帶鏉� -->
-            <div class="log-board">
-                <div class="command-log">
-                    <div data-steNo="1" class="ste-command-item">
-                        <label>1#</label>
-                        <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
-                        <button id="mode-1" class="demoBtn mode-btn" >璁惧淇℃伅</button>
-                    </div>
-                </div>
-                <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
-                <div class="ste-state">
-                    <table id="ste-state-table">
-                        <thead>
-                            <tr>
-                                <th>绌挎杞�</th>
-                                <th>妯″紡</th>
-                                <th>鐘舵��</th>
-                                <th>鏈夌墿</th>
-                                <th>鍦ㄨ建</th>
-                                <th>鐢甸噺</th>
-                                <th>鎺�</th>
-                                <th>鍒�</th>
-                                <th>灞�</th>
-                                <th>绛夊緟WCS纭</th>
-                                <th>瀹氫綅</th>
-                                <th>鍏呯數鐘舵��</th>
-                                <th>鎶ヨ淇℃伅1</th>
-                                <th>鎶ヨ淇℃伅2</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <!-- 绌挎杞︾姸鎬� -->
-            <div class="ste-msg">
-                <table id="ste-msg-table">
-                    <thead>
-                        <tr>
-                            <th>绌挎杞�</th>
-                            <th>宸ヤ綔鍙�</th>
-                            <th>鐘舵��</th>
-                            <th>婧愮珯</th>
-                            <th>鐩爣绔�</th>
-                            <th>婧愬簱浣�</th>
-                            <th>鐩爣搴撲綅</th>
-                            <th>閫熷害</th>
-                            <th>杩戠偣璺濈</th>
-                            <th>浣滀笟鏍囪</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
-            <!-- 鎵嬪姩鎿嶄綔 -->
-            <div class="ste-operation">
-                <!-- 閬僵灞� -->
-                <div class="ste-operation-shade">
-                    <span class="ste-operation-shade-span">
-                        WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
-                    </span>
-                </div>
-                <!-- 璁惧浠诲姟閫夋嫨 -->
-                <div class="task-select">
-                    <!-- 閫夋嫨 -->
-                    <div id="ste-select" class="operator-item">
-                        <span class="select-title">绌挎杞﹀彿</span>
-                        <div class="select-container">
-                            <label><input type="radio" name="steSelect" value="1" checked>&nbsp;1鍙风┛姊溅</label>
-                        </div>
-                    </div>
-                </div>
-                <!-- 璁惧浠诲姟鎿嶄綔 -->
-                <div class="task-operator">
-                    <fieldset>
-                        <legend>鎵嬪姩鎿嶄綔</legend>
-                        <div class="button-group">
-                            <button class="item" onclick="steOperator(99)">鑱旀満</button>
-                            <button class="item" onclick="steOperator(100)">鑴辨満</button>
-                            <button class="item" onclick="steOperator(1)">鍚戝彸鍑哄簱</button>
-                            <button class="item" onclick="steOperator(2)">鍚戝乏鍑哄簱</button>
-                            <button class="item" onclick="steOperator(3)">浠庡彸鍏ュ簱</button>
-                            <button class="item" onclick="steOperator(4)">浠庡乏鍏ュ簱</button>
-                            <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>
-                            <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>
-                            <button class="item" onclick="steOperator(7)">鍘诲彸绔�</button>
-                            <button class="item" onclick="steOperator(8)">鍘诲乏绔�</button>
-                            <button class="item" onclick="steOperator(9)">鍙冲緟鏈�</button>
-                            <button class="item" onclick="steOperator(10)">宸﹀緟鏈�</button>
-<!--                            <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>-->
-<!--                            <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>-->
-<!--                            <button class="item" onclick="steOperator(13)">宸﹀厖鐢�</button>-->
-<!--                            <button class="item" onclick="steOperator(14)">鍙冲厖鐢�</button>-->
-<!--                            <button class="item" onclick="steOperator(17)">鏂紑鍏呯數</button>-->
-<!--                            <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
-<!--                            <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
-                            <button class="item" onclick="steOperator(16)">浠诲姟瀹屾垚</button>
-
-                        </div>
-                    </fieldset>
-                </div>
-
-            </div>
-            <!-- 绌挎杞︽棩蹇楄緭鍑� -->
-            <div class="ste-output-board">
-                <textarea id="ste-output"></textarea>
-            </div>
-        </div>
-    </div>
-
-    <div id="ste-detl" style="display: none">
-        <div>
-            <div class="form-item">
-                <label class="form-label">绌挎杞﹀彿:</label>
-                <div class="form-input">
-                    <input id="steNo" name="steNo" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
-                </div>
-            </div>
-            <div class="form-item">
-                <label class="form-label">宸ヤ綔鍙�:</label>
-                <div class="form-input">
-                    <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
-                </div>
-            </div>
-            <div class="form-item">
-                <label class="form-label">鎺�:</label>
-                <div class="form-input">
-                    <input id="row" name="row" type="number" class="layui-input" lay-verify="number" autocomplete="off">
-                </div>
-            </div>
-            <div class="form-item">
-                <label class="form-label">鍒�:</label>
-                <div class="form-input">
-                    <input id="bay" name="bay" type="number" class="layui-input" autocomplete="off">
-                </div>
-            </div>
-            <div class="form-item">
-                <label class="form-label">灞�:</label>
-                <div class="form-input">
-                    <input id="lev" name="lev" type="number" class="layui-input" autocomplete="off">
-                </div>
-            </div>
-            <div class="form-item">
-                <label class="form-label">鍫嗗灈鏈�:</label>
-                <div class="form-input">
-                    <input id="crnNo" name="crnNo" type="number" class="layui-input" autocomplete="off">
-                </div>
-            </div>
-            <div class="form-item">
-                <label class="form-label">浣滀笟鏍囪:</label>
-                <div class="form-input">
-                    <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
-                </div>
-            </div>
-            <div class="form-item form-button-container">
-                <button class="form-button" id="save">淇濆瓨</button>
-                <button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
-            </div>
-        </div>
-    </div>
-    <div id="ste-detl2" style="display: none">
-        <div style="width: 1400px">
-            <div class="form-item" style="text-align: left">
-                <spen style="margin:  20px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted;">
-                    寮傚父锛�<spen style="color: #FD482C;">鉁�</spen>
-                </spen>
-                <spen style="margin:  20px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style: double;">
-                    姝e父锛�<spen style="color: #00FF00;">鈥�</spen>
-                </spen>
-            </div>
-            <div style="float:left;margin:  10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted;">
-                <div class="form-item" style="text-align: center">
-                    <label>绌挎杞﹀紓甯�</label>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">绌挎杞﹀彿:</label>
-                    <div class="form-input">
-                        <input id="steNo1" name="steNo" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍗囬檷瓒呮椂鎶ヨ:</label>
-                    <div class="form-input">
-                        <input id="liftErr" name="liftErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍏ュ簱鍙栫┖鎶ヨ:</label>
-                    <div class="form-input">
-                        <input id="inFetchErr" name="inFetchErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍑哄簱鍙栫┖鎶ヨ:</label>
-                    <div class="form-input">
-                        <input id="outFetchErr" name="outFetchErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">闃叉挒淇濇姢:</label>
-                    <div class="form-input">
-                        <input id="antiErr" name="antiErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍗囬檷鎺ヨ繎寮�鍏虫晠闅�:</label>
-                    <div class="form-input">
-                        <input id="liftSwitchErr" name="liftSwitchErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">杞ㄩ亾妫�娴嬫姤璀�:</label>
-                    <div class="form-input">
-                        <input id="trackErr" name="trackErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">璁惧杩愯瓒呮椂鎶ヨ:</label>
-                    <div class="form-input">
-                        <input id="timeoutErr" name="timeoutErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">閫氫俊閿欒鎶ヨ:</label>
-                    <div class="form-input">
-                        <input id="connectErr" name="connectErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">璁惧鎬ュ仠:</label>
-                    <div class="form-input">
-                        <input id="emergencyErr" name="emergencyErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浠诲姟绫诲瀷缂哄け:</label>
-                    <div class="form-input">
-                        <input id="taskTypeErr" name="taskTypeErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浠诲姟鍙风己澶�:</label>
-                    <div class="form-input">
-                        <input id="taskNoErr" name="taskNoErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">杩愯涓湁鏂颁换鍔�:</label>
-                    <div class="form-input">
-                        <input id="newTaskErr" name="newTaskErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鏁呴殰涓湁浠诲姟:</label>
-                    <div class="form-input">
-                        <input id="errTaskErr" name="errTaskErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">杩愯涓仠姝�:</label>
-                    <div class="form-input">
-                        <input id="stopErr" name="stopErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鑴辨満妯″紡涓嬫湁浠诲姟:</label>
-                    <div class="form-input">
-                        <input id="offlineTaskErr" name="offlineTaskErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鏉′欢鏈弧瓒冲惎鍔ㄤ换鍔�:</label>
-                    <div class="form-input">
-                        <input id="startTaskErr" name="startTaskErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浣庣數鍘嬫椂鏈変换鍔�:</label>
-                    <div class="form-input">
-                        <input id="voltageTaskErr" name="voltageTaskErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">璁惧鏁呴殰鏍囧織浣�:</label>
-                    <div class="form-input">
-                        <input id="devpErr" name="devpErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-            </div>
-            <div style="float:left;margin:  10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted">
-                <div class="form-item" style="text-align: center">
-                    <label>绌挎杞︽彁绀轰俊鎭�</label>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鑱旀満鐘舵��:</label>
-                    <div class="form-input">
-                        <input id="online" name="online" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">涓嶅湪杞ㄩ亾涓�:</label>
-                    <div class="form-input">
-                        <input id="notOnTrack" name="notOnTrack" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浣庣數閲忔彁閱�:</label>
-                    <div class="form-input">
-                        <input id="lowVoltage" name="lowVoltage" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浜忕數涓�:</label>
-                    <div class="form-input">
-                        <input id="electricityLoss" name="electricityLoss" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">寮哄埗琛岃蛋鍚姩:</label>
-                    <div class="form-input">
-                        <input id="forcedTravel" name="forcedTravel" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">婕旂ず妯″紡寮�鍚�:</label>
-                    <div class="form-input">
-                        <input id="demoMode" name="demoMode" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍏呯數鍒峰凡鎺ラ��:</label>
-                    <div class="form-input">
-                        <input id="brushConnect" name="brushConnect" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浠诲姟涓姝㈡墜鍔�:</label>
-                    <div class="form-input">
-                        <input id="taskManualForbid" name="taskManualForbid" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鑱旀満涓姝㈡墜鍔�:</label>
-                    <div class="form-input">
-                        <input id="onlineManualForbid" name="onlineManualForbid" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">璁惧鎬ュ仠涓�:</label>
-                    <div class="form-input">
-                        <input id="devpEmergency" name="devpEmergency" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浠诲姟涓柇涓�:</label>
-                    <div class="form-input">
-                        <input id="taskInterrupt" name="taskInterrupt" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浠诲姟宸叉竻闄�:</label>
-                    <div class="form-input">
-                        <input id="taskClear" name="taskClear" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">浠诲姟纭宸茶秴鏃�:</label>
-                    <div class="form-input">
-                        <input id="taskConfirmTimeout" name="taskConfirmTimeout" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍏呯數涓湁浠诲姟:</label>
-                    <div class="form-input">
-                        <input id="taskWithCharge" name="taskWithCharge" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-            </div>
-            <div style="float:left;margin:  10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted">
-                <div class="form-item" style="text-align: center">
-                    <label>浠诲姟淇℃伅</label>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍏ュ簱浠诲姟涓�:</label>
-                    <div class="form-input">
-                        <input id="pakInTask" name="pakInTask" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍑哄簱浠诲姟涓�:</label>
-                    <div class="form-input">
-                        <input id="pakOutTask" name="pakOutTask" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">绉诲簱浠诲姟涓�:</label>
-                    <div class="form-input">
-                        <input id="pakMoveTask" name="pakMoveTask" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍥炲師鐐逛换鍔′腑:</label>
-                    <div class="form-input">
-                        <input id="goHpTask" name="goHpTask" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲弽鍘熺偣浠诲姟涓�:</label>
-                    <div class="form-input">
-                        <input id="goOHpTask" name="goOHpTask" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲師鐐归伩璁╀綅:</label>
-                    <div class="form-input">
-                        <input id="goHpAvoid" name="goHpAvoid" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲弽鍘熺偣閬胯浣�:</label>
-                    <div class="form-input">
-                        <input id="goOHpAvoid" name="goOHpAvoid" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍏ュ簱鍙栫┖缁撴潫:</label>
-                    <div class="form-input">
-                        <input id="pakInEmpty" name="pakInEmpty" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍏ュ簱姝e父缁撴潫:</label>
-                    <div class="form-input">
-                        <input id="pakInFinish" name="pakInFinish" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍑哄簱鍙栫┖缁撴潫:</label>
-                    <div class="form-input">
-                        <input id="pakOutEmpty" name="pakOutEmpty" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍑哄簱姝e父缁撴潫:</label>
-                    <div class="form-input">
-                        <input id="pakOutFinish" name="pakOutFinish" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲師鐐归伩璁╁畬鎴�:</label>
-                    <div class="form-input">
-                        <input id="goHpAvoidFinish" name="goHpAvoidFinish" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲弽鍘熺偣閬胯瀹屾垚:</label>
-                    <div class="form-input">
-                        <input id="goOHpAvoidFinish" name="goOHpAvoidFinish" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲師鐐归伩璁╁畬鎴�:</label>
-                    <div class="form-input">
-                        <input id="goHpAvoidErr" name="goHpAvoidErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鍘诲弽鍘熺偣閬胯瀹屾垚:</label>
-                    <div class="form-input">
-                        <input id="goOHpAvoidErr" name="goOHpAvoidErr" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-            </div>
-            <div style="float:left;margin:  10px 10px 10px 10px; padding: 10px 10px 10px 10px;border: black;border-width: 3px;border-style:dotted">
-                <div class="form-item" style="text-align: center">
-                    <label>鐘舵�佷俊鎭�</label>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鑱旀満妯″紡:</label>
-                    <div class="form-input">
-                        <input id="autoMode" name="autoMode" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-                <div class="form-item">
-                    <label class="form-label">鐢靛帇杩囦綆:</label>
-                    <div class="form-input">
-                        <input id="voltageLow" name="voltageLow" class="layui-input" autocomplete="off" readonly>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
-<script>
-    // 绌虹櫧琛屾暟
-    var steStateTableBlankRows = 0;
-    var steMsgTableBlankRows = 0;
-    // 瀹為檯琛屾暟
-    var steStateTableFullRows = 0;
-    var steMsgTableFullRows = 0;
-    // 鍒濆鍖�
-    var steOutputDom = document.getElementById("ste-output");
-    $(document).ready(function() {
-        initSteStateTable();
-        getSteStateInfo();
-        initSteMsgTable();
-        getSteMsgInfo();
-        operatorBlockShow();
-    });
-
-    setInterval(function () {
-        getSteStateInfo()
-        getSteMsgInfo();
-    },1000)
-    setInterval(function () {
-        getSteOutput();
-        operatorBlockShow();
-    },500);
-
-    // 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
-    function operatorBlockShow() {
-        if (parent.systemRunning) {
-            $('.ste-operation').css("opacity", "0.5");
-            $('.ste-operation-shade').show();
-            $('.ste-operation-shade-span').show();
-        }  else {
-            $('.ste-operation').css("opacity", "1");
-            $('.ste-operation-shade').hide();
-            $('.ste-operation-shade-span').hide();
-        }
-    }
-
-    var layerIdx;
-    $(document).on('click ','.pos-btn', function () {
-        let steNo = Number($(this).parent().attr("data-steNo"));
-        layerIdx = layer.open({
-            type: 1,
-            title: false,
-            shadeClose: true,
-            offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
-            anim: 5,
-            shade: [0],
-            area: ['310px', '370px'],
-            closeBtn: 0,
-            content: $("#ste-detl"),
-            success: function(layero, index){
-                http.get(baseUrl+ "/ste/detl/"+steNo, null, function (res) {
-                    $('#steNo').val(steNo);
-                    $('#workNo').val(res.data.workNo);
-                    $('#row').val(res.data.row);
-                    $('#bay').val(res.data.bay);
-                    $('#lev').val(res.data.lev);
-                    $('#crnNo').val(res.data.crnNo);
-                    $('#pakMk').val(res.data.pakMk);
-                })
-            },
-            end: function () {
-                $('#steNo').val("");
-                $('#workNo').val("");
-                $('#row').val("");
-                $('#bay').val("");
-                $('#lev').val("");
-                $('#crnNo').val("");
-                $('#pakMk').val("");
-            }
-        })
-    })
-
-    var layerIdx0;
-    $(document).on('click ','.mode-btn', function () {
-        let steNo = Number($(this).parent().attr("data-steNo"));
-        layerIdx0 = layer.open({
-            type: 1,
-            title: false,
-            shadeClose: true,
-            offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
-            anim: 5,
-            shade: [0],
-            area: ['70%', '85%'],
-            closeBtn: 0,
-            content: $("#ste-detl2"),
-            success: function(layero, index){
-                http.get(baseUrl+ "/ste/sensor/detl/"+steNo, null, function (res) {
-                    $('#steNo1').val(res.data.steNo);
-                    getColor(res.data.liftErr,'#liftErr');
-                    getColor(res.data.inFetchErr,'#inFetchErr');
-                    getColor(res.data.outFetchErr,'#outFetchErr');
-                    getColor(res.data.antiErr,'#antiErr');
-                    getColor(res.data.liftSwitchErr,'#liftSwitchErr');
-                    getColor(res.data.trackErr,'#trackErr');
-                    getColor(res.data.timeoutErr,'#timeoutErr');
-                    getColor(res.data.connectErr,'#connectErr');
-                    getColor(res.data.emergencyErr,'#emergencyErr');
-                    getColor(res.data.taskTypeErr,'#taskTypeErr');
-                    getColor(res.data.taskNoErr,'#taskNoErr');
-                    getColor(res.data.newTaskErr,'#newTaskErr');
-                    getColor(res.data.errTaskErr,'#errTaskErr');
-                    getColor(res.data.stopErr,'#stopErr');
-                    getColor(res.data.offlineTaskErr,'#offlineTaskErr');
-                    getColor(res.data.startTaskErr,'#startTaskErr');
-                    getColor(res.data.voltageTaskErr,'#voltageTaskErr');
-                    getColor(res.data.devpErr,'#devpErr');
-                    getColor(res.data.online,'#online');
-                    getColor(res.data.notOnTrack,'#notOnTrack');
-                    getColor(res.data.lowVoltage,'#lowVoltage');
-                    getColor(res.data.electricityLoss,'#electricityLoss');
-                    getColor(res.data.forcedTravel,'#forcedTravel');
-                    getColor(res.data.demoMode,'#demoMode');
-                    getColor(res.data.brushConnect,'#brushConnect');
-                    getColor(res.data.taskManualForbid,'#taskManualForbid');
-                    getColor(res.data.onlineManualForbid,'#onlineManualForbid');
-                    getColor(res.data.devpEmergency,'#devpEmergency');
-                    getColor(res.data.taskInterrupt,'#taskInterrupt');
-                    getColor(res.data.taskClear,'#taskClear');
-                    getColor(res.data.taskConfirmTimeout,'#taskConfirmTimeout');
-                    getColor(res.data.taskWithCharge,'#taskWithCharge');
-                    getColor(res.data.pakInTask,'#pakInTask');
-                    getColor(res.data.pakOutTask,'#pakOutTask');
-                    getColor(res.data.pakMoveTask,'#pakMoveTask');
-                    getColor(res.data.goHpTask,'#goHpTask');
-                    getColor(res.data.goOHpTask,'#goOHpTask');
-                    getColor(res.data.goHpAvoid,'#goHpAvoid');
-                    getColor(res.data.goOHpAvoid,'#goOHpAvoid');
-                    getColor(res.data.pakInEmpty,'#pakInEmpty');
-                    getColor(res.data.pakInFinish,'#pakInFinish');
-                    getColor(res.data.pakOutEmpty,'#pakOutEmpty');
-                    getColor(res.data.pakOutFinish,'#pakOutFinish');
-                    getColor(res.data.goHpAvoidFinish,'#goHpAvoidFinish');
-                    getColor(res.data.goOHpAvoidFinish,'#goOHpAvoidFinish');
-                    getColor(res.data.goHpAvoidErr,'#goHpAvoidErr');
-                    getColor(res.data.goOHpAvoidErr,'#goOHpAvoidErr');
-                    getColor(res.data.autoMode,'#autoMode');
-                    getColor(res.data.voltageLow,'#voltageLow');
-                })
-            },
-            end: function () {
-                $('#steNo').val("");
-            }
-        })
-    })
-
-    function getColor(res,e){
-        $(e).val(res?"鉁�":"鈥�");
-        if (res){
-            $(e).attr("style", "color: #FD482C;");
-        }else {
-            $(e).attr("style", "color: #00FF00;");
-        }
-    }
-
-    // $(document).on('click ','.mode-btn', function () {
-    //     let steNo = Number($(this).parent().attr("data-steNo"));
-    //     layer.confirm("鏀瑰彉" + steNo + ' 鍙风┛姊溅鍦ㄧ嚎鐘舵�佸悧锛�', function(){
-    //         var index = layer.load(1, {
-    //             shade: [0.1,'#fff']
-    //         });
-    //         $.ajax({
-    //             url: baseUrl+ "/ste/mode/switch",
-    //             headers: {'token': localStorage.getItem('token')},
-    //             data: {
-    //                 steNo: Number(steNo),
-    //                 password: 'root'
-    //             },
-    //             method: 'POST',
-    //             success: function (res) {
-    //                 layer.close(index);
-    //                 if (res.code === 200){
-    //                     layer.msg(res.msg, {icon: 1});
-    //                 } else if (res.code === 403){
-    //                     window.location.href = baseUrl+"/login";
-    //                 }  else {
-    //                     layer.msg(res.msg, {icon: 2});
-    //                 }
-    //             }
-    //         });
-    //     });
-    // })
-
-
-
-    $(document).on('click ','#save', function () {
-        http.post(baseUrl+ "/ste/detl/update", {
-            steNo: $('#steNo').val(),
-            workNo: $('#workNo').val(),
-            row:  $('#row').val(),
-            bay: $('#bay').val(),
-            lev:  $('#lev').val(),
-            crnNo: $('#crnNo').val(),
-            pakMk: $('#pakMk').val(),
-        }, function (res) {
-            layer.msg("淇敼鎴愬姛", {icon: 1,});
-            layer.close(layerIdx);
-        })
-    })
-
-    $(document).on('click ','#cancel', function () {
-        layer.close(layerIdx);
-    })
-
-    // 绌挎杞︿俊鎭〃鑾峰彇 ---- 琛ㄤ竴
-    function getSteStateInfo() {
-        let tableEl = $('#ste-state-table');
-        $.ajax({
-            url: baseUrl+ "/ste/table/ste/state",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200){
-                    let table = res.data;
-                    if (table.length > steStateTableBlankRows && table.length !== steStateTableFullRows) {
-                        initSteStateTable(table.length-steStateTableBlankRows);
-                        steStateTableFullRows = table.length;
-                    }
-                    for (let i=1;i<=table.length;i++){
-                        // $("#mode-"+table[i-1].steNo).html(table[i-1].statusVal===0?'鑱旀満':'鑴辨満');
-                        let tr = tableEl.find("tr").eq(i);
-                        setVal(tr.children("td").eq(0), table[i-1].steNo);
-                        setVal(tr.children("td").eq(1), table[i-1].statusType);
-                        setVal(tr.children("td").eq(2), table[i-1].status);
-                        setVal(tr.children("td").eq(3), table[i-1].loading);
-                        setVal(tr.children("td").eq(4), table[i-1].track);
-                        setVal(tr.children("td").eq(5), table[i-1].charge);
-                        setVal(tr.children("td").eq(6), table[i-1].row);
-                        setVal(tr.children("td").eq(7), table[i-1].bay);
-                        setVal(tr.children("td").eq(8), table[i-1].lev);
-                        setVal(tr.children("td").eq(9), table[i-1].waiting);
-                        setVal(tr.children("td").eq(10), table[i-1].loca);
-                        setVal(tr.children("td").eq(11), table[i-1].chargeStatus);
-                        setVal(tr.children("td").eq(12), table[i-1].alarm1);
-                        setVal(tr.children("td").eq(13), table[i-1].alarm2);
-                    }
-                } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
-                }  else {
-                    console.log(res.msg);
-                }
-            }
-        });
-    }
-
-    // 绌挎杞︽暟鎹〃鑾峰彇 ---- 琛ㄤ簩
-    function getSteMsgInfo() {
-        let tableEl = $('#ste-msg-table');
-        $.ajax({
-            url: baseUrl+ "/ste/table/ste/msg",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200){
-                    var table = res.data;
-                    if (table.length > steMsgTableBlankRows && table.length !== steMsgTableFullRows) {
-                        initSteMsgTable(table.length-steMsgTableBlankRows);
-                        steMsgTableFullRows = table.length;
-                    }
-                    for (var i=1;i<=table.length;i++){
-                        var tr = tableEl.find("tr").eq(i);
-                        setVal(tr.children("td").eq(0), table[i-1].steNo);
-                        setVal(tr.children("td").eq(1), table[i-1].workNo);
-                        setVal(tr.children("td").eq(2), table[i-1].status);
-                        setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
-                        setVal(tr.children("td").eq(4), table[i-1].staNo);
-                        setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
-                        setVal(tr.children("td").eq(6), table[i-1].locNo);
-                        setVal(tr.children("td").eq(7), table[i-1].speed);
-                        setVal(tr.children("td").eq(8), table[i-1].closer);
-                        setVal(tr.children("td").eq(9), table[i-1].pakMk);
-                    }
-                } else if (res.code === 403){
-                    window.location.href = baseUrl+"/login";
-                }  else {
-                    console.log(res.msg);
-                }
-            }
-        });
-    }
-
-    // 绌挎杞︽棩蹇楄緭鍑� -----------------------------------------------------------------------
-    function getSteOutput() {
-        $.ajax({
-            url: baseUrl + "/ste/output/ste",
-            headers: {'token': localStorage.getItem('token')},
-            method: 'POST',
-            success: function (res) {
-                if (res.code === 200) {
-                    steOutput(res.data);
-                } else if (res.code === 403) {
-                    window.location.href = baseUrl + "/login";
-                } else {
-                    console.log(res.msg);
-                }
-            }
-        })
-    }
-
-    // 浠诲姟鎸囦护涓嬪彂
-    function steOperator(steTaskMode) {
-        http.post(baseUrl+"/ste/operator/ste", {
-            steNo: $('input[name="steSelect"]:checked').val(),
-            steTaskMode: steTaskMode
-        }, function (res) {
-            layer.msg(res.msg, {icon: 1});
-        });
-    }
-
-
-    // ------------------------------------------------------------------------------------------------
-
-    // 绌挎杞︿俊鎭〃鑾峰彇  ----- 琛ㄤ竴
-    function initSteStateTable(row) {
-        let line;
-        if (row === undefined){
-            let one = $('#ste-state-table thead').height();
-            let total = $('.ste-state').height();
-            let count = total / one;
-            count = parseInt(count) - 1;
-            steStateTableBlankRows = count;
-            line = count;
-        } else {
-            line = row;
-        }
-        let html = "";
-        for (let i = 0; i < line; i ++){
-            html += " <tr>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "     </tr>\n";
-        }
-        $('#ste-state-table tbody').after(html);
-    }
-
-    // 绌挎杞︽暟鎹〃鑾峰彇  ----- 琛ㄤ簩
-    function initSteMsgTable(row) {
-        let line;
-        if (row === undefined){
-            let one = $('#ste-msg-table thead').height();
-            let total = $('.ste-msg').height();
-            let count = total / one;
-            count = parseInt(count) - 1;
-            steMsgTableBlankRows = count;
-            line = count;
-        } else {
-            line = row;
-        }
-        let html = "";
-        for (let i = 0; i < line; i ++){
-            html += " <tr>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "       <td></td>\n" +
-                "     </tr>\n";
-        }
-        $('#ste-msg-table tbody').after(html);
-    }
-
-    // 鏃ュ織杈撳嚭妗�
-    function steOutput(content){
-        steOutputDom.value += content;
-        steOutputDom.scrollTop = steOutputDom.scrollHeight;
-    }
-
-</script>

--
Gitblit v1.9.1