From 1449f79f342919f5b65003312b113a8dad229692 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index fdba045..82724c8 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -101,7 +101,7 @@
}
};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/edgTasks`;
+const socketUrl = `ws://${window.ipConfig.serverUrl}/api/cacheGlass/api/talk/edgTasks`;
const handleMessage = (data) => {
const formattedTasks = data.edgTasks[0].map(cageInfo => {
if (cageInfo && cageInfo.createTime) {
@@ -162,7 +162,7 @@
<template>
<div style="height: 500px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="display: flex;">
<!-- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{
$t('searchOrder.historicaltasks')
@@ -210,11 +210,11 @@
</el-table-column>
<el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{
+ <el-button type="text" plain @click="open(scope.row)">{{
$t('workOrder.breakage')
}}
</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{
+ <el-button type="text" plain @click="opena(scope.row)">{{
$t('workOrder.takeout')
}}
</el-button>
@@ -225,7 +225,7 @@
</el-card>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="95%">
+<el-dialog v-model="blindb" top="10vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0