#

Junjie

2023-08-30 cdca466c533197157f3255b77fbdb4aac89be064

 src/main/webapp/views/shuttle.html

@@ -20,21 +20,22 @@
        <div style="padding: 10px;height: 100%">
            <!-- 日志监控板 -->
            <div class="log-board">
                <div class="command-log" id="commandLogId" style="width: 5%;">
<!--                    <div data-shuttleNo="1" class="shuttle-command-item">-->
<!--                        <label>1#</label>-->
<!--                        <button class="demoBtn pos-btn">数据维护</button>-->
<!--                        <button id="mode-1" class="demoBtn mode-btn" >设备信息</button>-->
<!--                    </div>-->
                </div>
<!--                <div class="command-log" id="commandLogId" style="width: 5%;">-->
<!--&lt;!&ndash;                    <div data-shuttleNo="1" class="shuttle-command-item">&ndash;&gt;-->
<!--&lt;!&ndash;                        <label>1#</label>&ndash;&gt;-->
<!--&lt;!&ndash;                        <button class="demoBtn pos-btn">数据维护</button>&ndash;&gt;-->
<!--&lt;!&ndash;                        <button id="mode-1" class="demoBtn mode-btn" >设备信息</button>&ndash;&gt;-->
<!--&lt;!&ndash;                    </div>&ndash;&gt;-->
<!--                </div>-->
                <!-- 堆垛机状态位信息 -->
                <div class="shuttle-state" style="width: 95%;">
                <div class="shuttle-state" style="width: 100%;">
                    <table id="shuttle-state-table">
                        <thead>
                            <tr>
                                <th>四向穿梭车</th>
                                <th>任务状态</th>
                                <th>小车状态</th>
                                <th>工作模式</th>
                                <th>实际库位</th>
                                <th>实际坐标</th>
                                <th>电量</th>
@@ -46,6 +47,7 @@
                                <th>充电状态</th>
                                <th>故障状态</th>
                                <th>故障码</th>
                                <th>管制状态</th>
                            </tr>
                        </thead>
                        <tbody>
@@ -71,6 +73,7 @@
                            <th>总里程数</th>
                            <th>作业标记</th>
                            <th>当前库位</th>
                            <th>令牌</th>
                        </tr>
                    </thead>
                    <tbody>
@@ -88,9 +91,9 @@
                <!-- 设备任务选择 -->
                <div class="task-select">
                    <!-- 选择 -->
                    <div id="shuttle-select" class="operator-item">
                    <div id="shuttle-select" class="operator-item" style="width: 100%;">
                        <span class="select-title">四向穿梭车号</span>
                        <div class="select-container" id="shuttleRadioBoxId">
                        <div class="select-container" id="shuttleRadioBoxId" style="display: flex;flex-wrap: wrap;justify-content: center;align-items: center;">
<!--                            <label><input type="radio" name="shuttleSelect" value="1" checked>&nbsp;1号穿梭车</label>-->
                        </div>
                    </div>
@@ -132,40 +135,13 @@
                                            <button class="item" onclick="shuttleOperator(4)">托盘下降</button>
                                            <button class="item" onclick="shuttleOperator(15)">充电开关</button>
                                            <button class="item" onclick="shuttleOperator(9)">复位</button>
                                            <button class="item" onclick="shuttleOperator(21)">管制</button>
                                            <button class="item" onclick="shuttleOperator(22)">取消管制</button>
                                        </div>
                                    </div>
                                </div>
                            </div>

<!--                            <div style="width: 20%;">-->
<!--                                <div class="operator-item" style="height: auto;width: 100%;">-->
<!--                                    <span class="select-title">设置配置参数</span>-->
<!--                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
<!--                                        <div class="select-container-item">-->
<!--                                            <span>运行速度</span>-->
<!--                                            <label><input id="runSpeed" type="text" name="runSpeed" /></label>-->
<!--                                        </div>-->
<!--                                        <div class="select-container-item">-->
<!--                                            <span>充电阈值</span>-->
<!--                                            <label><input id="chargeLine" type="text" name="runSpeed" /></label>-->
<!--                                        </div>-->

<!--                                        <div>-->
<!--                                            <button class="item" onclick="shuttleParamSave()">保存</button>-->
<!--                                        </div>-->
<!--                                    </div>-->
<!--                                </div>-->
<!--                            </div>-->

