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/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index 23a9e18..3857916 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -158,6 +158,10 @@
<div class="search_label">鏁版嵁搴撳瘑鐮侊細</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.dbPassword"></el-input>
</div>
+ <div v-if="configForm.fileType === '.mysql'" class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鏁版嵁搴撹〃锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="configForm.dbTable"></el-input>
+ </div>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="dialogVisible4 = false">鍙� 娑�</el-button>
@@ -244,7 +248,8 @@
dbFileName: "",
fiberOpticRibbon: "",
dbUserName: "",
- dbPassword: ""
+ dbPassword: "",
+ dbTable: ""
},
domains: [
{
@@ -266,6 +271,8 @@
{ label: "excel", value: ".xlsx" },
{ label: "excel", value: ".xls" },
{ label: "txt", value: ".txt" },
+ { label: "mysql", value: ".mysql" },
+ { label: "mqtt", value: ".mqtt" },
{ label: "png", value: ".png" }
],
spanList: [],
@@ -417,7 +424,8 @@
this.$set(this.configForm, "dbFileName", res.data.dbFileName);
this.$set(this.configForm, "fiberOpticRibbon", res.data.fiberOpticRibbon);
this.$set(this.configForm, "dbUserName", res.data.dbUserName);
- this.$set(this.configForm, "dbPassword", res.data.dbPassword)
+ this.$set(this.configForm, "dbPassword", res.data.dbPassword);
+ this.$set(this.configForm, "dbTable", res.data.dbTable);
})
},
// 鎻愪氦鏂囦欢閰嶇疆
@@ -433,7 +441,8 @@
dbFileName: this.configForm.dbFileName,
fiberOpticRibbon: this.configForm.fiberOpticRibbon,
dbUserName: this.configForm.dbUserName,
- dbPassword: this.configForm.dbPassword
+ dbPassword: this.configForm.dbPassword,
+ dbTable: this.configForm.dbTable
});
this.upLoad4 = true;
saveDeviceFileConfiguration({ deviceId: this.deviceId, ...obj }).then(res => {
--
Gitblit v1.9.3