From 7777ea1d5fc8b7dab64944f0413901d034cf1347 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 09:31:28 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console.html | 147 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 105 insertions(+), 42 deletions(-)
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 1108d29..976ded0 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/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
@@ -58,15 +65,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>-->
-<!-- <!– 鏄剧ず琛屽彿 –>-->
-<!-- <div class="item" style="background: none;color: #000;">#{{index+1}}</div>-->
-<!-- </td>-->
</tr>
</table>
</div>
@@ -83,10 +86,10 @@
el: '#app',
data: {
map: [],//鍦板浘鏁版嵁
- crnList: [], //鍫嗗灈鏈洪泦鍚�
+ levList: [],
+ currentLev: 1,
systemStatus: true,//绯荤粺杩愯鐘舵��
consoleInterval: null,//瀹氭椂鍣ㄥ瓨鍌ㄥ彉閲�
- crnInitPosition: [],
rgvPosition: [],
activateCard: 'crn',
crnParam: {
@@ -112,6 +115,7 @@
init() {
this.getMap()
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
+ this.getLevList() //鑾峰彇鍦板浘灞傜骇鍒楄〃
this.consoleInterval = setInterval(() => {
this.getCrnInfo() //鑾峰彇鍫嗗灈鏈烘暟鎹�
@@ -119,13 +123,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 +166,13 @@
col.width = (col.cellWidth / 30) + "px";
})
})
- this.map = mapData;
+ that.map = mapData;
}
})
+ },
+ switchLev(lev) {
+ this.currentLev = lev;
+ this.getMap()
},
openCrn(id) {
this.crnParam.crnNo = id;
@@ -200,49 +223,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);
- 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
+ let bay = parseInt(crns[i].bay, 10);
+ if (isNaN(bay) || bay < 1 || bay === -2) {
+ bay = 1;
}
- 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 targetCell = that.getCrnTargetCell(crnEl, bay);
+ if (!targetCell || targetCell.length === 0) {
+ continue;
}
- crnEl.animate({left: finalOffset + 'px'}, 1000);
+ 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 +286,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 +301,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 +421,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)
--
Gitblit v1.9.1