From af3f9aac7a437875da00aaffc628ff38dfc63e8f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 25 七月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_y_ztns
---
src/views/business/inspectionTask/inspection.vue | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index f26bb54..b441fb0 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -141,7 +141,7 @@
<el-button :loading="dataAcquisitionLoading" v-if="state == 1" size="small" type="primary"
@click="getDataAcquisitionDevice">鏁版嵁閲囬泦</el-button>
<el-button :type="dataAcquisitionEidtAble ? '' : 'primary'" v-if="state == 1" size="small"
- @click="dataAcquisitionEidtAble = !dataAcquisitionEidtAble">{{ dataAcquisitionEidtAble ? "鍏抽棴缂栬緫" : "缂栬緫鏁伴噰"
+ @click="dataAcquisitionEidtAble = !dataAcquisitionEidtAble,disconnect()">{{ dataAcquisitionEidtAble ? "鍏抽棴缂栬緫" : "缂栬緫鏁伴噰"
}}</el-button>
</div>
</div>
@@ -536,6 +536,8 @@
import AddUnPass from "../unpass/components/addUnPass.vue";
import InspectionWord from "./components/InspectionWord.vue";
import PurchaseVerification from "../unpass/components/PurchaseVerification.vue";
+import { connect,disconnect } from "@/utils/connect.js";
+
import {
doInsOrder,
getCableTag,
@@ -818,6 +820,7 @@
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
+ disconnect()
},
activated() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
@@ -897,6 +900,7 @@
beforeDestroy() {
// 鍦ㄧ粍浠堕攢姣佸墠纭繚鍋滄 Worker锛岄伩鍏嶅唴瀛樻硠婕�
this.stopWorker();
+ disconnect()
},
methods: {
// 鏂囦欢绠＄悊--寮�濮�
@@ -1128,6 +1132,8 @@
},
// 鏁版嵁閲囬泦
getDataAcquisitionDevice() {
+ // connect()
+ // return
let itemIds = [];
this.currentSample.insProduct.forEach((item) => {
if (item.inspectionItemType === "1") {
@@ -2914,6 +2920,9 @@
this.$router.go(-1)
}
},
+ destroyed() {
+ disconnect()
+ },
};
</script>
<style scoped>
--
Gitblit v1.9.3