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

zjj

2024-12-20 3695eb9fa6062ef00e685835cf384c02e60f7b17

 src/main/webapp/views/basDevp/basDevp_detail.html

@@ -30,12 +30,12 @@
            </div>
        </div>

        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">备　　注：</label>
            <div class="layui-input-inline">
                <input id="devMk" class="layui-input" type="text">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;display: none">-->
<!--            <label class="layui-form-label">备　　注：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="devMk" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">可　　入：</label>
            <div class="layui-input-inline">
@@ -234,10 +234,16 @@
                <input id="cartPos" class="layui-input" type="text">
            </div>
        </div>
<!--        <div class="layui-inline"  style="width:31%;">-->
<!--            <label class="layui-form-label">设备描述：</label>-->
<!--            <div class="layui-input-inline">-->
<!--                <input id="decDesc" class="layui-input" type="text">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">设备描述：</label>
            <label class="layui-form-label">站点出入状态</label>
            <div class="layui-input-inline">
                <input id="decDesc" class="layui-input" type="text">
                <input id="devMk" class="layui-input" type="text">
            </div>
        </div>