Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-15 9a34ff2378be183e5dd80dc1b7ac98579589ff62

 src/components/view/a6-device-management.vue

@@ -438,7 +438,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>
@@ -700,6 +700,23 @@
            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;
                    }
                  })
                }
              })
            }
          })
            })
      },
         handleClose() {
@@ -940,10 +957,6 @@
        }
        if(!this.configForm.y){
          this.$message.error('请填写Y');
          return
        }
        if(!this.configForm.formula){
          this.$message.error('请填写公式');
          return
        }