#

luxiaotao1123

2020-12-30 cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567

 src/main/webapp/views/pipeline.html

@@ -9,7 +9,6 @@
    <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/pipeline.css">
    <link rel="stylesheet" type="text/css" href="../static/layui/css/layui.css" media="all">
    <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>
@@ -23,12 +22,12 @@
    <div id="plc-error" class="main-board" style="padding-left: 10px">
        <!-- 头部 -->
        <div class="plc-log-header">
            <div style="height: 40%">
                <span>东侧PLC执行指令</span>
            </div>
            <div style="height: 40%">
                <span>西侧PLC执行指令</span>
            </div>
<!--            <div style="height: 40%">-->
<!--                <span>东侧PLC执行指令</span>-->
<!--            </div>-->
<!--            <div style="height: 40%">-->
<!--                <span>西侧PLC执行指令</span>-->
<!--            </div>-->
            <div>
                <span style="color: #1E9FFF">PLC异常信息表:</span>
            </div>
@@ -63,7 +62,7 @@
                    <th>有物</th>
                    <th>可入</th>
                    <th>可出</th>
                    <th>需求1</th>
                    <th>入库标记</th>
                    <th>空板信号</th>
                    <th>目标站</th>
                </tr>
@@ -78,30 +77,36 @@
</footer>

<div id="site-detl" style="display: none">
    <div class="layui-form">
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">站点:</label>
            <div class="layui-input-block">
                <input id="siteId" name="siteId" placeholder="请输入站点编号" class="layui-input" lay-verify="required|number" autocomplete="off">
    <form>
        <div class="form-item">
            <label class="form-label">站号:</label>
            <div class="form-input">
                <input id="siteId" name="siteId" class="layui-input" lay-verify="required|number" autocomplete="off" disabled="disabled">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">工作号:</label>
            <div class="layui-input-block">
                <input id="workNo" name="workNo" type="number" placeholder="请输入工作号" class="layui-input" lay-verify="number" autocomplete="off">
        <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="layui-form-item">
            <label class="layui-form-label layui-form-required">目标站:</label>
            <div class="layui-input-block">
                <input id="staNo" name="staNo" type="number" placeholder="请输入目标站" class="layui-input" lay-verify="number" autocomplete="off">
        <div class="form-item">
            <label class="form-label">目标站:</label>
            <div class="form-input">
                <input id="staNo" name="staNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
            </div>
        </div>
        <div class="layui-form-item cool-button-contain">
            <button class="layui-btn layui-btn-normal" id="print" lay-filter="print" lay-submit="">打印</button>
            <button class="layui-btn layui-btn-primary" id="cancel">取消</button>
        <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>
        <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>
    </form>
</div>
</body>
<script>
@@ -128,25 +133,6 @@
        getSiteOutput();
    },500);

    $(document).on('click','#site-table tr', function () {
        layer.open({
            type: 1,
            title: false,
            shadeClose: true,
            offset: 'rt',
            anim: 5,
            shade: [0],
            area: ['340px', '215px'],
            closeBtn: 0,
            content: $("#site-detl"),
            success: function(layero, index){

            }
        })
        console.log($(this).children("td").eq(0).html());
    });


    // plc异常信息表获取
    function getPlcError() {
        var tableEl = $('#plc-error-table');
@@ -167,7 +153,7 @@
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -195,14 +181,14 @@
                        setVal(tr.children("td").eq(3), table[i-1].loading);
                        setVal(tr.children("td").eq(4), table[i-1].inEnable);
                        setVal(tr.children("td").eq(5), table[i-1].outEnable);
                        setVal(tr.children("td").eq(6), table[i-1].inreq1);
                        setVal(tr.children("td").eq(6), table[i-1].pakMk);
                        setVal(tr.children("td").eq(7), table[i-1].emptyMk);
                        setVal(tr.children("td").eq(9), table[i-1].staNo);
                        setVal(tr.children("td").eq(8), table[i-1].staNo);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
                }  else {
                    alert(res.msg);
                    console.log(res.msg);
                }
            }
        });
@@ -288,5 +274,56 @@
        $('#site-table tbody').after(html);
    }

    // 详情操作 -------------------------------------------------------------------------
    var layerDetl;
    $(document).on('dblclick ','#site-table tr', function () {
        var siteId = $(this).children("td").eq(0).html();
        if (siteId !== null && siteId !== "") {
            layerDetl = layer.open({
                type: 1,
                title: false,
                shadeClose: true,
                offset: 'rt',
                anim: 5,
                shade: [0],
                area: ['340px', '255px'],
                closeBtn: 0,
                content: $("#site-detl"),
                success: function(layero, index){
                    http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
                        $('#siteId').val(siteId);
                        $('#workNo').val(res.data.workNo);
                        $('#staNo').val(res.data.staNo);
                        $('#pakMk').val(res.data.pakMk);
                    })
                },
                end: function () {
                    $('#siteId').val("");
                    $('#workNo').val("");
                    $('#staNo').val("");
                    $('#pakMk').val("");
                }
            })
        }
    });

    $(document).on('click ','#save', function () {
        http.post(baseUrl+ "/site//detl/update", {
            siteId: $('#siteId').val(),
            workNo: $('#workNo').val(),
            staNo:  $('#staNo').val(),
            pakMk: $('#pakMk').val()
        }, function (res) {
            layer.msg("修改成功",{icon: 1,});
        })
    })
    $(document).on('click ','#cancel', function () {
        $('#siteId').val("");
        $('#workNo').val("");
        $('#staNo').val("");
        $('#pakMk').val("");
        layer.close(layerDetl);
    })

</script>
</html>