From e9c7fa1915cd2afbadaef1884324fa7cd5aaaf25 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 29 七月 2025 10:12:06 +0800
Subject: [PATCH] Merge branch 'dev_y_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_y_ztns
---
src/views/business/inspectionTask/inspection.vue | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index b441fb0..01ef6f2 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -598,6 +598,7 @@
sampleName: null,
state: null,
},
+ isSerialConnected: false, // 鏂板鐘舵�佸彉閲忥紝涓插彛杩炴帴鐘舵��
id: null,
changeType: null,
insOrder: {},
@@ -1130,9 +1131,12 @@
this.$refs.purchaseDialog.$refs["purchaseForm"].resetFields();
this.purchaseDialog = false;
},
+
// 鏁版嵁閲囬泦
getDataAcquisitionDevice() {
- // connect()
+ if (this.isSerialConnected) {
+ connect();
+ }
// return
let itemIds = [];
this.currentSample.insProduct.forEach((item) => {
@@ -1159,6 +1163,11 @@
this.dataAcquisitionLoading = false;
});
},
+ // 鍋囪瀛樺湪涓�涓柟娉曠敤浜庢洿鏂颁覆鍙ｈ繛鎺ョ姸鎬�
+ // updateSerialConnectionStatus(status) {
+ // this.isSerialConnected = status;
+ // },
+
objectOrder(obj) {
let newkey = Object.keys(obj).sort();
let newObj = {};
@@ -1220,6 +1229,7 @@
};
}
let list = this.tableList[0].arr;
+ console.log(this.tableList[0]);
// 寰幆椤甸潰鍒楄〃淇℃伅锛屽垽鏂暟閲囨暟鎹搴旈〉闈㈠垪琛ㄤ俊鎭殑妫�楠岄」鏄摢涓紝骞剁粰褰撳墠妫�楠岄」缁戝畾璁惧淇℃伅
list.forEach((item, index) => {
let num0 = 0;
--
Gitblit v1.9.3