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 |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 01323d6..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>
@@ -480,7 +480,10 @@
 						id: 'handleConfig',
 						font: '鏁伴噰閰嶇疆',
 						type: 'text',
-						method: 'handleConfig'
+						method: 'handleConfig',
+            disabFun: (row, index) => {
+              return row.insProductItem === ''
+            }
 					}],
           headNoShow:['enDeviceName'],
 					tagField: {
@@ -595,7 +598,7 @@
 					if (power[i].menuMethod == 'addDeviceParameter') {
 						add = true
 					}
-          			if (power[i].menuMethod == 'numberCollect') {
+          			if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
 						config = true
 					}
 				}
@@ -659,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;
+                    }
+                  })
+                }
+              })
+            }
           })
 				})
       },
@@ -884,10 +904,6 @@
         }
         if(!this.configForm.y){
           this.$message.error('璇峰~鍐橸');
-          return
-        }
-        if(!this.configForm.formula){
-          this.$message.error('璇峰~鍐欏叕寮�');
           return
         }
 

--
Gitblit v1.9.3