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/components/WatchRgvCard.js         |   45 +-
 src/main/webapp/components/MapCanvas.js            |  250 ++++++++++---------
 src/main/webapp/views/watch/console.html           |  246 ++++----------------
 src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java |   59 ++++
 src/main/webapp/components/DevpCard.js             |   46 +--
 src/main/webapp/components/WatchCrnCard.js         |   46 +--
 6 files changed, 308 insertions(+), 384 deletions(-)

diff --git a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
index be15871..ba09508 100644
--- a/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
+++ b/src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java
@@ -1,6 +1,14 @@
 package com.zy.asrs.ws;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
+import com.core.common.SpringUtils;
+import com.zy.asrs.controller.CrnController;
+import com.zy.asrs.controller.RgvController;
+import com.zy.asrs.controller.BasMapController;
+import com.zy.asrs.controller.ConsoleController;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -64,7 +72,56 @@
      */
     @OnMessage
     public void onMessage(String message, Session session) throws IOException {
-//        log.info("鏀跺埌鏉ヨ嚜杩炴帴锛�" + sessionId + "鐨勪俊鎭�:" + message);
+        Object resObj = null;
+        String url = null;
+        try {
+            JSONObject req = JSON.parseObject(message);
+            url = req.getString("url");
+            if (url == null) {
+                return;
+            }
+            if (url.startsWith("/basMap/lev/") && url.endsWith("/auth")) {
+                String[] segs = url.split("/");
+                Integer lev = null;
+                for (int i = 0; i < segs.length; i++) {
+                    if ("lev".equals(segs[i]) && i + 1 < segs.length) {
+                        try {
+                            lev = Integer.parseInt(segs[i + 1]);
+                        } catch (Exception ignore) {}
+                        break;
+                    }
+                }
+                BasMapController basMapController = SpringUtils.getBean(BasMapController.class);
+                R r = basMapController.getByLev(lev);
+                resObj = r;
+            } else if ("/console/latest/data/station".equals(url)) {
+                ConsoleController consoleController = SpringUtils.getBean(ConsoleController.class);
+                resObj = consoleController.stationLatestData();
+            } else if ("/console/latest/data/crn".equals(url)) {
+                ConsoleController consoleController = SpringUtils.getBean(ConsoleController.class);
+                resObj = consoleController.crnLatestData();
+            } else if ("/console/latest/data/rgv".equals(url)) {
+                ConsoleController consoleController = SpringUtils.getBean(ConsoleController.class);
+                resObj = consoleController.rgvLatestData();
+            } else if ("/crn/table/crn/state".equals(url)) {
+                resObj = SpringUtils.getBean(CrnController.class).crnStateTable();
+            } else if ("/rgv/table/rgv/state".equals(url)) {
+                resObj = SpringUtils.getBean(RgvController.class).rgvStateTable();
+            }
+        } catch (Exception e) {
+            R err = R.error(e.getMessage());
+            JSONObject out = new JSONObject();
+            out.put("url", "error");
+            out.put("data", JSON.toJSONString(err));
+            this.sendMessage(out.toJSONString());
+            return;
+        }
+        if (resObj != null && url != null) {
+            JSONObject out = new JSONObject();
+            out.put("url", url);
+            out.put("data", JSON.toJSONString(resObj));
+            this.sendMessage(out.toJSONString());
+        }
     }
 
     /**
diff --git a/src/main/webapp/components/DevpCard.js b/src/main/webapp/components/DevpCard.js
index 5f91ad5..6d5d678 100644
--- a/src/main/webapp/components/DevpCard.js
+++ b/src/main/webapp/components/DevpCard.js
@@ -110,33 +110,31 @@
       this.currentPage = 1;
     },
     getDevpStateInfo() {
+      if (this.$root.sendWs) {
+        this.$root.sendWs(JSON.stringify({
+          "url": "/console/latest/data/station",
+          "data": {}
+        }));
+      }
+    },
+    setStationList(res) {
       let that = this;
-      $.ajax({
-        url: baseUrl + "/console/latest/data/station",
-        headers: {
-          token: localStorage.getItem("token"),
-        },
-        method: "post",
-        success: (res) => {
-          // 鍫嗗灈鏈轰俊鎭〃鑾峰彇
-          if (res.code == 200) {
-            let list = res.data;
+      if (res.code == 200) {
+        let list = res.data;
 
-            if (that.searchStationId == "") {
-              that.stationList = list;
-            } else {
-              let tmp = [];
-              list.forEach((item) => {
-                if (item.stationId == that.searchStationId) {
-                  tmp.push(item);
-                }
-              });
-              that.stationList = tmp;
-              that.currentPage = 1;
+        if (that.searchStationId == "") {
+          that.stationList = list;
+        } else {
+          let tmp = [];
+          list.forEach((item) => {
+            if (item.stationId == that.searchStationId) {
+              tmp.push(item);
             }
-          }
-        },
-      });
+          });
+          that.stationList = tmp;
+          that.currentPage = 1;
+        }
+      }
     },
     openControl() {
       this.showControl = !this.showControl;
diff --git a/src/main/webapp/components/MapCanvas.js b/src/main/webapp/components/MapCanvas.js
index 0b3705a..63b695b 100644
--- a/src/main/webapp/components/MapCanvas.js
+++ b/src/main/webapp/components/MapCanvas.js
@@ -13,6 +13,7 @@
       map: [],
       currentLev: 1,
       mapFps: 0,
+      ws: null,
       pixiApp: null,
       pixiStageList: [],
       pixiStaMap: new Map(),
@@ -43,7 +44,16 @@
   mounted() {
     this.currentLev = this.lev || 1;
     this.createMap();
-    this.getMap(this.currentLev);
+    this.ws = new WebSocket("ws://" + window.location.host + baseUrl + "/console/websocket");
+    this.ws.onopen = this.webSocketOnOpen;
+    this.ws.onerror = this.webSocketOnError;
+    this.ws.onmessage = this.webSocketOnMessage;
+    this.ws.onclose = this.webSocketClose;
+    
+    setTimeout(() => {
+      this.getMap(this.currentLev);
+    }, 1000);
+
     this.timer = setInterval(() => {
       this.getCrnInfo();
       this.getSiteInfo();
@@ -187,16 +197,7 @@
       }
     },
     getMap() {
-      $.ajax({
-        url: baseUrl + "/basMap/lev/" + this.currentLev + "/auth",
-        headers: { 'token': localStorage.getItem('token') },
-        method: 'get',
-        success: (res) => {
-          const data = res.data;
-          const mapData = JSON.parse(data);
-          this.createMapData(mapData);
-        }
-      })
+      this.sendWs(JSON.stringify({ url: "/basMap/lev/" + this.currentLev + "/auth", data: {} }));
     },
     changeFloor(lev) {
       this.currentLev = lev;
@@ -488,123 +489,134 @@
     },
     getCrnInfo() {
       if (this.isSwitchingFloor) { return; }
-      $.ajax({
-        url: baseUrl + "/console/latest/data/crn",
-        headers: { 'token': localStorage.getItem('token') },
-        method: 'POST',
-        success: (res) => {
-          if (res.code === 200) {
-            var crns = res.data;
-            for (var i = 0; i < crns.length; i++) {
-              const id = parseInt(crns[i].crnId);
-              const sprite = this.pixiCrnMap.get(id);
-              if (!sprite) { continue; }
-              const taskNo = crns[i].taskNo;
-              if (taskNo != null && taskNo > 0) { sprite.textObj.text = id + "(" + taskNo + ")"; } else { sprite.textObj.text = String(id); }
-              const status = crns[i].crnStatus;
-              const statusColor = this.getCrnStatusColor(status);
-              this.updateCrnTextureColor(sprite, statusColor);
-              let bay = parseInt(crns[i].bay, 10);
-              if (isNaN(bay) || bay < 1 || bay === -2) { bay = 1; }
-              let rowIndex = (sprite.rowIndex != null) ? sprite.rowIndex : -1;
-              if (rowIndex === -1) {
-                for (let r = 0; r < this.map.length; r++) {
-                  if (this.map[r].length > 0) {
-                    const rowY = this.map[r][0].posY;
-                    if (Math.abs(rowY - sprite.y) < 0.5) { rowIndex = r; break; }
-                  }
-                }
-                if (rowIndex === -1) { rowIndex = 0; }
-              }
-              let targetCell = null;
-              let crnCount = 0;
-              for (let c = 0; c < this.map[rowIndex].length; c++) {
-                const cell = this.map[rowIndex][c];
-                if (cell && cell.type === 'crn') { crnCount++; if (crnCount === bay) { targetCell = cell; break; } }
-              }
-              if (!targetCell) {
-                for (let c = this.map[rowIndex].length - 1; c >= 0; c--) {
-                  const cell = this.map[rowIndex][c];
-                  if (cell && cell.type === 'crn') { targetCell = cell; break; }
-                }
-              }
-              if (!targetCell) { continue; }
-              const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
-              const dx = Math.abs(targetX - sprite.x);
-              if (dx < 1) {
-              } else if (dx < 5) {
-                sprite.x = targetX;
-              } else if (window.gsap) {
-                window.gsap.killTweensOf(sprite);
-                window.gsap.to(sprite, { x: targetX, duration: 0.3, ease: "power1.inOut" });
-              } else {
-                sprite.x = targetX;
-              }
-            }
-          }
-          this.scheduleAdjustLabels();
-        }
-      });
+      this.sendWs(JSON.stringify({ url: "/console/latest/data/crn", data: {} }));
     },
     getSiteInfo() {
       if (this.isSwitchingFloor) { return; }
-      $.ajax({
-        url: baseUrl + "/console/latest/data/station",
-        headers: { 'token': localStorage.getItem('token') },
-        method: 'POST',
-        success: (res) => { this.setSiteInfo(res); }
-      });
+      this.sendWs(JSON.stringify({ url: "/console/latest/data/station", data: {} }));
     },
     getRgvInfo() {
       if (this.isSwitchingFloor) { return; }
-      $.ajax({
-        url: baseUrl + "/console/latest/data/rgv",
-        headers: { 'token': localStorage.getItem('token') },
-        method: 'POST',
-        success: (res) => {
-          if (res.code === 200) {
-            const rgvs = res.data;
-            for (let i = 0; i < rgvs.length; i++) {
-              const id = parseInt(rgvs[i].rgvNo, 10);
-              const sprite = this.pixiRgvMap.get(id);
-              if (!sprite) { continue; }
-              const taskNo = rgvs[i].taskNo;
-              if (sprite.textObj) { if (taskNo != null && taskNo > 0) { sprite.textObj.text = id + "(" + taskNo + ")"; } else { sprite.textObj.text = String(id); } }
-              const statusColor = this.getRgvStatusColor(rgvs[i].rgvStatus);
-              this.updateRgvTextureColor(sprite, statusColor);
-              let trackSiteNo = parseInt(rgvs[i].trackSiteNo, 10);
-              if (!trackSiteNo || trackSiteNo <= 0) { continue; }
-              let rowIndex = (sprite.rowIndex != null) ? sprite.rowIndex : 0;
-              let targetCell = null;
-              for (let c = 0; c < this.map[rowIndex].length; c++) {
-                const cell = this.map[rowIndex][c];
-                if (!cell || cell.type !== 'rgv') { continue; }
-                const ts = this.getTrackSiteNo(cell.value);
-                if (ts === trackSiteNo) { targetCell = cell; break; }
-              }
-              if (!targetCell) {
-                for (let c = this.map[rowIndex].length - 1; c >= 0; c--) {
-                  const cell = this.map[rowIndex][c];
-                  if (cell && cell.type === 'rgv') { targetCell = cell; break; }
-                }
-              }
-              if (!targetCell) { continue; }
-              const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
-              const dx = Math.abs(targetX - sprite.x);
-              if (dx < 1) {
-              } else if (dx < 5) {
-                sprite.x = targetX;
-              } else if (window.gsap) {
-                window.gsap.killTweensOf(sprite);
-                window.gsap.to(sprite, { x: targetX, duration: 0.3, ease: "power1.inOut" });
-              } else {
-                sprite.x = targetX;
-              }
+      this.sendWs(JSON.stringify({ url: "/console/latest/data/rgv", data: {} }));
+    },
+    setCrnInfo(res) {
+      let crns = Array.isArray(res) ? res : (res && res.code === 200 ? res.data : null);
+      if (!crns) { return; }
+      for (var i = 0; i < crns.length; i++) {
+        const id = parseInt(crns[i].crnId);
+        const sprite = this.pixiCrnMap.get(id);
+        if (!sprite) { continue; }
+        const taskNo = crns[i].taskNo;
+        if (taskNo != null && taskNo > 0) { sprite.textObj.text = id + "(" + taskNo + ")"; } else { sprite.textObj.text = String(id); }
+        const status = crns[i].crnStatus;
+        const statusColor = this.getCrnStatusColor(status);
+        this.updateCrnTextureColor(sprite, statusColor);
+        let bay = parseInt(crns[i].bay, 10);
+        if (isNaN(bay) || bay < 1 || bay === -2) { bay = 1; }
+        let rowIndex = (sprite.rowIndex != null) ? sprite.rowIndex : -1;
+        if (rowIndex === -1) {
+          for (let r = 0; r < this.map.length; r++) {
+            if (this.map[r].length > 0) {
+              const rowY = this.map[r][0].posY;
+              if (Math.abs(rowY - sprite.y) < 0.5) { rowIndex = r; break; }
             }
           }
-          this.scheduleAdjustLabels();
+          if (rowIndex === -1) { rowIndex = 0; }
         }
-      });
+        let targetCell = null;
+        let crnCount = 0;
+        for (let c = 0; c < this.map[rowIndex].length; c++) {
+          const cell = this.map[rowIndex][c];
+          if (cell && cell.type === 'crn') { crnCount++; if (crnCount === bay) { targetCell = cell; break; } }
+        }
+        if (!targetCell) {
+          for (let c = this.map[rowIndex].length - 1; c >= 0; c--) {
+            const cell = this.map[rowIndex][c];
+            if (cell && cell.type === 'crn') { targetCell = cell; break; }
+          }
+        }
+        if (!targetCell) { continue; }
+        const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
+        const dx = Math.abs(targetX - sprite.x);
+        if (dx < 1) {
+        } else if (dx < 5) {
+          sprite.x = targetX;
+        } else if (window.gsap) {
+          window.gsap.killTweensOf(sprite);
+          window.gsap.to(sprite, { x: targetX, duration: 0.3, ease: "power1.inOut" });
+        } else {
+          sprite.x = targetX;
+        }
+      }
+      this.scheduleAdjustLabels();
+    },
+    setRgvInfo(res) {
+      let rgvs = Array.isArray(res) ? res : (res && res.code === 200 ? res.data : null);
+      if (!rgvs) { return; }
+      for (let i = 0; i < rgvs.length; i++) {
+        const id = parseInt(rgvs[i].rgvNo, 10);
+        const sprite = this.pixiRgvMap.get(id);
+        if (!sprite) { continue; }
+        const taskNo = rgvs[i].taskNo;
+        if (sprite.textObj) { if (taskNo != null && taskNo > 0) { sprite.textObj.text = id + "(" + taskNo + ")"; } else { sprite.textObj.text = String(id); } }
+        const statusColor = this.getRgvStatusColor(rgvs[i].rgvStatus);
+        this.updateRgvTextureColor(sprite, statusColor);
+        let trackSiteNo = parseInt(rgvs[i].trackSiteNo, 10);
+        if (!trackSiteNo || trackSiteNo <= 0) { continue; }
+        let rowIndex = (sprite.rowIndex != null) ? sprite.rowIndex : 0;
+        let targetCell = null;
+        for (let c = 0; c < this.map[rowIndex].length; c++) {
+          const cell = this.map[rowIndex][c];
+          if (!cell || cell.type !== 'rgv') { continue; }
+          const ts = this.getTrackSiteNo(cell.value);
+          if (ts === trackSiteNo) { targetCell = cell; break; }
+        }
+        if (!targetCell) {
+          for (let c = this.map[rowIndex].length - 1; c >= 0; c--) {
+            const cell = this.map[rowIndex][c];
+            if (cell && cell.type === 'rgv') { targetCell = cell; break; }
+          }
+        }
+        if (!targetCell) { continue; }
+        const targetX = targetCell.posX + (targetCell.width - sprite.width) / 2;
+        const dx = Math.abs(targetX - sprite.x);
+        if (dx < 1) {
+        } else if (dx < 5) {
+          sprite.x = targetX;
+        } else if (window.gsap) {
+          window.gsap.killTweensOf(sprite);
+          window.gsap.to(sprite, { x: targetX, duration: 0.3, ease: "power1.inOut" });
+        } else {
+          sprite.x = targetX;
+        }
+      }
+      this.scheduleAdjustLabels();
+    },
+    setMap(res) {
+      this.createMapData(JSON.parse(res.data));
+    },
+    webSocketOnOpen(e) {
+    },
+    webSocketOnError(e) {
+    },
+    webSocketOnMessage(e) {
+      const result = JSON.parse(e.data);
+      if (result.url === "/console/latest/data/station" || result.url === "/console/latest/data/site") {
+        this.setSiteInfo(JSON.parse(result.data));
+      } else if (result.url === "/console/latest/data/crn") {
+        this.setCrnInfo(JSON.parse(result.data));
+      } else if (result.url === "/console/latest/data/rgv") {
+        this.setRgvInfo(JSON.parse(result.data));
+      } else if (typeof result.url === "string" && result.url.indexOf("/basMap/lev/") === 0) {
+        this.setMap(JSON.parse(result.data));
+      }
+    },
+    webSocketClose(e) {
+    },
+    sendWs(message) {
+      if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+        this.ws.send(message);
+      }
     },
     createShelfSprite(width, height) {
       let idx = width + "-" + height;
diff --git a/src/main/webapp/components/WatchCrnCard.js b/src/main/webapp/components/WatchCrnCard.js
index 432f9ff..e460b0a 100644
--- a/src/main/webapp/components/WatchCrnCard.js
+++ b/src/main/webapp/components/WatchCrnCard.js
@@ -123,33 +123,31 @@
       this.currentPage = 1;
     },
     getCrnStateInfo() {
+      if (this.$root.sendWs) {
+        this.$root.sendWs(JSON.stringify({
+          "url": "/crn/table/crn/state",
+          "data": {}
+        }));
+      }
+    },
+    setCrnList(res) {
       let that = this;
-      $.ajax({
-        url: baseUrl + "/crn/table/crn/state",
-        headers: {
-          token: localStorage.getItem("token"),
-        },
-        method: "post",
-        success: (res) => {
-          // 鍫嗗灈鏈轰俊鎭〃鑾峰彇
-          if (res.code == 200) {
-            let list = res.data;
+      if (res.code == 200) {
+        let list = res.data;
 
-            if (that.searchCrnNo == "") {
-              that.crnList = list;
-            } else {
-              let tmp = [];
-              list.forEach((item) => {
-                if (item.crnNo == that.searchCrnNo) {
-                  tmp.push(item);
-                }
-              });
-              that.crnList = tmp;
-              that.currentPage = 1;
+        if (that.searchCrnNo == "") {
+          that.crnList = list;
+        } else {
+          let tmp = [];
+          list.forEach((item) => {
+            if (item.crnNo == that.searchCrnNo) {
+              tmp.push(item);
             }
-          }
-        },
-      });
+          });
+          that.crnList = tmp;
+          that.currentPage = 1;
+        }
+      }
     },
     openControl() {
       this.showControl = !this.showControl;
diff --git a/src/main/webapp/components/WatchRgvCard.js b/src/main/webapp/components/WatchRgvCard.js
index 7adaf36..881b896 100644
--- a/src/main/webapp/components/WatchRgvCard.js
+++ b/src/main/webapp/components/WatchRgvCard.js
@@ -112,31 +112,30 @@
       this.currentPage = 1;
     },
     getRgvStateInfo() {
+      if (this.$root.sendWs) {
+        this.$root.sendWs(JSON.stringify({
+          "url": "/rgv/table/rgv/state",
+          "data": {}
+        }));
+      }
+    },
+    setRgvList(res) {
       let that = this;
-      $.ajax({
-        url: baseUrl + "/rgv/table/rgv/state",
-        headers: {
-          token: localStorage.getItem("token"),
-        },
-        method: "post",
-        success: (res) => {
-          if (res.code == 200) {
-            let list = res.data || [];
-            if (that.searchRgvNo == "") {
-              that.rgvList = list;
-            } else {
-              let tmp = [];
-              list.forEach((item) => {
-                if (item.rgvNo == that.searchRgvNo) {
-                  tmp.push(item);
-                }
-              });
-              that.rgvList = tmp;
-              that.currentPage = 1;
+      if (res.code == 200) {
+        let list = res.data || [];
+        if (that.searchRgvNo == "") {
+          that.rgvList = list;
+        } else {
+          let tmp = [];
+          list.forEach((item) => {
+            if (item.rgvNo == that.searchRgvNo) {
+              tmp.push(item);
             }
-          }
-        },
-      });
+          });
+          that.rgvList = tmp;
+          that.currentPage = 1;
+        }
+      }
     },
     openControl() {
       this.showControl = !this.showControl;
diff --git a/src/main/webapp/views/watch/console.html b/src/main/webapp/views/watch/console.html
index 54ba4b6..4b8d85e 100644
--- a/src/main/webapp/views/watch/console.html
+++ b/src/main/webapp/views/watch/console.html
@@ -21,13 +21,13 @@
 				<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">
-							<watch-rgv-card :param="rgvParam"></watch-rgv-card>
+							<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>
@@ -52,6 +52,7 @@
 		<script src="../../components/WatchRgvCard.js"></script>
 		<script src="../../components/MapCanvas.js"></script>
 		<script>
+			let ws;
 			var app = new Vue({
 				el: '#app',
 				data: {
@@ -85,13 +86,59 @@
 
 				},
 				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.getLevList() //鑾峰彇鍦板浘灞傜骇鍒楄〃
 						this.getLocMastData() //鑾峰彇搴撲綅鏁版嵁
 					},
-					
 					getLevList() {
 						let that = this;
 						$.ajax({
@@ -103,39 +150,6 @@
 							success: (res) => {
 								let data = res.data;
 								that.levList = data;
-							}
-						})
-					},
-					//鑾峰彇鍦板浘鏁版嵁
-					getMap() {
-						let that = this
-						let rowPx = 35;
-						let colPx = 35;
-
-						$.ajax({
-							url: baseUrl + "/basMap/lev/" + this.currentLev + "/auth",
-							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";
-									})
-								})
-								that.map = mapData;
 							}
 						})
 					},
@@ -155,160 +169,6 @@
 					openSite(id) {
 						this.devpParam.stationId = id;
 						this.activateCard = 'devp';
-					},
-					getSiteInfo() {
-						//鑾峰彇杈撻�佺珯鐐规暟鎹�
-						$.ajax({
-							url: baseUrl + "/console/latest/data/station",
-							headers: {'token': localStorage.getItem('token')},
-							method: 'POST',
-							success: function (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;
-
-									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].taskNo != null && crns[i].taskNo > 0) {
-											crnEl.html(crns[i].crnId + "[" + crns[i].taskNo + "]");
-										} else {
-											crnEl.html(crns[i].crnId);
-										}
-
-										let bay = parseInt(crns[i].bay, 10);
-										if (isNaN(bay) || bay < 1 || bay === -2) {
-											bay = 1;
-										}
-
-										// 鏍规嵁鍒楀�煎畾浣嶅埌褰撳墠琛岀殑鐩爣鍗曞厓鏍硷紝閬垮厤闅忔満鍋忕Щ瀵艰嚧鐨勮宸�
-										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
-										})
-									}
-								} 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].rgvNo);
-											if(rgvEl.offset() == undefined) {
-												continue;
-											}
-											position.push({
-												id: rgvs[i].rgvNo,
-												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].rgvNo);
-										if (rgvs[i].rgvStatus == 'idle') {
-											rgvEl.attr("class", "rgv-item");
-										}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;
-										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";
-								} else {
-									console.log(res.msg);
-								}
-							}
-						});
 					},
 					systemSwitch() {
 						// 绯荤粺寮�鍏�
@@ -511,7 +371,7 @@
 							return locInfo.row1 + '-' + locInfo.bay1;
 						}
 						return '';
-					}
+					},
 				}
 			})
 			</script>

--
Gitblit v1.9.1