Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/rulesManagement/components/programRulesDialog.vue

@@ -705,7 +705,7 @@
                   deviceInfo: item.equipmentList.map((item) => {
                     return {
                       substanceId: this.dialogTitle.includes('新增')
-                        ? item.position[0].substanceId
+                        ? item.position[0]?.substanceId
                         : item.id,
                       // 前端回显字段
                       id: item.id,

src/views/system/role/components/role-search.vue

@@ -12,11 +12,11 @@
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织名称:">
           <el-input clearable v-model.trim="where.groupName" placeholder="请输入" />
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="备注:">
           <el-input clearable v-model.trim="where.comments" placeholder="请输入" />
@@ -45,7 +45,7 @@
       // 默认表单数据
       const defaultWhere = {
         name: '',
-        groupName: ''
+        // groupName: ''
       };
       return {
         // 表单数据