#

Junjie

2023-09-09 d3cc456ffe53a2423c80377d4d96b79459405e29

 src/main/webapp/views/console.html

@@ -22,12 +22,12 @@
                  <div v-for="(col,idx) in row" :key="idx">
                     <div v-if="col.value == 0">
                        <!-- 子轨道 路径为穿梭车预计路径则显示穿梭车颜色和穿梭车号 -->
                        <div :style="{background: checkAdvancePath(index,idx) == null ? '':shuttleColorList[checkAdvancePath(index,idx)]}" class="item" v-if="col.data.length > 0">{{col.data}}</div>
                        <div :style="{background: checkAdvancePath(index,idx) == null ? '':shuttleColorList[checkAdvancePath(index,idx)]}" class="item" v-else>{{checkAdvancePath(index,idx) == null ? idx:checkAdvancePath(index,idx)}}</div>
                        <div :style="{background: checkAdvancePath(index,idx).length == 0 ? '':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item" v-if="col.data.length > 0">{{col.data}}</div>
                        <div :style="{background: checkAdvancePath(index,idx).length == 0 ? '':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item" v-else>{{checkAdvancePath(index,idx).length == 0 ? idx:checkAdvancePath(index,idx)}}</div>
                     </div>
                     <div v-else-if="col.value == 3">
                        <!-- 母轨道 路径为穿梭车预计路径则显示穿梭车颜色和穿梭车号 -->
                        <div :style="{background: checkAdvancePath(index,idx) == null ? '#5af':shuttleColorList[checkAdvancePath(index,idx)]}" class="item">{{checkAdvancePath(index,idx) == null ? '&#x21c5;&#x21c4;':checkAdvancePath(index,idx)}}</div>
                        <div :style="{background: checkAdvancePath(index,idx).length == 0 ? '#5af':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item">{{checkAdvancePath(index,idx).length == 0 ? '&#x21c5;&#x21c4;':checkAdvancePath(index,idx)}}</div>
                     </div>
                     <div v-else-if="col.value == 4">
                        <!-- 站点 -->
@@ -73,7 +73,7 @@
            <!--输出楼层-->
            <div style="height: 100%;">
               <div class="floorBtnBox" v-for="(lev,idx) in floorList">
                  <el-button @click="changFloor(lev)">{{lev}}F</el-button>
                  <el-button :style="{background:currentLev === lev ? '#7DCDFF':''}" @click="changFloor(lev)">{{lev}}F</el-button>
               </div>
               <div>
                  <el-button @click="testMove()">测试移动车</el-button>
@@ -354,7 +354,6 @@
                  this.consoleInterval = setInterval(() => {
                     this.getShuttleStateInfo() //获取四向穿梭车信息
                     this.getLiftStateInfo() //获取提升机信息
                     console.log('interval')
                  }, 1000)
               },
               //获取地图数据
@@ -419,8 +418,10 @@
                        if (res.code == 200) {
                           let currentLevShuttle = []//当前楼层小车集合
                           res.data.forEach((item,idx) => {
                              if (item.point.z == that.currentLev) {
                                 currentLevShuttle.push(item)
                              if (item != null && item.point != undefined && item.point != null) {
                                 if (item.point.z == that.currentLev) {
                                    currentLevShuttle.push(item);
                                 }
                              }
                           })
                           that.currentLevShuttleList = currentLevShuttle
@@ -489,10 +490,12 @@
                              $('#system-toggle-checked').attr("checked", true);
                              $('#system-run-desc').html("系统运行中...");
                              that.systemStatus = true;
                              parent.systemRunning = true;
                           } else {
                              $('#system-toggle-checked').attr("checked", false);
                              $('#system-run-desc').html("系统已停止!");
                              that.systemStatus = false;
                              parent.systemRunning = false;
                           }
                        } else if (res.code === 403) {
                           parent.location.href = baseUrl + "/login";
@@ -520,10 +523,12 @@
                              $('#system-toggle-checked').attr("checked", true);
                              $('#system-run-desc').html("系统运行中...");
                              that.systemStatus = true;
                              parent.systemRunning = true;
                           } else {
                              $('#system-toggle-checked').attr("checked", false);
                              $('#system-run-desc').html("系统已停止!");
                              that.systemStatus = false;
                              parent.systemRunning = false;
                           }
                        } else if (res.code === 403) {
                           parent.location.href = baseUrl + "/login";
@@ -590,6 +595,7 @@
                        })
                     }
                  })
                  let data = []
                  let shuttleList = this.currentLevShuttleList;
                  for (var i = 0; i < shuttleList.length; i++) {
                     let shuttle = shuttleList[i]
@@ -598,12 +604,13 @@
                        for (var j = 0; j < moveAdvancePath.length; j++) {
                           let path = moveAdvancePath[j]
                           if (path.x-1 === x && path.y === y) {//路径符合
                              return shuttle.shuttleNo;//返回小车号
                              data.push(shuttle.shuttleNo)
                              continue;
                           }
                        }
                     }
                  }
                  return null;
                  return data;//返回小车号集合
               }
            }
         })