From ea2b6775c278d8990e858a309a966b82b36f4d40 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 13 七月 2024 15:11:25 +0800
Subject: [PATCH] 设备数采配置提交
---
src/components/view/a6-device-management.vue | 2 +-
src/assets/api/controller.js | 3 ++-
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
3 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 7b82b18..a7ffa68 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -149,7 +149,8 @@
getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
-
+ queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
+ deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
}
const insOrder = {
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 c6a7209..2c40656 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
@@ -148,12 +148,28 @@
dataConfig (row) {
this.configForm = {
deviceId: row.deviceId,
- insProductItem: row.insProductItem
+ insProductItem: row.insProductItem.trim()
}
this.dialogVisible3 = true
- // this.$axios.post(this.$api.deviceScope.getNumberCollect+'?id='+row.id).then(res => {
- // this.configForm = res.data
- // })
+ this.$axios.get(this.$api.deviceScope.queryDataAcquisitionConfiguration + "?deviceId=" + row.deviceId + "&insProductItem=" + row.insProductItem.trim()).then(res => {
+ const data = res.data
+ if(data[0]) {
+ this.domains.splice(0, 1)
+ this.$set(this.configForm, 'fileType', data[0].fileType)
+ this.$set(this.configForm, 'collectUrl', data[0].collectUrl)
+ this.$set(this.configForm, 'storageUrl', data[0].storageUrl)
+ this.$set(this.configForm, 'formula', data[0].formula)
+ data.forEach(i => {
+ this.domains.push({
+ referx: i.referx,
+ refery: i.refery,
+ x: i.x,
+ y: i.y,
+ id: i.id
+ });
+ })
+ }
+ })
},
submitForm3() {
this.$refs.configForm.validate((valid) => { // 琛ㄥ崟鏍￠獙
@@ -172,9 +188,20 @@
i.deviceId = this.configForm.deviceId
i.insProductItem = this.configForm.insProductItem
})
- console.log(`output->this.domains`,this.domains)
- this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, this.domains).then(res => {
- console.log(`output->res`,res)
+ this.$axios.post(this.$api.deviceScope.saveDataAcquisitionConfiguration, {dataConfigList: JSON.parse(JSON.stringify(this.domains))},{headers: {
+ 'Content-Type': 'application/json'
+ }}).then(res => {
+ this.dialogVisible3 = false
+ this.domains = [
+ {
+ referx: '',
+ refery: '',
+ x: '',
+ y: '',
+ id: ''
+ }
+ ]
+ this.$message.success('娣诲姞鎴愬姛')
})
} else {
return false;
@@ -185,7 +212,13 @@
// 鍒犻櫎鍏紡formItem
const index = this.domains.indexOf(item)
if (index !== -1 && this.domains.length > 1) {
- this.domains.splice(index, 1)
+ this.$axios.get(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
+ if(res.code == 200) {
+ this.domains.splice(index, 1)
+ }
+ })
+ } else {
+ this.$message.error('涓嶅厑璁稿垹闄ゆ渶鍚庝竴鏉℃暟鎹紒');
}
},
addDomain() {
@@ -194,7 +227,8 @@
referx: '',
refery: '',
x: '',
- y: ''
+ y: '',
+ id: ''
});
},
evalResult () {
@@ -211,7 +245,8 @@
referx: '',
refery: '',
x: '',
- y: ''
+ y: '',
+ id: ''
}]
this.dialogVisible3 = false
this.$refs.configForm.resetFields();
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 386d68c..75ee698 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -598,7 +598,7 @@
if (power[i].menuMethod == 'addDeviceParameter') {
add = true
}
- if (power[i].menuMethod == 'numberCollect') {
+ if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
config = true
}
}
--
Gitblit v1.9.3