From 35be1338289feb3004f4d78f5a2d42e8b879954d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 22 七月 2024 18:17:28 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/view/a6-device-management.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index b687008..0388057 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -449,7 +449,7 @@
 				</el-row>
 			</span>
     </el-dialog>
-    <dataAcquisitionConfig v-if="showData" :tableList="tableList"/>
+    <dataAcquisitionConfig v-if="showData" :deviceId="deviceId"/>
 	</div>
 </template>
 
@@ -463,6 +463,7 @@
 		},
 		data() {
 			return {
+				deviceId: '',
 				fileTypeOptions: [
 					{label: 'csv', value: '.csv'},
 					{label: 'db', value: '.db'},
@@ -914,6 +915,7 @@
           list2.push(obj)
         })
         this.tableList = list2
+		this.deviceId = row.id
       },
       closeDataVue () {
         this.showData = false

--
Gitblit v1.9.3