#

Junjie

2025-01-07 5c12ee87de4f483ce6a205b53996944c8e4506a7

#

 src/main/java/com/zy/common/utils/NavigateMapData.java

@@ -371,11 +371,11 @@

                if (mapType == NavigationMapType.DFX.id) {
                    //车辆有货
                    if (staProtocol.getHasTray()) {
                    if (staProtocol.getHasTray() != null && staProtocol.getHasTray()) {
                        mapNode.setValue(MapNodeType.DISABLE.id);
                    }
                }else {
                    if (staProtocol.getHasCar()) {
                    if (staProtocol.getHasCar() != null && staProtocol.getHasCar()) {
                        mapNode.setValue(MapNodeType.CAR.id);
                    }
                }

 src/main/webapp/static/css/index.css

@@ -7,7 +7,7 @@
}

.sidebar {
    width: 8%;
    width: 10%;
    height: 50%;
    line-height: 5.625em;
    position: fixed;
@@ -76,11 +76,11 @@


.nav-unselect {
    color: #FFFFFF;
    color: #000000;
}
.nav-select {
    font-weight: 900;
    color:  #fff;
    color: #ffe100;
}



 src/main/webapp/views/console.html

@@ -333,7 +333,7 @@
                    map: [],//地图数据
                    currentLev: 1,//地图当前楼层
                    siteWindow: false, //站点弹窗显示默认不显示
                    floorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], //当前项目楼层
                    floorList: [1, 2, 3], //当前项目楼层
                    shuttleList: [], //四向穿梭车集合
                    currentLevShuttleList: [],//当前楼层四向穿梭车集合
                    shuttleColorList: [],//四向穿梭车颜色集合

 src/main/webapp/views/console4.html

@@ -150,7 +150,7 @@
    data: {
      map: [],
      currentLev: 1,
      floorList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], //当前项目楼层
      floorList: [1, 2, 3], //当前项目楼层
      currentLevShuttleList: [],//当前楼层四向穿梭车集合
      shuttleColorList: [],//四向穿梭车颜色集合
      drawer: false,
@@ -932,6 +932,24 @@
          })
        }
      },
      resetMap() {
        //重置地图
        let that = this
        $.ajax({
          url:baseUrl+"/console/map/resetMap/" + this.currentLev,
          headers:{
            'token': localStorage.getItem('token')
          },
          data:{},
          method:'get',
          success:function (res) {
            that.$message({
              message: that.currentLev + '层地图重置完成',
              type: 'success'
            });
          }
        })
      },
    }
  })


 src/main/webapp/views/index.html

@@ -23,8 +23,6 @@
            <li><a id="lift" onclick="nav(this.id)" class="nav-unselect" href="#">提升机</a></li>
<!--            <li><a id="ste" onclick="nav(this.id)" class="nav-unselect" href="#">穿梭车</a></li>-->
            <li><a id="shuttle" onclick="nav(this.id)" class="nav-unselect" href="#">四向穿梭车</a></li>
            <li><a id="plc2" onclick="nav(this.id)" class="nav-unselect" href="#">PLC2</a></li>
            <li><a id="ess" onclick="nav(this.id)" class="nav-unselect" href="#">ESS</a></li>
        </ul>
    </div>
</div>