#

luxiaotao1123

2023-02-17 f4c155cd69fd0048bb0b1a06b578eb050aedd25b

#

 src/main/java/com/zy/asrs/controller/SteController.java

@@ -11,6 +11,7 @@
import com.zy.asrs.domain.param.SteOperatorParam;
import com.zy.asrs.domain.vo.SteDataVo;
import com.zy.asrs.domain.vo.SteMsgTableVo;
import com.zy.asrs.domain.vo.SteSensorDataVo;
import com.zy.asrs.domain.vo.SteStateTableVo;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.WrkMast;
@@ -185,6 +186,27 @@
        return R.ok().add(vo);
    }

    @GetMapping("/sensor/detl/{steNo}")
    public R steSensorDetl(@PathVariable("steNo") Integer steNo){
        SteSensorDataVo vo = new SteSensorDataVo();
        for (SteSlave ste : slaveProperties.getSte()) {
            if (steNo.equals(ste.getId())) {
                vo.setSteNo(ste.getId());
                // 获取穿梭车信息
                SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
                if (steThread == null) {
                    return R.error("设备不在线");
                }
                SteProtocol steProtocol = steThread.getSteProtocol();
                if (steProtocol == null) {
                    return R.error("设备不在线");
                }
                break;
            }
        }
        return R.ok().add(vo);
    }

    @PostMapping("/detl/update")
    @ManagerAuth
    public R steUpdate(SteDataVo vo){

 src/main/java/com/zy/asrs/domain/vo/SteSensorDataVo.java

New file
@@ -0,0 +1,15 @@
package com.zy.asrs.domain.vo;

import lombok.Data;

/**
 * Created by vincent on 2020-06-02
 */
@Data
public class SteSensorDataVo {

    // 穿梭车号
    private Integer steNo;


}

 src/main/webapp/views/ste.html

@@ -24,7 +24,7 @@
                    <div data-steNo="1" class="ste-command-item">
                        <label>1#</label>
                        <button class="demoBtn pos-btn">数据维护</button>
                        <button id="mode-1" class="demoBtn mode-btn" > - </button>
                        <button id="mode-1" class="demoBtn mode-btn" >设备信息</button>
                    </div>
                </div>
                <!-- 堆垛机状态位信息 -->
@@ -257,33 +257,58 @@
        })
    })

    var layerIdx0;
    $(document).on('click ','.mode-btn', function () {
        let steNo = Number($(this).parent().attr("data-steNo"));
        layer.confirm("改变" + steNo + ' 号穿梭车在线状态吗？', function(){
            var index = layer.load(1, {
                shade: [0.1,'#fff']
            });
            $.ajax({
                url: baseUrl+ "/ste/mode/switch",
                headers: {'token': localStorage.getItem('token')},
                data: {
                    steNo: Number(steNo),
                    password: 'root'
                },
                method: 'POST',
                success: function (res) {
                    layer.close(index);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                    } else if (res.code === 403){
                        window.location.href = baseUrl+"/login";
                    }  else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            });
        });
        layerIdx0 = layer.open({
            type: 1,
            title: false,
            shadeClose: true,
            offset: [$(this).offset().top + 30 + 'px', $(this).offset().left + 'px'],
            anim: 5,
            shade: [0],
            area: ['310px', '370px'],
            closeBtn: 0,
            content: $("#ste-detl"),
            success: function(layero, index){
                http.get(baseUrl+ "/ste/sensor/detl/"+steNo, null, function (res) {
                    $('#steNo').val(steNo);

                })
            },
            end: function () {
                $('#steNo').val("");
            }
        })
    })

    // $(document).on('click ','.mode-btn', function () {
    //     let steNo = Number($(this).parent().attr("data-steNo"));
    //     layer.confirm("改变" + steNo + ' 号穿梭车在线状态吗？', function(){
    //         var index = layer.load(1, {
    //             shade: [0.1,'#fff']
    //         });
    //         $.ajax({
    //             url: baseUrl+ "/ste/mode/switch",
    //             headers: {'token': localStorage.getItem('token')},
    //             data: {
    //                 steNo: Number(steNo),
    //                 password: 'root'
    //             },
    //             method: 'POST',
    //             success: function (res) {
    //                 layer.close(index);
    //                 if (res.code === 200){
    //                     layer.msg(res.msg, {icon: 1});
    //                 } else if (res.code === 403){
    //                     window.location.href = baseUrl+"/login";
    //                 }  else {
    //                     layer.msg(res.msg, {icon: 2});
    //                 }
    //             }
    //         });
    //     });
    // })



@@ -321,7 +346,7 @@
                        steStateTableFullRows = table.length;
                    }
                    for (let i=1;i<=table.length;i++){
                        $("#mode-"+table[i-1].steNo).html(table[i-1].statusVal===0?'联机':'脱机');
                        // $("#mode-"+table[i-1].steNo).html(table[i-1].statusVal===0?'联机':'脱机');
                        let tr = tableEl.find("tr").eq(i);
                        setVal(tr.children("td").eq(0), table[i-1].steNo);
                        setVal(tr.children("td").eq(1), table[i-1].statusType);