#
Junjie
6 天以前 1ae2f3acafa9d036dfe4f14f8dcc5c4b5815c46a
src/main/webapp/views/watch/console.html
@@ -32,7 +32,14 @@
                  </el-tab-pane>
               </el-tabs>
            </div>
            <div id="mapDataId" style="position: relative;" :style="{zoom: mapSettingParam.zoom / 100}">
            <div style="position: absolute;top: 15px;left: 50%;display: flex;">
               <div v-if="levList.length > 1" v-for="(lev,index) in levList" :key="index" style="margin-right: 10px;">
                  <el-button :type="currentLev == lev ? 'primary' : ''" @click="switchLev(lev)" size="mini">{{ lev }}F</el-button>
               </div>
            </div>
            <div id="mapDataId" style="position: relative;margin-top: 50px;" :style="{zoom: mapSettingParam.zoom / 100}">
               <table class="excel-table">
                  <tr v-for="(row,index) in map" :key="index">
                     <td
@@ -46,7 +53,9 @@
                           <div class="item" style="visibility: hidden">{{idx}}</div>
                        </div>
                        <div v-else-if="col.type == 'shelf'">
                           <div class="shelf">{{col.shelfIdx}}</div>
                           <div class="shelf">
                              <div class="shelf-loc-info" v-if="getShelfLocInfo(index, idx)">{{getShelfLocInfo(index, idx)}}</div>
                           </div>
                        </div>
                        <div v-else-if="col.type == 'devp'">
                           <div class="site" :style="{height: col.rowPx}" :id="'site-' + getStationId(col.value)" @click="openSite(getStationId(col.value))">{{getStationId(col.value)}}</div>
@@ -58,15 +67,11 @@
                        </div>
                        <div v-else-if="col.type == 'crn'">
                           <div class="crn-item" v-if="getDeviceNo(col.value) != -1" :style="{width: col.width}" :id="'crn-' + getDeviceNo(col.value)" @click="openCrn(getDeviceNo(col.value))">{{getDeviceNo(col.value)}}</div>
                           <div class="track-item" v-if="getTrackSiteNo(col.value) == -1"></div>
                           <div class="track-item" v-else :id="'crnTrackSiteNo-' + getTrackSiteNo(col.value)"></div>
                           <div class="track-item track-crn" v-if="getTrackSiteNo(col.value) == -1"></div>
                           <div class="track-item track-crn" v-else :id="'crnTrackSiteNo-' + getTrackSiteNo(col.value)"></div>
                        </div>
                     </td>
<!--                     <td>-->
<!--                        &lt;!&ndash; 显示行号 &ndash;&gt;-->
<!--                        <div class="item" style="background: none;color: #000;">#{{index+1}}</div>-->
<!--                     </td>-->
                  </tr>
               </table>
            </div>
