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

1

2 天以前 5e29b1323d051893de577c1a33c8bd30545fde1e

 src/main/webapp/views/basDevpErrorLog/basDevpErrorLog.html

@@ -56,8 +56,7 @@
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -66,279 +65,6 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/basDevpErrorLog/basDevpErrorLog.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">输送编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="devNo" placeholder="请输入输送编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">物体进/出超时: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="passTimeOut" placeholder="请输入物体进/出超时">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">有物体无数据: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="objectNoIdError" placeholder="请输入有物体无数据">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">有数据无物体: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="idNoObjectError" placeholder="请输入有数据无物体">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">线体电机热继报警: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="lmfrError" placeholder="请输入线体电机热继报警">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升报警: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="liftError" placeholder="请输入顶升报警">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升电机热继报警: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="dlfrError" placeholder="请输入顶升电机热继报警">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升横移电机热继报警: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="dmfrError" placeholder="请输入顶升横移电机热继报警">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">变频故障: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="vfdError" placeholder="请输入变频故障">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">伺服故障: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="srvError" placeholder="请输入伺服故障">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预留1: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="res1" placeholder="请输入预留1">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预留2: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="res2" placeholder="请输入预留2">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">预留3: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="res3" placeholder="请输入预留3">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">与上位机通讯超时: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="communicationTimeOut" placeholder="请输入与上位机通讯超时">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">信息参数不全: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="parameterIncompleteError" placeholder="请输入信息参数不全">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">信息数据未清除: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="dataNotClear" placeholder="请输入信息数据未清除">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">参数设置报警: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="setParameterError" placeholder="请输入参数设置报警">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">创建时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入创建时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="inEnable" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="outEnable" placeholder="请输入">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">数据错误: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="dataError" placeholder="请输入数据错误">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">直线光电: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorGArrive" placeholder="请输入直线光电">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">减速光电: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorGDec" placeholder="请输入减速光电">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">直线凸出: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorGArrive2" placeholder="请输入直线凸出">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">限位保护光电: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorLimit" placeholder="请输入限位保护光电">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">急停: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="emergency" placeholder="请输入急停">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">光电离开1: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorGLeave" placeholder="请输入光电离开1">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">光电离开2: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorGLeave2" placeholder="请输入光电离开2">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升上升: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorCUp" placeholder="请输入顶升上升">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升下降: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorCDown" placeholder="请输入顶升下降">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">顶升热继: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="liftMotorFr" placeholder="请输入顶升热继">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">直线热继: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="lineMotorFr" placeholder="请输入直线热继">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">移栽热继: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="tranMotorFr" placeholder="请输入移栽热继">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备用1: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rst1" placeholder="请输入备用1">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备用2: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rst2" placeholder="请输入备用2">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备用3: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rst3" placeholder="请输入备用3">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备用4: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="rst4" placeholder="请输入备用4">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">直行方向到位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorArriveD" placeholder="请输入直行方向到位">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">直行方向减速: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorDecD" placeholder="请输入直行方向减速">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">左移方向到位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorArriveL" placeholder="请输入左移方向到位">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">左移方向减速: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorDecL" placeholder="请输入左移方向减速">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">右移方向到位: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorArriveR" placeholder="请输入右移方向到位">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">右移方向减速: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="sensorDecR" placeholder="请输入右移方向减速">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>