From 7f1673a5d9d43e6e03dfa9c9ee18186cf1be3ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Thu, 18 Jul 2024 22:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E3=80=81?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=8E=A5=E6=94=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scExport/index.vue | 12 +++++++++---
 src/components/scImport/index.vue | 23 +++++++++++++++--------
 src/main.js                       |  1 -
 src/utils/eventBus.js             | 25 +++++++++++++++++++++++++
 src/utils/websocket.js            |  5 ++++-
 5 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 src/utils/eventBus.js

diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index ec832da..92ea18e 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -27,6 +27,8 @@
 </template>
 
 <script>
+import {eventBus} from "@/utils/eventBus"
+
 export default {
 	name: "index",
 	props:{
@@ -41,10 +43,16 @@ export default {
 		return{
 			list:[{},{},{}],
 		}
+	},
+	setup(){
+
 	},
 	mounted() {
 		// 获取新消息
-		// this.$socketApi.getSock(this.getWsResult);
+		eventBus.$on('sockBack', this.getWsResult);
+	},
+	unmounted() {
+		eventBus.$off('sockBack', this.getWsResult);
 	},
 	methods:{
 		getWsResult(res){
@@ -82,8 +90,6 @@ export default {
 		},
 		exportClick(){
 			this.$emit('exportData');
-			// 获取新消息
-			this.$socketApi.getSock(this.getWsResult);
 		},
 	}
 }
diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue
index 6dcdb82..d2fd6ff 100644
--- a/src/components/scImport/index.vue
+++ b/src/components/scImport/index.vue
@@ -34,7 +34,9 @@
 
 				<template #tip>
 					<div class="el-upload__tip">
-						<span class="tip">如果数据导入中途业务出错，请不要刷新页面，修改后继续点击导入</span>
+						<span class="tip">
+<!--							如果数据导入中途业务出错，请不要刷新页面，修改后继续点击导入-->
+						</span>
 						<span class="btn">
 							<slot></slot>
 						</span>
@@ -60,6 +62,9 @@
 </template>
 
 <script>
+// import {inject} from "vue";
+import {eventBus} from "@/utils/eventBus"
+
 export default {
 	name: "import",
 	emits: ['parentParams', 'closed', "importSuccess"],
@@ -86,17 +91,18 @@ export default {
 			importInfo:{},
 			errorList:[]
 		}
+	},
+	setup(){
+
 	},
 	watch:{
-		visible(val){
-			if(val){
-				// 获取新消息
-				this.$socketApi.getSock(this.getWsResult);
-			}
-		}
+
 	},
 	mounted() {
-
+		eventBus.$on('sockBack', this.getWsResult);
+	},
+	unmounted() {
+		eventBus.$off('sockBack', this.getWsResult);
 	},
 	methods:{
 		getWsResult(res){
@@ -155,6 +161,7 @@ export default {
 		},
 		save(){
 			this.errorClick();
+
 			this.$emit('parentParams',this.params);
 		},
 		// 上传成功
diff --git a/src/main.js b/src/main.js
index e27ad42..7eeebb1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,5 @@ app.use(i18n);
 app.use(scui);
 app.use(VideoPlayer)
 
-
 //挂载app
 app.mount('#app');
diff --git a/src/utils/eventBus.js b/src/utils/eventBus.js
new file mode 100644
index 0000000..6636de8
--- /dev/null
+++ b/src/utils/eventBus.js
@@ -0,0 +1,25 @@
+// eventBus.js
+export const eventBus = {
+	listeners: {},
+
+	$on(eventName, listener) {
+		if (!this.listeners[eventName]) {
+			this.listeners[eventName] = [];
+		}
+		this.listeners[eventName].push(listener);
+	},
+
+	$emit(eventName, ...args) {
+		const listeners = this.listeners[eventName];
+		if (listeners) {
+			listeners.forEach((listener) => listener(...args));
+		}
+	},
+
+	$off(eventName, listener) {
+		const listeners = this.listeners[eventName];
+		if (listeners) {
+			this.listeners[eventName] = listeners.filter(l => l !== listener);
+		}
+	}
+};
diff --git a/src/utils/websocket.js b/src/utils/websocket.js
index 19413c1..5540cb9 100644
--- a/src/utils/websocket.js
+++ b/src/utils/websocket.js
@@ -5,6 +5,7 @@ import systemConfig from '@/config';
 import api from '../api';
 import router from "@/router";
 import {ElNotification} from 'element-plus';
+import {eventBus} from "./eventBus"
 // import store from "../store";
 
 let websocket = null;
@@ -153,6 +154,8 @@ function webSocketOnMessage(msg) {
 		}
 	}
 
+	eventBus.$emit('sockBack',result);
+
 	if(result.type == 'init'){
 		if(showNot && showNot.close){
 			showNot.close();
@@ -168,7 +171,7 @@ function handleError() {
 }
 
 function getSock(callback) {
-	global_callback = callback
+	global_callback = callback;
 }
 
 // 数据发送