@@ -83,10 +88,10 @@
            el: '#app',
            data: {
               map: [],//地图数据
               crnList: [], //堆垛机集合
               levList: [],
               currentLev: 1,
               systemStatus: true,//系统运行状态
               consoleInterval: null,//定时器存储变量
               crnInitPosition: [],
               rgvPosition: [],
               activateCard: 'crn',
               crnParam: {
@@ -100,7 +105,8 @@
               },
               rgvParam: {
                  rgvNo: 0
               }
               },
               locMastData: []//库位数据
            },
            created() {
               this.init()
@@ -112,6 +118,8 @@
               init() {
                  this.getMap()
                  this.getSystemRunningStatus() //获取系统运行状态
                  this.getLevList() //获取地图层级列表
                  this.getLocMastData() //获取库位数据
                  this.consoleInterval = setInterval(() => {
                     this.getCrnInfo() //获取堆垛机数据
@@ -119,13 +127,28 @@
                     this.getRgvInfo() //获取RGV数据
                  }, 1000)
               },
               getLevList() {
                  let that = this;
                  $.ajax({
                     url: baseUrl + "/basMap/getLevList",
                     headers: {
                        'token': localStorage.getItem('token')
                     },
                     method: "get",
                     success: (res) => {
                        let data = res.data;
                        that.levList = data;
                     }
                  })
               },
               //获取地图数据
               getMap() {
                  let that = this
                  let rowPx = 35;
                  let colPx = 35;
                  $.ajax({
                     url: baseUrl + "/basMap/lev/1/auth",
                     url: baseUrl + "/basMap/lev/" + this.currentLev + "/auth",
                     headers: {
                        'token': localStorage.getItem('token')
                     },
@@ -147,9 +170,14 @@
                              col.width = (col.cellWidth / 30) + "px";
                           })
                        })
                        this.map = mapData;
                        that.map = mapData;
                     }
                  })
               },
               switchLev(lev) {
                  this.currentLev = lev;
                  this.getMap()
                  this.getLocMastData() //切换层级时重新获取库位数据
               },
               openCrn(id) {
                  this.crnParam.crnNo = id;
@@ -200,49 +228,52 @@
                        if (res.code === 200) {
                           var crns = res.data;
                           if (that.crnInitPosition.length == 0) {
                              let position = []
                              for (var i = 0; i < crns.length; i++) {
                                 var crnEl = $("#crn-" + crns[i].crnId);
                                 position.push({
                                    id: crns[i].crnId,
                                    left: crnEl.offset().left + crnEl.width()
                                 })
                              }
                              that.crnInitPosition = position
                              return;
                           }
                           let crnList = []
                           for (var i = 0; i < crns.length; i++) {
                              var crnEl = $("#crn-" + crns[i].crnId);
                              crnEl.attr("class", "crn-item " + crns[i].crnStatus);
                              if (crns[i].bay < 0 || crns[i].bay === -2) {
                                 crns[i].bay = 1
                              if (crns[i].taskNo != null && crns[i].taskNo > 0) {
                                 crnEl.html(crns[i].crnId + "[" + crns[i].taskNo + "]");
                              } else {
                                 crnEl.html(crns[i].crnId);
                              }
                              let basePosition = 0;
                              that.crnInitPosition.forEach((item) => {
                                 if (item.id == crns[i].crnId) {
                                    basePosition = item.left
                                 }
                              })
                              var offSet = crns[i].offset;
                              let finalOffset = basePosition + offSet;
                              if (finalOffset < basePosition) {
                                 finalOffset = basePosition;
                              let bay = parseInt(crns[i].bay, 10);
                              if (isNaN(bay) || bay < 1 || bay === -2) {
                                 bay = 1;
                              }
                              crnEl.animate({left: finalOffset + 'px'}, 1000);
                              // 根据列值定位到当前行的目标单元格,避免随机偏移导致的误差
                              let targetCell = that.getCrnTargetCell(crnEl, bay);
                              if (!targetCell || targetCell.length === 0) {
                                 continue;
                              }
                              if (targetCell.offset() == undefined) {
                                 continue;
                              }
                              if (crnEl.offsetParent().offset() == undefined) {
                                 continue;
                              }
                              let parentLeft = crnEl.offsetParent().offset().left;
                              let cellLeft = targetCell.offset().left - parentLeft;
                              let offsetWithinCell = (targetCell.outerWidth() - crnEl.outerWidth()) / 2;
                              let zoomFactor = that.mapSettingParam.zoom ? (that.mapSettingParam.zoom / 100) : 1;
                              if (zoomFactor <= 0) { zoomFactor = 1; }
                              let finalOffset = (cellLeft + offsetWithinCell) / zoomFactor;
                              if(finalOffset < 0) {
                                 finalOffset = 0;
                              }
                              crnEl.animate({left: finalOffset + 'px'}, 500);
                              crnList.push({
                                 crnNo: crns[i].crnId,
                                 crnStatus: crns[i].crnStatus
                              })
                           }
                           that.crnList = crnList;
                        } else if (res.code === 403) {
                           parent.location.href = baseUrl + "/login";
                        } else {
@@ -266,6 +297,9 @@
                              let position = []
                              for (var i = 0; i < rgvs.length; i++) {
                                 var rgvEl = $("#rgv-" + rgvs[i].rgvNo);
                                 if(rgvEl.offset() == undefined) {
                                    continue;
                                 }
                                 position.push({
                                    id: rgvs[i].rgvNo,
                                    trackSiteNo: rgvs[i].trackSiteNo,
@@ -278,15 +312,23 @@
                           for (var i = 0; i < rgvs.length; i++) {
                              var rgvEl = $("#rgv-" + rgvs[i].rgvNo);
                              if (rgvs[i].rgvStatus == 'IDLE') {
                              if (rgvs[i].rgvStatus == 'idle') {
                                 rgvEl.attr("class", "rgv-item");
                              }else if (rgvs[i].rgvStatus == 'WORKING') {
                              }else if (rgvs[i].rgvStatus == 'working') {
                                 rgvEl.attr("class", "rgv-item machine-working");
                              }else if (rgvs[i].rgvStatus == 'waiting') {
                                 rgvEl.attr("class", "rgv-item machine-working");
                              }else {
                                 rgvEl.attr("class", "rgv-item machine-un-auto");
                              }
                              let trackSiteNo = rgvs[i].trackSiteNo;
                              let trackSiteEl = $("#rgvTrackSiteNo-" + trackSiteNo);
                              if(rgvEl.offsetParent().offset() == undefined) {
                                 continue;
                              }
                              let parentLeft = rgvEl.offsetParent().offset().left;
                              let targetPosition = trackSiteEl.parent().parent().offset().left - parentLeft;
                              let rgvPosition = rgvEl.position().left;
@@ -390,6 +432,38 @@
                     }
                  });
               },
               getCrnTargetCell(crnEl, bay) {
                  if (!crnEl || bay == null) {
                     return null;
                  }
                  let rowEl = crnEl.closest('tr');
                  if (!rowEl || rowEl.length === 0) {
                     return null;
                  }
                  let targetCell = null;
                  let colCounter = 0;
                  let startCount = false;
                  rowEl.find('td').each(function () {
                     // 以当前行中首次出现的track-item为起点进行列计数
                     const isTrackCrn = $(this).find('.track-crn').length > 0;
                     if (!startCount && !isTrackCrn) {
                        return;
                     }
                     let span = parseInt($(this).attr('colspan'), 10);
                     if (isNaN(span) || span < 1) {
                        span = 1;
                     }
                     if (!startCount && isTrackCrn) {
                        startCount = true;
                     }
                     colCounter += span;
                     if (targetCell == null && colCounter >= bay) {
                        targetCell = $(this);
                        return false;
                     }
                  });
                  return targetCell;
               },
               getDeviceNo(obj) {
                  if (this.isJson(obj)) {
                     let data = JSON.parse(obj)
@@ -433,6 +507,45 @@
               },
               handleCardClick(tab, event) {
               },
               //获取库位数据
               getLocMastData() {
                  let that = this;
                  $.ajax({
                     url: baseUrl + "/console/map/locList",
                     headers: {
                        'token': localStorage.getItem('token')
                     },
                     method: "get",
                     data: {},
                     success: (res) => {
                        if (res.code === 200) {
                           that.locMastData = res.data;
                        }
                     }
                  })
               },
               //根据地图坐标获取库位的排列信息
               getShelfLocInfo(rowIdx, colIdx) {
                  if (!this.locMastData || this.locMastData.length === 0) {
                     return '';
                  }
                  // 在locMastData中查找匹配的库位
                  // locType字段存储的是地图坐标信息
                  let locInfo = this.locMastData.find(loc => {
                     if (!loc.locType) return false;
                     // locType格式类似 "0-1-1" (mapX-mapY-lev)
                     let parts = loc.locType.split('-');
                     if (parts.length >= 2) {
                        return parseInt(parts[0]) === rowIdx && parseInt(parts[1]) === colIdx;
                     }
                     return false;
                  });
                  if (locInfo && locInfo.row1 && locInfo.bay1) {
                     return locInfo.row1 + '-' + locInfo.bay1;
                  }
                  return '';
               }
            }
         })