From da30bfc3795305f0bbd400d196bcf4c30612c37f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 10 十二月 2025 17:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/StockBasicData/stockBasicData.vue | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index dfa3f9f..b43c2da 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -1,7 +1,6 @@
<script setup>
import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
-import {host, WebSocketHost} from '@/utils/constants'
import request from "@/utils/request"
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
@@ -32,7 +31,6 @@
stateList=[selectValuesa[1]];
}
}
-console.log(timeRange.value[0],timeRange.value[1]);
const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", {
cellList: celllist,
stateList: stateList,
@@ -70,8 +68,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 鎷胯蛋
@@ -100,11 +97,10 @@
}
}
} catch (error) {
- console.error('鍙戠敓閿欒:', error);
}
};
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) {
@@ -159,19 +155,18 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<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">{{
+ <!-- <el-button style="margin-left: 20px;" id="searchButton" type="success" @click="handlehistorical">{{
$t('searchOrder.historicaltasks')
}}
- </el-button>
+ </el-button> -->
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable
style="margin-left: 20px;margin-bottom: 10px;">
<el-option :label="$t('workOrder.edgingone')" value="930"></el-option>
@@ -214,11 +209,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>
@@ -229,7 +224,7 @@
</el-card>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="10vh" width="95%" @close="iframeUrl=''">
<iframe
:src="iframeUrl"
marginwidth="2000px"
--
Gitblit v1.8.0