From ae8d12c499079cf95d961bce28f6c677446130b0 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:01 +0800
Subject: [PATCH] 增添mqtt设备选项
---
src/views/business/inspectionTask/inspection.vue | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index f26bb54..01ef6f2 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,
@@ -596,6 +598,7 @@
sampleName: null,
state: null,
},
+ isSerialConnected: false, // 鏂板鐘舵�佸彉閲忥紝涓插彛杩炴帴鐘舵��
id: null,
changeType: null,
insOrder: {},
@@ -818,6 +821,7 @@
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
+ disconnect()
},
activated() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
@@ -897,6 +901,7 @@
beforeDestroy() {
// 鍦ㄧ粍浠堕攢姣佸墠纭繚鍋滄 Worker锛岄伩鍏嶅唴瀛樻硠婕�
this.stopWorker();
+ disconnect()
},
methods: {
// 鏂囦欢绠＄悊--寮�濮�
@@ -1126,8 +1131,13 @@
this.$refs.purchaseDialog.$refs["purchaseForm"].resetFields();
this.purchaseDialog = false;
},
+
// 鏁版嵁閲囬泦
getDataAcquisitionDevice() {
+ if (this.isSerialConnected) {
+ connect();
+ }
+ // return
let itemIds = [];
this.currentSample.insProduct.forEach((item) => {
if (item.inspectionItemType === "1") {
@@ -1153,6 +1163,11 @@
this.dataAcquisitionLoading = false;
});
},
+ // 鍋囪瀛樺湪涓�涓柟娉曠敤浜庢洿鏂颁覆鍙ｈ繛鎺ョ姸鎬�
+ // updateSerialConnectionStatus(status) {
+ // this.isSerialConnected = status;
+ // },
+
objectOrder(obj) {
let newkey = Object.keys(obj).sort();
let newObj = {};
@@ -1214,6 +1229,7 @@
};
}
let list = this.tableList[0].arr;
+ console.log(this.tableList[0]);
// 寰幆椤甸潰鍒楄〃淇℃伅锛屽垽鏂暟閲囨暟鎹搴旈〉闈㈠垪琛ㄤ俊鎭殑妫�楠岄」鏄摢涓紝骞剁粰褰撳墠妫�楠岄」缁戝畾璁惧淇℃伅
list.forEach((item, index) => {
let num0 = 0;
@@ -2914,6 +2930,9 @@
this.$router.go(-1)
}
},
+ destroyed() {
+ disconnect()
+ },
};
</script>
<style scoped>
--
Gitblit v1.9.3