From 49af39650d947cd7b12f665e58585c95410715d3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 16 七月 2024 14:51:13 +0800
Subject: [PATCH] 修改bug
---
src/components/view/a6-device-management.vue | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 714b35c..a5e0e51 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -410,7 +410,7 @@
v-model="configForm.y"></el-input>
</div>
<div class="search_thing">
- <div class="search_label"><span style="color:red;margin-right: 4px;">*</span>鍏紡锛�</div>
+ <div class="search_label">鍏紡锛�</div>
<el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="configForm.formula"></el-input>
</div>
@@ -598,21 +598,21 @@
if (power[i].menuMethod == 'addDeviceParameter') {
add = true
}
- if (power[i].menuMethod == 'numberCollect') {
+ if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
config = true
}
}
- if (!config) {
- this.componentData.do.splice(2, 1)
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- },
+ if (!config) {
+ this.componentData.do.splice(2, 1)
+ }
+ if (!up) {
+ this.componentData.do.splice(1, 1)
+ }
+ if (!del) {
+ this.componentData.do.splice(0, 1)
+ }
+ this.addPower = add
+ },
// 鑾峰彇瀛楀吀
selectEnumByCategory() {
this.$axios.post(this.$api.enums.selectEnumByCategory, {
@@ -662,6 +662,23 @@
this.componentData.tagField.insProductIds.select = [...this.componentData.tagField.insProductIds.select,...children]
this.componentData.selectField.insProductIds.select = [...this.componentData.selectField.insProductIds.select,...children]
return m
+ })
+ this.options.forEach(item=>{
+ if(item.children.length==0){
+ item.children = null;
+ }else{
+ item.children.forEach(m=>{
+ if(m.children.length==0){
+ m.children = null;
+ }else{
+ m.children.forEach(n=>{
+ if(n.children&&n.children.length==0){
+ n.children = null;
+ }
+ })
+ }
+ })
+ }
})
})
},
@@ -854,6 +871,7 @@
let list2 = []
list.map((item) => {
const obj = Object.assign({
+ deviceId: row.id,
insProductItem: item,
})
list2.push(obj)
@@ -886,10 +904,6 @@
}
if(!this.configForm.y){
this.$message.error('璇峰～鍐橸');
- return
- }
- if(!this.configForm.formula){
- this.$message.error('璇峰～鍐欏叕寮�');
return
}
--
Gitblit v1.9.3