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

---
 src/components/do/b6-device-management/b6-data-acquisition-config.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
index 2d4c12e..cf5af10 100644
--- a/src/components/do/b6-device-management/b6-data-acquisition-config.vue
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -322,6 +322,8 @@
           this.$set(this.configForm, 'collectUrl', this.tableList[0].collectUrl)
           this.$set(this.configForm, 'storageUrl', this.tableList[0].storageUrl)
           this.$set(this.configForm, 'ip', this.tableList[0].ip)
+          this.$set(this.configForm, 'mdbEntrustCode', this.tableList[0].mdbEntrustCode)
+          this.$set(this.configForm, 'mdbSampleCode', this.tableList[0].mdbSampleCode)
         }
         // 涓�鑸殑鍚堝苟琛�
         if (this.spanConfig != undefined && this.spanConfig.rows && this.spanConfig.rows.length >
@@ -357,7 +359,9 @@
         collectUrl: this.configForm.collectUrl,
         storageUrl: this.configForm.storageUrl,
         ip: this.configForm.ip,
-        isDevice: true
+        isDevice: true,
+        mdbEntrustCode: this.configForm.mdbEntrustCode,
+        mdbSampleCode: this.configForm.mdbSampleCode
       })
       this.upLoad4 = true
       this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration + "?deviceId=" + this.deviceId, obj, {headers: {

--
Gitblit v1.9.3