From 4e005e4936039fca16bfd1679942daa416a21986 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 20 十一月 2025 14:27:47 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console.html | 82 ++++++++++------------------------------
1 files changed, 21 insertions(+), 61 deletions(-)
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 69b1781..1108d29 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -24,7 +24,9 @@
<el-tab-pane label="杈撻�佺珯" name="devp">
<devp-card :param="devpParam"></devp-card>
</el-tab-pane>
- <el-tab-pane label="RGV" name="rgv">RGV</el-tab-pane>
+ <el-tab-pane label="RGV" name="rgv">
+ <watch-rgv-card :param="rgvParam"></watch-rgv-card>
+ </el-tab-pane>
<el-tab-pane label="鍦板浘閰嶇疆" name="mapSetting">
<map-setting-card :param="mapSettingParam"></map-setting-card>
</el-tab-pane>
@@ -75,6 +77,7 @@
<script src="../../components/WatchCrnCard.js"></script>
<script src="../../components/DevpCard.js"></script>
<script src="../../components/MapSettingCard.js"></script>
+ <script src="../../components/WatchRgvCard.js"></script>
<script>
var app = new Vue({
el: '#app',
@@ -94,6 +97,9 @@
},
devpParam: {
stationId: 0
+ },
+ rgvParam: {
+ rgvNo: 0
}
},
created() {
@@ -147,35 +153,15 @@
},
openCrn(id) {
this.crnParam.crnNo = id;
+ this.activateCard = 'crn';
},
openRgv(id) {
- this.rgvWindow = true; //鎵撳紑RGV淇℃伅寮圭獥
- $(".detailed").empty();
- $('.detailed').append(id + '鍙稲GV');
- $.ajax({
- url: baseUrl + "/console/rgv/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- rgvNo: id
- },
- method: 'post',
- success: function(res) {
- for (var val in res.data) {
- var find = $("#rgvWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
- }
- }
-
- })
+ this.rgvParam.rgvNo = id;
+ this.activateCard = 'rgv';
},
openSite(id) {
this.devpParam.stationId = id;
+ this.activateCard = 'devp';
},
getSiteInfo() {
//鑾峰彇杈撻�佺珯鐐规暟鎹�
@@ -184,7 +170,6 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
if (res.code === 200) {
var sites = res.data;
for (var i = 0; i < sites.length; i++){
@@ -280,9 +265,9 @@
if (that.rgvPosition.length == 0) {
let position = []
for (var i = 0; i < rgvs.length; i++) {
- var rgvEl = $("#rgv-" + rgvs[i].rgvId);
+ var rgvEl = $("#rgv-" + rgvs[i].rgvNo);
position.push({
- id: rgvs[i].rgvId,
+ id: rgvs[i].rgvNo,
trackSiteNo: rgvs[i].trackSiteNo,
initLeft: rgvEl.offset().left
})
@@ -292,7 +277,7 @@
}
for (var i = 0; i < rgvs.length; i++) {
- var rgvEl = $("#rgv-" + rgvs[i].rgvId);
+ var rgvEl = $("#rgv-" + rgvs[i].rgvNo);
if (rgvs[i].rgvStatus == 'IDLE') {
rgvEl.attr("class", "rgv-item");
}else if (rgvs[i].rgvStatus == 'WORKING') {
@@ -302,38 +287,13 @@
let trackSiteNo = rgvs[i].trackSiteNo;
let trackSiteEl = $("#rgvTrackSiteNo-" + trackSiteNo);
- let flag = false;
- that.rgvPosition.forEach((item) => {
- if (item.id == rgvs[i].rgvId) {
- if (item.trackSiteNo != trackSiteNo) {
- flag = true
- }
- }
- })
-
- if (flag) {
- let finalOffset = 0;
- let targetPosition = trackSiteEl.parent().parent().position().left;
- let rgvPosition = rgvEl.position().left;
- let calcResult = targetPosition - rgvPosition
- if (calcResult > 0) {
- finalOffset = targetPosition + trackSiteEl.width();
- }else {
- finalOffset = targetPosition;
- }
-
- rgvEl.animate({left: finalOffset + "px"}, 500);
-
- let position = []
- that.rgvPosition.forEach((item) => {
- if (item.id == rgvs[i].rgvId) {
- item.trackSiteNo = trackSiteNo
- }
- position.push(item)
- })
- that.rgvPosition = position
- }
-
+ let parentLeft = rgvEl.offsetParent().offset().left;
+ let targetPosition = trackSiteEl.parent().parent().offset().left - parentLeft;
+ let rgvPosition = rgvEl.position().left;
+ let zoomFactor = that.mapSettingParam.zoom ? (that.mapSettingParam.zoom / 100) : 1;
+ if (zoomFactor <= 0) { zoomFactor = 1; }
+ let finalOffset = targetPosition / zoomFactor;
+ rgvEl.animate({left: finalOffset + "px"}, 500);
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
--
Gitblit v1.9.1