From 5cedec3fdbb013a01ebcc1516a26efba680f764b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 七月 2024 12:22:46 +0800
Subject: [PATCH] 设备数采配置bug调整
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 fcd579d..2d4c12e 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
@@ -28,7 +28,7 @@
<el-table-column prop="refery" align="center" label="鍙傜収Y" min-width="100"></el-table-column>
<el-table-column prop="y" align="center" label="Y"></el-table-column>
<el-table-column prop="formula" align="center" label="鍏紡"></el-table-column>
- <el-table-column prop="section" fixed="right" label="鎿嶄綔" width="120">
+ <el-table-column prop="section" label="鎿嶄綔" width="120">
<template slot-scope="scope">
<el-button type="text" @click="dataConfig(scope.row)">鏁伴噰閰嶇疆</el-button>
</template>
@@ -122,6 +122,16 @@
:value="item.value">
</el-option>
</el-select>
+ </div>
+ <div v-if="configForm.fileType == '.mdb'" class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">濮旀墭瀛楁锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.mdbEntrustCode"></el-input>
+ </div>
+ <div v-if="configForm.fileType == '.mdb'" class="search_thing" style="margin-bottom: 14px;">
+ <div class="search_label">鏍峰搧瀛楁锛�</div>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="configForm.mdbSampleCode"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -217,12 +227,12 @@
index:7
},
{
- name:'inspectionItemSubclass',
- index:12
+ name:'formula',
+ index:13
},
{
name:'inspectionItemSubclass',
- index:13
+ index:14
}
]
}
@@ -306,7 +316,6 @@
this.tableList = res.data
this.tableList.forEach(i => {
i.sample = i.sample.replaceAll('"', '').replaceAll("],", '锛�').replaceAll("[", '').replaceAll('"', '').replaceAll(']', '')
- console.log(`output->i.sample`,i.sample)
})
if(this.tableList[0]) {
this.$set(this.configForm, 'fileType', this.tableList[0].fileType)
@@ -354,11 +363,13 @@
this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration + "?deviceId=" + this.deviceId, obj, {headers: {
'Content-Type': 'application/json'
}}).then(res => {
- this.tableList = res.data
- this.dialogVisible4 = false
- this.upLoad4 = false
- this.init()
- this.$message.success('鎿嶄綔鎴愬姛')
+ if(res.code == 200) {
+ this.tableList = res.data
+ this.dialogVisible4 = false
+ this.init()
+ this.$message.success('鎿嶄綔鎴愬姛')
+ }
+ this.upLoad4 = false
}).catch(err => {
this.upLoad4 = false
})
--
Gitblit v1.9.3