From 1ae2f3acafa9d036dfe4f14f8dcc5c4b5815c46a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 01 十二月 2025 16:33:09 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console.html | 147 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 8dda836..37f7242 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -53,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>
@@ -65,8 +67,8 @@
</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>
@@ -90,7 +92,6 @@
currentLev: 1,
systemStatus: true,//绯荤粺杩愯鐘舵��
consoleInterval: null,//瀹氭椂鍣ㄥ瓨鍌ㄥ彉閲�
- crnInitPosition: [],
rgvPosition: [],
activateCard: 'crn',
crnParam: {
@@ -104,7 +105,8 @@
},
rgvParam: {
rgvNo: 0
- }
+ },
+ locMastData: []//搴撲綅鏁版嵁
},
created() {
this.init()
@@ -117,6 +119,7 @@
this.getMap()
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
this.getLevList() //鑾峰彇鍦板浘灞傜骇鍒楄〃
+ this.getLocMastData() //鑾峰彇搴撲綅鏁版嵁
this.consoleInterval = setInterval(() => {
this.getCrnInfo() //鑾峰彇鍫嗗灈鏈烘暟鎹�
@@ -174,6 +177,7 @@
switchLev(lev) {
this.currentLev = lev;
this.getMap()
+ this.getLocMastData() //鍒囨崲灞傜骇鏃堕噸鏂拌幏鍙栧簱浣嶆暟鎹�
},
openCrn(id) {
this.crnParam.crnNo = id;
@@ -224,44 +228,46 @@
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);
- if(crnEl.offset() == undefined) {
- continue;
- }
- 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,
@@ -426,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)
@@ -469,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 '';
+ }
+ // 鍦╨ocMastData涓煡鎵惧尮閰嶇殑搴撲綅
+ // 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 '';
}
}
})
--
Gitblit v1.9.1