#

vincent

2020-06-03 fff93401e35bda6bd7a545217ef60b3920d7d874

#

 src/main/webapp/static/css/console.css

@@ -344,6 +344,28 @@
    margin-left: 35px;
}

/* 弹窗 */
form .form-item {
    display: inline-block;
    padding-top: 10px;
    padding-left: 5px;
}
form .form-item-label {
    float: left;
    text-align: right;
    padding: 1px 6px;
    display: inline-block;
    vertical-align: middle;
}
form .form-item-input {
    display: inline-block;
    float: left;
    vertical-align: middle;
}
form .form-item-input input {
    height: 1.5rem;
    padding-left: 0.5rem;
}


/* 动画 */

 src/main/webapp/views/console.html

@@ -15,9 +15,9 @@
    <script type="text/javascript" src="../static/js/layer/layer.js"></script>
    <style>
        /* layer 深蓝色按钮修改 */
        .layui-layer-lan .layui-layer-btn {
            border-top: none;
        }
        /*.layui-layer-lan .layui-layer-btn {*/
            /*border-top: none;*/
        /*}*/
        .layui-layer-lan .layui-layer-btn a {
            background: #4476A7;
            border-color: #4476A7;
@@ -418,32 +418,203 @@
<!-- 输送设备弹窗 -->
<div id="siteWindow" style="display: none">
    <form>
        <label>设备号<input type="text" name="devpNo" value="12" disabled="disabled"></label>
        <label>工作号<input type="text" name="workNo" value="9998" disabled="disabled"></label>
        <label>工作状态<input type="text" name="workStatus" value="2.设备上移动" disabled="disabled"></label>
        <label>自动<input type="checkbox" name="auto" disabled="disabled" checked></label>
        <label>有物<input type="checkbox" name="loading" disabled="disabled" checked></label>
        <label>能入<input type="checkbox" name="canining" disabled="disabled" checked></label>
        <label>能出<input type="checkbox" name="canouting" disabled="disabled" checked></label>
        <label>出入类型<input type="text" name="ioType" value="1.入库" disabled="disabled"></label>
        <label>源站<input type="text" name="sourceStaNo" value="2303" disabled="disabled"></label>
        <label>目标站<input type="text" name="staNo" value="2410" disabled="disabled"></label>
        <label>源库位<input type="text" name="sourceStock" value="" disabled="disabled"></label>
        <label>目标库位<input type="text" name="stock" value="" disabled="disabled"></label>
        <!-- 第一行 -->
        <div class="form-item" style="width: 25%">
            <div class="form-item-label">
                <span>设备号</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="devpNo" value="12" disabled="disabled" style="width: 4rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
            <div class="form-item-label">
                <span>工作号</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 4rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
            <div class="form-item-label">
                <span>工作状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workStatus" value="2.设备上移动" disabled="disabled" style="width: 10rem">
            </div>
        </div>

        <!-- 第二行 -->
        <div class="form-item" style="width: 20%">
            <div class="form-item-label">
                <span>自动</span>
            </div>
            <div class="form-item-input">
                <input type="checkbox" name="auto" disabled="disabled" style="width: 1rem" checked>
            </div>
        </div>
        <div class="form-item" style="width: 20%">
            <div class="form-item-label">
                <span>有物</span>
            </div>
            <div class="form-item-input">
                <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem" checked>
            </div>
        </div>
         <div class="form-item" style="width: 20%">
             <div class="form-item-label">
                 <span>能入</span>
             </div>
             <div class="form-item-input">
                 <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem" checked>
             </div>
         </div>
         <div class="form-item" style="width: 20%">
             <div class="form-item-label">
                 <span>能出</span>
             </div>
             <div class="form-item-input">
                 <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem" checked>
             </div>
        </div>

        <!-- 第三行 -->
        <div class="form-item" style="width: 40%">
            <div class="form-item-label">
                <span>出入类型</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="ioType" value="1.入库" disabled="disabled" style="width: 8rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
            <div class="form-item-label">
                <span>源站</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
            <div class="form-item-label">
                <span>目标站</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
            </div>
        </div>

        <!-- 第四行 -->
        <div class="form-item" style="width: 40%">
            <div class="form-item-label">
                <span>源库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
            </div>
        </div>
        <div class="form-item" style="width: 40%">
            <div class="form-item-label">
                <span>目标库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="stock" value="" style="width: 8rem">
            </div>
        </div>
    </form>
</div>

<!-- 堆垛机弹窗 -->
<div id="crnWindow" style="display: none">
    <label>堆垛机号<input type="text" name="crnNo" value="12" disabled="disabled"></label>
    <label>工作号<input type="text" name="workNo" value="9998" disabled="disabled"></label>
    <label>源站<input type="text" name="sourceStaNo" value="2303" disabled="disabled"></label>
    <label>目标站<input type="text" name="staNo" value="2410" disabled="disabled"></label>
    <label>工作状态<input type="text" name="workStatus" value="2.设备上移动" disabled="disabled"></label>
    <label>出入类型<input type="text" name="ioType" value="1.入库" disabled="disabled"></label>
    <label>源库位<input type="text" name="sourceStock" value="" disabled="disabled"></label>
    <label>目标库位<input type="text" name="stock" value="" disabled="disabled"></label>
    <label>堆垛机状态<input type="text" name="crnStatus" disabled="disabled"></label>
    <label>异常<input type="text" name="error" disabled="disabled" checked></label>
    <form>
        <!-- 第一行 -->
        <div class="form-item" style="width: 23%">
            <div class="form-item-label"  style="width: 87px">
                <span>堆垛机号</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="crnNo" value="12" disabled="disabled" style="width: 3rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
            <div class="form-item-label">
                <span>工作号</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 5rem">
            </div>
        </div>
        <div class="form-item" style="width: 23%">
            <div class="form-item-label">
                <span>源站</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
            </div>
        </div>
        <div class="form-item" style="width: 25%">
            <div class="form-item-label">
                <span>目标站</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
            </div>
        </div>

        <!-- 第二行 -->
        <div class="form-item" style="width: 45%">
            <div class="form-item-label" style="width: 87px">
                <span>工作状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="workStatus" value="2.设备上移动" disabled="disabled" style="width: 10rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
            <div class="form-item-label">
                <span>出入类型</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="ioType" value="1.入库" disabled="disabled" style="width: 10rem">
            </div>
        </div>

        <!-- 第三行 -->
        <div class="form-item" style="width: 45%">
            <div class="form-item-label" style="width: 87px">
                <span>源库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>
        <div class="form-item" style="width: 45%">
            <div class="form-item-label">
                <span>目标库位</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
            </div>
        </div>

        <!-- 第四行 -->
        <div class="form-item" style="width: 95%">
            <div class="form-item-label">
                <span>堆垛机状态</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="crnStatus" disabled="disabled" style="width: 25rem">
            </div>
        </div>
        <div class="form-item" style="width: 95%">
            <div class="form-item-label" style="width: 87px">
                <span>异常</span>
            </div>
            <div class="form-item-input">
                <input type="text" name="error" disabled="disabled" style="width: 25rem">
            </div>
        </div>
    </form>
</div>

</body>
@@ -465,7 +636,7 @@
    // 系统运行开关
    function systemSwitch() {
        if (systemRunning){
            layer.prompt({title: '请输入口令，并停止 WCS 系统', formType: 1}, function(pass, idx){
            layer.prompt({title: '请输入口令，并停止 WCS 系统', formType: 1,   shadeClose: true}, function(pass, idx){
                layer.close(idx);
                if ("123"!==pass){
                    alert("口令错误");
@@ -597,7 +768,7 @@
            type: 1,
            shadeClose: true,
            content: $('#siteWindow'),
            area: ['30rem', '18rem'],
            area: ['35rem', '18rem'],
            btn: ['确定', '关闭']
        });
    });
@@ -609,10 +780,10 @@
            skin: 'layui-layer-lan',
            closeBtn: 0,
            type: 1,
            offset: '180px',
            offset: '150px',
            shadeClose: true,
            content: $("#crnWindow"),
            area: ['30rem', '18rem'],
            area: ['40rem', '20rem'],
            btn: ['确定', '关闭']
        });
    });