#

luxiaotao1123

2021-12-21 55cb30b5be3d5d460c0cb541f6b669ce947728d0

#

 static/js/app.js

@@ -326,7 +326,6 @@
        }
        this.initStoreObjects = function (object) {
            if (this.firstTime === 1) {
                // initStore();
                if (Store3DData !== undefined && Store3DData !== null) {
                    for(var group of Store3DData.data.store.groups) {
                        new StoreCrn(group.crn, object);
@@ -354,7 +353,7 @@
            }
        }
        this.queryCrn = function () {
            if (CrnDatas !== null) {
            if (CrnDatas !== null && this.firstTime === 0) {
                for (let crnData of CrnDatas) {
                    let crnTask = getArrVal(this.crnTasks, "crnNo", crnData.crnNo);
                    if (null == crnTask) {

 static/js/data/Asrs.js

@@ -9,8 +9,8 @@
var CrnDatas = null;
function queryCrnCurrent() {
    $.ajax({
        // url: 'http://47.97.1.152:58080/jkwcs/three/query/crn/cache/v1',
        url: 'http://localhost:9090/jkwcs/three/query/crn/cache/v1',
        url: 'http://47.97.1.152:58080/jkwcs/three/query/crn/cache/v1',
        // url: 'http://localhost:9090/jkwcs/three/query/crn/cache/v1',
        type: "GET",
        data: {},
        success: function (res) {
@@ -22,8 +22,8 @@
var Store3DData;
function initStore() {
    $.ajax({
        // url: 'http://47.97.1.152:58080/jkwcs/three/init/store/v1',
        url: 'http://localhost:9090/jkwcs/three/init/store/v1',
        url: 'http://47.97.1.152:58080/jkwcs/three/init/store/v1',
        // url: 'http://localhost:9090/jkwcs/three/init/store/v1',
        type: "POST",
        data: {},
        // async: false,

 static/js/object/CrnTask.js

@@ -53,13 +53,29 @@
        that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
        that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
        that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
        if (that.crnBody===null || that.crnLoad===null || that.crnFork==null) {
            console.log(that.crnNo + "号堆垛机没有初始化");
        }
    };
    init();

    that.modify = function (crnData) {
        if (that.run || that.crnNo === 0 || that.crnBody===null || that.crnLoad===null || that.crnFork==null) {
            // console.log(that.crnNo + "号堆垛机更新失败");
        } else {
        if (that.run || that.crnNo === 0) {
            console.error(that.crnNo + "号堆垛机更新失败");
            return;
        }
        if (that.crnBody===null) {
            that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
            return;
        }
        if (that.crnLoad===null) {
            that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
            return;
        }
        if (that.crnFork===null) {
            that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
            return;
        }
            if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
                return;
            }
@@ -152,7 +168,6 @@

            curves[0].start = true;

        }
    }

    that.move = function () {

 views/index.html

@@ -95,8 +95,8 @@
    var shipInfoBtn = document.getElementById("ship-info-btn");
    var speedDom = document.getElementById("speed");
    var timer = setInterval(function () {
        if (percent < 99.95) {
            percent += 0.05;
        if (percent < 100.00) {
            percent += 0.04;
            speedDom.innerText = percent.toFixed(2);
        } else {
            if (!hasClass(shipInfoBtn, "show")) {