From 18f6e14f2cb0e19fc8726e9821bc4db172a04d17 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 24 四月 2024 16:32:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index a504e69..0d44280 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -8,7 +8,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
-import unloadrequest from "@/utils/unloadrequest";
+import request from "@/utils/request";
const dialogFormVisiblea = ref(false)
@@ -29,7 +29,7 @@
if (typeof WebSocket === "undefined") {
console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
} else {
- let socketUrl = "ws://" + "localhost"+":88" + "/api/unLoadGlass/api/talk/" + viewname;
+ let socketUrl = "ws://" + "localhost"+":88" + "/api/talk/" + viewname;
if (socket != null) {
socket.close();
socket = null;
@@ -49,8 +49,6 @@
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
-
-
let obj = JSON.parse(msg.data);
@@ -99,10 +97,10 @@
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
try {
- const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId');
+ const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
- flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
+ flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_id }));
} else {
ElMessage.error(response.msg);
}
@@ -113,7 +111,7 @@
//纭
const handleConfirm = async () => {
try {
- const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', {
+ const response = await request.post('unLoadGlass/downWorkStation/updateFlowCardId', {
workstationId: workstationId.value,
flowCardId: flowCardId.value
});
@@ -147,7 +145,7 @@
//娓呴櫎鍐呭
const handleclear = async () => {
try {
- const response = await unloadrequest.post('/api/unLoadGlass/clear', {
+ const response = await request.post('unLoadGlass/downWorkStation/clear', {
workstationId: workstationId.value,
});
@@ -180,7 +178,7 @@
const fetchTableData = async () => {
try {
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- const response = await unloadrequest.get('/api/unLoadGlass/getone');
+ const response = await request.get('unLoadGlass/downWorkStation/getone');
// 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
@@ -202,7 +200,7 @@
initWebSocket();
onMounted(fetchTableData);
-setInterval(fetchTableData, 2000)
+// setInterval(fetchTableData, 2000)
const open = () => {
ElMessageBox.confirm(
@@ -390,7 +388,7 @@
}
#main-body{
margin-top: -20px;
- margin-left: 300px;
+ margin-left: 200px;
}
#main-bodya{
margin-top: -10px;
--
Gitblit v1.8.0