From 32004d6bb7db528c151cca5bd78c4e557171a9ee Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 23 十二月 2025 14:09:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/watch/console.html | 462 ++++++++++++++++++++++-----------------------------------
1 files changed, 180 insertions(+), 282 deletions(-)
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 69b1781..4b8d85e 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -1,72 +1,46 @@
<!DOCTYPE html>
<html lang="en">
- <head>
- <meta charset="UTF-8">
- <title>WCS鎺у埗涓績</title>
- <link rel="stylesheet" href="../../static/css/animate.min.css">
- <link rel="stylesheet" href="../../static/vue/element/element.css">
- <link rel="stylesheet" href="../../static/css/watch/console_vue.css">
- <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../../static/layui/layui.js"></script>
- <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
- <script type="text/javascript" src="../../static/js/common.js"></script>
- <script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
- <script type="text/javascript" src="../../static/vue/element/element.js"></script>
- </head>
+ <head>
+ <meta charset="UTF-8">
+ <title>WCS鎺у埗涓績</title>
+ <link rel="stylesheet" href="../../static/css/animate.min.css">
+ <link rel="stylesheet" href="../../static/vue/element/element.css">
+ <link rel="stylesheet" href="../../static/css/watch/console_vue.css">
+ <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/layui/layui.js"></script>
+ <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+ <script type="text/javascript" src="../../static/js/common.js"></script>
+ <script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
+ <script type="text/javascript" src="../../static/vue/element/element.js"></script>
+ <script src="../../static/js/gsap.min.js"></script>
+ <script src="../../static/js/pixi-legacy.min.js"></script>
+ </head>
<body>
<div id="app">
- <div style="display: flex;margin-top: 30px;margin-left: 20px;">
- <div style="width: 20%;height: 60vh;margin-right: 20px;">
+ <div style="display: flex;margin-left: 20px;">
+ <div style="width: 20%;height: 60vh;margin-right: 20px;margin-top: 30px;">
<el-tabs type="border-card" v-model="activateCard" @tab-click="handleCardClick">
<el-tab-pane label="鍫嗗灈鏈�" name="crn">
- <watch-crn-card :param="crnParam"></watch-crn-card>
+ <watch-crn-card ref="watchCrnCard" :param="crnParam"></watch-crn-card>
</el-tab-pane>
<el-tab-pane label="杈撻�佺珯" name="devp">
- <devp-card :param="devpParam"></devp-card>
+ <devp-card ref="devpCard" :param="devpParam"></devp-card>
</el-tab-pane>
- <el-tab-pane label="RGV" name="rgv">RGV</el-tab-pane>
- <el-tab-pane label="鍦板浘閰嶇疆" name="mapSetting">
+ <el-tab-pane label="RGV" name="rgv">
+ <watch-rgv-card ref="watchRgvCard" :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>
+ </el-tab-pane> -->
</el-tabs>
</div>
- <div id="mapDataId" style="position: relative;" :style="{zoom: mapSettingParam.zoom / 100}">
- <table class="excel-table">
- <tr v-for="(row,index) in map" :key="index">
- <td
- v-for="(col,idx) in row" :key="idx"
- :rowspan="col.rowSpan"
- :colspan="col.colSpan"
- :style="{width: col.width}"
- v-if="col.type != 'merge'"
- >
- <div v-if="col.type == 'none'">
- <div class="item" style="visibility: hidden">{{idx}}</div>
- </div>
- <div v-else-if="col.type == 'shelf'">
- <div class="shelf">{{col.shelfIdx}}</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>
- </div>
- <div v-else-if="col.type == 'rgv'" style="position: relative;">
- <div class="rgv-item" v-if="getDeviceNo(col.value) != -1" :style="{width: col.width}" :id="'rgv-' + getDeviceNo(col.value)" @click="openRgv(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="'rgvTrackSiteNo-' + getTrackSiteNo(col.value)"></div>
- </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>
- </td>
-<!-- <td>-->
-<!-- <!– 鏄剧ず琛屽彿 –>-->
-<!-- <div class="item" style="background: none;color: #000;">#{{index+1}}</div>-->
-<!-- </td>-->
- </tr>
- </table>
+ <map-canvas :lev="currentLev" :crn-param="crnParam" :rgv-param="rgvParam" :devp-param="devpParam" @crn-click="openCrn" @station-click="openSite" style="width: 80%; height: 100vh;"></map-canvas>
+
+ <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>
@@ -75,15 +49,18 @@
<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 src="../../components/MapCanvas.js"></script>
<script>
+ let ws;
var app = new Vue({
el: '#app',
data: {
map: [],//鍦板浘鏁版嵁
- crnList: [], //鍫嗗灈鏈洪泦鍚�
+ levList: [],
+ currentLev: 1,
systemStatus: true,//绯荤粺杩愯鐘舵��
consoleInterval: null,//瀹氭椂鍣ㄥ瓨鍌ㄥ彉閲�
- crnInitPosition: [],
rgvPosition: [],
activateCard: 'crn',
crnParam: {
@@ -94,254 +71,104 @@
},
devpParam: {
stationId: 0
- }
+ },
+ rgvParam: {
+ rgvNo: 0
+ },
+ locMastData: []//搴撲綅鏁版嵁
},
created() {
this.init()
+ },
+ mounted() {
},
watch: {
},
methods: {
+ sendWs(data) {
+ if (ws && ws.readyState === WebSocket.OPEN) {
+ ws.send(data);
+ }
+ },
+ webSocketOnOpen() {
+ console.log("WebSocket杩炴帴鎴愬姛");
+ },
+ webSocketOnError() {
+ console.log("WebSocket杩炴帴鍙戠敓閿欒");
+ },
+ webSocketClose() {
+ console.log("WebSocket杩炴帴鍏抽棴");
+ },
+ webSocketOnMessage(e) {
+ const result = JSON.parse(e.data);
+ if (result.url == "/crn/table/crn/state") {
+ if(this.$refs.watchCrnCard) {
+ this.$refs.watchCrnCard.setCrnList(JSON.parse(result.data));
+ }
+ } else if (result.url == "/console/latest/data/station") {
+ if(this.$refs.devpCard) {
+ this.$refs.devpCard.setStationList(JSON.parse(result.data));
+ }
+ } else if (result.url == "/rgv/table/rgv/state") {
+ if(this.$refs.watchRgvCard) {
+ this.$refs.watchRgvCard.setRgvList(JSON.parse(result.data));
+ }
+ } else if (result.url == "/basMap/lev/" + this.currentLev + "/auth") {
+ // 鍦板浘鏁版嵁
+ let res = JSON.parse(result.data);
+ if (res.code === 200) {
+ this.map = res.data;
+ }
+ }
+ },
+ getMap() {
+ this.sendWs(JSON.stringify({
+ "url": "/basMap/lev/" + this.currentLev + "/auth",
+ "data": {}
+ }))
+ },
init() {
- this.getMap()
+ ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
+ ws.onopen = this.webSocketOnOpen;
+ ws.onerror = this.webSocketOnError;
+ ws.onmessage = this.webSocketOnMessage;
+ ws.onclose = this.webSocketClose;
+
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
-
- this.consoleInterval = setInterval(() => {
- this.getCrnInfo() //鑾峰彇鍫嗗灈鏈烘暟鎹�
- this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
- this.getRgvInfo() //鑾峰彇RGV鏁版嵁
- }, 1000)
+ this.getLevList() //鑾峰彇鍦板浘灞傜骇鍒楄〃
+ this.getLocMastData() //鑾峰彇搴撲綅鏁版嵁
},
- //鑾峰彇鍦板浘鏁版嵁
- getMap() {
- let rowPx = 35;
- let colPx = 35;
-
+ getLevList() {
+ let that = this;
$.ajax({
- url: baseUrl + "/basMap/lev/1/auth",
+ url: baseUrl + "/basMap/getLevList",
headers: {
'token': localStorage.getItem('token')
},
method: "get",
success: (res) => {
let data = res.data;
- let mapData = JSON.parse(data)
- mapData.forEach((row) => {
- let shelfIdx = 1;
- row.forEach((col) => {
- if (col.type == 'shelf') {
- col.shelfIdx = shelfIdx;
- shelfIdx++;
- }
-
- col.rowPx = (col.rowSpan * rowPx) + "px";
- col.colPx = (col.colSpan * colPx) + "px";
-
- col.width = (col.cellWidth / 30) + "px";
- })
- })
- this.map = mapData;
+ that.levList = data;
}
})
+ },
+ switchLev(lev) {
+ this.currentLev = lev;
+ this.getMap()
+ this.getLocMastData()
},
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;
- },
- getSiteInfo() {
- //鑾峰彇杈撻�佺珯鐐规暟鎹�
- $.ajax({
- url: baseUrl + "/console/latest/data/station",
- 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++){
- var siteEl = $("#site-"+sites[i].stationId);
- siteEl.attr("class", "site " + sites[i].stationStatus);
- if (sites[i].taskNo != null && sites[i].taskNo>0) {
- siteEl.html(sites[i].stationId + "[" + sites[i].taskNo + "]");
- } else {
- siteEl.html(sites[i].stationId);
- }
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- },
- getCrnInfo() {
- let that = this
- //鑾峰彇鍫嗗灈鏈烘暟鎹�
- $.ajax({
- url: baseUrl + "/console/latest/data/crn",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- 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 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;
- }
- crnEl.animate({left: finalOffset + 'px'}, 1000);
-
- crnList.push({
- crnNo: crns[i].crnId,
- crnStatus: crns[i].crnStatus
- })
- }
- that.crnList = crnList;
-
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- },
- getRgvInfo() {
- let that = this
- //鑾峰彇RGV鏁版嵁
- $.ajax({
- url: baseUrl + "/console/latest/data/rgv",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var rgvs = res.data;
-
- if (that.rgvPosition.length == 0) {
- let position = []
- for (var i = 0; i < rgvs.length; i++) {
- var rgvEl = $("#rgv-" + rgvs[i].rgvId);
- position.push({
- id: rgvs[i].rgvId,
- trackSiteNo: rgvs[i].trackSiteNo,
- initLeft: rgvEl.offset().left
- })
- }
- that.rgvPosition = position
- return;
- }
-
- for (var i = 0; i < rgvs.length; i++) {
- var rgvEl = $("#rgv-" + rgvs[i].rgvId);
- if (rgvs[i].rgvStatus == 'IDLE') {
- rgvEl.attr("class", "rgv-item");
- }else if (rgvs[i].rgvStatus == 'WORKING') {
- rgvEl.attr("class", "rgv-item machine-working");
- }
-
- 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
- }
-
- }
- } else if (res.code === 403) {
- parent.location.href = baseUrl + "/login";
- } else {
- console.log(res.msg);
- }
- }
- });
+ this.activateCard = 'devp';
},
systemSwitch() {
// 绯荤粺寮�鍏�
@@ -430,6 +257,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)
@@ -473,9 +332,48 @@
},
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 '';
+ },
}
})
- </script>
- </body>
-</html>
+ </script>
+ </body>
+ </html>
--
Gitblit v1.9.1