From c1a35f017eba33c14536784325f3fd16a60a603d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 16:20:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 20 ++++++++++++--------
1 files changed, 12 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 32d89ba..0f5b5d3 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
@@ -54,11 +54,11 @@
<el-form-item class="fomItemInput" label="鍙傜収X:">
<el-input v-model="domain.referx"></el-input>
</el-form-item>
- <el-form-item class="fomItemInput" label="鍙傜収Y:">
- <el-input v-model="domain.refery"></el-input>
- </el-form-item>
<el-form-item class="fomItemInput" label="X:">
<el-input v-model="domain.x" onkeyup="value=value.replace(/[^-0-9]/g,'')"></el-input>
+ </el-form-item>
+ <el-form-item class="fomItemInput" label="鍙傜収Y:">
+ <el-input v-model="domain.refery"></el-input>
</el-form-item>
<el-form-item class="fomItemInput" label="Y:">
<el-input v-model="domain.y" onkeyup="value=value.replace(/[^-0-9]/g,'')"></el-input>
@@ -203,11 +203,15 @@
// 鍒犻櫎鍏紡formItem
const index = this.domains.indexOf(item)
if (index !== -1 && this.domains.length > 1) {
- this.$axios.get(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
- if(res.code == 200) {
- this.domains.splice(index, 1)
- }
- })
+ if(item.id){
+ this.$axios.get(this.$api.deviceScope.deleteDataAcquisitionConfiguration + "?id=" + item.id).then(res => {
+ if(res.code == 200) {
+ this.domains.splice(index, 1)
+ }
+ })
+ } else {
+ this.domains.splice(index, 1)
+ }
} else {
this.$message.error('涓嶅厑璁稿垹闄ゆ渶鍚庝竴鏉℃暟鎹紒');
}
--
Gitblit v1.9.3