<!--                            <div style="width: 15%;">-->
<!--                                <div class="operator-item" style="height: auto;width: 100%;">-->
<!--                                    <span class="select-title">配置参数</span>-->
<!--                                    <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">-->
<!--                                        <div>运行速度：<span id="runSpeedText"></span></div>-->
<!--                                        <div>充电阈值：<span id="chargeLineText"></span></div>-->
<!--                                    </div>-->
<!--                                </div>-->
<!--                            </div>-->
                        </div>
                    </fieldset>
                </div>
@@ -196,6 +172,12 @@
                <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">
                <label class="form-label">令牌:</label>
                <div class="form-input">
                    <input id="token" name="token" type="text" class="layui-input" autocomplete="off">
                </div>
            </div>
            <div class="form-item form-button-container">
@@ -260,6 +242,7 @@
            shuttleNo: $('#shuttleNo').val(),
            workNo: $('#workNo').val(),
            pakMk: $('#pakMk').val(),
            token: $('#token').val(),
        }, function (res) {
            layer.msg("修改成功", {icon: 1,});
            layer.close(layerDetl);
@@ -321,17 +304,19 @@
                        setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
                        setVal(tr.children("td").eq(1), table[i-1].protocolStatus$);
                        setVal(tr.children("td").eq(2), table[i-1].free$);
                        setVal(tr.children("td").eq(3), table[i-1].point$);
                        setVal(tr.children("td").eq(4), table[i-1].coord$);
                        setVal(tr.children("td").eq(5), table[i-1].powerPercent$);
                        setVal(tr.children("td").eq(6), table[i-1].speed);
                        setVal(tr.children("td").eq(7), table[i-1].loadState$);
                        setVal(tr.children("td").eq(8), table[i-1].liftPosition$);
                        setVal(tr.children("td").eq(9), table[i-1].runDir$);
                        setVal(tr.children("td").eq(10), table[i-1].runDir2$);
                        setVal(tr.children("td").eq(11), table[i-1].chargState$);
                        setVal(tr.children("td").eq(12), table[i-1].errState$);
                        setVal(tr.children("td").eq(13), table[i-1].errCode);
                        setVal(tr.children("td").eq(3), table[i-1].workingMode$);
                        setVal(tr.children("td").eq(4), table[i-1].point$);
                        setVal(tr.children("td").eq(5), table[i-1].point$$);
                        setVal(tr.children("td").eq(6), table[i-1].powerPercent$);
                        setVal(tr.children("td").eq(7), table[i-1].speed);
                        setVal(tr.children("td").eq(8), table[i-1].loadState$);
                        setVal(tr.children("td").eq(9), table[i-1].liftPosition$);
                        setVal(tr.children("td").eq(10), table[i-1].runDir$);
                        setVal(tr.children("td").eq(11), table[i-1].runDir2$);
                        setVal(tr.children("td").eq(12), table[i-1].chargState$);
                        setVal(tr.children("td").eq(13), table[i-1].errState$);
                        setVal(tr.children("td").eq(14), table[i-1].errCode);
                        setVal(tr.children("td").eq(15), table[i-1].suspendState$);
                    }
                } else if (res.code === 403){
                    window.location.href = baseUrl+"/login";
@@ -371,6 +356,7 @@
                        setVal(tr.children("td").eq(10), table[i-1].statusSum.mileage);
                        setVal(tr.children("td").eq(11), table[i-1].pakMk$);
                        setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
                        setVal(tr.children("td").eq(13), table[i-1].token);
                        if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
                            $("#runSpeedText").text(table[i-1].runSpeed)
                            $("#chargeLineText").text(table[i-1].chargeLine + "%")
@@ -549,6 +535,7 @@
                                        $('#shuttleNo').val(shuttleNo);
                                        $('#workNo').val(table[i-1].taskNo);
                                        $('#pakMk').val(table[i-1].pakMk$);
                                        $('#token').val(table[i-1].token);
                                    }
                                }
                            } else if (res.code === 403){
@@ -563,6 +550,7 @@
                    $('#shuttleNo').val("");
                    $('#workNo').val("");
                    $('#pakMk').val("");
                    $('#token').val("");
                }
            })
        }
@@ -572,6 +560,7 @@
        $('#shuttleNo').val("");
        $('#workNo').val("");
        $('#pakMk').val("");
        $('#token').val("");
        layer.close(layerDetl);
    })