From a01f3e11256c235a6604a09b7648965db7eeee7a Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 15:20:55 +0800
Subject: [PATCH] 设备数采配置bug调整
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 bb598d9..42964c9 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
@@ -21,7 +21,7 @@
<el-table-column prop="storageUrl" align="center" min-width="100" show-overflow-tooltip label="瀛樺偍鍦板潃"></el-table-column>
<el-table-column prop="ip" align="center" label="IP鍦板潃"></el-table-column>
<el-table-column prop="inspectionItem" align="center" label="妫�楠岄」" min-width="100"></el-table-column>
- <el-table-column prop="inspectionItemSubClass" align="center" label="妫�楠岄」瀛愰」" min-width="100"></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" align="center" label="妫�楠岄」瀛愰」" min-width="100"></el-table-column>
<el-table-column prop="referx" align="center" label="鍙傜収X"></el-table-column>
<el-table-column prop="x" align="center" label="X"></el-table-column>
<el-table-column prop="refery" align="center" label="鍙傜収Y"></el-table-column>
@@ -185,7 +185,7 @@
specialSpanList: [],
spanConfig: {
special: {
- main: "inspectionItemSubClass",
+ main: "inspectionItemSubclass",
rows:[
{
name:'deviceName',
@@ -212,15 +212,15 @@
index:6
},
{
- name:'inspectionItemSubClass',
+ name:'inspectionItemSubclass',
index:7
},
{
- name:'inspectionItemSubClass',
+ name:'inspectionItemSubclass',
index:12
},
{
- name:'inspectionItemSubClass',
+ name:'inspectionItemSubclass',
index:13
}
]
@@ -361,10 +361,14 @@
dataConfig (row) {
this.configForm = {
deviceId: row.deviceId,
- insProductItem: row.inspectionItemSubClass.trim()
+ inspectionItem: row.inspectionItem.trim(),
+ inspectionItemSubclass: row.inspectionItemSubclass
}
this.dialogVisible3 = true
- this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + this.deviceId + "&insProductItem=" + row.inspectionItemSubClass.trim() + "&isDevice=" + true).then(res => {
+ this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + this.deviceId +
+ "&inspectionItem=" + row.inspectionItem.trim() +
+ "&isDevice=" + true +
+ "&inspectionItemSubclass=" + row.inspectionItemSubclass.trim()).then(res => {
const data = res.data
if(data[0]) {
this.domains.splice(0, 1)
@@ -399,7 +403,8 @@
}
i.formula = this.configForm.formula
i.deviceId = this.deviceId
- i.insProductItem = this.configForm.insProductItem
+ i.inspectionItem = this.configForm.inspectionItem
+ i.inspectionItemSubclass = this.configForm.inspectionItemSubclass
})
this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration + "?deviceId=" + this.deviceId, {dataConfigList: this.domains, isDevice: false},{headers: {
'Content-Type': 'application/json'
--
Gitblit v1.9.3